diff --git a/build/tfs/linux/build-2.sh b/build/tfs/linux/build-2.sh
deleted file mode 100755
index e521cd8c3f2..00000000000
--- a/build/tfs/linux/build-2.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-set -e
-
-. ./scripts/env.sh
-
-# set agent specific npm cache
-if [ -n "$AGENT_WORKFOLDER" ]
-then
-	export npm_config_cache="$AGENT_WORKFOLDER/npm-cache"
-	echo "Using npm cache: $npm_config_cache"
-fi
-
-export ARCH="$1"
-export VSCODE_MIXIN_PASSWORD="$2"
-export AZURE_STORAGE_ACCESS_KEY="$3"
-export AZURE_STORAGE_ACCESS_KEY_2="$4"
-export MOONCAKE_STORAGE_ACCESS_KEY="$5"
-export AZURE_DOCUMENTDB_MASTERKEY="$6"
-export LINUX_REPO_PASSWORD="$7"
-VSO_PAT="$8"
-
-echo "machine monacotools.visualstudio.com password $VSO_PAT" > ~/.netrc
-
-npm install --arch=$ARCH --unsafe-perm
-
-npm run gulp -- mixin
-
-npm run gulp -- "electron-$ARCH"
-
-node build/tfs/common/installDistro.js --arch=$ARCH
-
-npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-min"
-
-# ./scripts/test.sh --xvfb --build --reporter dot
-
-./build/tfs/linux/release.sh
\ No newline at end of file
diff --git a/build/tfs/linux/build-ia32.sh b/build/tfs/linux/build-ia32.sh
index 69bc2ecddbc..0b0f1c2a458 100755
--- a/build/tfs/linux/build-ia32.sh
+++ b/build/tfs/linux/build-ia32.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 set -e
-./build/tfs/linux/build-2.sh ia32 "$@"
\ No newline at end of file
+./build/tfs/linux/build.sh ia32 "$@"
\ No newline at end of file
diff --git a/build/tfs/linux/build.sh b/build/tfs/linux/build.sh
index e6ba3dd8042..f69898e9629 100755
--- a/build/tfs/linux/build.sh
+++ b/build/tfs/linux/build.sh
@@ -29,8 +29,10 @@ step "Install distro dependencies" \
 step "Build minified" \
 	npm run gulp -- --max_old_space_size=4096 "vscode-linux-$ARCH-min"
 
-step "Run unit tests" \
-	./scripts/test.sh --xvfb --build --reporter dot
+if [ -z "$SKIP_UNIT_TESTS" ]; then
+	step "Run unit tests" \
+		./scripts/test.sh --xvfb --build --reporter dot
+fi
 
 step "Publish release" \
 	./build/tfs/linux/release.sh
\ No newline at end of file