diff --git a/ipmi/test_ipmi_resets.robot b/ipmi/test_ipmi_resets.robot
new file mode 100755
index 0000000..19743af
--- /dev/null
+++ b/ipmi/test_ipmi_resets.robot
@@ -0,0 +1,50 @@
+*** Settings ***
+Documentation    Module to test IPMI cold and warm reset functionalities.
+
+Resource         ../lib/ipmi_client.robot
+Resource         ../lib/openbmc_ffdc.robot
+
+Test Teardown    FFDC On Test Case Fail
+
+*** Variables ***
+
+# User may pass LOOP_COUNT.
+${LOOP_COUNT}  ${1}
+
+*** Test Cases ***
+
+Test IPMI Warm Reset
+    [Documentation]  Check IPMI warm reset and wait for BMC to become online.
+    [Tags]  Test_IPMI_Warm_Reset
+    Repeat Keyword  ${LOOP_COUNT} times  IPMI MC Reset Warm (off)
+
+
+Test IPMI Cold Reset
+    [Documentation]  Check IPMI cold reset and wait for BMC to become online.
+    [Tags]  Test_IPMI_Cold_Reset
+
+    Repeat Keyword  ${LOOP_COUNT} times  IPMI MC Reset Cold (off)
+
+
+Verify BMC Power Cycle via IPMI
+    [Documentation]  Verify IPMI power cycle command works fine.
+    [Tags]  Verify_BMC_Power_Cycle_via_IPMI
+
+    Redfish Power On  stack_mode=skip  quiet=1
+    Run IPMI Standard Command  chassis power cycle
+    Wait Until Keyword Succeeds  3 min  10 sec  Is IPMI Chassis Off
+    Wait Until Keyword Succeeds  3 min  10 sec  Is IPMI Chassis On
+
+
+*** Keywords ***
+
+Is IPMI Chassis Off
+    [Documentation]  Check if chassis state is "Off" via IPMI.
+    ${power_state}=  Get Chassis Power State
+    Should Be Equal  ${power_state}  Off
+
+
+Is IPMI Chassis On
+    [Documentation]  Check if chassis state is "On" via IPMI.
+    ${power_state}=  Get Chassis Power State
+    Should Be Equal  ${power_state}  On
diff --git a/tests/ipmi/test_ipmi_resets.robot b/tests/ipmi/test_ipmi_resets.robot
deleted file mode 100755
index 2e99d1e..0000000
--- a/tests/ipmi/test_ipmi_resets.robot
+++ /dev/null
@@ -1,39 +0,0 @@
-*** Settings ***
-Documentation    Module to test IPMI cold and warm reset functionalities.
-
-Resource         ../../lib/ipmi_client.robot
-Resource         ../../lib/openbmc_ffdc.robot
-Resource         ../../lib/state_manager.robot
-Resource         ../../lib/utils.robot
-Resource         ../../lib/boot_utils.robot
-
-Test Teardown    FFDC On Test Case Fail
-
-*** Variables ***
-
-# User may pass LOOP_COUNT.
-${LOOP_COUNT}  ${1}
-
-*** Test Cases ***
-
-Test IPMI Warm Reset
-    [Documentation]  Check IPMI warm reset and wait for BMC to become online.
-    [Tags]  Test_IPMI_Warm_Reset
-
-    Repeat Keyword  ${LOOP_COUNT} times  IPMI MC Reset Warm (off)
-
-
-Test IPMI Cold Reset
-    [Documentation]  Check IPMI cold reset and wait for BMC to become online.
-    [Tags]  Test_IPMI_Cold_Reset
-
-    Repeat Keyword  ${LOOP_COUNT} times  IPMI MC Reset Cold (off)
-
-Verify BMC Power Cycle via IPMI
-    [Documentation]  Verify IPMI power cycle command works fine.
-    [Tags]  Verify_BMC_Power_Cycle_via_IPMI
-
-    REST Power On  stack_mode=skip
-    Run IPMI Standard Command  chassis power cycle
-    Wait Until Keyword Succeeds  3 min  10 sec  Is Host Off
-    Wait Until Keyword Succeeds  3 min  10 sec  Is Host Running