diff --git a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
index 014b1bc01c..532a15b46a 100644
--- a/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/AutoCompleteBoxTests.cs
@@ -1,18 +1,19 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Linq;
-using System.Reactive.Subjects;
 using Avalonia.Controls.Primitives;
 using Avalonia.Controls.Templates;
 using Avalonia.Data;
+using Avalonia.Threading;
+using Avalonia.UnitTests;
+using Xunit;
+using System.Collections.ObjectModel;
+using System.Reactive.Subjects;
+using Avalonia.Headless;
 using Avalonia.Harfbuzz;
 using Avalonia.Input;
 using Avalonia.Platform;
-using Avalonia.Threading;
-using Avalonia.UnitTests;
 using Moq;
-using Xunit;
 
 namespace Avalonia.Controls.UnitTests
 {
@@ -405,7 +406,7 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(control.Text, control.ItemSelector(input, selectedItem));
             });
         }
-
+        
         [Fact]
         public void Text_Validation()
         {
@@ -420,7 +421,7 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(DataValidationErrors.GetErrors(control).SequenceEqual(new[] { exception }), true);
             });
         }
-
+        
         [Fact]
         public void Text_Validation_TextBox_Errors_Binding()
         {
@@ -429,20 +430,20 @@ namespace Avalonia.Controls.UnitTests
                 // simulate the TemplateBinding that would be used within the AutoCompleteBox control theme for the inner PART_TextBox
                 //      DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
                 textbox.Bind(DataValidationErrors.ErrorsProperty, control.GetBindingObservable(DataValidationErrors.ErrorsProperty));
-
+                
                 var exception = new InvalidCastException("failed validation");
                 var textObservable = new BehaviorSubject<BindingNotification>(new BindingNotification(exception, BindingErrorType.DataValidationError));
                 control.Bind(AutoCompleteBox.TextProperty, textObservable);
                 Dispatcher.UIThread.RunJobs();
-
+                
                 Assert.True(DataValidationErrors.GetHasErrors(control));
                 Assert.Equal([exception], DataValidationErrors.GetErrors(control));
-
+                
                 Assert.True(DataValidationErrors.GetHasErrors(textbox));
                 Assert.Equal([exception], DataValidationErrors.GetErrors(textbox));
             });
         }
-
+        
         [Fact]
         public void SelectedItem_Validation()
         {
@@ -1197,7 +1198,7 @@ namespace Avalonia.Controls.UnitTests
                 AutoCompleteBox control = CreateControl();
                 control.ItemsSource = CreateSimpleStringArray();
                 TextBox textBox = GetTextBox(control);
-                var window = new Window { Content = control };
+                var window = new Window {Content = control};
                 window.ApplyStyling();
                 window.ApplyTemplate();
                 window.Presenter.ApplyTemplate();
diff --git a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
index 0ebbbdd9b9..ecffcbac0f 100644
--- a/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/ListBoxTests.cs
@@ -13,6 +13,7 @@ using Avalonia.Data;
 using Avalonia.Input;
 using Avalonia.Layout;
 using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml.Templates;
 using Avalonia.Styling;
 using Avalonia.UnitTests;
 using Avalonia.VisualTree;
@@ -774,9 +775,9 @@ namespace Avalonia.Controls.UnitTests
             {
                 Template = ListBoxTemplate(),
                 ItemsSource = items,
-                ItemsPanel = new FuncTemplate<Panel>(() => new VirtualizingStackPanel
+                ItemsPanel = new FuncTemplate<Panel>(() => new VirtualizingStackPanel 
                 {
-                    Orientation = Orientation.Horizontal
+                    Orientation = Orientation.Horizontal 
                 }),
                 ItemTemplate = new FuncDataTemplate<string>((x, _) => new TextBlock { Height = 10 }),
                 SelectedIndex = 0,
@@ -1110,8 +1111,8 @@ namespace Avalonia.Controls.UnitTests
                 Items = { "Foo", "Bar", "Baz" },
             };
 
-            var button = new Button
-            {
+            var button = new Button 
+            { 
                 Content = "Button",
                 [DockPanel.DockProperty] = Dock.Top,
             };
@@ -1346,9 +1347,9 @@ namespace Avalonia.Controls.UnitTests
         {
             private readonly List<string> _inner = new(Enumerable.Repeat<string>(null, 100));
 
-            public object this[int index]
-            {
-                get => _inner[index] = $"Item{index}";
+            public object this[int index] 
+            { 
+                get => _inner[index] = $"Item{index}"; 
                 set => throw new NotSupportedException();
             }
 
diff --git a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
index 9d0cc9ad7a..f9eb31d216 100644
--- a/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/MaskedTextBoxTests.cs
@@ -137,7 +137,7 @@ namespace Avalonia.Controls.UnitTests
                     Template = CreateTemplate(),
                     Text = "1234"
                 };
-
+                
                 target.ApplyTemplate();
 
                 RaiseKeyEvent(target, Key.A, KeyModifiers.Control);
@@ -192,7 +192,7 @@ namespace Avalonia.Controls.UnitTests
                     Text = "First Second Third Fourth",
                     CaretIndex = 5
                 };
-
+                
                 textBox.ApplyTemplate();
 
                 // (First| Second Third Fourth)
@@ -234,7 +234,7 @@ namespace Avalonia.Controls.UnitTests
                     Text = "First Second Third Fourth",
                     CaretIndex = 19
                 };
-
+                
                 textBox.ApplyTemplate();
 
                 // (First Second Third |Fourth)
@@ -337,7 +337,7 @@ namespace Avalonia.Controls.UnitTests
                     Template = CreateTemplate(),
                     AcceptsReturn = true
                 };
-
+                
                 target.ApplyTemplate();
 
                 RaiseKeyEvent(target, Key.Enter, 0);
@@ -454,7 +454,7 @@ namespace Avalonia.Controls.UnitTests
                     AcceptsReturn = true,
                     NewLine = "Test"
                 };
