diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index 9367e0e94e..6d3351d2b2 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -88,7 +88,7 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
                 Assert.IsType<VisualLayerManager>(visualLayerManager);
 
-                var contentPresenter = visualLayerManager.VisualChildren.Take(1).Single();
+                var contentPresenter = visualLayerManager.VisualChildren.Single();
                 Assert.IsType<ContentPresenter>(contentPresenter);
                 
                 
diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
index 3a83bd4f43..5f91f2e2a1 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -345,9 +345,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
                             "ContentPresenter",
                             "ContentPresenter",
                             "Border",
-                            "AdornerLayer",
-                            "WindowNotificationManager",
-                            "ReversibleStackPanel"
                         },
                         types);
                 }
@@ -356,8 +353,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     .OfType<IControl>()
                     .Select(x => x.TemplatedParent).ToList();
 
-                var notificationManager = (popup.Host as TopLevel)?.NotificationManager;
-
                 if (UsePopupHost)
                 {
                     Assert.Equal(
@@ -383,9 +378,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
                             popupRoot,
                             target,
                             null,
-                            null,
-                            null,
-                            notificationManager,
                         },
                         templatedParents);
                 }
@@ -446,9 +438,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
                             "ItemsPresenter",
                             "StackPanel",
                             "Border",
-                            "AdornerLayer",
-                            "WindowNotificationManager",
-                            "ReversibleStackPanel"
                         },
                         types);
                 }
@@ -457,8 +446,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
                     .OfType<IControl>()
                     .Select(x => x.TemplatedParent).ToList();
 
-                var notificationManager = (popup.Host as TopLevel)?.NotificationManager;
-
                 if (UsePopupHost)
                 {
                     Assert.Equal(
@@ -486,9 +473,6 @@ namespace Avalonia.Controls.UnitTests.Primitives
                             target,
                             target,
                             null,
-                            null,
-                            null,
-                            notificationManager,
                         },
                         templatedParents);
                 }