diff --git a/azure-devops/run-build.yml b/azure-devops/run-build.yml
index 0a517388607..2d52b453755 100644
--- a/azure-devops/run-build.yml
+++ b/azure-devops/run-build.yml
@@ -4,8 +4,6 @@
 jobs:
 - job: ${{ parameters.targetPlatform }}
   timeoutInMinutes: 360
-  pool:
-    name: $(agentPool)
 
   variables:
     buildOutputLocation: 'D:\build\${{ parameters.targetPlatform }}'
@@ -74,7 +72,7 @@ jobs:
     - task: CmdLine@2
       displayName: 'Run Tests'
       timeoutInMinutes: 120
-      condition: in('${{ parameters.targetPlatform }}', 'x64', 'x86')
+      condition: and(succeeded(), in('${{ parameters.targetPlatform }}', 'x64', 'x86'))
       inputs:
         workingDirectory: $(buildOutputLocation)
         script: |
@@ -85,7 +83,7 @@ jobs:
     - task: PublishTestResults@2
       displayName: 'Publish Tests'
       timeoutInMinutes: 10
-      condition: in('${{ parameters.targetPlatform }}', 'x64', 'x86')
+      condition: and(succeededOrFailed(), in('${{ parameters.targetPlatform }}', 'x64', 'x86'))
       inputs:
         searchFolder: $(buildOutputLocation)
         testResultsFormat: JUnit
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 69437b81002..49c9a55da32 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -4,9 +4,10 @@
 # Build STL targeting x86, x64, arm, arm64
 
 variables:
-  agentPool: 'StlBuild-2020-09-14'
   tmpDir: 'D:\Temp'
 
+pool: 'StlBuild-2020-09-14'
+
 stages:
   - stage: Code_Format
     displayName: 'Code Format'
@@ -14,9 +15,6 @@ stages:
       - job: Code_Format_Validation
         timeoutInMinutes: 90
         displayName: 'Validation'
-        pool:
-          name: $(agentPool)
-
         variables:
           buildOutputLocation: 'D:\tools'
         steps:
@@ -43,6 +41,7 @@ stages:
           - task: BatchScript@1
             displayName: 'Enforce clang-format'
             timeoutInMinutes: 60
+            condition: succeededOrFailed()
             inputs:
               filename: 'azure-devops/enforce-clang-format.cmd'
               failOnStandardError: true
@@ -51,6 +50,7 @@ stages:
           - task: BatchScript@1
             displayName: 'Validate Files'
             timeoutInMinutes: 2
+            condition: succeededOrFailed()
             inputs:
               filename: 'azure-devops/validate-files.cmd'
               failOnStandardError: true