diff --git a/tests/tt-workflow/Voltha_TT_FailureScenarios.robot b/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
index 88d80bd..de0ffd6 100755
--- a/tests/tt-workflow/Voltha_TT_FailureScenarios.robot
+++ b/tests/tt-workflow/Voltha_TT_FailureScenarios.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
@@ -61,7 +61,7 @@
 Verify restart openonu-adapter container after subscriber provisioning for TT
     [Documentation]    Restart openonu-adapter container after VOLTHA is operational.
     ...    Prerequisite : ONUs are authenticated and pingable.
-    [Tags]    functional   Restart-OpenOnu-TT
+    [Tags]    functionalTT    Restart-OpenOnu-TT
     [Setup]    Start Logging    Restart-OpenOnu-TT
     [Teardown]    Run Keywords    Collect Logs
     ...           AND             Stop Logging    Restart-OpenOnu-TT
@@ -99,3 +99,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
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