diff --git a/build-tools/automation/azure-pipelines.yaml b/build-tools/automation/azure-pipelines.yaml
index 77d233d883b..b8f32eb1b64 100644
--- a/build-tools/automation/azure-pipelines.yaml
+++ b/build-tools/automation/azure-pipelines.yaml
@@ -613,6 +613,7 @@ stages:
     steps:
     - template: yaml-templates/setup-test-environment.yaml
       parameters:
+        provisionClassic: false
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
     - template: yaml-templates/run-xaprepare.yaml
@@ -779,6 +780,7 @@ stages:
     steps:
     - template: yaml-templates/setup-test-environment.yaml
       parameters:
+        provisionClassic: false
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
     - template: yaml-templates/run-xaprepare.yaml
diff --git a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml
index e5264ad1b1c..0c2c4295c42 100644
--- a/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml
+++ b/build-tools/automation/yaml-templates/run-msbuild-device-tests.yaml
@@ -23,6 +23,7 @@ jobs:
     steps:
     - template: setup-test-environment.yaml
       parameters:
+        provisionClassic: ${{ ne(parameters.target_framework, parameters.dotnet_targetframework) }}
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
     - template: run-xaprepare.yaml
diff --git a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml
index f84b0ac0d44..8d9c602b6b6 100644
--- a/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml
+++ b/build-tools/automation/yaml-templates/run-msbuild-mac-tests.yaml
@@ -22,6 +22,7 @@ jobs:
     steps:
     - template: setup-test-environment.yaml
       parameters:
+        provisionClassic: ${{ ne(parameters.target_framework, parameters.dotnet_targetframework) }}
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
     - task: DownloadPipelineArtifact@1
diff --git a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
index a267d415e4f..f96e5eca4bb 100644
--- a/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
+++ b/build-tools/automation/yaml-templates/run-msbuild-win-tests.yaml
@@ -28,6 +28,7 @@ jobs:
 
     - template: setup-test-environment.yaml
       parameters:
+        provisionClassic: ${{ ne(parameters.target_framework, parameters.dotnet_targetframework) }}
         provisionatorChannel: ${{ parameters.provisionatorChannel }}
         remove_dotnet: true
 
diff --git a/build-tools/automation/yaml-templates/setup-test-environment.yaml b/build-tools/automation/yaml-templates/setup-test-environment.yaml
index 1cc3fa8c32f..727499dc2b6 100644
--- a/build-tools/automation/yaml-templates/setup-test-environment.yaml
+++ b/build-tools/automation/yaml-templates/setup-test-environment.yaml
@@ -1,5 +1,6 @@
 parameters:
   configuration: $(XA.Build.Configuration)
+  provisionClassic: true
   provisionExtraArgs: -vv -f
   provisionatorChannel: latest
   xaSourcePath: $(System.DefaultWorkingDirectory)
@@ -19,10 +20,11 @@ steps:
     parameters: 
       xasourcePath: ${{ parameters.xaSourcePath }}
 
-- template: run-installer.yaml
-  parameters:
-    provisionExtraArgs: ${{ parameters.provisionExtraArgs }}
-    provisionatorChannel: ${{ parameters.provisionatorChannel }}
+- ${{ if eq(parameters.provisionClassic, true) }}:
+  - template: run-installer.yaml
+    parameters:
+      provisionExtraArgs: ${{ parameters.provisionExtraArgs }}
+      provisionatorChannel: ${{ parameters.provisionatorChannel }}
 
 - script: |
     echo "##vso[task.setvariable variable=JI_JAVA_HOME]${{ parameters.jdkTestFolder }}"