diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 3b4ef344804..aac2dadff62 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -98,14 +98,12 @@ steps:
     ./scripts/test.sh --build --tfs "Unit Tests"
   displayName: Run unit tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
     yarn test-browser --build --browser chromium --browser webkit --browser firefox
   displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     # Figure out the full absolute path of the product we just built
@@ -119,7 +117,6 @@ steps:
     ./scripts/test-integration.sh --build --tfs "Integration Tests"
   displayName: Run integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
@@ -130,7 +127,6 @@ steps:
     ./resources/server/test/test-remote-integration.sh
   displayName: Run remote integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
@@ -138,24 +134,23 @@ steps:
     ./resources/server/test/test-web-integration.sh --browser webkit
   displayName: Run integration tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
     APP_ROOT=$(agent.builddirectory)/VSCode-darwin
     APP_NAME="`ls $APP_ROOT | head -n 1`"
     yarn smoketest --build "$APP_ROOT/$APP_NAME"
+  continueOnError: true
   displayName: Run smoke tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: true
 
 - script: |
     set -e
     VSCODE_REMOTE_SERVER_PATH="$(agent.builddirectory)/vscode-reh-web-darwin" \
     yarn smoketest --web --headless
+  continueOnError: true
   displayName: Run smoke tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: true
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 0dbf6f03a1f..cbe3bf051e6 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -103,14 +103,12 @@ steps:
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
   displayName: Run unit tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
     DISPLAY=:10 yarn test-browser --build --browser chromium
   displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     # Figure out the full absolute path of the product we just built
@@ -124,7 +122,6 @@ steps:
     DISPLAY=:10 ./scripts/test-integration.sh --build --tfs "Integration Tests"
   displayName: Run integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
@@ -135,7 +132,6 @@ steps:
     DISPLAY=:10 ./resources/server/test/test-remote-integration.sh
   displayName: Run remote integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
@@ -143,7 +139,6 @@ steps:
     DISPLAY=:10 ./resources/server/test/test-web-integration.sh --browser chromium
   displayName: Run integration tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 150ff419e71..c428642454c 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -111,7 +111,6 @@ steps:
     exec { .\scripts\test.bat --build --tfs "Unit Tests" }
   displayName: Run unit tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -119,7 +118,6 @@ steps:
     exec { yarn test-browser --build --browser chromium --browser firefox }
   displayName: Run unit tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - powershell: |
     # Figure out the full absolute path of the product we just built
@@ -133,7 +131,6 @@ steps:
     exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\scripts\test-integration.bat --build --tfs "Integration Tests" }
   displayName: Run integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -144,7 +141,6 @@ steps:
     exec { $env:INTEGRATION_TEST_ELECTRON_PATH = "$AppRoot\$AppNameShort.exe"; $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-remote-integration.bat }
   displayName: Run remote integration tests (Electron)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -152,7 +148,6 @@ steps:
     exec { $env:VSCODE_REMOTE_SERVER_PATH = "$(agent.builddirectory)\vscode-reh-web-win32-$(VSCODE_ARCH)"; .\resources\server\test\test-web-integration.bat --browser firefox }
   displayName: Run integration tests (Browser)
   condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
-  continueOnError: eq(variables['VSCODE_CONTINUE_ON_TEST_ERRORS'], 'true')
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs: