diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 057d98e..da1e1c9 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2020-04-02  Chris Dumez  <cdumez@apple.com>
+
+        [ Mac wk1 ] fast/loader/child-frame-add-after-back-forward.html  is flaky timing out.
+        https://bugs.webkit.org/show_bug.cgi?id=209621
+        <rdar://problem/60937276>
+
+        Reviewed by Jonathan Bedard.
+
+        Update empty-document-goes-back.html to schedule the history.back() call *after* the load
+        event has been fired, so that a HistoryItem has actually been created.
+
+        * fast/loader/resources/empty-document-goes-back.html:
+        * platform/mac-wk1/TestExpectations:
+
 2020-04-02  Jason Lawrence  <lawrence.j@apple.com>
 
         [ Mac wk2 Debug ] webrtc/datachannel/multiple-connections.html is flaky timing out.
diff --git a/LayoutTests/fast/loader/resources/empty-document-goes-back.html b/LayoutTests/fast/loader/resources/empty-document-goes-back.html
index f8f15b7..365bd0f 100644
--- a/LayoutTests/fast/loader/resources/empty-document-goes-back.html
+++ b/LayoutTests/fast/loader/resources/empty-document-goes-back.html
@@ -2,7 +2,9 @@
 <body>
 <script>
     document.body.offsetWidth;
-    setTimeout("window.history.back();", 0);
+    onload = () => {
+        setTimeout("window.history.back();", 0);
+    }
 </script>
 </body>
 </html>
diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
index db3fbe2..d38e620 100644
--- a/LayoutTests/platform/mac-wk1/TestExpectations
+++ b/LayoutTests/platform/mac-wk1/TestExpectations
@@ -944,10 +944,8 @@
 
 webkit.org/b/209560 imported/w3c/web-platform-tests/xhr/send-response-upload-event-progress.htm [ Pass Crash Failure ]
 
-webkit.org/b/209621 fast/loader/child-frame-add-after-back-forward.html [ Pass Timeout ]
-
 webkit.org/b/209837 [ Mojave Release ] fast/canvas/webgl/texImage2D-mse-flipY-true.html [ Pass Timeout ]
 
 webkit.org/b/209866 [ Mojave Release ] platform/mac/media/media-source/videoplaybackquality-decompressionsession.html [ Pass Failure ]
 
-webkit.org/b/209882 [ Debug ] inspector/page/overrideSetting-ICECandidateFilteringEnabled.html [ Pass Timeout ]
\ No newline at end of file
+webkit.org/b/209882 [ Debug ] inspector/page/overrideSetting-ICECandidateFilteringEnabled.html [ Pass Timeout ]