diff --git a/tests/dmi-interface/dmi-hw-management.robot b/tests/dmi-interface/dmi-hw-management.robot
index 2f68fe6..096b6cb 100755
--- a/tests/dmi-interface/dmi-hw-management.robot
+++ b/tests/dmi-interface/dmi-hw-management.robot
@@ -180,7 +180,7 @@
         ${component_uuid}=  utility.get_uuid_from_Inventory_Element  ${element}  ${component_name}
     END
     Should Not Be Equal  ${None}  ${component_uuid}     Could not find UUID for ${component_name}
-    [Return]    ${component_uuid}
+    RETURN    ${component_uuid}
 
 Loggable Entities
     [Documentation]  get the loggable entities of a device
@@ -194,7 +194,7 @@
     ${is_loglevels_in}=  Run Keyword And Return Status  Dictionary Should Contain Key  ${response}  logLevels
     ${loggable_entities}=  Run Keyword If  ${is_loglevels_in}==${True}  Get From Dictionary  ${response}  logLevels
     ...  ELSE  Create Dictionary
-    [Return]  ${loggable_entities}
+    RETURN    ${loggable_entities}
 
 Get X Loggable Entities
     [Documentation]  get x (at least!) loggable entities and their loglevel of a device back to the user
@@ -208,7 +208,7 @@
         Exit For Loop If    ${number_entities}==${counter}
         ${counter}=  Set Variable  ${counter+1}
     END
-    [Return]  ${entities}
+    RETURN    ${entities}
 
 Set Component Inventory Info
     [Documentation]    This keyword sets a new value
diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index e04554b..a79745d 100755
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -963,4 +963,4 @@
         ${result_interval}=   Set Variable If   (${interval_upstream_bw_used} < 5000 or ${interval_upstream_bw_used} < 5000)
         ...    False    ${result_interval}
     END
-    [Return]     ${result_interval}
+    RETURN    ${result_interval}
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
diff --git a/tests/memory-leak/VOLTHA_Memory_Leak_Tests.robot b/tests/memory-leak/VOLTHA_Memory_Leak_Tests.robot
index 120cf92..215ea50 100755
--- a/tests/memory-leak/VOLTHA_Memory_Leak_Tests.robot
+++ b/tests/memory-leak/VOLTHA_Memory_Leak_Tests.robot
@@ -401,7 +401,7 @@
     ...    ELSE   Set Variable    ${EMPTY}
     ${out_string}=   Catenate   ${formated_prestring}    :    ${formated_mem} Bytes    ${poststring}
     Append To File    ${output_file}   ${out_string}
-    [return]    ${mem_consumption}
+    RETURN    ${mem_consumption}
 
 Compare Memory Consumptions
     [Documentation]    Compares the current memory consumptions with the compare-to value of passed container and
@@ -416,7 +416,7 @@
     ${formated_perc}=       Format String    {:>7}     ${percentage_value}
     ${out_string}=   Catenate   : Corresponds ${formated_perc}% compared to ${compare_to} (${formated_start} Bytes) :
     ...    Difference: ${formated_diff} Bytes
-    [return]    ${out_string}
+    RETURN    ${out_string}
 
 Get And Write Memory Consumption Per Container To File
     [Documentation]    Gets and write current memory consumptions to memory consumption file per container
@@ -432,7 +432,7 @@
     ${out_string}=   Catenate   \r\n${formated_prestring}    :    ${formated_mem} Bytes    at ${time}
     Append To File    ${output_file}   ${out_string}
     Run Keyword If    ${print2console}    Log    ${formated_prestring} : ${formated_mem} Bytes at ${time}    console=yes
-    [return]    ${mem_consumption}
+    RETURN    ${mem_consumption}
 
 Check for new ONU Device IDs
     [Documentation]    Checks that no old onu device ids stay
@@ -481,14 +481,14 @@
         Exit For Loop If   ${index}>5 and ${current_consumptions}<${upper_bound} and ${current_consumptions}>${lower_bound}
         Sleep    60s
     END
-    [return]   ${average_value}
+    RETURN    ${average_value}
 
 Get Memory Consumptions
     [Documentation]    Delivers memory consumptions of passed POD
     [Arguments]    ${prometheusaddr}    ${prometheusport}    ${container}    ${namespace}
     ${mem_consumption}=    utility.get_memory_consumptions    ${prometheusaddr}:${prometheusport}    ${container}   ${namespace}
     Should Be True    ${mem_consumption} > 0
-    [return]    ${mem_consumption}
+    RETURN    ${mem_consumption}
 
 Write Memory Consumption File Per Container
     [Documentation]    Writes memory consumptions file of passed POD for later evaluation.
diff --git a/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot b/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
index 30dc762..550f9e1 100755
--- a/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUFlowChecks.robot
@@ -228,7 +228,7 @@
         ...                                  ${src['onu']}    ${src['c_tag']}    ${src['s_tag']}
     END
     log    ${onu_tags_dict}
-    [return]    ${onu_tags_dict}
+    RETURN    ${onu_tags_dict}
 
 Update ONU Tags Dict
     [Documentation]    This keyword update passed dictionary with the s- and c-tags for passed ONU.
