diff --git a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
index 6543649eb2..a584a859ec 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/CompositorHitTestingTests.cs
@@ -414,21 +414,22 @@ public class CompositorHitTestingTests : CompositorTestsBase
     {
         using (var s = new CompositorServices(new Size(200, 200)))
         {
-            Button targetButton;
+            Rectangle targetRectangle;
 
             var stackPanel = new StackPanel
             {
                 Orientation = Orientation.Vertical,
+                HorizontalAlignment = HorizontalAlignment.Left,
                 Children =
                 {
-                    new Button { Width = 10, Height = 10 },
-                    { targetButton = new Button { Width = 10, Height = 10 } }
+                    new Rectangle { Width = 10, Height = 10, Fill= Brushes.Red},
+                    { targetRectangle = new Rectangle { Width = 10, Height = 10, Fill = Brushes.Green} }
                 }
             };
 
             s.TopLevel.Content = stackPanel;
             
-            s.AssertHitTest(new Point(5, 10), null, targetButton);
+            s.AssertHitTest(new Point(5, 10), null, targetRectangle);
         }
     }
 
diff --git a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
index e1b36c9d72..7800ddfc8a 100644
--- a/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
+++ b/tests/Avalonia.Base.UnitTests/Rendering/DeferredRendererTests_HitTesting.cs
@@ -542,7 +542,7 @@ namespace Avalonia.Base.UnitTests.Rendering
         {
             using (TestApplication())
             {
-                Button targetButton;
+                Rectangle targetRectangle;
 
                 var root = new TestRoot
                 {
@@ -551,10 +551,11 @@ namespace Avalonia.Base.UnitTests.Rendering
                     Child = new StackPanel
                     {
                         Orientation = Orientation.Vertical,
+                        HorizontalAlignment = HorizontalAlignment.Left,
                         Children =
                             {
-                                new Button { Width = 10, Height = 10 },
-                                { targetButton = new Button { Width = 10, Height = 10 } }
+                                new Rectangle { Width = 10, Height = 10, Fill = Brushes.Red},
+                                { targetRectangle = new Rectangle { Width = 10, Height = 10, Fill = Brushes.Green} }
                             }
                     }
                 }; 
@@ -564,7 +565,7 @@ namespace Avalonia.Base.UnitTests.Rendering
                 root.Arrange(new Rect(root.DesiredSize));
 
                 var result = root.Renderer.HitTest(new Point(5, 10), root, null);
-                Assert.Equal(new[] { targetButton }, result);
+                Assert.Equal(new[] { targetRectangle }, result);
             }
         }