diff --git a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
index ddf109f80e..08b9c75dbc 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupRootTests.cs
@@ -77,8 +77,13 @@ namespace Avalonia.Controls.UnitTests.Primitives
 
                 var templatedChild = ((Visual)target.Host).GetVisualChildren().Single();
                 
-                Assert.IsType<VisualLayerManager>(templatedChild);
-                var contentPresenter = templatedChild.VisualChildren.Single();
+                Assert.IsType<Panel>(templatedChild);
+
+                var visualLayerManager = templatedChild.GetVisualChildren().Skip(1).Single();
+
+                Assert.IsType<VisualLayerManager>(visualLayerManager);
+
+                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 0b9c94f850..fd06ba295b 100644
--- a/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
+++ b/tests/Avalonia.Controls.UnitTests/Primitives/PopupTests.cs
@@ -275,6 +275,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Assert.Equal(
                     new[]
                     {
+                        "Panel",
+                        "Border",
                         "VisualLayerManager",
                         "ContentPresenter",
                         "ContentPresenter",
@@ -289,6 +291,8 @@ namespace Avalonia.Controls.UnitTests.Primitives
                 Assert.Equal(
                     new object[]
                     {
+                        popupRoot,
+                        popupRoot,
                         popupRoot,
                         popupRoot,
                         target,