diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 3ef040d53ce7..7cd6e7e314dc 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -97,7 +97,7 @@ extends:
         parameters:
           pool:
             name: $(DncEngInternalBuildPool)
-            image: 1es-windows-2022
+            image: windows.vs2022.amd64
             os: windows
           helixTargetQueue: windows.amd64.vs2022.pre
           oneESCompat:
diff --git a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs
index 6c3dac9ca3f5..46f9c2a07fa5 100644
--- a/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs
+++ b/test/Microsoft.NET.Build.Tests/GivenThatWeWantToBuildAWindowsDesktopProject.cs
@@ -463,6 +463,7 @@ public void ItWarnsWhenBuildingAProjectWithUseUwpProperty()
                 TargetFrameworks = "net9.0-windows10.0.22621.0"
             };
             testProject.AdditionalProperties["UseUwp"] = "true";
+            testProject.AdditionalProperties["UseUwpTools"] = "false";
 
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
 
@@ -484,6 +485,7 @@ public void ItErrorsWhenTargetingBelowNet6WithUseUwpProperty()
                 TargetFrameworks = "netstandard2.0"
             };
             testProject.AdditionalProperties["UseUwp"] = "true";
+            testProject.AdditionalProperties["UseUwpTools"] = "false";
 
             var testAsset = _testAssetsManager.CreateTestProject(testProject);
 
@@ -505,6 +507,7 @@ public void ItErrorsWhenTransitivelyReferencingWindowsUIXamlReferencesWithoutUse
                 TargetFrameworks = "net9.0-windows10.0.22621.0"
             };
             testProjectA.AdditionalProperties["UseUwp"] = "true";
+            testProjectA.AdditionalProperties["UseUwpTools"] = "false";
 
             TestProject testProjectB = new()
             {
@@ -579,6 +582,7 @@ public void ItBuildsWhenReferencingWindowsUIXamlTypesWithUseUwpProperty()
                 }
             };
             testProject.AdditionalProperties["UseUwp"] = "true";
+            testProject.AdditionalProperties["UseUwpTools"] = "false";
 
             // Temporary until new projections flow to tests
             testProject.AdditionalProperties["WindowsSdkPackageVersion"] = "10.0.22621.39";
diff --git a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs
index bf1ca6f53949..5e23d2946d45 100644
--- a/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs
+++ b/test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/BlazorLegacyIntegrationTest60.cs
@@ -54,7 +54,7 @@ public void Publish60Hosted_Works()
             ProjectDirectory = CreateAspNetSdkTestAsset(testAsset);
 
             var publish = CreatePublishCommand(ProjectDirectory, "Server");
-            ExecuteCommand(publish)
+            ExecuteCommand(publish, "/p:BuildWithNetFrameworkHostedCompiler=true")
                 .Should()
                 .Pass()
                 .And.NotHaveStdOutContaining("warning IL");
diff --git a/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs b/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs
index b93cec570764..1feb0fed8adf 100644
--- a/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs
+++ b/test/Microsoft.NET.Sdk.Razor.Tests/BuildWithComponentsIntegrationTest.cs
@@ -40,7 +40,7 @@ private void Build_ComponentsWorks([CallerMemberName] string callerName = "")
             var projectDirectory = CreateAspNetSdkTestAsset(testAsset, callerName);
 
             var build = new BuildCommand(projectDirectory);
-            build.Execute().Should().Pass();
+            build.Execute("/p:BuildWithNetFrameworkHostedCompiler=true").Should().Pass();
 
             string outputPath = build.GetOutputDirectory(DefaultTfm).ToString();