diff --git a/extended/test_watchdog.robot b/extended/test_watchdog.robot
index a9e38b4..c11db31 100644
--- a/extended/test_watchdog.robot
+++ b/extended/test_watchdog.robot
@@ -48,7 +48,7 @@
     # Verify if watchdog settings are enabled and timeremaining is reduced.
     Wait Until Keyword Succeeds  3 min  10 sec  Verify Watchdog Enabled
 
-    Wait Until Keyword Succeeds  120 sec  20 sec  Is Host Rebooted
+    Wait Until Keyword Succeeds  300 sec  20 sec  Is Host Rebooted
     Wait For Host To Ping  ${OS_HOST}  5min  10
     Wait for OS
 
@@ -110,6 +110,9 @@
     # Boot to OS.
     REST Power On
 
+    # Enable auto reboot
+    Set Auto Reboot  ${1}
+
 Suite Teardown Execution
     [Documentation]  Restore watchdog Default setting.