diff --git a/.azure-pipelines/test-docker-sonic-vs-template.yml b/.azure-pipelines/test-docker-sonic-vs-template.yml
index d3f31d6e439b..f4b9636e3c0f 100644
--- a/.azure-pipelines/test-docker-sonic-vs-template.yml
+++ b/.azure-pipelines/test-docker-sonic-vs-template.yml
@@ -107,7 +107,7 @@ jobs:
     inputs:
       testResultsFiles: '**/*_tr.xml'
       testRunTitle: vstest
-    condition: always()
+    condition: succeeded()
 
   - script: |
       cp -r tests/log $(Build.ArtifactStagingDirectory)/
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 166905654e25..3cb2f7b12a62 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -101,7 +101,7 @@ stages:
 
 - stage: Gcov
   dependsOn: Test
-  condition: always()
+  condition: in(dependencies.Test.result, 'Succeeded', 'SucceededWithIssues')
   jobs:
   - template: .azure-pipelines/gcov.yml
     parameters: