diff --git a/extended/test_watchdog.robot b/extended/test_watchdog.robot
index 5d717c9..51c4613 100644
--- a/extended/test_watchdog.robot
+++ b/extended/test_watchdog.robot
@@ -46,9 +46,7 @@
     Wait Until Keyword Succeeds  3 min  10 sec  Watchdog Object Should Exist
 
     # Verify if watchdog settings are enabled and timeremaining is reduced.
-    ${properties}=  Read Properties  /xyz/openbmc_project/watchdog/host0
-    Should Be Equal As Strings  ${properties["Enabled"]}  ${True}
-    Should Not Be Equal As Strings  ${properties["TimeRemaining"]}  0
+    Wait Until Keyword Succeeds  3 min  10 sec  Verify Watchdog Enabled
 
     Wait Until Keyword Succeeds  120 sec  20 sec  Is Host Rebooted
     Wait For Host To Ping  ${OS_HOST}  5min  10
@@ -144,3 +142,10 @@
     ${resp}=  OpenBMC Get Request  ${WATCHDOG_URI}host0
     Should Be Equal As Strings  ${resp.status_code}  ${HTTP_OK}
 
+
+Verify Watchdog Enabled
+    [Documentation]  Check that watchdog settings are enabled.
+
+    ${properties}=  Read Properties  /xyz/openbmc_project/watchdog/host0
+    Should Be Equal As Strings  ${properties["Enabled"]}  ${True}
+    Should Not Be Equal As Strings  ${properties["TimeRemaining"]}  0