diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index 422ade2f90..d9176ca55d 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -14,6 +14,7 @@ using Avalonia.UnitTests;
 using Avalonia.VisualTree;
 using Xunit;
 using Avalonia.Input;
+using Avalonia.Rendering;
 
 namespace Avalonia.Controls.UnitTests.Primitives
 {
@@ -353,8 +354,14 @@ namespace Avalonia.Controls.UnitTests.Primitives
         {
             using (CreateServices())
             {
-                var window = PreparedWindow();
-                var rendererMock = Mock.Get(window.Renderer);
+                var renderer = new Mock<IRenderer>();
+                var platform = AvaloniaLocator.Current.GetService<IWindowingPlatform>();
+                var windowImpl = Mock.Get(platform.CreateWindow());
+                windowImpl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>())).Returns(renderer.Object);
+
+                var window = new Window(windowImpl.Object);
+                window.ApplyTemplate();
+
                 var target = new Popup() 
                 { 
                     PlacementTarget = window ,
@@ -366,7 +373,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 var border = new Border();
                 window.Content = border;
 
-                rendererMock.Setup(x =>
+                renderer.Setup(x =>
                     x.HitTestFirst(new Point(10, 15), window, It.IsAny<Func<IVisual, bool>>()))
                     .Returns(border);
 
diff --git a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
index 9b77fbb009..72f8ab9fd0 100644
--- a/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
+++ b/tests/Avalonia.UnitTests/MockWindowingPlatform.cs
@@ -40,9 +40,6 @@ namespace Avalonia.UnitTests
                 return CreatePopupMock(windowImpl.Object).Object;
             });
 
-            windowImpl.Setup(x => x.CreateRenderer(It.IsAny<IRenderRoot>()))
-                .Returns(Mock.Of<IRenderer>());
-
             windowImpl.Setup(x => x.Dispose()).Callback(() =>
             {
                 windowImpl.Object.Closed?.Invoke();