diff --git a/.pipelines/ci/templates/build-powertoys-steps.yml b/.pipelines/ci/templates/build-powertoys-steps.yml
index b7783e3108..cfba97e580 100644
--- a/.pipelines/ci/templates/build-powertoys-steps.yml
+++ b/.pipelines/ci/templates/build-powertoys-steps.yml
@@ -96,7 +96,7 @@ steps:
 
 # directly not doing WinAppDriver testing
 - task: VSTest@2
-  displayName: 'Run .Net Core Tests'
+  displayName: 'Run .Net Core Tests 1'
   inputs:
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
@@ -107,24 +107,32 @@ steps:
       **\Microsoft.Plugin.Calculator.UnitTest.dll
       **\Microsoft.Plugin.Uri.UnitTests.dll
       **\Wox.Test.dll
-      **\*Microsoft.PowerToys.Settings.UI.UnitTests.dll
+      **\Microsoft.PowerToys.Settings.UI.UnitTests.dll
       **\UnitTest-ColorPickerUI.dll
       **\Microsoft.Interop.Tests.dll
       !**\obj\**
-# .NetFramework assemblies
 - task: VSTest@2
-  displayName: 'Run .Net Framework Tests'
+  displayName: 'Run .Net Core Tests 2'
   inputs:
     platform: '$(BuildPlatform)'
     configuration: '$(BuildConfiguration)'
     testSelector: 'testAssemblies'
     testAssemblyVer2: |
-      **\ImageResizer.Test.dll
-      **\KeyboardManagerTest.dll
-      **\UnitTests-CommonLib.dll
       **\PreviewPaneUnitTests.dll #this is the markdown tests
       **\UnitTests-PreviewHandlerCommon.dll
       **\UnitTests-SvgPreviewHandler.dll
+      **\ImageResizer.Test.dll
       **\powerpreviewTest.dll
+      !**\obj\**
+# Native dlls
+- task: VSTest@2
+  displayName: 'Run Native Tests'
+  inputs:
+    platform: '$(BuildPlatform)'
+    configuration: '$(BuildConfiguration)'
+    testSelector: 'testAssemblies'
+    testAssemblyVer2: |
+      **\KeyboardManagerTest.dll
+      **\UnitTests-CommonLib.dll
       **\PowerRenameUnitTests.dll
       !**\obj\**