diff --git a/.pipelines/ci/templates/run-ui-tests-ci.yml b/.pipelines/ci/templates/run-ui-tests-ci.yml
index 1dab111c7f..66f55f93f6 100644
--- a/.pipelines/ci/templates/run-ui-tests-ci.yml
+++ b/.pipelines/ci/templates/run-ui-tests-ci.yml
@@ -36,6 +36,23 @@ jobs:
   - task: VisualStudioTestPlatformInstaller@1
     displayName: Ensure VSTest Platform
 
+  - task: VSTest@2
+    displayName: 'UI Tests'
+    condition: ne(variables['BuildPlatform'], 'arm64') # No arm64 agents to run the tests.
+    inputs:
+      platform: '$(BuildPlatform)'
+      configuration: '$(BuildConfiguration)'
+      testSelector: 'testAssemblies'
+      searchFolder: '$(Build.ArtifactStagingDirectory)'
+      vstestLocationMethod: 'location' # otherwise fails to find vstest.console.exe 
+      vstestLocation: '$(Agent.ToolsDirectory)\VsTest\**\$(BuildPlatform)\tools\net462\Common7\IDE\Extensions\TestPlatform'
+      uiTests: true
+      testAssemblyVer2: |
+        **\UITests-FancyZones.dll
+        **\UITests-FancyZonesEditor.dll
+        !**\obj\**
+        !**\ref\**
+
   - task: PowerShell@2
     displayName: 'Run UI Tests'
     inputs:
@@ -43,7 +60,7 @@ jobs:
       filePath: $(build.sourcesdirectory)\.pipelines\scripts\runUiTests.ps1
       arguments: >-
         -SearchFolder '$(Build.ArtifactStagingDirectory)\x64\**\UITests-FancyZonesEditor.dll'
-        -VsConsolePath '$(Agent.ToolsDirectory)\VsTest\17.10.0-preview-24080-01\x64\tools\net462\Common7\IDE\Extensions\TestPlatform'
+        -VsConsolePath '$(Agent.ToolsDirectory)\VsTest\**\$(BuildPlatform)\tools\net462\Common7\IDE\Extensions\TestPlatform'
         -MatchPattern '**\UITests-*.dll'
         -LogPath '$(Build.ArtifactStagingDirectory)\Logs'
         -ResultPath "$(Build.ArtifactStagingDirectory)\TestResults"
diff --git a/.pipelines/scripts/runUiTests.ps1 b/.pipelines/scripts/runUiTests.ps1
index 8d87506674..7e5ae7f926 100644
--- a/.pipelines/scripts/runUiTests.ps1
+++ b/.pipelines/scripts/runUiTests.ps1
@@ -13,7 +13,6 @@ Param(
 )
 
 Write-Output "Starting UI tests"
-Invoke-Expression "ls -R $VsConsolePath"
 
 $Command = "$VsConsolePath\vstest.console.exe $SearchFolder /ResultsDirectory:$ResultPath"
 Invoke-Expression $Command
\ No newline at end of file