diff --git a/oem/nuvoton/test_ipmi_flash.robot b/oem/nuvoton/test_ipmi_flash.robot
index 8774aad..b8fbf8c 100644
--- a/oem/nuvoton/test_ipmi_flash.robot
+++ b/oem/nuvoton/test_ipmi_flash.robot
@@ -8,7 +8,7 @@
 
 Suite Setup      Suite Setup Execution
 
-Test Tags       IPMI_Flash
+Test Tags        IPMI_Flash
 
 *** Variables ***
 
@@ -26,7 +26,7 @@
     [Documentation]  Test BIOS firmware update over IPMI.
     [Tags]  Test_BIOS_Firmware_Update
 
-    Run Keyword  Wait For Host To Ping  ${OS_HOST}  3 mins
+    Wait For Host To Ping  ${OS_HOST}  3 mins
 
     Get LPC SHM Address
     Update BIOS Firmware  ${IMAGE_HOST_FILE_PATH_0}
@@ -89,8 +89,7 @@
 
     ${os_state}=  Get Host State Attribute  OperatingSystemState
     Rprint Vars  os_state
-    Run Keyword if  '${OS_BOOT_COMPLETE}' != '${os_state}'
-    ...  Redfish Power On
+    IF  '${OS_BOOT_COMPLETE}' != '${os_state}'  Redfish Power On
 
     # generate bad image for test
     ${cmd}=  Catenate  dd if=/dev/urandom of=${HOST_WORK_DIR}/${BAD_IMG} bs=1K count=4
@@ -233,5 +232,5 @@
     Should Not Contain  ${stderr}  Exception received
 
     Sleep  10s
-    Check If BMC is Up  20 min  20 sec
+    Check If BMC Is Up  20 min  20 sec
     Wait For BMC Ready
diff --git a/oem/nuvoton/test_jtag_master.robot b/oem/nuvoton/test_jtag_master.robot
index d10fab2..ec00904 100644
--- a/oem/nuvoton/test_jtag_master.robot
+++ b/oem/nuvoton/test_jtag_master.robot
@@ -88,16 +88,20 @@
     Set Suite Variable  ${power_cycle_cmd}
 
     Get File From SFTP Server  ${readid_svf}
-    Run KeyWord If  ${program_cpld} == 1  Get File From SFTP Server  ${readusercode_svf}
-    Run KeyWord If  ${program_cpld} == 1  Get File From SFTP Server  ${cpld_firmware1}
-    Run KeyWord If  ${program_cpld} == 1  Get File From SFTP Server  ${cpld_firmware2}
+    IF  ${program_cpld} == 1
+        Get File From SFTP Server  ${readusercode_svf}
+        Get File From SFTP Server  ${cpld_firmware1}
+        Get File From SFTP Server  ${cpld_firmware2}
+    END
 
     scp.Open connection  ${OPENBMC_HOST}  username=${OPENBMC_USERNAME}
     ...  password=${OPENBMC_PASSWORD}
     Put File To BMC  ${readid_svf}
-    Run KeyWord If  ${program_cpld} == 1  Put File To BMC  ${readusercode_svf}
-    Run KeyWord If  ${program_cpld} == 1  Put File To BMC  ${cpld_firmware1}
-    Run KeyWord If  ${program_cpld} == 1  Put File To BMC  ${cpld_firmware2}
+    IF  ${program_cpld} == 1
+        Put File To BMC  ${readusercode_svf}
+        Put File To BMC  ${cpld_firmware1}
+        Put File To BMC  ${cpld_firmware2}
+    END
     Sleep  5s
     scp.Close Connection
 
diff --git a/xcat/test_xcat_group.robot b/xcat/test_xcat_group.robot
index 34e6496..5443d6a 100644
--- a/xcat/test_xcat_group.robot
+++ b/xcat/test_xcat_group.robot
@@ -218,6 +218,8 @@
     [Arguments]  ${node}  ${flag}=ON
 
     ${status}=  Get Power Status  ${node}
-    Run Keyword If  '${flag}' == 'ON'
-    ...  Should Contain  ${status}  on  msg=Host is off.
-    ...  ELSE  Should Contain  ${status}  off  msg=Host is on.
+    IF  '${flag}' == 'ON'
+        Should Contain  ${status}  on  msg=Host is off.
+    ELSE
+        Should Contain  ${status}  off  msg=Host is on.
+    END