diff --git a/.azure-pipelines/advanced-test.yml b/.azure-pipelines/advanced-test.yml
index 628937740..559cf5787 100644
--- a/.azure-pipelines/advanced-test.yml
+++ b/.azure-pipelines/advanced-test.yml
@@ -6,9 +6,15 @@ trigger:
   - test-*
 pr: none
 
-jobs:
-  # Any addition here should be reflected in the advanced and release pipelines.
-  # It is advised to declare all jobs here as templates to improve maintainability.
-#  - template: templates/jobs/standard-tests-jobs.yml
-  - template: templates/jobs/extended-tests-jobs.yml
-#  - template: templates/jobs/packaging-jobs.yml
+stages:
+  - stage: Test_Package
+    jobs:
+      # Any addition here should be reflected in the advanced-test and release pipelines.
+      # It is advised to declare all jobs here as templates to improve maintainability.
+      # - template: templates/jobs/standard-tests-jobs.yml
+      - template: templates/jobs/extended-tests-jobs.yml
+      # - template: templates/jobs/packaging-jobs.yml
+#  - stage: Deploy
+#    jobs:
+#      - template: templates/jobs/deployment-jobs.yml
+  - template: templates/stages/notify-failure-stage.yml
diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml
index 51684d9be..3b8646cdf 100644
--- a/.azure-pipelines/templates/steps/tox-steps.yml
+++ b/.azure-pipelines/templates/steps/tox-steps.yml
@@ -35,6 +35,7 @@ steps:
       cp $(testFarmPem.secureFilePath) tests/letstest/azure-test-farm.pem
     condition: contains(variables['TOXENV'], 'test-farm')
   - bash: |
+      exit 1
       if [[ "${TOXENV}" == *"oldest"* ]]; then
         tools/run_oldest_tests.sh
       else