diff --git a/tests/test_boot_devices.robot b/tests/test_boot_devices.robot
index 3a4e984..bbe203f 100644
--- a/tests/test_boot_devices.robot
+++ b/tests/test_boot_devices.robot
@@ -6,6 +6,7 @@
 Resource        ../lib/ipmi_client.robot
 Resource        ../lib/openbmc_ffdc.robot
 Resource        ../lib/utils.robot
+Resource        ../lib/boot_utils.robot
 
 Suite Setup     Test Suite Setup
 Test Setup      Pre Test Case Execution
@@ -14,6 +15,7 @@
 
 *** Variables ***
 
+${stack_mode}     skip
 ${HOST_SETTINGS}  ${SETTINGS_URI}host0
 
 *** Test Cases ***
@@ -194,11 +196,5 @@
 Test Suite Setup
     [Documentation]  Do the initial suite setup.
 
-    # Reboot host to re-power on clean if host is not "off".
-    ${current_state}=  Get Host State
-    Run Keyword If  '${current_state}' == 'Off'
-    ...  Initiate Host Boot
-    ...  ELSE  Initiate Host Reboot
-
-    Wait Until Keyword Succeeds
-    ...  10 min  10 sec  Is OS Starting
+    # Boot Host.
+    REST Power On