diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 392e55b4cdc..069fe38d842 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -265,6 +265,10 @@
         "path": "html-media-capture/capture_video_cancel-manual.html",
         "url": "/html-media-capture/capture_video_cancel-manual.html"
       },
+      {
+        "path": "html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html",
+        "url": "/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html"
+      },
       {
         "path": "html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html",
         "url": "/html/browsers/history/the-history-interface/non-automated/traverse_the_history_unload_prompt_1-manual.html"
@@ -36036,6 +36040,12 @@
             "url": "/cssom-view/scrolling-no-browsing-context.html"
           }
         ],
+        "html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html": [
+          {
+            "path": "html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html",
+            "url": "/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html"
+          }
+        ],
         "html/semantics/embedded-content/the-iframe-element/change_parentage.html": [
           {
             "path": "html/semantics/embedded-content/the-iframe-element/change_parentage.html",
diff --git a/tests/wpt/metadata/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html.ini b/tests/wpt/metadata/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html.ini
new file mode 100644
index 00000000000..24d84a1853f
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html.ini
@@ -0,0 +1,4 @@
+[joint-session-history-only-fully-active.html]
+  type: testharness
+  [Do only fully active documents count for session history?]
+    expected: FAIL
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child1.html b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child1.html
new file mode 100644
index 00000000000..22bb0b2980a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child1.html
@@ -0,0 +1,18 @@
+<body>
+  <a id="link" href="joint-session-history-child2.html">Child1</a>.
+  <iframe id="grandchild"></iframe>
+</body>
+<script>
+  window.onload = function() {
+    var link = document.getElementById("link");
+    var grandchild = document.getElementById("grandchild");
+    var timer = window.setInterval(poll, 100);
+    function poll() {
+      if (grandchild.getAttribute("data-grandchild-loaded")) {
+        window.clearInterval(timer);
+        link.click();
+      }
+    }
+    grandchild.src="joint-session-history-grandchild1.html";
+  };
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child2.html b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child2.html
new file mode 100644
index 00000000000..24b46951668
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-child2.html
@@ -0,0 +1,5 @@
+<body>Child 2.</body>
+<script>
+  // Servo doesn't support postMessage yet, so we poll on attributes.
+  window.frameElement.setAttribute("data-child-loaded", true);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild1.html b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild1.html
new file mode 100644
index 00000000000..d05e1524255
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild1.html
@@ -0,0 +1,8 @@
+<body>
+  <a id="link" href="joint-session-history-grandchild2.html">Grandchild1</a>.
+</body>
+<script>
+  window.onload = function() {
+    document.getElementById("link").click();
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild2.html b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild2.html
new file mode 100644
index 00000000000..b5c81e1fcab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-grandchild2.html
@@ -0,0 +1,5 @@
+<body>Grandchild2.</body>
+<script>
+  // Servo doesn't support postMessage yet, so we poll on attributes.
+  window.frameElement.setAttribute("data-grandchild-loaded", true);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html
new file mode 100644
index 00000000000..c42d160a21c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/joint-session-history/joint-session-history-only-fully-active.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Do only fully active documents count for session history?</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+  <iframe id="child"></iframe>
+</body>
+<script>
+  async_test(function(t) {
+    var old_history_len = window.history.length;
+    var child = document.getElementById("child");
+    var timer = window.setInterval(t.step_func(poll), 100);
+    function poll() {
+      if (child.getAttribute("data-child-loaded")) {
+        // Check to see how many entries have been added to the session history.
+        // The spec https://html.spec.whatwg.org/multipage/#joint-session-history
+        // says that only fully active documents are included in the joint session history.
+        // If only fully active documents count, then the only fully active document
+        // is the child, with session length 1, so the joint session length change will be 1.
+        // If all documents count, then the grandchild is reachable via the session history,
+        // and it has session length 1, so the joint session length change will be 2.
+        assert_equals(2, window.history.length - old_history_len);
+        window.clearInterval(timer);
+        t.done();
+      }
+    }
+    child.src = "joint-session-history-child1.html";
+  });
+</script>
