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