diff --git a/test_lists/HW_CI b/test_lists/HW_CI
index 3f82025..a0784ec 100644
--- a/test_lists/HW_CI
+++ b/test_lists/HW_CI
@@ -7,8 +7,6 @@
 -i Power_On_Test
 #Check for apps failures.
 -i Check_For_Application_Failures
-#OCC active state check.
--i Verify_OCC_State_When_Host_Is_Booted
 #Additional REST API tests
 -i REST_Login_Session_To_BMC
 -i Verify_REST_Get_Message_JSON_Compliant
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index b60f509..9ef2cb5 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -48,17 +48,6 @@
 
     Should Be Empty  ${journal_log}
 
-Test SSH And IPMI Connections
-    [Documentation]  Try SSH and IPMI commands to verify each connection.
-    [Tags]  Test_SSH_And_IPMI_Connections
-
-    Check If BMC Is Up  3 min  20 sec
-    Wait Until Keyword Succeeds
-    ...  3 min  30 sec  Wait for BMC state  Ready
-
-    BMC Execute Command  true
-    Run IPMI Standard Command  chassis status
-
 Verify Uptime Average Against Threshold
     [Documentation]  Compare BMC average boot time to a constant threshold.
     [Tags]  Verify_Uptime_Average_Against_Threshold
@@ -70,6 +59,17 @@
     Should Be True  ${uptime} < 180
     ...  msg=${uptime} exceeds threshold.
 
+Test SSH And IPMI Connections
+    [Documentation]  Try SSH and IPMI commands to verify each connection.
+    [Tags]  Test_SSH_And_IPMI_Connections
+
+    Check If BMC Is Up  3 min  20 sec
+    Wait Until Keyword Succeeds
+    ...  3 min  30 sec  Wait for BMC state  Ready
+
+    BMC Execute Command  true
+    Run IPMI Standard Command  chassis status
+
 *** Keywords ***
 
 Test Setup Execution