diff --git a/ipmi/test_ipmi_sol.robot b/ipmi/test_ipmi_sol.robot
index ded917c..3beb9d8 100644
--- a/ipmi/test_ipmi_sol.robot
+++ b/ipmi/test_ipmi_sol.robot
@@ -356,11 +356,21 @@
     Initiate Host Boot Via External IPMI  wait=${0}
 
     Activate SOL Via IPMI
-    Wait Until Keyword Succeeds  3 mins  15 secs
-    ...  Check IPMI SOL Output Content  Welcome to Hostboot
+    # Content takes maximum of 10 minutes to display in SOL console
+    # SOL_BIOS_OUTPUT - BIOS SOL console output
+    ${status}=  Run Keyword And Return Status  Wait Until Keyword Succeeds  10 mins  15 secs
+    ...  Check IPMI SOL Output Content  ${SOL_BIOS_OUTPUT}
 
-    Wait Until Keyword Succeeds  3 mins  15 secs
-    ...  Check IPMI SOL Output Content  ISTEP
+    Run Keyword If  '${status}' == 'False'
+    ...  Run Keywords  IPMI Power Off  AND  FAIL  msg=BIOS not loaded.
+
+    # SOL_LOGIN_OUTPUT - SOL output login prompt
+    # Once host reboot completes, SOL console may take maximum of 15 minutes to get the login prompt.
+    ${status}=  Run Keyword And Return Status  Wait Until Keyword Succeeds  15 mins  15 secs
+    ...  Check IPMI SOL Output Content  ${SOL_LOGIN_OUTPUT}
+
+    Run Keyword If  '${status}' == 'False'
+    ...  IPMI Power Off
 
 
 Get SOL Setting