diff --git a/lib/state_manager.robot b/lib/state_manager.robot
index d6e1508..d1998ae 100755
--- a/lib/state_manager.robot
+++ b/lib/state_manager.robot
@@ -62,14 +62,22 @@
 
 Is Host Running
     [Documentation]  Check if host state is "Running".
+    # Chassis state should be "On" before we check the host state.
+    Is Chassis On
     ${host_state}=  Get Host State
     Should Be Equal  Running  ${host_state}
+    # Check to verify that the host is really booted.
+    Is OS Starting
 
 
 Is Host Off
     [Documentation]  Check if host state is "Off".
+    # Chassis state should be "Off" before we check the host state.
+    Is Chassis Off
     ${host_state}=  Get Host State
     Should Be Equal  Off  ${host_state}
+    # Check to verify that the host shutdown completely.
+    Is OS Off
 
 
 Is Host Rebooted