diff --git a/eng/pipelines/templates/jobs/archetype-sdk-client.yml b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
index ccd64e2f2637..697fe21fd608 100644
--- a/eng/pipelines/templates/jobs/archetype-sdk-client.yml
+++ b/eng/pipelines/templates/jobs/archetype-sdk-client.yml
@@ -57,7 +57,7 @@ jobs:
           artifactName: packages
           path: $(Build.ArtifactStagingDirectory)
   - job: "Analyze"
-    condition: ne(variables['Skip.Analyze'], true)
+    condition: and(succeededOrFailed(), ne(variables['Skip.Analyze'], true))
     variables:
       - template: ../variables/globals.yml
     pool:
@@ -106,7 +106,7 @@ jobs:
           ignoreDirectories: "sdk/storage/Azure.Storage.Common/swagger/Generator"
         condition: and(succeededOrFailed(), ne(variables['Build.Reason'],'PullRequest'))
   - job: "Test"
-    condition: ne(variables['Skip.Test'], true)
+    condition: and(succeededOrFailed(), ne(variables['Skip.Test'], true))
     variables:
       - template: ../variables/globals.yml
     strategy: