diff --git a/ipmi/test_ipmi_mc_id.robot b/ipmi/test_ipmi_mc_id.robot
index 089fe22..2133b25 100644
--- a/ipmi/test_ipmi_mc_id.robot
+++ b/ipmi/test_ipmi_mc_id.robot
@@ -22,7 +22,8 @@
     # Example:
     # Get Management Controller Identifier String: witherspoon
 
-    ${cmd_output}=  Run IPMI Standard Command  dcmi get_mc_id_string
+    ${cmd_output}=  Wait Until Keyword Succeeds  15 sec  5 sec
+    ...  Run IPMI Standard Command  dcmi get_mc_id_string
 
     # Extract management controller ID from cmd_output.
     ${initial_mc_id}=  Fetch From Right  ${cmd_output}  :${SPACE}
diff --git a/ipmi/test_ipmi_user.robot b/ipmi/test_ipmi_user.robot
index 8a73587..3ec74ff 100644
--- a/ipmi/test_ipmi_user.robot
+++ b/ipmi/test_ipmi_user.robot
@@ -425,7 +425,8 @@
     #                  of above password and privilege (i.e. "Passed" or "Failed").
 
     ${expected_rc}=  Set Variable If  '${expected_status}' == 'Passed'  ${0}  ${1}
-    Run IPMI Standard Command  sel info ${channel}  expected_rc=${expected_rc}  U=${username}  P=${password}
+    Wait Until Keyword Succeeds  15 sec  5 sec  Run IPMI Standard Command
+    ...  sel info ${channel}  expected_rc=${expected_rc}  U=${username}  P=${password}
     ...  L=${privilege}