diff --git a/build/tfs/linux/product-build-linux.yml b/build/tfs/linux/product-build-linux.yml
index f38980542e8..8ad9e0c0ab8 100644
--- a/build/tfs/linux/product-build-linux.yml
+++ b/build/tfs/linux/product-build-linux.yml
@@ -30,6 +30,10 @@ steps:
 - script: |
     set -e
     npm run gulp -- "electron-$(VSCODE_ARCH)"
+
+    # xvfb seems to be crashing often, let's make sure it's always up
+    service xvfb start
+
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
     # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
   name: test