diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index 955af23..9028dc4 100644
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -49,7 +49,7 @@
 ${of_id}          0
 ${logical_id}     0
 ${has_dataplane}    True
-${teardown_device}    False
+${teardown_device}    True
 ${scripts}        ../../scripts
 
 # Per-test logging on failure is turned off by default; set this variable to enable
@@ -121,3 +121,4 @@
 Teardown Suite
     [Documentation]    Tear down steps for the suite
     Run Keyword If    ${has_dataplane}    Clean Up Linux
+    Run Keyword If    ${teardown_device}    Delete All Devices And Verify