diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index 201a6bdce4ca64e894be9c3503f1522967320edb..b465ef9a09543cf5d691b276ed074632ba8fbf97 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -50,7 +50,7 @@ steps:
     yarn gulp hygiene
     yarn monaco-compile-check
   displayName: Run hygiene checks
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
@@ -72,13 +72,13 @@ steps:
     # APP_NAME="`ls $(agent.builddirectory)/VSCode-darwin | head -n 1`"
     # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-darwin/$APP_NAME"
   displayName: Run unit tests
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
     ./scripts/test-integration.sh --build --tfs "Integration Tests"
   displayName: Run integration tests
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/linux/product-build-linux-alpine.yml b/build/azure-pipelines/linux/product-build-linux-alpine.yml
index 71dfb9206777ee01c50b39f0807dbcbcd9244a8f..107f7fa0cec732058ea736ce039812ac59218888 100644
--- a/build/azure-pipelines/linux/product-build-linux-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-linux-alpine.yml
@@ -59,7 +59,7 @@ steps:
     yarn gulp hygiene
     yarn monaco-compile-check
   displayName: Run hygiene checks
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/linux/product-build-linux-arm.yml b/build/azure-pipelines/linux/product-build-linux-arm.yml
index 8eb75c58aa9c3c813b6db8a7535a58d9c11aa5d4..ffa6d18f68e9df38a5a3dc683ab2df741393a3ad 100644
--- a/build/azure-pipelines/linux/product-build-linux-arm.yml
+++ b/build/azure-pipelines/linux/product-build-linux-arm.yml
@@ -59,7 +59,7 @@ steps:
     yarn gulp hygiene
     yarn monaco-compile-check
   displayName: Run hygiene checks
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index 691851fbf977fa1b9c34fd90830ba74e9ff6df1e..fa26c26dd1c63ec0a75026e18ed3ce39d7813644 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -51,7 +51,7 @@ steps:
     yarn gulp hygiene
     yarn monaco-compile-check
   displayName: Run hygiene checks
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
@@ -76,7 +76,7 @@ steps:
     DISPLAY=:10 ./scripts/test.sh --build --tfs "Unit Tests"
     # yarn smoketest -- --build "$(agent.builddirectory)/VSCode-linux-$(VSCODE_ARCH)"
   displayName: Run unit tests
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 6505b9a8df24850609a5e4feb12ee08c2fa71465..18758af4f997e33d06eeff0400c4a80fce84f907 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -55,7 +55,7 @@ steps:
     exec { yarn gulp hygiene }
     exec { yarn monaco-compile-check }
   displayName: Run hygiene checks
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -78,7 +78,7 @@ steps:
     exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test.bat --build --tfs "Unit Tests" }
   displayName: Run unit tests
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -86,7 +86,7 @@ steps:
     exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test-integration.bat --build --tfs "Integration Tests" }
   displayName: Run integration tests
-  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+  condition: and(succeeded(), eq(variables['VSCODE_STEP_ON_IT'], 'false'))
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs: