diff --git a/tests/scale/Voltha_Scale_Tests.robot b/tests/scale/Voltha_Scale_Tests.robot
index 7dcc4e8..33405e1 100755
--- a/tests/scale/Voltha_Scale_Tests.robot
+++ b/tests/scale/Voltha_Scale_Tests.robot
@@ -259,6 +259,11 @@
         Remove Values From List     ${olt_device_ids}   ${olt_device_id}
     END
 
+    ${onos_devices}=    Compute Device IDs
+    FOR     ${deviceId}     IN  @{onos_devices}
+        Wait for all flows to be removed    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}  ${deviceId}
+    END
+
     Set Suite Variable    ${olt_device_ids}
 
 *** Keywords ***