diff --git a/src/WinUIEx.Tests/MonitorInfoTests.cs b/src/WinUIEx.Tests/MonitorInfoTests.cs
index a1a73b4..d96f1c3 100644
--- a/src/WinUIEx.Tests/MonitorInfoTests.cs
+++ b/src/WinUIEx.Tests/MonitorInfoTests.cs
@@ -7,6 +7,7 @@
 namespace WinUIUnitTests
 {
     [TestClass]
+    [TestCategory(nameof(WinUIEx.MonitorInfo))]
     public class MonitorInfoTests
     {
         [TestMethod]
diff --git a/src/WinUIEx.Tests/UITestHelper.cs b/src/WinUIEx.Tests/UITestHelper.cs
index 3399377..b16e09f 100644
--- a/src/WinUIEx.Tests/UITestHelper.cs
+++ b/src/WinUIEx.Tests/UITestHelper.cs
@@ -1,8 +1,5 @@
 using System;
 
-// To learn more about WinUI, the WinUI project structure,
-// and more about our project templates, see: http://aka.ms/winui-project-info.
-
 namespace WinUIUnitTests
 {
     public static class UITestHelper
diff --git a/src/WinUIEx.Tests/WinUIExtensions.cs b/src/WinUIEx.Tests/WinUIExtensions.cs
index ca6e6b1..a430fd1 100644
--- a/src/WinUIEx.Tests/WinUIExtensions.cs
+++ b/src/WinUIEx.Tests/WinUIExtensions.cs
@@ -1,9 +1,5 @@
 using Microsoft.UI.Xaml.Media.Imaging;
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace WinUIUnitTests
 {
diff --git a/src/WinUIEx.Tests/WindowExTests.cs b/src/WinUIEx.Tests/WindowExTests.cs
index 96b69c8..1bf95a0 100644
--- a/src/WinUIEx.Tests/WindowExTests.cs
+++ b/src/WinUIEx.Tests/WindowExTests.cs
@@ -1,6 +1,7 @@
 namespace WinUIUnitTests;
 
 [TestClass]
+[TestCategory(nameof(WinUIEx.WindowEx))]
 public partial class WindowExTests
 {
     [WorkItem(16)]
diff --git a/src/WinUIEx.Tests/WindowExtensionTests.cs b/src/WinUIEx.Tests/WindowExtensionTests.cs
index 5ce3f31..120edf4 100644
--- a/src/WinUIEx.Tests/WindowExtensionTests.cs
+++ b/src/WinUIEx.Tests/WindowExtensionTests.cs
@@ -1,6 +1,7 @@
 namespace WinUIUnitTests;
 
 [TestClass]
+[TestCategory(nameof(WinUIEx.WindowExtensions))]
 public partial class WindowExtensionTests
 {
     [TestMethod]
diff --git a/src/WinUIEx.Tests/WindowManagerTests.cs b/src/WinUIEx.Tests/WindowManagerTests.cs
index 5917409..e89e752 100644
--- a/src/WinUIEx.Tests/WindowManagerTests.cs
+++ b/src/WinUIEx.Tests/WindowManagerTests.cs
@@ -1,15 +1,9 @@
 using Microsoft.UI.Windowing;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Net.Mail;
-using System.Text;
-using System.Threading.Tasks;
-using Windows.Services.Maps;
 
 namespace WinUIUnitTests
 {
     [TestClass]
+    [TestCategory(nameof(WinUIEx.WindowManager))]
     public class WindowManagerTests
     {
         public TestContext TestContext { get; set; }