diff --git a/src/PlaywrightSharp.Nunit/TestExpectations/TestExpectations.local.json b/src/PlaywrightSharp.Nunit/TestExpectations/TestExpectations.local.json
index 42a60d767..570727550 100644
--- a/src/PlaywrightSharp.Nunit/TestExpectations/TestExpectations.local.json
+++ b/src/PlaywrightSharp.Nunit/TestExpectations/TestExpectations.local.json
@@ -215,12 +215,6 @@
     "parameters": ["headful"],
     "expectations": ["FAIL"]
   },
-  {
-    "testIdPattern": "[frame-hierarchy.spec.ts] *",
-    "platforms": ["darwin", "linux", "win32"],
-    "parameters": ["headful"],
-    "expectations": ["FAIL"]
-  },
   {
     "testIdPattern": "[page-check.spec.ts] *",
     "platforms": ["darwin", "linux", "win32"],
diff --git a/src/PlaywrightSharp.Tests/FrameHierarchyTests.cs b/src/PlaywrightSharp.Tests/FrameHierarchyTests.cs
index 2209e5ada..831ef8157 100644
--- a/src/PlaywrightSharp.Tests/FrameHierarchyTests.cs
+++ b/src/PlaywrightSharp.Tests/FrameHierarchyTests.cs
@@ -185,7 +185,7 @@ await Page.EvaluateAsync(@"() => {
             Assert.That(frame1.IsDetached, Is.True);
 
             var (frame2, _) = await TaskUtils.WhenAll(
-              Page.WaitForEventAsync(PageEvent.FrameNavigated),
+              Page.WaitForEventAsync(PageEvent.FrameAttached),
               Page.EvaluateAsync("() => document.body.appendChild(window.frame)")
             );
 
diff --git a/src/PlaywrightSharp.Tests/FrameUtils.cs b/src/PlaywrightSharp.Tests/FrameUtils.cs
index 7921188f1..1982676e4 100644
--- a/src/PlaywrightSharp.Tests/FrameUtils.cs
+++ b/src/PlaywrightSharp.Tests/FrameUtils.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 
@@ -35,7 +37,10 @@ public static IEnumerable<string> DumpFrames(IFrame frame, string indentation =
                 description += $" ({frame.Name})";
             }
             var result = new List<string>() { description };
-            foreach (var child in frame.ChildFrames)
+            var childFrames = frame.ChildFrames.OrderBy(f => f.Url, StringComparer.Ordinal)
+                .ThenBy(f => f.Name, StringComparer.Ordinal)
+                .ToList();
+            foreach (var child in childFrames)
             {
                 result.AddRange(DumpFrames(child, "    " + indentation));
             }
diff --git a/src/PlaywrightSharp/PageEvent.cs b/src/PlaywrightSharp/PageEvent.cs
index 97eefdf0c..a8cd28e32 100644
--- a/src/PlaywrightSharp/PageEvent.cs
+++ b/src/PlaywrightSharp/PageEvent.cs
@@ -48,6 +48,11 @@ public static class PageEvent
         /// </summary>
         public static PlaywrightEvent<IPage> Popup { get; } = new PlaywrightEvent<IPage>() { Name = "Popup" };
 
+        /// <summary>
+        /// <see cref="PlaywrightEvent{T}"/> representing a <see cref="IPage.FrameAttached"/>.
+        /// </summary>
+        public static PlaywrightEvent<IFrame> FrameAttached { get; } = new PlaywrightEvent<IFrame>() { Name = "FrameAttached" };
+
         /// <summary>
         /// <see cref="PlaywrightEvent{T}"/> representing a <see cref="IPage.FrameNavigated"/>.
         /// </summary>