diff --git a/redfish/systems/test_power_operations.robot b/redfish/systems/test_power_operations.robot
index 563f24e..ff4f7bd 100644
--- a/redfish/systems/test_power_operations.robot
+++ b/redfish/systems/test_power_operations.robot
@@ -38,7 +38,10 @@
 
     Redfish Power On
 
-    Run Keyword If  ${additional_power_check} == ${1}  Additional OCC And Power Check
+    Run Keyword If  ${additional_power_check} == ${1}
+    ...  Wait Until Keyword Succeeds  3 mins  30 secs  Match OCC And CPU State Count
+
+    Run Keyword If  ${additional_power_check} == ${1}  Power Check
 
 
 Verify Redfish BMC GracefulRestart
@@ -78,11 +81,8 @@
     Redfish.Logout
 
 
-Additional OCC And Power Check
-    [Documentation]  Verify OCC state and PowerConsumedWatts property.
-
-    # TODO: Replace OCC state check with redfish property when available.
-    Verify OCC State
+Power Check
+    [Documentation]  Verify PowerConsumedWatts property.
 
     ${power_uri_list}=  redfish_utils.Get Members URI  /redfish/v1/Chassis/  PowerControl
     Log List  ${power_uri_list}