diff --git a/ansible/roles/test/files/ptftests/advanced-reboot.py b/ansible/roles/test/files/ptftests/advanced-reboot.py
index 2b4b748d641..16d46cbdf78 100644
--- a/ansible/roles/test/files/ptftests/advanced-reboot.py
+++ b/ansible/roles/test/files/ptftests/advanced-reboot.py
@@ -131,7 +131,7 @@ def __init__(self):
         self.check_param('dut_hostname', '', required=True)
         self.check_param('reboot_limit_in_seconds', 30, required=False)
         self.check_param('reboot_type', 'fast-reboot', required=False)
-        self.check_param('graceful_limit', 180, required=False)
+        self.check_param('graceful_limit', 240, required=False)
         self.check_param('portchannel_ports_file', '', required=True)
         self.check_param('vlan_ports_file', '', required=True)
         self.check_param('ports_file', '', required=True)
diff --git a/tests/platform_tests/args/cont_warm_reboot_args.py b/tests/platform_tests/args/cont_warm_reboot_args.py
index c4d4a540525..ea33d946e6d 100644
--- a/tests/platform_tests/args/cont_warm_reboot_args.py
+++ b/tests/platform_tests/args/cont_warm_reboot_args.py
@@ -6,7 +6,7 @@ def add_cont_warm_reboot_args(parser):
         "--continuous_reboot_count",
         action="store",
         type=int,
-        default=5,
+        default=3,
         help="Number of iterations of warm-reboot",
     )
 
diff --git a/tests/platform_tests/test_cont_warm_reboot.py b/tests/platform_tests/test_cont_warm_reboot.py
index 836d2be9094..b02c93e0b3c 100644
--- a/tests/platform_tests/test_cont_warm_reboot.py
+++ b/tests/platform_tests/test_cont_warm_reboot.py
@@ -353,6 +353,8 @@ def create_test_report(self):
         with open(report_file, "w") as report_file:
             json.dump(test_report, report_file, indent=4)
 
+        pytest_assert(self.test_failures == 0, "Continuous reboot test failed {}/{} times".\
+            format(self.test_failures, self.reboot_count))
 
     def wait_until_uptime(self):
         logging.info("Wait until DUT uptime reaches {}s".format(self.continuous_reboot_delay))