diff --git a/test_lists/HW_CI b/test_lists/HW_CI
index 9843029..e8350e8 100644
--- a/test_lists/HW_CI
+++ b/test_lists/HW_CI
@@ -1,6 +1,8 @@
-#REST SSL connection test
+#REST SSL connection test.
 -i Test_SSL_Connection
 #Basic poweron test
 -i Power_On_Test
-# Check for apps failures
+#Check for apps failures.
 -i Check_For_Application_Failures
+#OCC active state check.
+-i Verify_OCC_State_When_Host_Is_Booted
diff --git a/tests/test_occ_power.robot b/tests/test_occ_power.robot
index 0cdb400..ab1b136 100644
--- a/tests/test_occ_power.robot
+++ b/tests/test_occ_power.robot
@@ -38,9 +38,9 @@
     Should Be Equal  ${occ_count}  ${inventory_count}
     ...  msg=OCC and inventory entry counts are mismatched.
 
-Verify When Host Is Booted
+Verify OCC State When Host Is Booted
     [Documentation]  Verify OCC state when host is booted.
-    [Tags]  Verify_When_Host_Is_Booted
+    [Tags]  Verify_OCC_State_When_Host_Is_Booted
 
     Verify OCC State  ${1}
 
@@ -117,4 +117,5 @@
     \  Continue For Loop If  ${is_functional} == ${0}
     \  ${num}=  Set Variable  ${endpoint_path[-1]}
     \  ${occ_active}=  Get OCC Active State  ${OPENPOWER_CONTROL}occ${num}
-    \  Should Be Equal  ${occ_active}  ${expected_occ_active}  msg=OCC not in right state
+    \  Should Be Equal  ${occ_active}  ${expected_occ_active}
+    ...  msg=OCC not in right state