-
+                
                 target.ApplyTemplate();
 
                 RaiseKeyEvent(target, Key.Enter, 0);
@@ -897,8 +897,7 @@ namespace Avalonia.Controls.UnitTests
                 };
 
                 var impl = CreateMockTopLevelImpl();
-                var topLevel = new TestTopLevel(impl.Object)
-                {
+                var topLevel = new TestTopLevel(impl.Object) {
                     Template = CreateTopLevelTemplate(),
                     Content = target
                 };
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
index d5148e9b1f..92d2d44558 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/SelectingItemsControlTests_Multiple.cs
@@ -1031,8 +1031,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
         {
             // Issue #11119
             using var app = Start();
-            var items = Enumerable.Range(0, 100).Select(x => new TestContainer
-            {
+            var items = Enumerable.Range(0, 100).Select(x => new TestContainer 
+            { 
                 Content = $"Item {x}",
                 Height = 100,
             }).ToList();
@@ -1093,7 +1093,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             // Create a SelectingItemsControl that creates containers that raise IsSelectedChanged,
             // with a virtualizing stack panel.
             var target = CreateTarget<TestSelectorWithContainers>(
-                itemsSource: items,
+                itemsSource: items, 
                 virtualizing: true);
             target.AutoScrollToSelectedItem = false;
 
@@ -1187,7 +1187,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
             bool virtualizing = false)
         {
             return CreateTarget<TestSelector>(
-                dataContext: dataContext,
+                dataContext:  dataContext,
                 items: items,
                 itemsSource: itemsSource,
                 itemContainerTheme: itemContainerTheme,
diff --git a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
index 52ca72f26a..fc0b1818d5 100644
--- a/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/TextBlockTests.cs
@@ -169,7 +169,7 @@ namespace Avalonia.Controls.UnitTests
             {
                 var target = new TextBlock();
 
-                target.Inlines.Add(new TextBox { Text = "Hello" });
+                target.Inlines.Add(new TextBox { Text = "Hello"});
 
                 target.Measure(Size.Infinity);
 
@@ -285,7 +285,7 @@ namespace Avalonia.Controls.UnitTests
 
                 var span = new Span { Inlines = new InlineCollection { new Run { Text = "World" } } };
 
-                var inlines = new InlineCollection { new Run { Text = "Hello " }, span };
+                var inlines = new InlineCollection{ new Run{Text = "Hello "}, span };
 
                 target.Inlines = inlines;
 
@@ -425,7 +425,7 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(0, target.Inlines.Count);
             }
         }
-
+        
         [Fact]
         public void Setting_TextDecorations_Should_Update_Inlines()
         {
@@ -446,7 +446,7 @@ namespace Avalonia.Controls.UnitTests
                 Assert.Equal(underline, target.Inlines[0].TextDecorations);
             }
         }
-
+        
         [Fact]
         public void TextBlock_TextLines_Should_Be_Empty()
         {