diff --git a/build/tfs/linux/build.sh b/build/tfs/linux/build.sh
index 1c5afd88aa9c3888adde663c2b946715cf5bf1b5..f86e9f7182746fb68724c730d7da2e9463d3f9dd 100755
--- a/build/tfs/linux/build.sh
+++ b/build/tfs/linux/build.sh
@@ -25,15 +25,15 @@ step "Install distro dependencies" \
 step "Build minified" \
 	npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-min"
 
+# step "Run unit tests" \
+# 	[[ "$ARCH" == "x64" ]] && ./scripts/test.sh --xvfb --build --reporter dot
+
 step "Build Debian package" \
 	npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-build-deb"
 
 step "Build RPM package" \
 	npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-build-rpm"
 
-#step "Run unit tests" \
-	#[[ "$ARCH" == "x64" ]] && ./scripts/test.sh --xvfb --build --reporter dot
-
 (cd $BUILD_SOURCESDIRECTORY/build/tfs/common && \
 	step "Install build dependencies" \
 	npm install --unsafe-perm)
diff --git a/scripts/test.sh b/scripts/test.sh
index ebe397741931217a9aa26ec8c03bfe69557927ab..19b79bf58438d5b8be2ed1df2b2f36b5dd9b841a 100755
--- a/scripts/test.sh
+++ b/scripts/test.sh
@@ -26,17 +26,10 @@ test -d node_modules || ./scripts/npm.sh install
 # Get electron
 (test -f "$CODE" && [ $INTENDED_VERSION == $INSTALLED_VERSION ]) || ./node_modules/.bin/gulp electron
 
-# Build
-test -d out || ./node_modules/.bin/gulp compile
-echo "code $CODE"
-
 # Unit Tests
-export VSCODE_DEV=1
-
 if [[ "$1" == "--xvfb" ]]; then
 	cd $ROOT ; \
 		xvfb-run "$CODE" test/electron/index.js "$@"
-
 elif [[ "$OSTYPE" == "darwin"* ]]; then
 	cd $ROOT ; ulimit -n 4096 ; \
 		"$CODE" \