diff --git a/.github/workflows/build_artifacts.yml b/.github/workflows/build_artifacts.yml
index 028e0a9511..04124bed57 100644
--- a/.github/workflows/build_artifacts.yml
+++ b/.github/workflows/build_artifacts.yml
@@ -55,7 +55,7 @@ jobs:
         uses: actions/upload-artifact@v7
         with:
             name: Screenshots-${{ github.run_number }}
-            path: ${{ github.workspace }}\tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net9.0-windows\Screenshots
+            path: ${{ github.workspace }}\tests\MaterialDesignThemes.UITests\bin\${{ inputs.build-configuration }}\net10.0-windows\Screenshots
             if-no-files-found: ignore
 
       - name: Build NuGets
diff --git a/Directory.packages.props b/Directory.packages.props
index 7b6068480f..caf0d57aed 100644
--- a/Directory.packages.props
+++ b/Directory.packages.props
@@ -12,31 +12,31 @@
     <PackageVersion Include="Humanizer" Version="3.0.10" />
     <PackageVersion Include="MahApps.Metro" Version="2.4.11" />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" PrivateAssets="all" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.3.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.3.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.9.0" PrivateAssets="all" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Common" Version="5.9.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="5.9.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.Workspaces.Common" Version="5.9.0" />
     <PackageVersion Include="Microsoft.Composition" Version="1.0.31" />
     <PackageVersion Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.10.1" />
     <PackageVersion Include="Microsoft.Toolkit.MVVM" Version="7.1.2" />
-    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.142" />
+    <PackageVersion Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.161" />
     <PackageVersion Include="Newtonsoft.Json" Version="13.0.4" />
     <PackageVersion Include="Polyfill" Version="8.8.1" />
     <PackageVersion Include="Shouldly" Version="4.3.0" />
     <PackageVersion Include="ShowMeTheXAML" Version="2.1.1" />
     <PackageVersion Include="ShowMeTheXAML.AvalonEdit" Version="2.1.1" />
     <PackageVersion Include="ShowMeTheXAML.MSBuild" Version="2.1.1" />
-    <PackageVersion Include="System.CommandLine" Version="2.0.9" />
+    <PackageVersion Include="System.CommandLine" Version="2.0.12" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Net.Http" Version="4.3.4" />
     <PackageVersion Include="System.Private.Uri" Version="4.3.2" />
     <PackageVersion Include="System.ValueTuple" Version="4.6.2" />
     <PackageVersion Include="System.Text.RegularExpressions" Version="4.3.1" />
-    <PackageVersion Include="TUnit" Version="1.53.0" />
-    <PackageVersion Include="VirtualizingWrapPanel" Version="2.5.1" />
-    <PackageVersion Include="XAMLTest" Version="1.3.1" />
+    <PackageVersion Include="TUnit" Version="1.72.10" />
+    <PackageVersion Include="VirtualizingWrapPanel" Version="2.5.4" />
+    <PackageVersion Include="XAMLTest" Version="1.3.2" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/tests/MaterialDesignThemes.UITests/AllStyles.cs b/tests/MaterialDesignThemes.UITests/AllStyles.cs
index cf78a95deb..e7cd822b1b 100644
--- a/tests/MaterialDesignThemes.UITests/AllStyles.cs
+++ b/tests/MaterialDesignThemes.UITests/AllStyles.cs
@@ -5,6 +5,7 @@ namespace MaterialDesignThemes.UITests;
 public class AllStyles : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("Button", "MaterialDesignRaisedButton")]
     [Arguments("Calendar", "MaterialDesignCalendarPortrait")]
     [Arguments("CheckBox", "MaterialDesignCheckBox")]
diff --git a/tests/MaterialDesignThemes.UITests/DoesNotRequireInteractionAttribute.cs b/tests/MaterialDesignThemes.UITests/DoesNotRequireInteractionAttribute.cs
new file mode 100644
index 0000000000..c379435c2d
--- /dev/null
+++ b/tests/MaterialDesignThemes.UITests/DoesNotRequireInteractionAttribute.cs
@@ -0,0 +1,16 @@
+using TUnit.Core.Interfaces;
+
+[assembly: NotInParallel("Default")]
+
+namespace MaterialDesignThemes.UITests;
+
+[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
+public sealed class DoesNotRequireInteractionAttribute : Attribute, ITestDiscoveryEventReceiver
+{
+    public ValueTask OnTestDiscovered(DiscoveredTestContext context)
+    {
+        context.AddParallelConstraint(new ParallelGroupConstraint("NoInteraction", 0));
+        context.AddParallelConstraint(new NotInParallelConstraint([Guid.NewGuid().ToString()]));
+        return default;
+    }
+}
diff --git a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
index cc91938039..86ee4a7191 100644
--- a/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
+++ b/tests/MaterialDesignThemes.UITests/MaterialDesignThemes.UITests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net10.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
@@ -19,6 +19,7 @@
 
   <ItemGroup>
     <Using Include="MaterialDesignThemes.Wpf" />
+    <Using Include="System.ComponentModel"/>
     <Using Include="XamlTest" />
   </ItemGroup>
 
diff --git a/tests/MaterialDesignThemes.UITests/TUnitExtensions.cs b/tests/MaterialDesignThemes.UITests/TUnitExtensions.cs
new file mode 100644
index 0000000000..401d13358b
--- /dev/null
+++ b/tests/MaterialDesignThemes.UITests/TUnitExtensions.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Collections.Generic;
+using System.Linq.Expressions;
+using System.Reflection;
+using System.Text;
+using Expression = System.Linq.Expressions.Expression;
+
+namespace MaterialDesignThemes.UITests;
+
+internal static class TUnitExtensions
+{
+    private const string GetDisplayNameMethodName = "GetDisplayName";
+
+    private static readonly Lazy<Func<TestContext, string>> _getDisplayNameFunc = new(() =>
+    {
+        var testContextType = typeof(TestContext);
+        MethodInfo? getDisplayNameMethod = testContextType.GetMethod(
+            GetDisplayNameMethodName,
+            BindingFlags.NonPublic | BindingFlags.Instance)
+            ?? throw new InvalidOperationException($"Could not find {GetDisplayNameMethodName} method on {testContextType.FullName}.");
+
+        if (getDisplayNameMethod.ReturnType != typeof(string) || getDisplayNameMethod.GetParameters().Length != 0)
+        {
+            throw new InvalidOperationException(
+                $"{GetDisplayNameMethodName} on {testContextType.FullName} has an unexpected signature.");
+        }
+
+        ParameterExpression testContextParameter = Expression.Parameter(testContextType, "testContext");
+        MethodCallExpression callExpression = Expression.Call(testContextParameter, getDisplayNameMethod);
+        var lambdaExpression = Expression.Lambda<Func<TestContext, string>>(callExpression, testContextParameter);
+
+        return lambdaExpression.Compile();
+    });
+
+    extension(TestContext testContext)
+    {
+        public string GetDisplayName()
+            => _getDisplayNameFunc.Value(testContext);
+    }
+}
diff --git a/tests/MaterialDesignThemes.UITests/TestBase.cs b/tests/MaterialDesignThemes.UITests/TestBase.cs
index b80e7288e7..87017c67e8 100644
--- a/tests/MaterialDesignThemes.UITests/TestBase.cs
+++ b/tests/MaterialDesignThemes.UITests/TestBase.cs
@@ -2,13 +2,8 @@
 using System.Windows.Media;
 using MaterialDesignThemes.UITests;
 using MaterialDesignThemes.Wpf.Internal;
-using Microsoft.VisualStudio.TestPlatform.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.Utilities;
-using TUnit.Core;
 using TUnit.Core.Interfaces;
 
-[assembly: ParallelLimiter<SingleParallelLimit>]
-
 [assembly: GenerateHelpers(typeof(AutoSuggestBox))]
 [assembly: GenerateHelpers(typeof(ColorPicker))]
 [assembly: GenerateHelpers(typeof(DecimalUpDown))]
@@ -23,11 +18,15 @@
 [assembly: GenerateHelpers(typeof(TreeListViewItem))]
 [assembly: GenerateHelpers(typeof(PaddedBringIntoViewStackPanel))]
 
+
+[assembly: ParallelLimiter<ParallelLimit>]
+
+
 namespace MaterialDesignThemes.UITests;
 
-public record SingleParallelLimit : IParallelLimit
+public record ParallelLimit : IParallelLimit
 {
-    public int Limit => 1;
+    public int Limit => 10;
 }
 
 public abstract class TestBase
@@ -63,12 +62,16 @@ protected async Task<IVisualElement> LoadUserControl(Type userControlType)
         return await App.CreateWindowWithUserControl(userControlType);
     }
 
