diff --git a/build/azure-pipelines/darwin/product-build-darwin.yml b/build/azure-pipelines/darwin/product-build-darwin.yml
index f136f2b44961356b916e33b44c37c8042c58b088..201a6bdce4ca64e894be9c3503f1522967320edb 100644
--- a/build/azure-pipelines/darwin/product-build-darwin.yml
+++ b/build/azure-pipelines/darwin/product-build-darwin.yml
@@ -26,18 +26,38 @@ steps:
 
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
+  displayName: Prepare tooling
+
+- script: |
+    set -e
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
     git fetch distro
     git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
 
+- script: |
+    set -e
     yarn
+  displayName: Install dependencies
+
+- script: |
+    set -e
     yarn gulp mixin
+  displayName: Mix in quality
+
+- script: |
+    set -e
     yarn gulp hygiene
     yarn monaco-compile-check
+  displayName: Run hygiene checks
+  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+
+- script: |
+    set -e
     node build/azure-pipelines/common/installDistroDependencies.js
     node build/azure-pipelines/common/installDistroDependencies.js remote
     node build/lib/builtInExtensions.js
-  displayName: Prepare build
+  displayName: Install distro dependencies and extensions
 
 - script: |
     set -e
@@ -52,11 +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')
 
 - script: |
     set -e
     ./scripts/test-integration.sh --build --tfs "Integration Tests"
   displayName: Run integration tests
+  condition: 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 4beee37d1a041c4022ab4e41105c03c7f1a8c88e..71dfb9206777ee01c50b39f0807dbcbcd9244a8f 100644
--- a/build/azure-pipelines/linux/product-build-linux-alpine.yml
+++ b/build/azure-pipelines/linux/product-build-linux-alpine.yml
@@ -35,14 +35,34 @@ steps:
 
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
+  displayName: Prepare tooling
+
+- script: |
+    set -e
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
     git fetch distro
     git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
 
+- script: |
+    set -e
     CHILD_CONCURRENCY=1 yarn
+  displayName: Install dependencies
+
+- script: |
+    set -e
     yarn gulp mixin
+  displayName: Mix in quality
+
+- script: |
+    set -e
     yarn gulp hygiene
     yarn monaco-compile-check
+  displayName: Run hygiene checks
+  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+
+- script: |
+    set -e
     ./build/azure-pipelines/linux/prebuild-alpine.sh
   displayName: Prepare build
 
diff --git a/build/azure-pipelines/linux/product-build-linux-arm.yml b/build/azure-pipelines/linux/product-build-linux-arm.yml
index 55350cce29537e396d02b3a222655f8b130367bd..8eb75c58aa9c3c813b6db8a7535a58d9c11aa5d4 100644
--- a/build/azure-pipelines/linux/product-build-linux-arm.yml
+++ b/build/azure-pipelines/linux/product-build-linux-arm.yml
@@ -35,16 +35,36 @@ steps:
 
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
+  displayName: Prepare tooling
+
+- script: |
+    set -e
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
     git fetch distro
     git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
 
+- script: |
+    set -e
     CHILD_CONCURRENCY=1 yarn
+  displayName: Install dependencies
+
+- script: |
+    set -e
     yarn gulp mixin
+  displayName: Mix in quality
+
+- script: |
+    set -e
     yarn gulp hygiene
     yarn monaco-compile-check
+  displayName: Run hygiene checks
+  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+
+- script: |
+    set -e
     ./build/azure-pipelines/linux/prebuild-arm.sh
-  displayName: Prepare build
+  displayName: Prebuild
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/linux/product-build-linux.yml b/build/azure-pipelines/linux/product-build-linux.yml
index c1386b93f71f0bff2f746016500bb08497737f5a..691851fbf977fa1b9c34fd90830ba74e9ff6df1e 100644
--- a/build/azure-pipelines/linux/product-build-linux.yml
+++ b/build/azure-pipelines/linux/product-build-linux.yml
@@ -27,18 +27,38 @@ steps:
 
     git config user.email "vscode@microsoft.com"
     git config user.name "VSCode"
+  displayName: Prepare tooling
+
+- script: |
+    set -e
     git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git"
     git fetch distro
     git merge $(node -p "require('./package.json').distro")
+  displayName: Merge distro
 
+- script: |
+    set -e
     CHILD_CONCURRENCY=1 yarn
+  displayName: Install dependencies
+
+- script: |
+    set -e
     yarn gulp mixin
+  displayName: Mix in quality
+
+- script: |
+    set -e
     yarn gulp hygiene
     yarn monaco-compile-check
+  displayName: Run hygiene checks
+  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+
+- script: |
+    set -e
     node build/azure-pipelines/common/installDistroDependencies.js
     node build/azure-pipelines/common/installDistroDependencies.js remote
     node build/lib/builtInExtensions.js
-  displayName: Prepare build
+  displayName: Install distro dependencies and extensions
 
 - script: |
     set -e
@@ -56,6 +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')
 
 - script: |
     set -e
diff --git a/build/azure-pipelines/win32/product-build-win32.yml b/build/azure-pipelines/win32/product-build-win32.yml
index 339bdde1b9cc4ad82ac282a5fadb3f6b2a2d243d..6505b9a8df24850609a5e4feb12ee08c2fa71465 100644
--- a/build/azure-pipelines/win32/product-build-win32.yml
+++ b/build/azure-pipelines/win32/product-build-win32.yml
@@ -27,18 +27,43 @@ steps:
 
     exec { git config user.email "vscode@microsoft.com" }
     exec { git config user.name "VSCode" }
+  displayName: Prepare tooling
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
     exec { git remote add distro "https://github.com/$(VSCODE_MIXIN_REPO).git" }
     exec { git fetch distro }
     exec { git merge $(node -p "require('./package.json').distro") }
+  displayName: Merge distro
 
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
     exec { yarn }
+  displayName: Install dependencies
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
     exec { yarn gulp mixin }
+  displayName: Mix in quality
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
     exec { yarn gulp hygiene }
     exec { yarn monaco-compile-check }
+  displayName: Run hygiene checks
+  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
+
+- powershell: |
+    . build/azure-pipelines/win32/exec.ps1
+    $ErrorActionPreference = "Stop"
     exec { node build/azure-pipelines/common/installDistroDependencies.js }
     exec { node build/azure-pipelines/common/installDistroDependencies.js remote }
     exec { node build/lib/builtInExtensions.js }
-  displayName: Prepare build
+  displayName: Install distro dependencies and extensions
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -52,8 +77,8 @@ steps:
     $ErrorActionPreference = "Stop"
     exec { yarn gulp "electron-$(VSCODE_ARCH)" }
     exec { .\scripts\test.bat --build --tfs "Unit Tests" }
-    # yarn smoketest -- --build "$(agent.builddirectory)\VSCode-win32-$(VSCODE_ARCH)"
   displayName: Run unit tests
+  condition: eq(variables['VSCODE_STEP_ON_IT'], 'false')
 
 - powershell: |
     . build/azure-pipelines/win32/exec.ps1
@@ -61,6 +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')
 
 - task: SFP.build-tasks.custom-build-task-1.EsrpCodeSigning@1
   inputs: