diff --git a/.azure/azure-ci-build-pipeline.yaml b/.azure/azure-ci-build-pipeline.yaml
index 26559889..f962a628 100644
--- a/.azure/azure-ci-build-pipeline.yaml
+++ b/.azure/azure-ci-build-pipeline.yaml
@@ -18,36 +18,43 @@ parameters:
       py: '3.8'
       img: 'ubuntu-latest'
       every_time: false
+      publish_coverage: false
     - job_name: 'UbuntuPython310'
       py: '3.10'
       img: 'ubuntu-latest'
       every_time: true
+      publish_coverage: true
     - job_name: 'WindowsPython38'
       py: '3.8'
       img: 'windows-latest'
       every_time: false
+      publish_coverage: false
     - job_name: 'WindowsPython310'
       py: '3.10'
       img: 'windows-latest'
       every_time: false
+      publish_coverage: false
     - job_name: 'MacOSPython38'
       py: '3.8'
       img: 'macOS-latest'
       every_time: false
+      publish_coverage: false
     - job_name: 'MacOSPython310'
       py: '3.10'
       img: 'macOS-latest'
       every_time: false
+      publish_coverage: false
 
 stages:
   - stage: Test
     jobs:
     - ${{ each item in parameters.matrix }}:
       - job: ${{ item.job_name }}
+        timeoutInMinutes: 90
+        cancelTimeoutInMinutes: 1
         pool:
           vmImage: ${{ item.img }}
-
-        condition: or( eq(variables['Build.Reason'], 'PullRequest'), ${{ item.every_time }} )
+        condition: and(succeeded(), or( eq(variables['Build.Reason'], 'PullRequest'), ${{ item.every_time }} ))
 
         steps:
           - task: UsePythonVersion@0
@@ -109,12 +116,12 @@ stages:
 
           - publish: $(System.DefaultWorkingDirectory)/htmlcov/
             # publish the html report - so we can debug the coverage if needed
-            condition: ${{ item.every_time }} # should only be run once
+            condition: ${{ item.publish_coverage }} # should only be run once
             artifact: coverage_report
 
           - task: PublishCodeCoverageResults@2
             # publish the code coverage so it can be viewed in the run coverage page
-            condition: ${{ item.every_time }} # should only be run once
+            condition: ${{ item.publish_coverage }} # should only be run once
             inputs:
               codeCoverageTool: Cobertura
               summaryFileLocation: '$(System.DefaultWorkingDirectory)/**/coverage.xml'