diff --git a/build/tfs/linux/smoketest.sh b/build/tfs/linux/smoketest.sh
index 3e4b8eb1687..6658c29e0f0 100644
--- a/build/tfs/linux/smoketest.sh
+++ b/build/tfs/linux/smoketest.sh
@@ -11,6 +11,15 @@ VSO_PAT="$2"
 
 echo "machine monacotools.visualstudio.com password $VSO_PAT" > ~/.netrc
 
+function configureEnvironment {
+	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 runSmokeTest {
+	DISPLAY=:10 sudo -i -u testuser -- sh -c "cd $BUILD_SOURCESDIRECTORY/test/smoke && ./node_modules/.bin/mocha --build $AGENT_BUILDDIRECTORY/VSCode-linux-x64/code-insiders"
+}
+
 step "Install dependencies" \
 	npm install --arch=$ARCH --unsafe-perm
 
@@ -26,19 +35,9 @@ step "Install distro dependencies" \
 step "Build minified" \
 	npm run gulp -- "vscode-linux-$ARCH-min"
 
-function configureEnvironment {
-	id -u testuser &>/dev/null || (useradd -m testuser; chpasswd <<< testuser:testpassword)
-	sudo -i -u testuser git config --global user.name "VS Code Agent"
-	sudo -i -u testuser git config --global user.email "monacotools@microsoft.com"
-}
-
 step "Configure environment" \
 	configureEnvironment
 
-function runSmokeTest {
-	cd test/smoke && sudo -i -u testuser ../../node_modules/.bin/mocha --build "$AGENT_BUILDDIRECTORY/VSCode-linux-x64/code-insiders"
-}
-
 step "Run smoke test" \
 	runSmokeTest