diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 6cc8d50..8154b8d 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -18,7 +18,7 @@
 Suite Setup       Common Test Suite Setup
 Test Setup        Setup
 Test Teardown     Teardown
-#Suite Teardown    Teardown Suite
+Suite Teardown    Teardown Suite
 Library           Collections
 Library           String
 Library           OperatingSystem
@@ -268,7 +268,8 @@
     [Documentation]    Set up the test suite
     Common Test Suite Setup
 
-#Teardown Suite
-#    [Documentation]    Teardown suite
+Teardown Suite
+    [Documentation]    Teardown suite
+    Run Keyword If    ${has_dataplane}    Clean Up Linux
     #Restore all ONUs
 #    Run Keyword If    ${has_dataplane}    RestoreONUs    ${num_onus}
diff --git a/tests/tt-workflow/Voltha_TT_PODTests.robot b/tests/tt-workflow/Voltha_TT_PODTests.robot
index 886cca4..af97b72 100644
--- a/tests/tt-workflow/Voltha_TT_PODTests.robot
+++ b/tests/tt-workflow/Voltha_TT_PODTests.robot
@@ -87,7 +87,7 @@
     ...           AND             Stop Logging    SanityTestTT
     Run Keyword If    ${has_dataplane}    Clean Up Linux
     Wait Until Keyword Succeeds    ${timeout}    2s    Perform Sanity Test TT
-    Run Keyword If    ${has_dataplane}    Clean Up Linux
+    #Run Keyword If    ${has_dataplane}    Clean Up Linux
 
 *** Keywords ***
 Setup Suite
@@ -104,3 +104,7 @@
     # Execute normal test Setup Keyword
     Setup
 
+
+Teardown Suite
+    [Documentation]    Tear down steps for the suite
+    Run Keyword If    ${has_dataplane}    Clean Up Linux