diff --git a/data/boot_table_redfish.json b/data/boot_table_redfish.json
index 238fd4b..5379a4a 100644
--- a/data/boot_table_redfish.json
+++ b/data/boot_table_redfish.json
@@ -198,6 +198,7 @@
         },
         "end": {
             "redfish": "^1$",
+            "bmc": "^Enabled$",
             "chassis": "^On$",
             "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
             "host": "^Enabled$",
@@ -221,6 +222,7 @@
         },
         "end": {
             "redfish": "^1$",
+            "bmc": "^Enabled$",
             "chassis": "^On$",
             "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
             "host": "^Enabled$",
@@ -240,6 +242,7 @@
         },
         "end": {
             "redfish": "^1$",
+            "bmc": "^Enabled$",
             "chassis": "^Off$",
             "boot_progress": "^None$",
             "host": "^Disabled$"
@@ -255,6 +258,7 @@
         },
         "end": {
             "redfish": "^1$",
+            "bmc": "^Enabled$",
             "chassis": "^Off$",
             "boot_progress": "^None$",
             "host": "^Disabled$"
@@ -548,6 +552,7 @@
         },
         "end": {
             "redfish": "^1$",
+            "bmc": "^Enabled$",
             "chassis": "^On$",
             "boot_progress": "^SystemHardwareInitializationComplete|OSBootStarted|OSRunning$",
             "host": "^Enabled$",
diff --git a/lib/utils.robot b/lib/utils.robot
index ad1a700..3163015 100755
--- a/lib/utils.robot
+++ b/lib/utils.robot
@@ -1000,7 +1000,6 @@
 
     # Check if BMC is still online.
     Wait Until Keyword Succeeds  5 min  10 sec  Is BMC Unpingable
-    Wait For Host To Ping  ${OPENBMC_HOST}  3 min
 
 
 Get BIOS Attribute