diff --git a/tests/dt-workflow/Voltha_DT_PODTests.robot b/tests/dt-workflow/Voltha_DT_PODTests.robot
index 24a84bd..f55f34e 100644
--- a/tests/dt-workflow/Voltha_DT_PODTests.robot
+++ b/tests/dt-workflow/Voltha_DT_PODTests.robot
@@ -48,7 +48,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
diff --git a/tests/functional/Voltha_ErrorScenarios.robot b/tests/functional/Voltha_ErrorScenarios.robot
index 96df01e..52eb6db 100644
--- a/tests/functional/Voltha_ErrorScenarios.robot
+++ b/tests/functional/Voltha_ErrorScenarios.robot
@@ -75,7 +75,7 @@
     ${rc}    ${output}=    Run and Return Rc and Output
     ...    ${VOLTCTL_CONFIG}; voltctl device create -t openolt -H ${olt_ip}:${OLT_PORT}
     Should Not Be Equal As Integers    ${rc}    0
-    Should Contain     ${output}     Device is already pre-provisioned
+    Should Contain     ${output}     device is already pre-provisioned
     #Enable the created OLT device
     Enable Device    ${olt_device_id}
     Wait Until Keyword Succeeds    ${timeout}    5s    Validate OLT Device    ENABLED    ACTIVE    REACHABLE
@@ -84,7 +84,7 @@
     ...    ${VOLTCTL_CONFIG}; voltctl device create -t openolt -H ${olt_ip}:${OLT_PORT}
     Should Not Be Equal As Integers    ${rc}    0
     Log    ${output}
-    Should Contain     ${output}    Device is already pre-provisioned
+    Should Contain     ${output}    device is already pre-provisioned
     Log    "This OLT is added already and enabled"
 
 Test Disable or Enable different device id which is not in the device list