diff --git a/.azure-pipelines/advanced-test.yml b/.azure-pipelines/advanced-test.yml
index 10ff79289..3d5e7e3ab 100644
--- a/.azure-pipelines/advanced-test.yml
+++ b/.azure-pipelines/advanced-test.yml
@@ -8,6 +8,7 @@ pr: none
 
 stages:
   - template: templates/stages/test-and-package-stage.yml
+  - template: templates/stages/deploy-stage.yml
   # Notify failures only for release branches.
   - ${{ if not(startsWith(variables['Build.SourceBranchName'], 'test-')) }}:
     - template: templates/stages/notify-failure-stage.yml
diff --git a/.azure-pipelines/templates/stages/test-and-package-stage.yml b/.azure-pipelines/templates/stages/test-and-package-stage.yml
index 26010644d..60021cc33 100644
--- a/.azure-pipelines/templates/stages/test-and-package-stage.yml
+++ b/.azure-pipelines/templates/stages/test-and-package-stage.yml
@@ -1,6 +1,4 @@
 stages:
   - stage: TestAndPackage
     jobs:
-      - template: ../jobs/standard-tests-jobs.yml
-      - template: ../jobs/extended-tests-jobs.yml
       - template: ../jobs/packaging-jobs.yml