+    private static bool IsNonInteractiveTest()
+        => TestContext.Current?.Metadata.TestDetails.GetAttributes<DoesNotRequireInteractionAttribute>().Any() == true;
+
     public Task<IApp> StartApp()
     {
         return XamlTest.App.StartRemote(new AppOptions
         {
 #if !DEBUG
-            MinimizeOtherWindows = !System.Diagnostics.Debugger.IsAttached,
+            // Minimizing other windows would also minimize the windows of tests running in parallel
+            MinimizeOtherWindows = !System.Diagnostics.Debugger.IsAttached && !IsNonInteractiveTest(),
 #endif
             AllowVisualStudioDebuggerAttach = AttachedDebuggerToRemoteProcess,
             LogMessage = Output.WriteLine
diff --git a/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
index 5b4156b60f..de23246304 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/AutoSuggestBoxes/AutoSuggestTextBoxTests.cs
@@ -2,6 +2,7 @@
 using MaterialDesignThemes.UITests.Samples.AutoSuggestBoxes;
 using MaterialDesignThemes.UITests.Samples.AutoSuggestTextBoxes;
 using TUnit.Core.Exceptions;
+
 namespace MaterialDesignThemes.UITests.WPF.AutoSuggestBoxes;
 
 public class AutoSuggestBoxTests : TestBase
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs
index 9158740a13..36546dd425 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Buttons/OutlineButtonTests.cs
@@ -5,6 +5,7 @@ namespace MaterialDesignThemes.UITests.WPF.Buttons;
 public class OutlineButtonTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     public async Task OutlinedButton_UsesThemeColorForBorder()
     {
         //Arrange
@@ -23,15 +24,18 @@ public async Task OutlinedButton_UsesThemeColorForBorder()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task OutlinedButton_BorderCanBeOverridden()
     {
         //Arrange
         var button = await LoadXaml<Button>(
-            @"<Button Content=""Button""
-                          Style=""{StaticResource MaterialDesignOutlinedButton}""
-                          BorderThickness=""5""
-                          BorderBrush=""Red""
-                    />");
+            """
+            <Button Content="Button"
+                    Style="{StaticResource MaterialDesignOutlinedButton}"
+                    BorderThickness="5"
+                    BorderBrush="Red"
+                    />
+            """);
         IVisualElement<Border> internalBorder = await button.GetElement<Border>("border");
 
         //Act
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs
index e2596c87f1..61e82805f5 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Buttons/RaisedButtonTests.cs
@@ -5,6 +5,7 @@ namespace MaterialDesignThemes.UITests.WPF.Buttons;
 public class RaisedButtonTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     public async Task OnLoad_ThemeBrushesSet()
     {
         //Arrange
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs
index a2f129ce92..3968631304 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Cards/ElevatedCardTests.cs
@@ -1,11 +1,9 @@
-
-
-namespace MaterialDesignThemes.UITests.WPF.Cards;
+namespace MaterialDesignThemes.UITests.WPF.Cards;
 
 public class ElevatedCardTests : TestBase
 {
-
     [Test]
+    [DoesNotRequireInteraction]
     public async Task ElevatedCard_UniformCornerRadiusApplied_AppliesCornerRadiusOnBorder()
     {
         //Arrange
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs
index 874790a0d7..af32c950cb 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Cards/OutlinedCardTests.cs
@@ -5,6 +5,7 @@ namespace MaterialDesignThemes.UITests.WPF.Cards;
 public class OutlinedCardTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     public async Task OutlinedCard_UsesThemeColorForBorder()
     {
         //Arrange
@@ -21,6 +22,7 @@ public async Task OutlinedCard_UsesThemeColorForBorder()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task OutlinedCard_UniformCornerRadiusApplied_AppliesCornerRadiusOnBorder()
     {
         //Arrange
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs
index 9e80946bb5..f7fd7647f9 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ColorZones/ColorZoneTests.cs
@@ -1,11 +1,11 @@
 using System.Windows.Media;
 
-
 namespace MaterialDesignThemes.UITests.WPF.ColorZones;
 
 public class ColorZoneTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments(ColorZoneMode.Standard, "MaterialDesign.Brush.Background", "MaterialDesign.Brush.Foreground")]
     [Arguments(ColorZoneMode.Inverted, "MaterialDesign.Brush.Foreground", "MaterialDesign.Brush.Background")]
     [Arguments(ColorZoneMode.PrimaryLight, "MaterialDesign.Brush.Primary.Light", "MaterialDesign.Brush.Primary.Light.Foreground")]
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
index 6dec4654c4..e251f245ac 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ComboBoxes/ComboBoxTests.cs
@@ -7,6 +7,7 @@ namespace MaterialDesignThemes.UITests.WPF.ComboBoxes;
 public class ComboBoxTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Pull Request 2192")]
     public async Task OnComboBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
@@ -24,6 +25,7 @@ public async Task OnComboBoxHelperTextFontSize_ChangesHelperTextFontSize()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Pull Request 2192")]
     public async Task OnFilledComboBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
@@ -146,6 +148,7 @@ public async Task OnEditableComboBox_ClickInTextArea_FocusesTextBox()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintComboBox", null)]
     [Arguments("MaterialDesignFloatingHintComboBox", 5)]
     [Arguments("MaterialDesignFloatingHintComboBox", 20)]
@@ -183,6 +186,7 @@ public async Task ComboBox_WithHintAndHelperText_RespectsPadding(string styleNam
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintComboBox", null)]
     [Arguments("MaterialDesignFloatingHintComboBox", 5)]
     [Arguments("MaterialDesignFloatingHintComboBox", 20)]
@@ -217,7 +221,7 @@ public async Task ComboBox_WithHintAndValidationError_RespectsPadding(string sty
 
         var contentHost = await comboBox.GetElement<ScrollViewer>("PART_ContentHost");
         var hint = await comboBox.GetElement<SmartHint>("Hint");
-        var errorViewer = await comboBox.GetElement<Border>("DefaultErrorViewer");
+        var errorViewer = await Wait.For(async () => await comboBox.GetElement<Border>("DefaultErrorViewer"));
 
         Rect? contentHostCoordinates = await contentHost.GetCoordinates();
         Rect? hintCoordinates = await hint.GetCoordinates();
@@ -228,6 +232,7 @@ public async Task ComboBox_WithHintAndValidationError_RespectsPadding(string sty
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments(HorizontalAlignment.Left)]
     [Arguments(HorizontalAlignment.Right)]
     [Arguments(HorizontalAlignment.Center)]
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
index 32b0e8d6ae..4bfee6767d 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DatePickers/DatePickerTests.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using System.Globalization;
 using System.Windows.Media;
 using MaterialDesignThemes.UITests.WPF.TextBoxes;
@@ -9,6 +8,7 @@ namespace MaterialDesignThemes.UITests.WPF.DatePickers;
 public class DatePickerTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Pull Request 2192")]
     public async Task OnDatePickerHelperTextFontSize_ChangesHelperTextFontSize()
     {
@@ -129,6 +129,7 @@ public async Task OutlinedDatePicker_RespectsActiveAndInactiveBorderThickness_Wh
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintDatePicker", null)]
     [Arguments("MaterialDesignFloatingHintDatePicker", 5)]
     [Arguments("MaterialDesignFloatingHintDatePicker", 20)]
@@ -200,7 +201,7 @@ public async Task DatePicker_WithHintAndValidationError_RespectsPadding(string s
 
         var contentHost = await datePicker.GetElement<ScrollViewer>("PART_ContentHost");
         var hint = await datePicker.GetElement<SmartHint>("Hint");
-        var errorViewer = await datePicker.GetElement<Border>("DefaultErrorViewer");
+        var errorViewer = await Wait.For(async () => await datePicker.GetElement<Border>("DefaultErrorViewer"));
 
         Rect? contentHostCoordinates = await contentHost.GetCoordinates();
         Rect? hintCoordinates = await hint.GetCoordinates();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
index 1bd5c0a276..fa84783942 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DialogHosts/DialogHostTests.cs
@@ -15,6 +15,7 @@ public DialogHostTests()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task WaitForOpenAndClosed_CompletesAfterDialogAnimates()
     {
         var dialogHost = await LoadXaml<DialogHost>("<materialDesign:DialogHost />");
@@ -43,6 +44,7 @@ static async Task CloseAndWaitForCompletion(DialogHost dialogHost)
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task WaitAlreadyReachedState_CompletesImmediately()
     {
         var dialogHost = await LoadXaml<DialogHost>("<materialDesign:DialogHost />");
diff --git a/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs b/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
index 7aab8cc2ca..e27878c5d8 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/DrawerHosts/DrawerHostTests.cs
@@ -117,6 +117,7 @@ public async Task DrawerHost_CancelingClosingEvent_DrawerStaysOpen()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 3224")]
     public async Task DrawerHost_ShouldInvokeCustomContentTemplateSelector_WhenSetExplicitly()
     {
@@ -174,7 +175,7 @@ public class CustomContentTemplateSelector : DataTemplateSelector
     public override DataTemplate? SelectTemplate(object? item, DependencyObject container)
     {
         var template = new DataTemplate();
-        FrameworkElementFactory content = new FrameworkElementFactory(typeof(TextBlock));
+        FrameworkElementFactory content = new(typeof(TextBlock));
         content.SetValue(TextBlock.TextProperty, ContentText);
         template.VisualTree = content;
         return template;
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs
index 162aa8ea64..2c150d8e1f 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Flippers/ClassicFlipperTests.cs
@@ -5,6 +5,7 @@ namespace MaterialDesignThemes.UITests.WPF.Flippers;
 public class ClassicFlipperTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     public async Task UniformCornerRadiusAndOutlinedCardStyleAttachedPropertiesApplied_AppliesCornerRadiusOnBorder()
     {
         //Arrange
@@ -23,6 +24,7 @@ public async Task UniformCornerRadiusAndOutlinedCardStyleAttachedPropertiesAppli
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task UniformCornerRadiusAndElevatedCardStyleAttachedPropertiesApplied_AppliesCornerRadiusOnBorder()
     {
         //Arrange
@@ -43,6 +45,7 @@ public async Task UniformCornerRadiusAndElevatedCardStyleAttachedPropertiesAppli
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task ElevatedCardStyleApplied_AppliesDefaultElevation()
     {
         //Arrange
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs
index a4028926f8..cbf5c5d006 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ListBoxes/ListBoxTests.cs
@@ -71,6 +71,7 @@ public async Task OnClickChoiceChipListBox_ChangesSelectedItem(string listBoxSty
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task ScrollBarAssist_ButtonsVisibility_HidesButtonsOnMinimalistStyle()
     {
         string xaml = @"<ListBox Height=""300"" Width=""300""
diff --git a/tests/MaterialDesignThemes.UITests/WPF/PackIcon/PackIconTests.cs b/tests/MaterialDesignThemes.UITests/WPF/PackIcon/PackIconTests.cs
index d098525d05..7de7c7474c 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/PackIcon/PackIconTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/PackIcon/PackIconTests.cs
@@ -1,13 +1,9 @@
-using System;
-using System.Collections.Generic;
-using System.Runtime.CompilerServices;
-using System.Text;
-
-namespace MaterialDesignThemes.UITests.WPF.PackIcon;
+namespace MaterialDesignThemes.UITests.WPF.PackIcon;
 
 public class PackIconTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments(14)]
     [Arguments(60)]
     public async Task PackIcon_ScaleToSizeOfWith_ScalesSizeWithSource(double fontSize)
diff --git a/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
index 0f5340d9f2..91eaf35911 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/PasswordBoxes/PasswordBoxTests.cs
@@ -2,12 +2,12 @@
 using MaterialDesignThemes.UITests.Samples.PasswordBox;
 using MaterialDesignThemes.UITests.WPF.TextBoxes;
 
-
 namespace MaterialDesignThemes.UITests.WPF.PasswordBoxes;
 
 public class PasswordBoxTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     public async Task OnClearButtonShown_LayoutDoesNotChange()
     {
         //Arrange
@@ -28,6 +28,7 @@ public async Task OnClearButtonShown_LayoutDoesNotChange()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Pull Request 2192")]
     public async Task OnPasswordBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
@@ -145,6 +146,7 @@ public async Task PasswordBox_WithBoundPasswordProperty_RespectsBinding()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2998")]
     public async Task PasswordBox_WithRevealStyle_RespectsMaxLength()
     {
@@ -163,6 +165,7 @@ public async Task PasswordBox_WithRevealStyle_RespectsMaxLength()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintPasswordBox", null)]
     [Arguments("MaterialDesignFloatingHintPasswordBox", 5)]
     [Arguments("MaterialDesignFloatingHintPasswordBox", 20)]
@@ -254,7 +257,7 @@ public async Task PasswordBox_WithHintAndValidationError_RespectsPadding(string
 
         var contentHost = await passwordBox.GetElement<ScrollViewer>("PART_ContentHost");
         var hint = await passwordBox.GetElement<SmartHint>("Hint");
-        var errorViewer = await passwordBox.GetElement<Border>("DefaultErrorViewer");
+        var errorViewer = await Wait.For(async () => await passwordBox.GetElement<Border>("DefaultErrorViewer"));
 
         Rect? contentHostCoordinates = await contentHost.GetCoordinates();
         Rect? hintCoordinates = await hint.GetCoordinates();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
index daeee9a379..70c982e36a 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/PopupBoxes/PopupBoxTests.cs
@@ -7,6 +7,7 @@ namespace MaterialDesignThemes.UITests.WPF.PopupBoxes;
 public class PopupBoxTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments(Elevation.Dp0)]
     [Arguments(Elevation.Dp16)]
     [Arguments(Elevation.Dp24)]
diff --git a/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs b/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs
index 4c404fe84f..5f6f64c243 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/SnackBars/SnackBarTests.cs
@@ -1,10 +1,9 @@
-using System.ComponentModel;
-
-namespace MaterialDesignThemes.UITests.WPF.SnackBars;
+namespace MaterialDesignThemes.UITests.WPF.SnackBars;
 
 public class SnackBarTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 1223")]
     public async Task SnackBar_WithFontSizeAndWeight_AffectsDisplayedMessage()
     {
diff --git a/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs b/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
index 2aeab12433..b8e323cbee 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/SplitButtons/SplitButtonTests.cs
@@ -1,6 +1,5 @@
 using MaterialDesignThemes.UITests.Samples.SplitButton;
 
-
 [assembly: GenerateHelpers(typeof(SplitButtonWithCommandBinding))]
 
 namespace MaterialDesignThemes.UITests.WPF.SplitButtons;
@@ -114,6 +113,7 @@ public async Task SplitButton_RegisterCommandBinding_InvokesCommand()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task SplitButton_CommandCanExecuteFalse_DisablesButton()
     {
         //Arrange
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
index 4e0f33eb1e..bff42a4e4a 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TabControls/TabControlTests.cs
@@ -1,13 +1,12 @@
-using System.ComponentModel;
 using System.Windows.Media;
 using MaterialDesignThemes.Wpf.Internal;
 
-
 namespace MaterialDesignThemes.UITests.WPF.TabControls;
 
 public class TabControlTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2602")]
     public async Task OnLoad_ThemeBrushesSet()
     {
@@ -113,6 +112,7 @@ public async Task TabItem_ShouldKeepDataContext_WhenContextMenuOpens(string hori
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 3271")]
     public async Task TabControl_ShouldRespectSelectedContentTemplate_WhenSetDirectlyOnTabItem()
     {
@@ -143,6 +143,7 @@ public async Task TabControl_ShouldRespectSelectedContentTemplate_WhenSetDirectl
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("")]                                     // UniformGrid style
     [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
     public async Task ScrollingTabs_WithMoreTabsThanScreenRealEstate_ShouldAddLeftAndRightMarginToHeaderPanel(string additionalProperties)
@@ -177,6 +178,7 @@ public async Task ScrollingTabs_WithMoreTabsThanScreenRealEstate_ShouldAddLeftAn
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("")]                                     // UniformGrid style
     [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
     public async Task ScrollingTabs_WithLessTabsThanScreenRealEstate_ShouldNotAddLeftAndRightMarginToHeaderPanel(string additionalProperties)
@@ -211,6 +213,7 @@ public async Task ScrollingTabs_WithLessTabsThanScreenRealEstate_ShouldNotAddLef
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("", 5, false)]                                     // UniformGrid style
     [Arguments("", 20, true)]                                     // UniformGrid style
     [Arguments("HorizontalContentAlignment=\"Left\"", 5, false)]  // VirtualizingStackPanel style
@@ -253,6 +256,7 @@ public async Task ScrollingTabs_WithNavigationPanels_ShouldCorrectlySetIsOverflo
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("")]                                     // UniformGrid style
     [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
     public async Task ScrollingTabs_WithNavigationPanelLeft_ShouldCorrectlySetIsOverflowingAndNavigationPanelLeftVisibility(string additionalProperties)
@@ -291,6 +295,7 @@ public async Task ScrollingTabs_WithNavigationPanelLeft_ShouldCorrectlySetIsOver
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("")]                                     // UniformGrid style
     [Arguments("HorizontalContentAlignment=\"Left\"")]  // VirtualizingStackPanel style
     public async Task ScrollingTabs_WithNavigationPanelRight_ShouldCorrectlySetIsOverflowingAndNavigationPanelLeftVisibility(string additionalProperties)
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
index 3c004f7759..0f1b0320e5 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TextBoxes/TextBoxTests.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using System.Globalization;
+using System.Globalization;
 using System.Windows.Media;
 using MaterialDesignThemes.UITests.Samples.Validation;
 
@@ -74,6 +73,7 @@ public async Task OnClearButtonWithHintShown_ControlHeightDoesNotChange()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 1979")]
     public async Task OnTextCleared_MultilineTextBox()
     {
@@ -130,6 +130,7 @@ await Wait.For(async () =>
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2002")]
     public async Task OnTextBoxDisabled_FloatingHintBackgroundIsOpaque()
     {
@@ -155,6 +156,7 @@ public async Task OnTextBoxDisabled_FloatingHintBackgroundIsOpaque()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Pull Request 2192")]
     public async Task OnTextBoxHelperTextFontSize_ChangesHelperTextFontSize()
     {
@@ -174,6 +176,7 @@ public async Task OnTextBoxHelperTextFontSize_ChangesHelperTextFontSize()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task CharacterCount_WithMaxLengthSet_IsDisplayed()
     {
         var grid = await LoadXaml<Grid>(@"
@@ -193,6 +196,7 @@ public async Task CharacterCount_WithMaxLengthSet_IsDisplayed()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task CharacterCount_WithoutMaxLengthSet_IsCollapsed()
     {
         var grid = await LoadXaml<Grid>(@"
@@ -206,6 +210,7 @@ public async Task CharacterCount_WithoutMaxLengthSet_IsCollapsed()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task CharacterCount_WithMaxLengthSetAndCharacterCounterVisibilityCollapsed_IsNotDisplayed()
     {
         var grid = await LoadXaml<Grid>(@"
@@ -222,6 +227,7 @@ public async Task CharacterCount_WithMaxLengthSetAndCharacterCounterVisibilityCo
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2300")]
     public async Task HelperText_CanSetFontColorWithAttachedStyle()
     {
@@ -243,6 +249,7 @@ public async Task HelperText_CanSetFontColorWithAttachedStyle()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2362")]
     public async Task FloatingOffset_ValuesGetAppropriatelyApplied()
     {
@@ -304,6 +311,7 @@ await Wait.For(async () =>
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2430")]
     public async Task VerticalContentAlignment_ProperlyAlignsText()
     {
@@ -325,6 +333,7 @@ public async Task VerticalContentAlignment_ProperlyAlignsText()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2596")]
     public async Task OutlinedTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
     {
@@ -346,8 +355,7 @@ public async Task OutlinedTextBox_ValidationErrorMargin_MatchesHelperTextMargin(
 
         var textBox = await stackPanel.GetElement<TextBox>("/TextBox");
 
-        var errorViewer = await textBox.GetElement<Border>("DefaultErrorViewer");
-        var helperTextTextBlock = await textBox.GetElement<TextBlock>("HelperTextTextBlock");
+        var errorViewer = await Wait.For(async () => await textBox.GetElement<Border>("DefaultErrorViewer"));
 
         Thickness? errorMargin = await errorViewer.GetMargin();
         Thickness? textBoxPadding = await textBox.GetPadding();
@@ -358,6 +366,7 @@ public async Task OutlinedTextBox_ValidationErrorMargin_MatchesHelperTextMargin(
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2596")]
     public async Task FilledTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
     {
@@ -379,8 +388,7 @@ public async Task FilledTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
 
         var textBox = await stackPanel.GetElement<TextBox>("/TextBox");
 
-        var errorViewer = await textBox.GetElement<Border>("DefaultErrorViewer");
-        var helperTextTextBlock = await textBox.GetElement<TextBlock>("HelperTextTextBlock");
+        var errorViewer = await Wait.For(async () => await textBox.GetElement<Border>("DefaultErrorViewer"));
 
         Thickness? errorMargin = await errorViewer.GetProperty<Thickness>(FrameworkElement.MarginProperty);
         Thickness? textBoxPadding = await textBox.GetProperty<Thickness>(Control.PaddingProperty);
@@ -392,6 +400,7 @@ public async Task FilledTextBox_ValidationErrorMargin_MatchesHelperTextMargin()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintTextBox", null)]
     [Arguments("MaterialDesignFloatingHintTextBox", 5)]
     [Arguments("MaterialDesignFloatingHintTextBox", 20)]
@@ -429,6 +438,7 @@ public async Task TextBox_WithHintAndHelperText_RespectsPadding(string styleName
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintTextBox", null)]
     [Arguments("MaterialDesignFloatingHintTextBox", 5)]
     [Arguments("MaterialDesignFloatingHintTextBox", 20)]
@@ -463,7 +473,7 @@ public async Task TextBox_WithHintAndValidationError_RespectsPadding(string styl
 
         var contentHost = await textBox.GetElement<ScrollViewer>("PART_ContentHost");
         var hint = await textBox.GetElement<SmartHint>("Hint");
-        var errorViewer = await textBox.GetElement<Border>("DefaultErrorViewer");
+        var errorViewer = await Wait.For(async () => await textBox.GetElement<Border>("DefaultErrorViewer"));
 
         Rect? contentHostCoordinates = await contentHost.GetCoordinates();
         Rect? hintCoordinates = await hint.GetCoordinates();
@@ -474,6 +484,7 @@ public async Task TextBox_WithHintAndValidationError_RespectsPadding(string styl
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments(VerticalAlignment.Stretch, VerticalAlignment.Stretch)]
     [Arguments(VerticalAlignment.Top, VerticalAlignment.Top)]
     [Arguments(VerticalAlignment.Bottom, VerticalAlignment.Bottom)]
@@ -559,6 +570,7 @@ await Wait.For(async() =>
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 3914")]
     public async Task TextBox_ClearButtonRemainsHidden_WhenInitiallyCollapsedAndMadeVisible()
     {
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs
index 2ea5c684aa..a41575f682 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TextFieldDefaultHeightTests.cs
@@ -5,6 +5,7 @@ public class TextFieldDefaultHeightTests : TestBase
     private const double Precision = 0.001;
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task SameHeightWithDefaultStyle()
     {
         var stackPanel = await LoadXaml<StackPanel>("""
@@ -18,14 +19,15 @@ public async Task SameHeightWithDefaultStyle()
             """);
 
         double height = await GetHeight(stackPanel, "TextBox");
-        
+
         await Assert.That(await GetHeight(stackPanel, "PasswordBox")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "ComboBox")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "DatePicker")).IsCloseTo(height, Precision);
         await Assert.That(await GetHeight(stackPanel, "TimePicker")).IsCloseTo(height, Precision);
     }
 
- [Test]
+    [Test]
+    [DoesNotRequireInteraction]
     public async Task SameHeightWithFloatingHintStyle()
     {
         var stackPanel = await LoadXaml<StackPanel>("""
@@ -48,6 +50,7 @@ public async Task SameHeightWithFloatingHintStyle()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task SameHeightWithFilledStyle()
     {
         var stackPanel = await LoadXaml<StackPanel>("""
@@ -70,6 +73,7 @@ public async Task SameHeightWithFilledStyle()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task SameHeightWithOutlinedStyle()
     {
         var stackPanel = await LoadXaml<StackPanel>("""
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs
index 6888ef245b..442ef063db 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Theme/ColorAdjustTests.cs
@@ -9,7 +9,7 @@ public class ColorAdjustTests : TestBase
 {
     public static IEnumerable<Func<PrimaryColor>> PrimaryColors()
     {
-        return Enum.GetValues(typeof(PrimaryColor))
+        return Enum.GetValues<PrimaryColor>()
             .OfType<PrimaryColor>()
             .Select(x => new Func<PrimaryColor>(() => x));
     }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs b/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs
index d7d02d200d..604c42f53e 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/Theme/ThemeTests.cs
@@ -1,13 +1,13 @@
-using System.Windows.Media;
+using System.Windows.Media;
 using MaterialDesignColors;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 
-
 namespace MaterialDesignThemes.UITests.WPF.Theme;
 
 public partial class ThemeTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     public async Task WhenUsingBuiltInLightXamlThemeDictionary_AllBrushesApplied()
     {
         IVisualElement<WrapPanel> panel = await Initialize("""
@@ -20,6 +20,7 @@ public async Task WhenUsingBuiltInLightXamlThemeDictionary_AllBrushesApplied()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task WhenUsingBuiltInDarkXamlThemeDictionary_AllBrushesApplied()
     {
         IVisualElement<WrapPanel> panel = await Initialize("""
@@ -32,6 +33,7 @@ public async Task WhenUsingBuiltInDarkXamlThemeDictionary_AllBrushesApplied()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task WhenUsingBuiltInThemeDictionary_AllBrushesApplied()
     {
         IVisualElement<WrapPanel> panel = await Initialize("""
@@ -45,6 +47,7 @@ public async Task WhenUsingBuiltInThemeDictionary_AllBrushesApplied()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task WhenUsingCustomColorThemeDictionary_AllBrushesApplied()
     {
         IVisualElement<WrapPanel> panel = await Initialize("""
@@ -60,6 +63,7 @@ public async Task WhenUsingCustomColorThemeDictionary_AllBrushesApplied()
     private static SecondaryColor[] SecondaryColors() => Enum.GetValues<SecondaryColor>();
 
     [Test]
+    [DoesNotRequireInteraction]
     [Explicit]
     [MatrixDataSource]
     public async Task BundledTheme_UsesSameColorsAsXamlResources(
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
index b95b6a466f..bb8e2c0ab3 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TimePickers/TimePickerTests.cs
@@ -1,4 +1,3 @@
-using System.ComponentModel;
 using System.Globalization;
 using System.Windows.Media;
 using MaterialDesignThemes.UITests.WPF.TextBoxes;
@@ -269,6 +268,7 @@ public async Task OnTimePickedIfTimeHasNotBeenChanged_TextWillBeFormatted(string
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Pull Request 2192")]
     public async Task OnTimePickerHelperTextFontSize_ChangesHelperTextFontSize()
     {
@@ -337,6 +337,7 @@ public async Task OutlinedTimePicker_RespectsActiveAndInactiveBorderThickness_Wh
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintTimePicker", null)]
     [Arguments("MaterialDesignFloatingHintTimePicker", 5)]
     [Arguments("MaterialDesignFloatingHintTimePicker", 20)]
@@ -374,6 +375,7 @@ public async Task TimePicker_WithHintAndHelperText_RespectsPadding(string styleN
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments("MaterialDesignFloatingHintTimePicker", null)]
     [Arguments("MaterialDesignFloatingHintTimePicker", 5)]
     [Arguments("MaterialDesignFloatingHintTimePicker", 20)]
@@ -408,7 +410,7 @@ public async Task TimePicker_WithHintAndValidationError_RespectsPadding(string s
 
         var contentHost = await timePicker.GetElement<ScrollViewer>("PART_ContentHost");
         var hint = await timePicker.GetElement<SmartHint>("Hint");
-        var errorViewer = await timePicker.GetElement<Border>("DefaultErrorViewer");
+        var errorViewer = await Wait.For(async () => await timePicker.GetElement<Border>("DefaultErrorViewer"));
 
         Rect? contentHostCoordinates = await contentHost.GetCoordinates();
         Rect? hintCoordinates = await hint.GetCoordinates();
diff --git a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
index 6b53d69d45..ad85a29992 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/ToolBars/ToolBarTests.cs
@@ -1,13 +1,12 @@
-using System.ComponentModel;
-using System.Windows.Media;
-
+using System.Windows.Media;
 
 namespace MaterialDesignThemes.UITests.WPF.ToolBars;
 
 public class ToolBarTests : TestBase
 {
-    [Description("Issue 2991")]
     [Test]
+    [DoesNotRequireInteraction]
+    [Description("Issue 2991")]
     [Arguments(Orientation.Horizontal, Dock.Right)]
     [Arguments(Orientation.Vertical, Dock.Bottom)]
     public async Task ToolBar_OverflowGrid_RespectsOrientation(Orientation orientation, Dock expectedOverflowGridDock)
@@ -28,8 +27,9 @@ public async Task ToolBar_OverflowGrid_RespectsOrientation(Orientation orientati
         await Assert.That(dock).IsEqualTo(expectedOverflowGridDock);
     }
 
-    [Description("Issue 3694")]
     [Test]
+    [DoesNotRequireInteraction]
+    [Description("Issue 3694")]
     public async Task ToolBar_OverflowButton_InheritsCustomBackground()
     {
         await using var recorder = new TestRecorder(App);
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeItem.cs b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeItem.cs
index 8b357d139d..c110d69682 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeItem.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeItem.cs
@@ -1,5 +1,4 @@
-using System.ComponentModel;
-using System.Diagnostics;
+using System.Diagnostics;
 using System.Windows.Data;
 using CommunityToolkit.Mvvm.ComponentModel;
 
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
index aa887b4e7d..24dc725305 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TreeListViews/TreeListViewTests.cs
@@ -4,7 +4,6 @@ namespace MaterialDesignThemes.UITests.WPF.TreeListViews;
 
 public class TreeListViewTests : TestBase
 {
-
     public static IEnumerable<Func<Type>> GetTestControls()
     {
         yield return () => typeof(TreeListViewDataBinding);
diff --git a/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs b/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs
index 409e3a0a91..e84e3aab17 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/TreeViews/TreeViewTests.cs
@@ -1,11 +1,12 @@
-using System.ComponentModel;
-
+using System.Collections.ObjectModel;
+using System.Windows.Data;
 
 namespace MaterialDesignThemes.UITests.WPF.TreeViews;
 
 public class TreeViewTests : TestBase
 {
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2618")]
     public async Task HasNoItemsExpanderVisibility_ChangesVisibilityOnExpander()
     {
@@ -55,12 +56,13 @@ public async Task HasNoItemsExpanderVisibility_ChangesVisibilityOnExpander()
         await Assert.That(await expander.GetVisibility()).IsEqualTo(Visibility.Visible);
         async Task<IVisualElement<ToggleButton>> GetExpanderForHeader(string header)
         {
-            var item = await treeView!.GetElement(ElementQuery.PropertyExpression<TreeViewItem>(x => x.Header, header));
+            var item = await treeView.GetElement(ElementQuery.PropertyExpression<TreeViewItem>(x => x.Header, header));
             return await item.GetElement<ToggleButton>();
         }
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Description("Issue 2618")]
     [Arguments(Visibility.Hidden)]
     [Arguments(Visibility.Collapsed)]
@@ -83,7 +85,7 @@ public async Task HasNoItemsExpanderVisibility_SetOnTreeView_ChangesVisibilityOn
         await Assert.That(await expander.GetVisibility()).IsEqualTo(Visibility.Visible);
         async Task<IVisualElement<ToggleButton>> GetExpanderForHeader(string header)
         {
-            var item = await treeView!.GetElement(ElementQuery.PropertyExpression<TreeViewItem>(x => x.Header, header));
+            var item = await treeView.GetElement(ElementQuery.PropertyExpression<TreeViewItem>(x => x.Header, header));
             return await item.GetElement<ToggleButton>();
         }
     }
diff --git a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
index 300c23bd50..15a6a1aec6 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/DecimalUpDownTests.cs
@@ -105,6 +105,7 @@ await Wait.For(async () =>
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
     {
         var numericUpDown = await LoadXaml<DecimalUpDown>("""
diff --git a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
index 21a5ef4553..377aa4f3bc 100644
--- a/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
+++ b/tests/MaterialDesignThemes.UITests/WPF/UpDownControls/NumericUpDownTests.cs
@@ -1,11 +1,8 @@
-using System.ComponentModel;
 using System.Windows.Data;
 using MaterialDesignThemes.UITests.Samples.UpDownControls;
 
-
 namespace MaterialDesignThemes.UITests.WPF.UpDownControls;
 
-
 public class NumericUpDownTests : TestBase
 {
     [Test]
@@ -95,6 +92,7 @@ await Wait.For(async () =>
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     public async Task MaxAndMinAssignments_CoerceValueToBeInRange()
     {
         var numericUpDown = await LoadXaml<NumericUpDown>("""
@@ -168,6 +166,7 @@ public async Task NumericUpDown_ValueSetGreaterThanMaximum_CoercesToMaximum()
     }
 
     [Test]
+    [DoesNotRequireInteraction]
     [Arguments(1, false, true)]
     [Arguments(5, true, true)]
     [Arguments(10, true, false)]
diff --git a/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs b/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs
index 096d9145f8..24cf943a5b 100644
--- a/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs
+++ b/tests/MaterialDesignThemes.UITests/XamlTestExtensions.cs
@@ -4,19 +4,21 @@ namespace MaterialDesignThemes.UITests;
 
 public static class XamlTestExtensions
 {
-    public static async Task InitializeWithMaterialDesign(this IApp app,
-        BaseTheme baseTheme = BaseTheme.Light,
-        PrimaryColor primary = PrimaryColor.DeepPurple,
-        SecondaryColor secondary = SecondaryColor.Lime,
-        ColorAdjustment? colorAdjustment = null)
+    extension(IApp app)
     {
-        string colorAdjustString = "";
-        if (colorAdjustment != null)
+        public async Task InitializeWithMaterialDesign(
+            BaseTheme baseTheme = BaseTheme.Light,
+            PrimaryColor primary = PrimaryColor.DeepPurple,
+            SecondaryColor secondary = SecondaryColor.Lime,
+            ColorAdjustment? colorAdjustment = null)
         {
-            colorAdjustString = "ColorAdjustment=\"{materialDesign:ColorAdjustment}\"";
-        }
+            string colorAdjustString = "";
+            if (colorAdjustment != null)
+            {
+                colorAdjustString = "ColorAdjustment=\"{materialDesign:ColorAdjustment}\"";
+            }
 
-        string applicationResourceXaml = $@"<ResourceDictionary 
+            string applicationResourceXaml = $@"<ResourceDictionary 
 xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
 xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
 xmlns:materialDesign=""http://materialdesigninxaml.net/winfx/xaml/themes"">
@@ -28,48 +30,55 @@ public static async Task InitializeWithMaterialDesign(this IApp app,
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>";
 
-        await app.Initialize(applicationResourceXaml,
-            Path.GetFullPath("MaterialDesignColors.dll"),
-            Path.GetFullPath("MaterialDesignThemes.Wpf.dll"),
-            System.Reflection.Assembly.GetExecutingAssembly().Location);
-    }
+            await app.Initialize(applicationResourceXaml,
+                Path.GetFullPath("MaterialDesignColors.dll"),
+                Path.GetFullPath("MaterialDesignThemes.Wpf.dll"),
+                System.Reflection.Assembly.GetExecutingAssembly().Location);
+        }
 
-    public static async Task<IVisualElement<T>> CreateWindowWith<T>(this IApp app, string xaml, params (string namespacePrefix, Type type)[] additionalNamespaceDeclarations)
-    {
-        var extraNamespaceDeclarations = new StringBuilder("");
-        foreach ((string namespacePrefix, Type type) in additionalNamespaceDeclarations)
+        public async Task<IVisualElement<T>> CreateWindowWith<T>(
+            string xaml,
+            params (string namespacePrefix, Type type)[] additionalNamespaceDeclarations)
         {
-            extraNamespaceDeclarations.AppendLine($@"xmlns:{namespacePrefix}=""clr-namespace:{type.Namespace};assembly={type.Assembly.GetName().Name}""");
-        }
+            var extraNamespaceDeclarations = new StringBuilder("");
+            foreach ((string namespacePrefix, Type type) in additionalNamespaceDeclarations)
+            {
+                extraNamespaceDeclarations.AppendLine($@"xmlns:{namespacePrefix}=""clr-namespace:{type.Namespace};assembly={type.Assembly.GetName().Name}""");
+            }
 
-        string windowXaml = @$"<Window
-        xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
-        xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
-        xmlns:d=""http://schemas.microsoft.com/expression/blend/2008""
-        xmlns:mc=""http://schemas.openxmlformats.org/markup-compatibility/2006""
-        xmlns:materialDesign=""http://materialdesigninxaml.net/winfx/xaml/themes""
-        {extraNamespaceDeclarations}
-        mc:Ignorable=""d""
-        Height=""800"" Width=""1100""
-        TextElement.Foreground=""{{DynamicResource MaterialDesignBody}}""
-        TextElement.FontWeight=""Regular""
-        TextElement.FontSize=""13""
-        TextOptions.TextFormattingMode=""Ideal"" 
-        TextOptions.TextRenderingMode=""Auto""
-        Background=""{{DynamicResource MaterialDesignPaper}}""
-        FontFamily=""{{materialDesign:MaterialDesignFont}}"" 
-        Title=""Test Window""
-        Topmost=""True""
-        WindowStartupLocation=""CenterScreen"">
-        {xaml}
-</Window>";
-        IWindow window = await app.CreateWindow(windowXaml);
-        return await window.GetElement<T>(".Content");
-    }
+            // Display names can contain quotes (e.g. HorizontalContentAlignment="Left") which would break the XAML attribute
+            string title = System.Security.SecurityElement.Escape(TestContext.Current?.GetDisplayName() ?? "Test Window");
 
-    public static async Task<IVisualElement> CreateWindowWith(this IApp app, string xaml)
-    {
-        string windowXaml = @$"<Window
+            string windowXaml = $$"""
+                <Window
+                    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+                    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+                    xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+                    {{extraNamespaceDeclarations}}
+                    mc:Ignorable="d"
+                    Height="800" Width="1100"
+                    TextElement.Foreground="{DynamicResource MaterialDesignBody}"
+                    TextElement.FontWeight="Regular"
+                    TextElement.FontSize="13"
+                    TextOptions.TextFormattingMode="Ideal"
+                    TextOptions.TextRenderingMode="Auto"
+                    Background="{DynamicResource MaterialDesignPaper}"
+                    FontFamily="{materialDesign:MaterialDesignFont}" 
+                    Title="{{title}}"
+                    Topmost="True"
+                    WindowStartupLocation="CenterScreen">
+                    {{xaml}}
+                </Window>
+                """;
+            IWindow window = await app.CreateWindow(windowXaml);
+            return await window.GetElement<T>(".Content");
+        }
+
+        public async Task<IVisualElement> CreateWindowWith(string xaml)
+        {
+            string windowXaml = @$"<Window
         xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
         xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
         xmlns:d=""http://schemas.microsoft.com/expression/blend/2008""
@@ -89,13 +98,13 @@ public static async Task<IVisualElement> CreateWindowWith(this IApp app, string
         WindowStartupLocation=""CenterScreen"">
         {xaml}
 </Window>";
-        IWindow window = await app.CreateWindow(windowXaml);
-        return await window.GetElement(".Content");
-    }
+            IWindow window = await app.CreateWindow(windowXaml);
+            return await window.GetElement(".Content");
+        }
 
-    public static async Task<IVisualElement> CreateWindowWithUserControl(this IApp app, Type userControlType)
-    {
-        string windowXaml = @$"<Window
+        public async Task<IVisualElement> CreateWindowWithUserControl(Type userControlType)
+        {
+            string windowXaml = @$"<Window
         xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
         xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
         xmlns:d=""http://schemas.microsoft.com/expression/blend/2008""
@@ -118,7 +127,8 @@ public static async Task<IVisualElement> CreateWindowWithUserControl(this IApp a
     <local:{userControlType.Name} x:Name=""Container"" VerticalAlignment=""Center"" />
   </Grid>
 </Window>";
-        IWindow window = await app.CreateWindow(windowXaml);
-        return await window.GetElement("Container.Content");
+            IWindow window = await app.CreateWindow(windowXaml);
+            return await window.GetElement("Container.Content");
+        }
     }
 }