diff --git a/libraries/voltctl.robot b/libraries/voltctl.robot
index 95b0874..3b6b0b4 100644
--- a/libraries/voltctl.robot
+++ b/libraries/voltctl.robot
@@ -175,21 +175,13 @@
 
 Validate ONU Devices
     [Arguments]    ${admin_state}    ${oper_status}    ${connect_status}    ${List_ONU_Serial}
+    ...    ${onu_reason}=omci-flows-pushed
     [Documentation]    Parses the output of "voltctl device list" and inspects device    ${List_ONU_Serial}
     ...    Iteratively match on each Serial number contained in ${List_ONU_Serial} and inspect
     ...    states including MIB state
     FOR    ${serial_number}    IN    @{List_ONU_Serial}
         Validate Device    ${admin_state}    ${oper_status}    ${connect_status}    ${serial_number}
-        ...    onu_reason=omci-flows-pushed    onu=True
-    END
-
-Validate ONU Devices DisableEnable
-    [Arguments]    ${admin_state}    ${oper_status}    ${connect_status}    ${List_ONU_Serial}
-    [Documentation]    Parses the output of "voltctl device list" and inspects device    ${List_ONU_Serial}
-    ...    Iteratively match on each Serial number contained in ${List_ONU_Serial} and inspects ONU states
-    FOR    ${serial_number}    IN    @{List_ONU_Serial}
-        Validate Device    ${admin_state}    ${oper_status}    ${connect_status}    ${serial_number}
-        ...    onu_reason=omci-flows-pushed    onu=False
+        ...    onu_reason=${onu_reason}    onu=True
     END
 
 Validate Device Port Types
diff --git a/tests/functional/Voltha_ScaleFunctionalTests.robot b/tests/functional/Voltha_ScaleFunctionalTests.robot
index 39c2aa7..9ea1d93 100644
--- a/tests/functional/Voltha_ScaleFunctionalTests.robot
+++ b/tests/functional/Voltha_ScaleFunctionalTests.robot
@@ -166,16 +166,16 @@
         ${onu_device_id}=    Get Device ID From SN    ${src['onu']}
         Disable Device    ${onu_device_id}
     END
-    Wait Until Keyword Succeeds ${long_timeout}  20s    Validate ONU Devices DisableEnable
-    ... DISABLED        UNKNOWN REACHABLE       ${List_ONU_Serial}
+    Wait Until Keyword Succeeds    ${long_timeout}     20s    Validate ONU Devices
+    ...    DISABLED    UNKNOWN    REACHABLE    ${List_ONU_Serial}    omci-admin-lock
     FOR    ${I}    IN RANGE    0    ${num_onus}
         ${src}=    Set Variable    ${hosts.src[${I}]}
         ${dst}=    Set Variable    ${hosts.dst[${I}]}
         ${onu_device_id}=    Get Device ID From SN    ${src['onu']}
         Enable Device    ${onu_device_id}
     END
-    Wait Until Keyword Succeeds ${long_timeout} 20s     Validate ONU Devices DisableEnable
-    ... ENABLED ACTIVE  REACHABLE       ${List_ONU_Serial}
+    Wait Until Keyword Succeeds    ${long_timeout}    20s     Validate ONU Devices
+    ...    ENABLED    ACTIVE    REACHABLE    ${List_ONU_Serial}
 
 *** Keywords ***
 Setup Suite