diff --git a/openpower/ext_interfaces/test_lock_management.robot b/openpower/ext_interfaces/test_lock_management.robot
index 0e29da5..2ff19d9 100644
--- a/openpower/ext_interfaces/test_lock_management.robot
+++ b/openpower/ext_interfaces/test_lock_management.robot
@@ -1431,7 +1431,7 @@
 Restart Bmcweb On Failure
     [Documentation]  Restart bmcweb only if test failed.
 
-    Return From Keyword If  "${TEST_STATUS}" == "PASS"
+    IF  "${TEST_STATUS}" == "PASS"  RETURN
 
     # This procedure is needs to be corrected or removed, when we figure out
     # what is causing the real failure here.
diff --git a/openpower/ext_interfaces/test_vmicert_management.robot b/openpower/ext_interfaces/test_vmicert_management.robot
index 2978480..a586a0b 100644
--- a/openpower/ext_interfaces/test_vmicert_management.robot
+++ b/openpower/ext_interfaces/test_vmicert_management.robot
@@ -649,7 +649,7 @@
     ...  expected_status=any
 
     Should Be Equal As Strings  ${resp.status_code}  ${valid_status_code}
-    Return From Keyword If  ${resp.status_code} != ${HTTP_OK}
+    IF  ${resp.status_code} != ${HTTP_OK}  RETURN
 
     ${cert}=  Evaluate  json.loads('''${resp.text}''', strict=False)  json
     Should Contain  ${cert["Certificate"]}  BEGIN CERTIFICATE
@@ -715,7 +715,7 @@
     ...  ${read_timeout}
 
     Should Be Equal As Strings  ${resp.status_code}  ${valid_status_code}
-    Return From Keyword If  ${resp.status_code} != ${HTTP_OK}
+    IF  ${resp.status_code} != ${HTTP_OK}  RETURN
 
     ${cert}=  Evaluate  json.loads('''${resp.text}''', strict=False)  json
     Should Contain  ${cert["Certificate"]}  BEGIN CERTIFICATE