@@ -240,7 +240,7 @@
     ${s_tags_list}=    Get From Dictionary    ${onu_tags_dict['${onu}']}    s_tags
     Append To List    ${s_tags_list}    ${s_tag}
     Set To Dictionary    ${onu_tags_dict['${onu}']}    c_tags    ${c_tags_list}    s_tags    ${s_tags_list}
-    [return]    ${onu_tags_dict}
+    RETURN    ${onu_tags_dict}
 
 Append To ONU Tags Dict
     [Documentation]    This keyword append the s- and c-tags of passed ONU to passed dictionary .
@@ -251,4 +251,4 @@
     ${s_tags_list}=    Create List    ${s_tag}
     ${onu_dict}=    Create Dictionary    c_tags    ${c_tags_list}    s_tags    ${s_tags_list}
     Set To Dictionary    ${onu_tags_dict}    ${onu}    ${onu_dict}
-    [return]    ${onu_tags_dict}
+    RETURN    ${onu_tags_dict}
diff --git a/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot b/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot
index 1554236..136c155 100755
--- a/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUMibAudit.robot
@@ -193,4 +193,4 @@
     ${seconds}=    Convert To String    ${seconds}
     ${seconds}=    Get Substring    ${seconds}    0    -2
     ${seconds}=    Set Variable If    ${unit}    ${seconds}s    ${seconds}
-    [return]    ${seconds}
+    RETURN    ${seconds}
diff --git a/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot b/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot
index 20bdec2..5e4dcdf 100755
--- a/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot
+++ b/tests/openonu-go-adapter/Voltha_ONUTemplateTests.robot
@@ -363,7 +363,7 @@
     ${timeCurrent} =    Get Current Date
     ${timeTotalMs} =    Subtract Date From Date    ${timeCurrent}    ${startTime}    result_format=number
     Log    ONU ${src['onu']}: reached the state ${onu_state} after ${timeTotalMs} sec.    console=yes
-    [Return]    ${timeTotalMs}
+    RETURN    ${timeTotalMs}
 
 Bring Up ONU
     [Documentation]    This keyword brings up onu
diff --git a/tests/scale/Voltha_Scale_Tests.robot b/tests/scale/Voltha_Scale_Tests.robot
index db77369..6352dda 100755
--- a/tests/scale/Voltha_Scale_Tests.robot
+++ b/tests/scale/Voltha_Scale_Tests.robot
@@ -376,7 +376,7 @@
         Append To List  ${device_ids}    ${id}
     END
 
-    [Return]    ${device_ids}
+    RETURN    ${device_ids}
 
 Perform Igmp Join or Leave Per OLT
     [Documentation]    Performs Igmp Join for all the ONUs of an OLT (based on Rest Endpoint)
diff --git a/tests/software-upgrades/ONU_Upgrade.robot b/tests/software-upgrades/ONU_Upgrade.robot
index beaedf8..ba56e1e 100755
--- a/tests/software-upgrades/ONU_Upgrade.robot
+++ b/tests/software-upgrades/ONU_Upgrade.robot
@@ -822,7 +822,7 @@
     ${timeCurrent} =    Get Current Date
     ${timeTotalMs} =    Subtract Date From Date    ${timeCurrent}    ${timeStart}    result_format=number
     Remove Adapter Image    ${image_version}    ${onu_device_id}
-    [Return]    ${timeTotalMs}
+    RETURN    ${timeTotalMs}
 
 Do ONU Upgrade Image Download Simultaneously
     [Documentation]    This keyword performs the ONU Upgrade Image Download Simultaneously on all ONUs test
diff --git a/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot b/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
index 01e529a..7e42df9 100755
--- a/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
+++ b/tests/tt-workflow/Voltha_TT_MultiTcontTests.robot
@@ -512,7 +512,7 @@
     ${output}=    OperatingSystem.Get File    ${file}
     Log    ${output}
     ${object}=    Evaluate    json.loads(r'''${output}''')    json
-    [Return]    ${object}
+    RETURN    ${object}
 
 Get File from Remote System
     [Arguments]    ${file}    ${ip}    ${user}    ${pass}=${None}
@@ -531,7 +531,7 @@
     ${output}=    OperatingSystem.Get File    ${file}
     Log    ${output}
     ${object}=    Evaluate    json.loads(r'''${output}''')    json
-    [Return]    ${object}
+    RETURN    ${object}
 
 Run Iperf3 Test Client in Background
     [Arguments]    ${src}    ${server}    ${args}    ${out_file}
@@ -564,7 +564,7 @@
         ...    True    False
         Exit For Loop If    ${matched}
     END
-    [Return]    ${matched}    ${src}    ${dst}
+    RETURN    ${matched}    ${src}    ${dst}
 
 Setup Suite
     [Documentation]    Set up the test suite
diff --git a/tests/tt-workflow/Voltha_TT_MulticastTests.robot b/tests/tt-workflow/Voltha_TT_MulticastTests.robot
index 3ed657f..d4990ab 100644
--- a/tests/tt-workflow/Voltha_TT_MulticastTests.robot
+++ b/tests/tt-workflow/Voltha_TT_MulticastTests.robot
@@ -227,7 +227,7 @@
         ...    True    False
         Exit For Loop If    ${matched}
     END
-    [Return]    ${matched}    ${src}    ${dst}
+    RETURN    ${matched}    ${src}    ${dst}
 
 
 TT 2 RG MCAST Test