diff --git a/build/tfs/darwin/build.sh b/build/tfs/darwin/build.sh
index df7ee5e0b16..b7efbf7b386 100755
--- a/build/tfs/darwin/build.sh
+++ b/build/tfs/darwin/build.sh
@@ -37,16 +37,16 @@ step "Run unit tests" \
 step "Run integration tests" \
 	./scripts/test-integration.sh
 
-# function smoketest {
-# 	ARTIFACTS="$AGENT_BUILDDIRECTORY/smoketest-artifacts"
-# 	rm -rf $ARTIFACTS
+function smoketest {
+	ARTIFACTS="$AGENT_BUILDDIRECTORY/smoketest-artifacts"
+	rm -rf $ARTIFACTS
 
-# 	[[ "$VSCODE_QUALITY" == "insider" ]] && VSCODE_APPNAME="Visual Studio Code - Insiders" || VSCODE_APPNAME="Visual Studio Code"
-# 	npm run smoketest -- --build "$AGENT_BUILDDIRECTORY/VSCode-darwin/$VSCODE_APPNAME.app" --log $ARTIFACTS
-# }
+	[[ "$VSCODE_QUALITY" == "insider" ]] && VSCODE_APPNAME="Visual Studio Code - Insiders" || VSCODE_APPNAME="Visual Studio Code"
+	npm run smoketest -- --build "$AGENT_BUILDDIRECTORY/VSCode-darwin/$VSCODE_APPNAME.app" --log $ARTIFACTS
+}
 
-# step "Run smoke test" \
-# 	smoketest
+step "Run smoke test" \
+	smoketest
 
 step "Publish release" \
 	./build/tfs/darwin/release.sh
diff --git a/build/tfs/linux/build.sh b/build/tfs/linux/build.sh
index f138b5d237e..933641afd21 100755
--- a/build/tfs/linux/build.sh
+++ b/build/tfs/linux/build.sh
@@ -39,22 +39,22 @@ step "Build minified" \
 step "Run unit tests" \
 	./scripts/test.sh --build --reporter dot
 
-# function smoketest {
-# 	id -u testuser &>/dev/null || (useradd -m testuser; chpasswd <<< testuser:testpassword)
-# 	sudo -i -u testuser -- sh -c 'git config --global user.name "VS Code Agent" &&  git config --global user.email "monacotools@microsoft.com"'
+function smoketest {
+	id -u testuser &>/dev/null || (useradd -m testuser; chpasswd <<< testuser:testpassword)
+	sudo -i -u testuser -- sh -c 'git config --global user.name "VS Code Agent" &&  git config --global user.email "monacotools@microsoft.com"'
 
-#  	ARTIFACTS="$AGENT_BUILDDIRECTORY/smoketest-artifacts"
-# 	rm -rf $ARTIFACTS
-# 	mkdir -p $ARTIFACTS
-# 	chown -R testuser $ARTIFACTS
+ 	ARTIFACTS="$AGENT_BUILDDIRECTORY/smoketest-artifacts"
+	rm -rf $ARTIFACTS
+	mkdir -p $ARTIFACTS
+	chown -R testuser $ARTIFACTS
 
-# 	ps -o pid= -u testuser | xargs sudo kill -9
-# 	DISPLAY=:10 sudo -i -u testuser -- sh -c "cd $BUILD_SOURCESDIRECTORY/test/smoke && ./node_modules/.bin/mocha --build $AGENT_BUILDDIRECTORY/VSCode-linux-$ARCH --log $ARTIFACTS"
-# 	# DISPLAY=:10 sudo -i -u testuser -- sh -c "cd /vso/work/1/s/test/smoke && ./node_modules/.bin/mocha --build /vso/work/1/VSCode-linux-ia32"
-# }
+	ps -o pid= -u testuser | xargs sudo kill -9
+	DISPLAY=:10 sudo -i -u testuser -- sh -c "cd $BUILD_SOURCESDIRECTORY/test/smoke && ./node_modules/.bin/mocha --build $AGENT_BUILDDIRECTORY/VSCode-linux-$ARCH --log $ARTIFACTS"
+	# DISPLAY=:10 sudo -i -u testuser -- sh -c "cd /vso/work/1/s/test/smoke && ./node_modules/.bin/mocha --build /vso/work/1/VSCode-linux-ia32"
+}
 
-# step "Run smoke test" \
-# 	smoketest
+step "Run smoke test" \
+	smoketest
 
 step "Publish release" \
 	./build/tfs/linux/release.sh
diff --git a/build/tfs/win32/1_build.ps1 b/build/tfs/win32/1_build.ps1
index c7fb712e18f..0d87c5276c0 100644
--- a/build/tfs/win32/1_build.ps1
+++ b/build/tfs/win32/1_build.ps1
@@ -52,11 +52,11 @@ step "Run unit tests" {
 #   exec { & .\scripts\test-integration.bat }
 # }
 
-# step "Run smoke test" {
-# 	$Artifacts = "$env:AGENT_BUILDDIRECTORY\smoketest-artifacts"
-# 	Remove-Item -Recurse -Force -ErrorAction Ignore $Artifacts
+step "Run smoke test" {
+	$Artifacts = "$env:AGENT_BUILDDIRECTORY\smoketest-artifacts"
+	Remove-Item -Recurse -Force -ErrorAction Ignore $Artifacts
 
-# 	exec { & npm run smoketest -- --build "$env:AGENT_BUILDDIRECTORY\VSCode-win32-$global:arch" --log "$Artifacts" }
-# }
+	exec { & npm run smoketest -- --build "$env:AGENT_BUILDDIRECTORY\VSCode-win32-$global:arch" --log "$Artifacts" }
+}
 
 done