diff --git a/Directory.Build.props b/Directory.Build.props
index 39b30a121..0d470e4a5 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -31,6 +31,8 @@
          This is a prevalent problem in building the precomputed assembly reference cache. Limiting the assemblies resolved
          to those outside the culture folders would work, but that is a nontrivial problem. -->
     <NoWarn>NU5125;NU5105;NU1701;MSB3243;MSB3247</NoWarn>
+
+    <UseVSTestRunner>true</UseVSTestRunner>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(DisableSourceLink)' == 'true'">
diff --git a/eng/build-pr.yml b/eng/build-pr.yml
index 831d96781..e9a14cdf7 100644
--- a/eng/build-pr.yml
+++ b/eng/build-pr.yml
@@ -233,8 +233,8 @@ jobs:
     - task: PublishTestResults@2
       displayName: Publish Test Results
       inputs:
-        testRunner: XUnit
-        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
+        testRunner: VSTest
+        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
         testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
         platform: '$(BuildPlatform)'
         configuration: '${{ parameters.buildConfiguration }}'
diff --git a/eng/build.yml b/eng/build.yml
index 4f947ea8f..d901233c4 100644
--- a/eng/build.yml
+++ b/eng/build.yml
@@ -239,8 +239,8 @@ jobs:
     - task: PublishTestResults@2
       displayName: Publish Test Results
       inputs:
-        testRunner: XUnit
-        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.xml'
+        testRunner: VSTest
+        testResultsFiles: 'artifacts/TestResults/${{ parameters.buildConfiguration }}/*.trx'
         testRunTitle: '$(_AgentOSName)_$(Agent.JobName)'
         platform: '$(BuildPlatform)'
         configuration: '${{ parameters.buildConfiguration }}'