diff --git a/systest/htx_softbootme_test.robot b/systest/htx_softbootme_test.robot
index 19996b8..9a6441d 100644
--- a/systest/htx_softbootme_test.robot
+++ b/systest/htx_softbootme_test.robot
@@ -90,8 +90,10 @@
             Wait Until Keyword Succeeds
             ...   1 min   30 sec   Verify Ping SSH And Redfish Authentication
 
-            OS Execute Command  uptime
-            Check HTX Run Status
+            Wait Until Keyword Succeeds
+            ...   3x  60 sec  OS Execute Command  uptime
+            Wait Until Keyword Succeeds
+            ...   1 min   30 sec   Check HTX Run Status
 
             Set Suite Variable  ${iteration}  ${iteration + 1}
             ${loop_count}=  Catenate  Completed reboot number: ${iteration}
@@ -108,7 +110,7 @@
     END
 
     Wait Until Keyword Succeeds
-    ...   15 min   30 sec   Verify Ping and REST Authentication
+    ...   15 min   30 sec   Verify Ping SSH And Redfish Authentication
 
     Shutdown Bootme