diff --git a/.pipelines/ci/templates/run-ui-tests-ci.yml b/.pipelines/ci/templates/run-ui-tests-ci.yml
index 66f55f93f6..6f93fe513e 100644
--- a/.pipelines/ci/templates/run-ui-tests-ci.yml
+++ b/.pipelines/ci/templates/run-ui-tests-ci.yml
@@ -36,6 +36,18 @@ jobs:
   - task: VisualStudioTestPlatformInstaller@1
     displayName: Ensure VSTest Platform
 
+  - task: PowerShell@2
+    displayName: 'Run UI Tests'
+    inputs:
+      targetType: filePath
+      filePath: $(build.sourcesdirectory)\.pipelines\scripts\runUiTests.ps1
+      arguments: >-
+        -SearchFolder '$(Build.ArtifactStagingDirectory)\${{ parameters.platform }}\**\UITests-FancyZonesEditor.dll'
+        -VsConsolePath '$(Agent.ToolsDirectory)\VsTest\**\${{ parameters.platform }}\tools\net462\Common7\IDE\Extensions\TestPlatform'
+        -MatchPattern '**\UITests-*.dll'
+        -LogPath '$(Build.ArtifactStagingDirectory)\Logs'
+        -ResultPath "$(Build.ArtifactStagingDirectory)\TestResults"
+
   - task: VSTest@2
     displayName: 'UI Tests'
     condition: ne(variables['BuildPlatform'], 'arm64') # No arm64 agents to run the tests.
@@ -45,22 +57,10 @@ jobs:
       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'
+      vstestLocation: '$(Agent.ToolsDirectory)\VsTest\17.10.0-preview-24080-01\x64\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:
-      targetType: filePath
-      filePath: $(build.sourcesdirectory)\.pipelines\scripts\runUiTests.ps1
-      arguments: >-
-        -SearchFolder '$(Build.ArtifactStagingDirectory)\x64\**\UITests-FancyZonesEditor.dll'
-        -VsConsolePath '$(Agent.ToolsDirectory)\VsTest\**\$(BuildPlatform)\tools\net462\Common7\IDE\Extensions\TestPlatform'
-        -MatchPattern '**\UITests-*.dll'
-        -LogPath '$(Build.ArtifactStagingDirectory)\Logs'
-        -ResultPath "$(Build.ArtifactStagingDirectory)\TestResults"