diff --git a/Makefile b/Makefile
index 4678694..e8e9f6b 100644
--- a/Makefile
+++ b/Makefile
@@ -112,6 +112,12 @@
 bbsim-alarms-kind: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
 bbsim-alarms-kind: voltctl-docker-image-build voltctl-docker-image-install-kind voltha-test
 
+bbsim-errorscenarios: ROBOT_MISC_ARGS += -X $(ROBOT_DEBUG_LOG_OPT)
+bbsim-errorscenarios: ROBOT_FILE := Voltha_ErrorScenarios.robot
+bbsim-errorscenarios: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_SINGLE_PON_FILE)
+bbsim-errorscenarios: voltha-test
+
+
 voltha-test: ROBOT_MISC_ARGS += -e notready
 
 voltha-test: vst_venv
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}