diff --git a/ipmi/test_ipmi_cold_reset.robot b/ipmi/test_ipmi_cold_reset.robot
index 51f5776..edb939d 100644
--- a/ipmi/test_ipmi_cold_reset.robot
+++ b/ipmi/test_ipmi_cold_reset.robot
@@ -144,7 +144,7 @@
     FOR  ${RANGE}  IN RANGE  0  ${sensor_count}
       ${random_sensor}  ${sensor_threshold}=  Selecting Random Sensor Name And Threshold Value  ${tmp_list}  ${sensor_list}
       ${threshold_dict_count}=  Get Length  ${sensor_threshold}
-      Exit For Loop If  '${threshold_dict_count}' != '0'
+      IF  '${threshold_dict_count}' != '0'  BREAK
       Remove Values From List  ${tmp_list}  ${random_sensor}
     END
 
diff --git a/ipmi/test_ipmi_fru_device.robot b/ipmi/test_ipmi_fru_device.robot
index 9f325be..ac8cd52 100644
--- a/ipmi/test_ipmi_fru_device.robot
+++ b/ipmi/test_ipmi_fru_device.robot
@@ -187,7 +187,7 @@
         ${dev}=  Split String  ${devices}  \n
         FOR  ${device}  IN  @{dev}
             ${ipmi_fru_board_serial_status}=  Run Keyword And Return Status  Should Contain  ${device}  Board Serial
-            Exit For Loop If  '${ipmi_fru_board_serial_status}' == 'True'
+            IF  '${ipmi_fru_board_serial_status}' == 'True'  BREAK
         END
         ${frudata}=  Get From List  ${output}  ${num}
         ${serial_no}=  Run Keyword If  '${ipmi_fru_board_serial_status}' == 'True'
diff --git a/ipmi/test_ipmi_network_configuration.robot b/ipmi/test_ipmi_network_configuration.robot
index 8da73b0..6fe622b 100644
--- a/ipmi/test_ipmi_network_configuration.robot
+++ b/ipmi/test_ipmi_network_configuration.robot
@@ -62,7 +62,7 @@
     FOR  ${ipv4_address}  IN  @{ipv4_addresses}
         ${ip_address}=  Set Variable if  '${ipv4_address['Address']}' == '${STATIC_IP}'
                         ...  ${ipv4_address}
-        Exit For Loop If  ${ip_address} != None
+        IF  ${ip_address} != None  BREAK
     END
 
     Should Be Equal  ${ip_address['AddressOrigin']}  Static
diff --git a/openpower/localuser/test_ipmi_redfish_user.robot b/openpower/localuser/test_ipmi_redfish_user.robot
index 77b144d..59a3750 100644
--- a/openpower/localuser/test_ipmi_redfish_user.robot
+++ b/openpower/localuser/test_ipmi_redfish_user.robot
@@ -32,7 +32,7 @@
     ...  user set name ${random_userid} ${random_username}
 
     # Verify new user privilege level via Redfish.
-    ${privilege}=  Redfish_Utils.Get Attribute
+    ${privilege}=  Redfish.Get Attribute
     ...  /redfish/v1/AccountService/Accounts/${random_username}  RoleId
     Valid Value  privilege  ['ReadOnly']
 
diff --git a/redfish/account_service/test_ipmi_redfish_user.robot b/redfish/account_service/test_ipmi_redfish_user.robot
index 9edc497..00176f8 100644
--- a/redfish/account_service/test_ipmi_redfish_user.robot
+++ b/redfish/account_service/test_ipmi_redfish_user.robot
@@ -333,7 +333,7 @@
         ${is_empty}=  Run Keyword And Return Status
         ...  Should Match Regexp  ${name_line}  ${empty_name_pattern}
 
-        Exit For Loop If  ${is_empty} == ${True}
+        IF  ${is_empty} == ${True}  BREAK
     END
     Run Keyword If  '${jj}' == '299'  Fail  msg=A free user ID could not be found.
     RETURN  ${random_userid}