diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index aabeb0d..6890abc 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -66,7 +66,7 @@
     ...          AND              Announce Message    END TEST AddSameOLT
     # Add OLT device
     #setup
-    Run Keyword If    ${has_dataplane}    Delete Device and Verify
+    Delete All Devices and Verify
     Run Keyword and Ignore Error   Collect Logs
     ${olt_device_id}=    Create Device    ${olt_ip}    ${OLT_PORT}
     Set Suite Variable    ${olt_device_id}