diff --git a/scripts/code.bat b/scripts/code.bat
index d54066040c7..43e3f71cf51 100644
--- a/scripts/code.bat
+++ b/scripts/code.bat
@@ -1,4 +1,6 @@
 @echo off
+setlocal
+
 title VSCode Dev
 
 pushd %~dp0\..
@@ -23,9 +25,4 @@ set ELECTRON_ENABLE_STACK_DUMPING=1
 .\.build\electron\electron.exe . %*
 popd
 
-:: Unset environment variables after we are done
-set NODE_ENV=
-set VSCODE_DEV=
-set ELECTRON_DEFAULT_ERROR_MODE=
-set ELECTRON_ENABLE_LOGGING=
-set ELECTRON_ENABLE_STACK_DUMPING=
\ No newline at end of file
+endlocal
\ No newline at end of file
diff --git a/scripts/test.bat b/scripts/test.bat
index 25318c2248e..10a3c3f4da3 100644
--- a/scripts/test.bat
+++ b/scripts/test.bat
@@ -1,7 +1,10 @@
 @echo off
+setlocal
 
 set ATOM_SHELL_INTERNAL_RUN_AS_NODE=1
 
 pushd %~dp0\..
 .\.build\electron\electron.exe .\node_modules\mocha\bin\_mocha %*
 popd
+
+endlocal
\ No newline at end of file