diff --git a/ipmi/test_ipmi_sol.robot b/ipmi/test_ipmi_sol.robot
index 6541d45..a9fdb82 100644
--- a/ipmi/test_ipmi_sol.robot
+++ b/ipmi/test_ipmi_sol.robot
@@ -272,4 +272,4 @@
     ${sol_log}=  Stop SOL Console Logging
     Log   ${sol_log}
     FFDC On Test Case Fail
-    Restore Default SOL Configuration
+    Wait Until Keyword Succeeds  15 sec  5 sec  Restore Default SOL Configuration
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index f4ad101..cbf71da 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -41,7 +41,7 @@
 
     # Verify maximum user count IPMI local user can have. Also verify
     # currently enabled users.
-    ${resp}=  Run IPMI Standard Command  user summary
+    ${resp}=  Wait Until Keyword Succeeds  15 sec  5 sec  Run IPMI Standard Command  user summary
     ${enabled_user_count}=
     ...  Get Lines Containing String  ${resp}  Enabled User Count
     ${maximum_ids}=  Get Lines Containing String  ${resp}  Maximum IDs
diff --git a/lib/ipmi_client.robot b/lib/ipmi_client.robot
index 6e47168..7422f79 100755
--- a/lib/ipmi_client.robot
+++ b/lib/ipmi_client.robot
@@ -66,7 +66,6 @@
     ...  ELSE IF  '${IPMI_COMMAND}' == 'Dbus'
     ...    Run Dbus IPMI Standard Command  ${command}
     ...  ELSE  Fail  msg=Invalid IPMI Command type provided : ${IPMI_COMMAND}
-
     [Return]  ${resp}