diff --git a/tests/functional/Voltha_ScaleFunctionalTests.robot b/tests/functional/Voltha_ScaleFunctionalTests.robot
index deb6251..f7b0cc9 100644
--- a/tests/functional/Voltha_ScaleFunctionalTests.robot
+++ b/tests/functional/Voltha_ScaleFunctionalTests.robot
@@ -50,12 +50,12 @@
     Set Global Variable    ${olt_device_id}
     #validate olt states
     Wait Until Keyword Succeeds    ${timeout}    5s    Validate OLT Device   PREPROVISIONED    UNKNOWN    UNKNOWN
-    ...    ${olt_device_id}
+    ...    ${olt_device_id}    by_dev_id=True
     #enable device
     Enable Device    ${olt_device_id}
     #validate olt states
     Wait Until Keyword Succeeds    ${timeout}    5s    Validate OLT Device   ENABLED    ACTIVE    REACHABLE
-    ...    ${olt_device_id}
+    ...    ${olt_device_id}    by_dev_id=True
 
 ONU Discovery
     [Documentation]    Discover lists of ONUS, their Serial Numbers and device id