diff --git a/navigation-api/navigate-event/navigate-history-back-bfcache.html b/navigation-api/navigate-event/navigate-history-back-bfcache.html
new file mode 100644
index 000000000000000..0336ff1c2fe0ed1
--- /dev/null
+++ b/navigation-api/navigate-event/navigate-history-back-bfcache.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script src="/common/dispatcher/dispatcher.js"></script>
+<script src="/html/browsers/browsing-the-web/back-forward-cache/resources/helper.sub.js"></script>
+
+<script>
+runBfcacheTest({
+  targetOrigin: originSameOrigin,
+  funcBeforeBackNavigation: () => {
+    window.did_navigate = false;
+    navigation.onnavigate = () => window.did_navigate = true;
+  },
+  async funcAfterAssertion(pageA, pageB) {
+    // When `funcAfterAssertion` is called, we've already navigated to pageB,
+    // then gone back to pageA with bfcache. Now go forward to pageB so we can
+    // observe whether the navigate event fired.
+    await pageA.execute_script(() => history.forward());
+    await pageB.execute_script(waitForPageShow);
+    assert_true(await pageB.execute_script(() => window.did_navigate));
+  }
+}, "navigate event should fire when traversing to a bfcache hit");
+</script>
diff --git a/navigation-api/navigation-methods/return-value/back-204-205-download.html b/navigation-api/navigation-methods/return-value/back-204-205-download.html
index 5bedbf21e868125..3e19bcb0f5017a9 100644
--- a/navigation-api/navigation-methods/return-value/back-204-205-download.html
+++ b/navigation-api/navigation-methods/return-value/back-204-205-download.html
@@ -32,11 +32,9 @@
 
     const indexBefore = i.contentWindow.navigation.currentEntry.index;
 
-    // One might be surprised that navigate does not fire. (It does fire for the
-    // corresponding tests of navigation.navigate(), i.e., this is
-    // traversal-specific behavior.) See https://github.com/WICG/navigation-api/issues/207
-    // for some discussion.
-    i.contentWindow.navigation.onnavigate = t.unreached_func("onnavigate should not be called");
+    let onnavigate_called = false;
+    i.contentWindow.navigation.onnavigate = () => onnavigate_called = true;
+    i.contentWindow.onunload = t.unreached_func("onunload should not be called");
     i.contentWindow.navigation.onnavigatesuccess = t.unreached_func("onnavigatesuccess should not be called");
     i.contentWindow.navigation.onnavigateerror = t.unreached_func("onnavigateerror should not be called");
 
@@ -47,6 +45,7 @@
     await new Promise(resolve => t.step_timeout(resolve, 50));
     assert_equals(i.contentWindow.navigation.currentEntry.index, indexBefore);
     assert_equals(i.contentWindow.navigation.transition, null);
+    assert_true(onnavigate_called);
   }, `back() promises to ${description} never settle`);
 }
 </script>
diff --git a/navigation-api/ordering-and-transition/back-cross-document-event-order.html b/navigation-api/ordering-and-transition/back-cross-document-event-order.html
new file mode 100644
index 000000000000000..bde5697001c9ea6
--- /dev/null
+++ b/navigation-api/ordering-and-transition/back-cross-document-event-order.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<iframe id="i" src="resources/notify-top-early.html"></iframe>
+<script>
+async_test(t => {
+  let events = [];
+  function finish() {
+    assert_array_equals(events, ["onnavigate", "onunload", "readystateinteractive", "domcontentloaded", "readystatecomplete", "onload", "onpageshow"]);
+    t.done();
+  };
+
+  window.onload = t.step_func(() => {
+    i.contentWindow.navigation.navigate("?1");
+    i.onload = t.step_func(() => {
+      window.childStarted = () => {
+        i.contentWindow.navigation.onnavigatesuccess = () => events.push("onnavigatesuccess");
+        i.contentWindow.navigation.onnavigateerror = () => events.push("onnavigateerror");
+        i.contentWindow.onpageshow = () => events.push("onpageshow");
+        i.contentWindow.onhashchange = () => events.push("onhashchange");
+        i.contentWindow.onpopstate = () => events.push("onpopstate");
+        i.onload = t.step_func(() => {
+          events.push("onload");
+          t.step_timeout(finish, 0);
+        });
+        i.contentDocument.addEventListener("DOMContentLoaded", () => events.push("domcontentloaded"));
+        i.contentDocument.onreadystatechange = () => events.push("readystate" + i.contentDocument.readyState);
+      };
+      i.contentWindow.onunload = () => events.push("onunload");
+      i.contentWindow.navigation.onnavigate = () => events.push("onnavigate");
+      i.contentWindow.navigation.back().committed.then(
+        () => events.push("promisefulfilled"), () => events.push("promiserejected"));
+    })
+  });
+}, "back() event ordering for cross-document traversal");
+</script>
diff --git a/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html b/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html
index 34a9b79fb5f01e0..7a8c179259551a0 100644
--- a/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html
+++ b/navigation-api/ordering-and-transition/navigate-cross-document-event-order.html
@@ -6,7 +6,7 @@
 async_test(t => {
   let events = [];
   function finish() {
-    assert_array_equals(events, ["onnavigate", "readystateinteractive", "domcontentloaded", "readystatecomplete", "onload", "onpageshow"]);
+    assert_array_equals(events, ["onnavigate", "onunload", "readystateinteractive", "domcontentloaded", "readystatecomplete", "onload", "onpageshow"]);
     t.done();
   };
 
@@ -24,6 +24,7 @@
       i.contentDocument.addEventListener("DOMContentLoaded", () => events.push("domcontentloaded"));
       i.contentDocument.onreadystatechange = () => events.push("readystate" + i.contentDocument.readyState);
     };
+    i.contentWindow.onunload = () => events.push("onunload");
     i.contentWindow.navigation.onnavigate = () => events.push("onnavigate");
     i.contentWindow.navigation.navigate("?1").committed.then(
         () => events.push("promisefulfilled"), () => events.push("promiserejected"));
