diff --git a/tests/functional/K8S_SystemTest.robot b/tests/functional/K8S_SystemTest.robot
index dc5361d..e153e0f 100644
--- a/tests/functional/K8S_SystemTest.robot
+++ b/tests/functional/K8S_SystemTest.robot
@@ -99,7 +99,7 @@
     ${rc}    ${size}=    Run and Return Rc and Output
     ...    kubectl -n ${namespace} get ${ETCD_resources} ${ETCD_name} -o jsonpath='{.status.replicas}'
     Should Be Equal As Integers    ${rc}    0   Could not get ETCD replica count
-    [Return]    ${size}
+    RETURN    ${size}
 
 Scale ETCD
     [Arguments]    ${namespace}    ${size}
diff --git a/tests/functional/Voltha_AlarmTests.robot b/tests/functional/Voltha_AlarmTests.robot
index 718cb53..7b1d58e 100755
--- a/tests/functional/Voltha_AlarmTests.robot
+++ b/tests/functional/Voltha_AlarmTests.robot
@@ -394,7 +394,7 @@
     ${header}    ${deviceEvent}    Get Device Event    ${deviceEventName}    ${since}
     ${LastEventPostTimestamp}    Set Variable     ${since}
     Set Suite Variable     ${LastEventPostTimestamp}
-    [return]    ${header}    ${deviceEvent}
+    RETURN    ${header}    ${deviceEvent}
 
 Clear Onu Alarm And Get Event
     [Documentation]    Clear an Alarm and return event
@@ -404,7 +404,7 @@
     ${header}    ${deviceEvent}    Get Device Event    ${deviceEventName}    ${since}
     ${LastEventPostTimestamp}    Set Variable     ${since}
     Set Suite Variable     ${LastEventPostTimestamp}
-    [return]    ${header}    ${deviceEvent}
+    RETURN    ${header}    ${deviceEvent}
 
 Raise Onu Alarm
     [Documentation]    Raise an Alarm
@@ -430,7 +430,7 @@
     ${header}    ${deviceEvent}    Get Device Event    ${deviceEventName}    ${since}
     ${LastEventPostTimestamp}    Set Variable     ${since}
     Set Suite Variable     ${LastEventPostTimestamp}
-    [return]    ${header}    ${deviceEvent}
+    RETURN    ${header}    ${deviceEvent}
 
 Clear Olt Alarm And Get Event
     [Documentation]    Clear an Alarm and return event
@@ -440,7 +440,7 @@
     ${header}    ${deviceEvent}    Get Device Event    ${deviceEventName}    ${since}
     ${LastEventPostTimestamp}    Set Variable     ${since}
     Set Suite Variable     ${LastEventPostTimestamp}
-    [return]    ${header}    ${deviceEvent}
+    RETURN    ${header}    ${deviceEvent}
 
 Raise Olt Alarm
     [Documentation]    Raise an Alarm
@@ -472,7 +472,7 @@
     ${deviceEvent}    Set Variable   ${lastItem}[deviceEvent]
     Log    ${header}
     Log    ${deviceEvent}
-    [return]    ${header}    ${deviceEvent}
+    RETURN    ${header}    ${deviceEvent}
 
 Verify Header
     [Documentation]    Verify that a DeviceEvent's header is sane and the id matches regex