diff --git a/tests/scale/Voltha_Scale_Tests.robot b/tests/scale/Voltha_Scale_Tests.robot
index b649378..1d5c849 100644
--- a/tests/scale/Voltha_Scale_Tests.robot
+++ b/tests/scale/Voltha_Scale_Tests.robot
@@ -172,6 +172,7 @@
     FOR    ${olt_device_id}    IN  @{olt_device_ids}
         Disable Device  ${olt_device_id}
         Delete Device  ${olt_device_id}
+        Remove Values From List     ${olt_device_ids}   ${olt_device_id}
     END
 
     Set Suite Variable    ${olt_device_ids}
@@ -180,7 +181,7 @@
 Setup Suite
     [Documentation]    Setup test global variables, open an SSH connection to ONOS and starts a timer
     Set Suite Variable    ${KUBECTL_CONFIG}    export KUBECONFIG=%{KUBECONFIG}
-    Set Suite Variable    ${VOLTCTL_CONFIG}    export VOLTCONFIG=%{VOLTCONFIG}
+    Set Suite Variable    ${VOLTCTL_CONFIG}    %{VOLTCONFIG}
 
     ${total_onus}=   Evaluate    ${olt} * ${pon} * ${onu}
     Set Suite Variable  ${total_onus}