diff --git a/tests/common/reboot.py b/tests/common/reboot.py
index 7dd99231405..004b654a263 100644
--- a/tests/common/reboot.py
+++ b/tests/common/reboot.py
@@ -46,7 +46,7 @@
     },
     REBOOT_TYPE_WARM: {
         "command": "warm-reboot",
-        "timeout": 210,
+        "timeout": 300,
         "wait": 90,
         "cause": "warm-reboot",
         "test_reboot_cause_only": False
@@ -111,7 +111,8 @@ def execute_reboot_helper():
                              state='absent',
                              search_regex=SONIC_SSH_REGEX,
                              delay=delay,
-                             timeout=timeout)
+                             timeout=timeout,
+                             module_ignore_errors=True)
 
     if 'failed' in res:
         if reboot_res.ready():
@@ -128,8 +129,8 @@ def execute_reboot_helper():
                              state='started',
                              search_regex=SONIC_SSH_REGEX,
                              delay=delay,
-                             timeout=timeout
-    )
+                             timeout=timeout,
+                             module_ignore_errors=True)
     if 'failed' in res:
         raise Exception('DUT did not startup')