diff --git a/lib/state_manager.robot b/lib/state_manager.robot
index 59da9ff..d6e1508 100755
--- a/lib/state_manager.robot
+++ b/lib/state_manager.robot
@@ -45,8 +45,10 @@
     # Does caller want to wait for status?
     Run Keyword If  '${wait}' == '${0}'  Return From Keyword
 
+    # TODO: Reference to open-power/skiboot#81.
+    # Revert to 3 minutes once fixed.
     Wait Until Keyword Succeeds
-    ...  3 min  10 sec  Is Host Off
+    ...  6 min  10 sec  Is Host Off
 
 
 Initiate Host Reboot
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index 0066458..093e0a9 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -51,10 +51,8 @@
     [Documentation]  Verify power off and on.
 
     Initiate Host PowerOff
-    Wait Until Keyword Succeeds  5 min  10 sec  Is OS Off
 
     Initiate Host Boot
-    Wait Until Keyword Succeeds  10 min  10 sec  Is OS Starting
 
     # TODO: Host shutdown race condition.
     # Wait 30 seconds before Powering Off.