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