diff --git a/redfish/systems/LogServices/test_post_codes.robot b/redfish/systems/LogServices/test_post_codes.robot
index 0e0bcad..dc35356 100644
--- a/redfish/systems/LogServices/test_post_codes.robot
+++ b/redfish/systems/LogServices/test_post_codes.robot
@@ -212,6 +212,6 @@
 
     ${post_codes}=  Redfish.Get Properties
     ...  /redfish/v1/Systems/${SYSTEM_ID}/LogServices/PostCodes/Entries
-    Run Keyword If  ${post_codes['Members@odata.count']} == 0
-    ...  RF SYS GracefulRestart
-
+    IF  ${post_codes['Members@odata.count']} == 0
+        RF SYS GracefulRestart
+    END
diff --git a/redfish/systems/test_boot_devices.robot b/redfish/systems/test_boot_devices.robot
index de636b6..1ff3030 100644
--- a/redfish/systems/test_boot_devices.robot
+++ b/redfish/systems/test_boot_devices.robot
@@ -249,9 +249,9 @@
     ${output}=  Run IPMI Standard Command  chassis bootparam get 5
     Should Contain  ${output}  ${redfish_ipmi_enabled_map['${override_enabled}']}
     Should Contain  ${output}  ${redfish_ipmi_target_map['${override_target}']}
-    Run Keyword If  '${PLATFORM_ARCH_TYPE}' == 'x86'
-    ...  Should Contain  ${output}  ${redfish_ipmi_mode_map['${override_mode}']}
-
+    IF  '${PLATFORM_ARCH_TYPE}' == 'x86'
+        Should Contain  ${output}  ${redfish_ipmi_mode_map['${override_mode}']}
+    END
 
 Verify Boot Source Override After BMC Reboot
     [Documentation]  Verify Boot Source Override After BMC Reboot.
@@ -304,8 +304,9 @@
     ${output}=  Run IPMI Standard Command  chassis bootparam get 5
     Should Contain  ${output}  ${redfish_ipmi_enabled_map['${override_enabled}']}
     Should Contain  ${output}  ${redfish_ipmi_target_map['${override_target}']}
-    Run Keyword If  '${PLATFORM_ARCH_TYPE}' == 'x86'
-    ...  Should Contain  ${output}  ${redfish_ipmi_mode_map['${override_mode}']}
+    IF  '${PLATFORM_ARCH_TYPE}' == 'x86'
+        Should Contain  ${output}  ${redfish_ipmi_mode_map['${override_mode}']}
+    END
 
 
 Verify Boot Source Override with Enabled Mode As Once After Host Reboot
@@ -369,9 +370,9 @@
     ${resp}=  Redfish.Get Attribute  /redfish/v1/Systems/system  Boot
     Should Be Equal As Strings  ${resp["BootSourceOverrideEnabled"]}  Disabled
     Should Be Equal As Strings  ${resp["BootSourceOverrideTarget"]}  None
-    Run Keyword If  '${PLATFORM_ARCH_TYPE}' == 'x86'
-    ...  Should Be Equal As Strings  ${resp["BootSourceOverrideMode"]}  Legacy
-
+    IF  '${PLATFORM_ARCH_TYPE}' == 'x86'
+        Should Be Equal As Strings  ${resp["BootSourceOverrideMode"]}  Legacy
+    END
 
 Verify Boot Source Override with Enabled Mode As Continuous After Host Reboot
     [Documentation]  Verify Boot Source Override with Enabled Mode As Continuous After Host Reboot.
@@ -434,9 +435,10 @@
     ${resp}=  Redfish.Get Attribute  /redfish/v1/Systems/system  Boot
     Should Be Equal As Strings  ${resp["BootSourceOverrideEnabled"]}  Continuous
     Should Be Equal As Strings  ${resp["BootSourceOverrideTarget"]}  ${override_target}
-    Run Keyword If  '${PLATFORM_ARCH_TYPE}' == 'x86'
-    ...  Should Be Equal As Strings  ${resp["BootSourceOverrideMode"]}  ${override_mode}
 
+    IF  '${PLATFORM_ARCH_TYPE}' == 'x86'
+        Should Be Equal As Strings  ${resp["BootSourceOverrideMode"]}  ${override_mode}
+    END
 
 Host Reboot For Bios Setup
     [Documentation]  Rebooting Host without checking Host state.