diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 27cab01ceb4..9972d8eecea 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -167389,6 +167389,126 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-absolute-001.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-absolute-001.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-containing-block-absolute-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-fixed-001.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-fixed-001.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-containing-block-fixed-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-float-001.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-float-001.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-formatting-context-float-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-formatting-context-margin-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-001.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-001.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-ignored-cases-no-principal-box-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-stacking-context-001.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-stacking-context-001.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-stacking-context-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-clip-001.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-clip-001.html",
@@ -270531,6 +270651,31 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-clip-001-ref.html": [
     [
      {}
@@ -279796,11 +279941,6 @@
      {}
     ]
    ],
-   "html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html": [
-    [
-     {}
-    ]
-   ],
    "html/browsers/windows/browsing-context-names/resources/choose-_parent-001-iframe-1.html": [
     [
      {}
@@ -352121,12 +352261,6 @@
      {}
     ]
    ],
-   "html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html": [
-    [
-     "/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html",
-     {}
-    ]
-   ],
    "html/browsers/windows/auxiliary-browsing-contexts/opener-setter.window.js": [
     [
      "/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.window.html",
@@ -353715,6 +353849,12 @@
      {}
     ]
    ],
+   "html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html": [
+    [
+     "/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html",
+     {}
+    ]
+   ],
    "html/scripting/the-noscript-element/non-html-noscript.html": [
     [
      "/html/scripting/the-noscript-element/non-html-noscript.html",
@@ -569748,6 +569888,66 @@
    "24dc3107e8b05ba65f7f418b5d078fee2db9ba86",
    "support"
   ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-absolute-001.html": [
+   "036cf7d8dd6f6de18e5aa4cf9f1df25799b10094",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-fixed-001.html": [
+   "979d71d406d293a3a0a507bf4a4c6a07826cbef7",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-float-001.html": [
+   "fe491aa5502cf58db4bf5669c6dc1780f016c0d4",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001-ref.html": [
+   "5a6d653862417ff7c1a6817434da2b2025a347ad",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001.html": [
+   "c346a529284b908ed4419f1626c96319242a1b76",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-001.html": [
+   "bd2f4cb8178054e0aab0b208610e8a2ba97b1141",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002-ref.html": [
+   "44cd7c109e059451dfea19460faf65faa16919da",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002.html": [
+   "de2edfb58f86fea5a8a0367b595dc471b568bc85",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003-ref.html": [
+   "46f028c0581fe1375d58c04b73642ac731644ee7",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003.html": [
+   "d40a02115665782b81d14e6c3d5e5b0c5f38690a",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html": [
+   "400369b763bd87d7b9de5a66923e6c12a2bc3a3f",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html": [
+   "e4330eca96de05996b750d3224aecb83ee3797e4",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html": [
+   "e35eb9b2b748d1e8ab8b62f244a1f3a0e8db42f4",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html": [
+   "aa02bcd73a63106d6cc40233b9c35e11984845f7",
+   "reftest"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-stacking-context-001.html": [
+   "4ec3bcee6fdf7d46f076ddf460c8081d9b19e8ee",
+   "reftest"
+  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-paint-clip-001-ref.html": [
    "629cb939e01329ae1f9613876f050777b1d5b011",
    "support"
@@ -569961,7 +570161,7 @@
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list": [
-   "83e3f0c55547d526c4c77f064d3cf1f231ddb0cb",
+   "3760a5b4ec9dcbb8b8c9d125982e3fea765fd755",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/counter-styles-3/dependent-builtin-ref.html": [
@@ -587792,10 +587992,6 @@
    "f82aa6f0abe0d16a8b132e531d165988af0af99f",
    "testharness"
   ],
-  "html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html": [
-   "85c52e0b42e19bdd78dda120320d66ddbb2103b4",
-   "testharness"
-  ],
   "html/browsers/windows/auxiliary-browsing-contexts/opener-setter.window.js": [
    "6d540ce97c94bff5845023098d0960d51dad62b4",
    "testharness"
@@ -587824,10 +588020,6 @@
    "6f43a5188c790577c4a1a03da270317eedba0fb0",
    "support"
   ],
-  "html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html": [
-   "4112dae0cee66138a309b202a8d09d6b256c6d4d",
-   "support"
-  ],
   "html/browsers/windows/browsing-context-names/choose-_blank-001.html": [
    "a1416f2eb8437a8824a26a0e2e6aa6fdede37ffa",
    "testharness"
@@ -594412,6 +594604,10 @@
    "d0b2396a4047a0c6d310fdcfa9dccb7b1ec8ee24",
    "reftest"
   ],
+  "html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html": [
+   "82aa08d2150572477365fdf53b5d3e9605d4210a",
+   "testharness"
+  ],
   "html/rendering/the-details-element/details-after.html": [
    "b4bf0504661062e7240892f5110caf6b851a9923",
    "reftest"
@@ -641085,7 +641281,7 @@
    "testharness"
   ],
   "user-timing/measure.html": [
-   "8f2a618f261e74ddb4ecada423a4f704f1419f1a",
+   "d114ecd18feee97b2c9a87a9f6a424b18e4ccc9d",
    "testharness"
   ],
   "user-timing/measure_associated_with_navigation_timing.html": [
@@ -641101,7 +641297,7 @@
    "testharness"
   ],
   "user-timing/measure_navigation_timing.html": [
-   "fa472fd3f9651973a2efa9c0129d8ce9d229fbcd",
+   "d6480d27a261c90dbe8c7cd9ddb3e20131efc068",
    "testharness"
   ],
   "user-timing/measure_syntax_err.any.js": [
@@ -642757,35 +642953,35 @@
    "testharness"
   ],
   "web-locks/META.yml": [
-   "39acca82900631cf0ffa80e660aa57439cdb25cf",
+   "24e7d28340606d9a6290af9ceac4f4fb9156abf0",
    "support"
   ],
   "web-locks/README.md": [
-   "e8091f8cd30e3e96979e4e7ddccd29f5f151e27d",
+   "8ff534e1b6f143de950e874d9b97dae951205110",
    "support"
   ],
   "web-locks/acquire.tentative.https.html": [
-   "3c360ab4ff0d50304f598180ef16a5e04fca981f",
+   "65bf0e4e064aa23116637092278e413fdd4409a0",
    "testharness"
   ],
   "web-locks/clientids.tentative.https.html": [
-   "8a99d7d2e7f1b718bce27c4aa36cd2554e66f9e2",
+   "9ce4c4e9d184e1d925316eaa2b3e2c0a17d3dda1",
    "testharness"
   ],
   "web-locks/frames.tentative.https.html": [
-   "366a7eafc4048b74c9aa4956352f72b54dc92ceb",
+   "7d8383cffc18fdb5d536d10833a38698ec09d385",
    "testharness"
   ],
   "web-locks/held.tentative.https.html": [
-   "ccf7c0b8f67ee839853e90766d8185cfffa6f10d",
+   "aecbbd3df89c32e0e6a34df59afaa5c7c26dd7ad",
    "testharness"
   ],
   "web-locks/ifAvailable.tentative.https.html": [
-   "ee190b2bf0c34a5c94e71b707bc53ffaebbcdb5c",
+   "2b6e1ff3c8156fc1881e1922f78be6e742ec48ec",
    "testharness"
   ],
   "web-locks/interfaces-serviceworker.tentative.https.html": [
-   "ea2a3d77c84e1c840e46b95195693fab8aa0fcfa",
+   "ca4d768546a60a57867756f1e3bd866ac522539e",
    "testharness"
   ],
   "web-locks/interfaces.idl": [
@@ -642797,43 +642993,43 @@
    "testharness"
   ],
   "web-locks/lock-attributes.tentative.https.html": [
-   "e0c1c5b3c80c90608d637b5f915286b5df38849f",
+   "89ffec41ba9f8295d609fc1b79a178b3f60f62e9",
    "testharness"
   ],
   "web-locks/mode-exclusive.tentative.https.html": [
-   "7769ca5ec6998aaa9b7592703e5f315134ebaebf",
+   "8c6005d04a59d42dcbd240fd6fde68132871cb18",
    "testharness"
   ],
   "web-locks/mode-mixed.tentative.https.html": [
-   "ac8f36534d7d651fc9f6a29ec5addb294bbe3476",
+   "0ce0583645ea43d01fbc543d88583e5f9c309e2e",
    "testharness"
   ],
   "web-locks/mode-shared.tentative.https.html": [
-   "cac3a571f35d4f084d0b00508d93596c7c51a6db",
+   "309ee57b5a9185d552fd0f201f2a6d29a5d86251",
    "testharness"
   ],
   "web-locks/non-secure-context.tentative.html": [
-   "328e4512b8f552fca46d3b223ef664ef12203668",
+   "568eb30e1ba6bb8c3156f04d0d105152b66b4879",
    "testharness"
   ],
   "web-locks/opaque-origin.tentative.https.html": [
-   "7abae82ab41cef9067b5e530f226fab87bd1d7f4",
+   "589c2a7cdd8bbc3216ea0556f7c6ef55944966e3",
    "testharness"
   ],
   "web-locks/query-empty.tentative.https.html": [
-   "a6133218ee6cac90cc4025d599602614198a279e",
+   "38fed37b9a56e41ad5b3dce4086e863653c3780e",
    "testharness"
   ],
   "web-locks/query-order.tentative.https.html": [
-   "25ac10a29ac07739c162a3b4ab026a12b1d52f3d",
+   "e4fb7c5e2623bfbeabe6db0e14ce54fe8bc318ba",
    "testharness"
   ],
   "web-locks/query.tentative.https.html": [
-   "77d37f34f8be742dcd5ba7d69acef1879ab7ebe3",
+   "218e984993ca8ba04f833f6115b7762d99d6d67d",
    "testharness"
   ],
   "web-locks/resource-names.tentative.https.html": [
-   "1dfe11d554f94c4bde23dd51e8a0e58cd4dd76f9",
+   "d4ac7437a9d4e159d3ba233fdd7bd2457f6a9cc7",
    "testharness"
   ],
   "web-locks/resources/helpers.js": [
@@ -642861,19 +643057,19 @@
    "support"
   ],
   "web-locks/secure-context.tentative.https.html": [
-   "b5b6feaa030a07c1fab1de4c93986a415d819813",
+   "a90b55dfb592e0ae49424a794452b09eed68f747",
    "testharness"
   ],
   "web-locks/signal.tentative.https.html": [
-   "94f07a52fa327f0615fcaac90bbf72f759086db8",
+   "a070bde21b1841a5b3c3a6dc4a389cd2aa14026d",
    "testharness"
   ],
   "web-locks/steal.tentative.https.html": [
-   "b796c24f7d3151d433220905337f2f6450dd35f0",
+   "169d849b6ac41354a7806de9a6c2e57c185a7a89",
    "testharness"
   ],
   "web-locks/workers.tentative.https.html": [
-   "1e699194c4b201869cec6237f244caa7b9cb54e5",
+   "04af72c8ad04a940f289678f4bde41ee4cde9654",
    "testharness"
   ],
   "web-nfc/META.yml": [
diff --git a/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini b/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
deleted file mode 100644
index 26435e28b09..00000000000
--- a/tests/wpt/metadata/css/css-values/vh_not_refreshing_on_chrome.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[vh_not_refreshing_on_chrome.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
index 5b38c37b086..78879bad5f1 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
@@ -1,4 +1,5 @@
 [javascript-url-abort-return-value-undefined.tentative.html]
+  expected: TIMEOUT
   [Not aborting fetch for javascript:undefined navigation]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
deleted file mode 100644
index dc2e45516de..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_5.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index 9579b42287e..20865f493ec 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -30,6 +30,3 @@
   [Set HTTP URL frame location.protocol to data]
     expected: FAIL
 
-  [Set HTTP URL frame location.protocol to x]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html.ini b/tests/wpt/metadata/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html.ini
new file mode 100644
index 00000000000..58c1e8fd29d
--- /dev/null
+++ b/tests/wpt/metadata/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html.ini
@@ -0,0 +1,7 @@
+[no-help-cursor-on-links.historical.html]
+  [Visited help links must have pointer cursor, not help cursor]
+    expected: FAIL
+
+  [Unvisited help links must have pointer cursor, not help cursor]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 1de3f8d68b2..6b0817b6c56 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,3 +172,63 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [XHTML img usemap="#percent-escape-id-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="#different-CASE-id"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#"]
+    expected: FAIL
+
+  [XHTML img usemap="hash-last#"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="no-hash-id"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="no-hash-name"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#no-such-map"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="hash-last#"]
+    expected: FAIL
+
+  [XHTML img usemap="no-hash-id"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#different-CASE-name"]
+    expected: FAIL
+
+  [XHTML img usemap="#no-such-map"]
+    expected: FAIL
+
+  [XHTML img usemap="#percent-escape-name-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="#"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#different-CASE-id"]
+    expected: FAIL
+
+  [XHTML img usemap="#different-CASE-name"]
+    expected: FAIL
+
+  [XHTML img usemap=""]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap=""]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#percent-escape-name-%41"]
+    expected: FAIL
+
+  [HTML (quirks) IMG usemap="#percent-escape-id-%41"]
+    expected: FAIL
+
+  [XHTML img usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
index 7d7eac7f422..a9a44c4ef54 100644
--- a/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
+++ b/tests/wpt/metadata/html/semantics/links/following-hyperlinks/activation-behavior.window.js.ini
@@ -1,3 +1,5 @@
 [activation-behavior.window.html]
   type: testharness
-  expected: TIMEOUT
+  [<a> that is not connected should be followed]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
index 9f7e8c87e00..70ad3e5d403 100644
--- a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
+++ b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
@@ -2,10 +2,10 @@
   [request.formData() with input: a&b&c]
     expected: FAIL
 
-  [response.formData() with input: a&b&c]
+  [request.formData() with input: &&&a=b&&&&c=d&]
     expected: FAIL
 
-  [response.formData() with input: &&&a=b&&&&c=d&]
+  [request.formData() with input: a=b&c=d]
     expected: FAIL
 
 
@@ -31,3 +31,6 @@
   [response.formData() with input: a=b&c=d]
     expected: FAIL
 
+  [request.formData() with input: a=b&c=d&]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-absolute-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-absolute-001.html
new file mode 100644
index 00000000000..036cf7d8dd6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-absolute-001.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' element should contain absolute position elements.</title>
+  <link rel="author" title="Kyle Zentner" href="mailto:zentner.kyle@gmail.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+  <link rel="match" href="contain-paint-containing-block-absolute-001-ref.html">
+  <style>
+  #a {
+      contain: layout;
+      width: 100px;
+      height: 100px;
+      background: red;
+      margin: 50px;
+  }
+  #b {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100px;
+      height: 100px;
+      background: green;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div>
+      <div id="b"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-fixed-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-fixed-001.html
new file mode 100644
index 00000000000..979d71d406d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-containing-block-fixed-001.html
@@ -0,0 +1,35 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' element should contain fixed position elements.</title>
+  <link rel="author" title="Kyle Zentner" href="mailto:zentner.kyle@gmail.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+  <link rel="match" href="contain-paint-containing-block-fixed-001-ref.html">
+  <style>
+  #a {
+      contain: layout;
+      width: 100px;
+      height: 100px;
+      background: red;
+      margin: 50px;
+  }
+  #b {
+      position: fixed;
+      top: 0;
+      left: 0;
+      width: 100px;
+      height: 100px;
+      background: green;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div>
+      <div id="b"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-float-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-float-001.html
new file mode 100644
index 00000000000..fe491aa5502
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-float-001.html
@@ -0,0 +1,38 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' should contain floats as a formatting context.</title>
+  <link rel="author" title="Kyle Zentner" href="mailto:zentner.kyle@gmail.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="http://www.w3.org/TR/css-containment-1/#containment-layout">
+  <link rel="match" href="contain-paint-formatting-context-float-001-ref.html">
+  <style>
+  #left {
+    float: left;
+    height: 50px;
+    width: 10px;
+    background: blue;
+  }
+  #a {
+    contain: layout;
+    background: red;
+    margin: 10px;
+    width: 50px;
+    height: 50px;
+  }
+  #b {
+    clear: left;
+    width: 50px;
+    height: 50px;
+    background: green;
+  }
+  </style>
+</head>
+<body>
+  <div id="left"></div>
+  <div id="a">
+    <div id="b"></div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001-ref.html
new file mode 100644
index 00000000000..5a6d6538624
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001-ref.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Reftest Test</title>
+  <link rel="author" title="Kyle Zentner" href="mailto:zentner.kyle@gmail.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <style>
+  #a {
+      background: blue;
+      margin: 10px;
+      width: 50px;
+      height: 50px;
+  }
+  #b {
+      width: 50px;
+      height: 40px;
+      background: green;
+  }
+  #b-padding {
+      height: 10px;
+  }
+  #c {
+    width: 50px;
+    height: 10px;
+    background: lightblue;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div id="b-padding"></div>
+    <div id="b"></div>
+    <div id="c"></div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001.html
new file mode 100644
index 00000000000..c346a529284
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-formatting-context-margin-001.html
@@ -0,0 +1,37 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' with a vertical margin child. Margin collapse should not occur, and neither should overflow clipping.</title>
+  <link rel="author" title="Kyle Zentner" href="mailto:zentner.kyle@gmail.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="http://www.w3.org/TR/css-containment-1/#containment-layout">
+  <link rel="match" href="contain-paint-formatting-context-margin-001-ref.html">
+  <style>
+  #a {
+      contain:layout;
+      background: blue;
+      margin: 10px;
+      width: 50px;
+      height: 50px;
+  }
+  #b {
+      width: 50px;
+      height: 40px;
+      background: green;
+      margin-top: 10px;
+  }
+  #c {
+      background: lightblue;
+      width: 50px;
+      height: 10px;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div id="b"></div>
+    <div id="c"></div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-001.html
new file mode 100644
index 00000000000..bd2f4cb8178
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-001.html
@@ -0,0 +1,61 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' should not create a stacking context when no principle box is generated.</title>
+  <link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-layout">
+  <link rel="match" href="contain-paint-ignored-cases-no-principal-box-001-ref.html">
+  <style>
+    div {
+      position: relative;
+      width: 100px;
+    }
+    #div1,
+    #div3 {
+      background-color: #cfc;
+      height: 100px;
+    }
+    #div1 {
+      z-index: 5;
+    }
+    #div2 {
+      display: contents;
+      contain: layout;
+      background-color: #fdd;
+      height: 100px;
+      top: -20px;
+    }
+    #div2_1 {
+      background-color: #ffc;
+      z-index: 6;
+      top: -10px;
+      height: 100px;
+    }
+    #div2_2 {
+      z-index: 3;
+      position: absolute;
+      top: -15px;
+      width: 40px;
+      height: 300px;
+      background-color: #ddf;
+    }
+    #div3 {
+      z-index: 2;
+      top: -50px;
+    }
+  </style>
+</head>
+<body>
+  <div id="div1"></div>
+
+  <div id="div2">
+    <div id="div2_1"></div>
+
+    <div id="div2_2"></div>
+  </div>
+
+  <div id="div3"></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002-ref.html
new file mode 100644
index 00000000000..44cd7c109e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Kyle Zentner" href="mailto:zentner.kyle@gmail.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <style>
+  #a {
+      display: contents;
+      width: 100px;
+      height: 100px;
+      background: green;
+      margin: 50px;
+  }
+ #b {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100px;
+      height: 100px;
+      background: green;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div>
+      <div id="b"></div>
+    </div>
+  </div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002.html
new file mode 100644
index 00000000000..de2edfb58f8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-002.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' element should not contain absolute/fixed position elements when no principal box is generated.</title>
+  <link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+  <link rel="match" href="contain-layout-ignored-cases-no-principal-box-002-ref.html">
+  <style>
+  #a {
+      contain: layout;
+      display: contents;
+      width: 100px;
+      height: 100px;
+      background: red;
+      margin: 50px;
+  }
+  #b {
+      position: absolute;
+      top: 0;
+      left: 0;
+      width: 100px;
+      height: 100px;
+      background: green;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div>
+      <div id="b"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003-ref.html
new file mode 100644
index 00000000000..46f028c0581
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003-ref.html
@@ -0,0 +1,33 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Kyle Zentner" href="mailto:zentner.kyle@gmail.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <style>
+  #a {
+    display: contents;
+    width: 100px;
+    height: 100px;
+    background: red;
+    margin: 50px;
+  }
+  #b {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div>
+      <div id="b"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003.html
new file mode 100644
index 00000000000..d40a0211566
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-ignored-cases-no-principal-box-003.html
@@ -0,0 +1,36 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' element should not contain absolute/fixed position elements when no principal box is generated.</title>
+  <link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+  <link rel="match" href="contain-layout-ignored-cases-no-principal-box-003-ref.html">
+  <style>
+  #a {
+    contain: layout;
+    display: contents;
+    width: 100px;
+    height: 100px;
+    background: red;
+    margin: 50px;
+  }
+  #b {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100px;
+    height: 100px;
+    background: green;
+  }
+  </style>
+</head>
+<body>
+  <div id="a">
+    <div>
+      <div id="b"></div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html
new file mode 100644
index 00000000000..400369b763b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <style>
+  .outer {
+    height: 100px;
+    width: 100px;
+  }
+  .auto {
+    overflow: auto;
+  }
+  .inner-sm {
+    height: 50px;
+    width: 50px;
+    background: lightblue;
+  }
+  .inner-md {
+    height: 100px;
+    width: 100px;
+    background: lightblue;
+  }
+  .inner-lg-1 {
+    height: 95px;
+    width: 95px;
+    background: lightblue;
+  }
+  .inner-lg-2 {
+    height: 200px;
+    width: 200px;
+  }
+  .pass {
+    background: green;
+  }
+  .border {
+    border: 5px solid green;
+  }
+
+  </style>
+</head>
+<body>
+  <div class="outer">
+    <div class="inner-sm"></div>
+  </div>
+  <br>
+
+  <div class="outer auto">
+    <div class="inner-lg-2 pass">
+    </div>
+  </div>
+  <br>
+
+  <div class="inner-sm border">
+    <div class="inner-lg-1">
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html
new file mode 100644
index 00000000000..e4330eca96d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-001.html
@@ -0,0 +1,71 @@
+
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' should force all overflow to be ink overflow.</title>
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-layout">
+  <link rel="match" href="contain-layout-overflow-001-ref.html">
+  <style>
+  .contain {
+    contain: layout;
+  }
+  .outer {
+    height: 100px;
+    width: 100px;
+  }
+  .auto {
+    overflow: auto;
+  }
+  .inner-sm {
+    height: 50px;
+    width: 50px;
+    background: lightblue;
+  }
+  .inner-md {
+    height: 100px;
+    width: 100px;
+    background: lightblue;
+  }
+  .inner-lg {
+    height: 200px;
+    width: 200px;
+    background: lightblue;
+  }
+  .pass {
+    background: green;
+  }
+  .fail {
+    background: red;
+  }
+  .border {
+    border: 5px solid green;
+  }
+  </style>
+</head>
+<body>
+  <!--CSS Test: Elements with contain:layout that do not produce scrollable overflow should paint as if containment were not applied. -->
+  <div class="outer">
+    <div class="inner-sm contain"></div>
+  </div>
+  <br>
+
+  <!--CSS Test: Layout-contained elements that overflow their container and have children who overflow should produce the same amount of scrollable overflow as if there were no children. -->
+  <div class="outer auto">
+    <div class="inner-lg contain">
+      <div class="inner-lg pass"></div>
+      <div class="inner-lg fail"></div>
+    </div>
+  </div>
+  <br>
+
+  <!--CSS Test: Layout-contained elements that do not overflow their container, but have children who overflow, should not allow their children to affect the scrollable overflow regions of their parent. -->
+  <div class="outer auto">
+    <div class="inner-sm contain border">
+      <div class="inner-lg">
+      </div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html
new file mode 100644
index 00000000000..e35eb9b2b74
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002-ref.html
@@ -0,0 +1,62 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Reftest Reference</title>
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <style>
+  .outer {
+    height: 100px;
+    width: 100px;
+  }
+  .auto {
+    overflow: auto;
+  }
+  .inner-sm {
+    height: 50px;
+    width: 50px;
+    background: lightblue;
+  }
+  .inner-md {
+    height: 100px;
+    width: 100px;
+    background: lightblue;
+  }
+  .inner-lg-1 {
+    height: 95px;
+    width: 95px;
+    float:left;
+    background: lightblue;
+  }
+  .inner-lg-2 {
+    height: 200px;
+    width: 200px;
+    float:left;
+  }
+  .pass {
+    background: green;
+  }
+  .border {
+    border: 5px solid green;
+  }
+
+  </style>
+</head>
+<body>
+  <div class="outer">
+    <div class="inner-sm" style="float:left;"></div>
+  </div>
+  <br>
+
+  <div class="outer auto">
+    <div class="inner-lg-2 pass">
+    </div>
+  </div>
+  <br>
+
+  <div class="inner-sm border">
+    <div class="inner-lg-1">
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html
new file mode 100644
index 00000000000..aa02bcd73a6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-overflow-002.html
@@ -0,0 +1,73 @@
+
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' should force all overflow to be ink overflow.</title>
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-layout">
+  <link rel="match" href="contain-layout-overflow-002-ref.html">
+  <style>
+  .contain {
+    contain: layout;
+  }
+  .outer {
+    height: 100px;
+    width: 100px;
+  }
+  .auto {
+    overflow: auto;
+  }
+  .inner-sm {
+    height: 50px;
+    width: 50px;
+    background: lightblue;
+  }
+  .inner-md {
+    height: 100px;
+    width: 100px;
+    background: lightblue;
+  }
+  .inner-lg {
+    height: 200px;
+    width: 200px;
+    background: lightblue;
+    float: left;
+  }
+  .pass {
+    background: green;
+  }
+  .fail {
+    background: red;
+  }
+  .border {
+    border: 5px solid green;
+  }
+  </style>
+</head>
+<body>
+  <!--CSS Test: Elements with contain:layout that do not produce scrollable overflow should paint as if containment were not applied. -->
+  <div class="outer">
+    <div class="inner-sm contain" style="float:left;"></div>
+  </div>
+  <br>
+
+  <!--CSS Test: Layout-contained elements that overflow their container and have children who overflow should produce the same amount of scrollable overflow as if there were no children. -->
+  <div class="outer auto">
+    <div class="outer contain">
+      <div class="inner-lg pass"></div>
+      <div class="inner-lg fail"></div>
+    </div>
+  </div>
+  <br>
+
+
+  <!--CSS Test: Layout-contained elements that do not overflow their container, but have children who overflow, should not allow their children to affect the scrollable overflow regions of their parent. -->
+  <div class="outer auto">
+    <div class="inner-sm contain border">
+      <div class="inner-lg">
+      </div>
+    </div>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-stacking-context-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-stacking-context-001.html
new file mode 100644
index 00000000000..4ec3bcee6fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/contain-layout-stacking-context-001.html
@@ -0,0 +1,66 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+  <meta charset="utf-8">
+  <title>CSS Test: 'contain: layout' with stacking contents. Z-index is defined only for siblings and children.</title>
+  <link rel="author" title="Yusuf Sermet" href="mailto:ysermet@mozilla.com">
+  <link rel="author" title="Morgan Rae Reschenberg" href="mailto:mreschenberg@berkeley.edu">
+  <link rel="help" href="https://drafts.csswg.org/css2/visuren.html#x43">
+  <link rel="help" href="https://drafts.csswg.org/css-contain/#containment-layout">
+  <link rel="match" href="contain-paint-stacking-context-001-ref.html">
+  <style>
+    div {
+      position: relative;
+      width: 100px;
+    }
+    #div1,
+    #div3 {
+      background-color: #cfc;
+    }
+    #div1 {
+      z-index: 5;
+    }
+    #div2 {
+      contain: layout;
+      background-color: #fdd;
+      height: 100px;
+      top: -20px;
+    }
+    #div2_1 {
+      background-color: #ffc;
+      z-index: 6;
+      top: -10px;
+    }
+    #div2_2 {
+      z-index: 3;
+      position: absolute;
+      top: -15px;
+      width: 40px;
+      height: 100px;
+      background-color: #ddf;
+    }
+    #div3 {
+      z-index: 2;
+      top: -50px;
+    }
+  </style>
+</head>
+<body>
+  <div id="div1">
+    <br/><br/>
+  </div>
+
+  <div id="div2">
+    <div id="div2_1">
+      <br/><br/>
+    </div>
+
+    <div id="div2_2">
+    </div>
+  </div>
+
+  <div id="div3">
+    <br/><br/>
+  </div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list
index 83e3f0c5554..3760a5b4ec9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/contain/reftest.list
@@ -26,4 +26,14 @@
 == contain-size-fieldset-002.html contain-size-fieldset-002-ref.html
 == contain-size-multicol-002.html contain-size-multicol-002-ref.html
 == contain-size-multicol-003.html contain-size-multicol-003-ref.html
+== contain-layout-overflow-001.html contain-layout-overflow-001-ref.html
+== contain-layout-overflow-002.html contain-layout-overflow-002-ref.html
 == contain-size-table-caption-001.html contain-size-table-caption-001-ref.html
+== contain-layout-stacking-context-001.html contain-paint-stacking-context-001-ref.html
+== contain-layout-formatting-context-float-001.html contain-paint-formatting-context-float-001-ref.html
+== contain-layout-formatting-context-margin-001.html contain-layout-formatting-context-margin-001-ref.html
+== contain-layout-containing-block-fixed-001.html contain-paint-containing-block-fixed-001-ref.html
+== contain-layout-containing-block-absolute-001.html contain-paint-containing-block-absolute-001-ref.html
+== contain-layout-ignored-cases-no-principal-box-001.html contain-paint-ignored-cases-no-principal-box-001-ref.html
+== contain-layout-ignored-cases-no-principal-box-002.html contain-layout-ignored-cases-no-principal-box-002-ref.html
+== contain-layout-ignored-cases-no-principal-box-003.html contain-layout-ignored-cases-no-principal-box-003-ref.html
diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html b/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html
deleted file mode 100644
index 85c52e0b42e..00000000000
--- a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/opener-setter.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Auxiliary Browing Contexts: window.opener setter</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/common/PrefixedLocalStorage.js"></script>
-  </head>
-  <body>
-    <div id="log"></div>
-    <script>
-    var prefixedLocalStorage;
-    setup(() => prefixedLocalStorage = new PrefixedLocalStorageTest());
-    async_test(t => {
-      t.add_cleanup(() => prefixedLocalStorage.cleanup());
-      prefixedLocalStorage.onSet('openerIsNull', t.step_func_done(e => {
-        assert_equals(e.newValue, 'true');
-      }));
-      window.open(prefixedLocalStorage.url('resources/opener-setter.html'),
-        'iShouldSetOpenerToNull');
-    }, 'Auxiliary browsing context created via `window.open` and setting `window.opener` to `null` should report `window.opener` `null`');
-    async_test(t => {
-      t.add_cleanup(() => prefixedLocalStorage.cleanup());
-      prefixedLocalStorage.onSet('openerIsTest', t.step_func_done(e => {
-        assert_equals(e.newValue, 'true');
-      }));
-      window.open(prefixedLocalStorage.url('resources/opener-setter.html'),
-        'iShouldSetOpenerToTest');
-    }, 'Auxiliary browsing context created via `window.open` and setting `window.opener` to `test` should report `test`');
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html b/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html
deleted file mode 100644
index 4112dae0cee..00000000000
--- a/tests/wpt/web-platform-tests/html/browsers/windows/auxiliary-browsing-contexts/resources/opener-setter.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!doctype html>
-<meta charset="utf-8">
-<html>
-<p>This window should set the window.opener attribute</p>
-<script src="/common/PrefixedLocalStorage.js"></script>
-<script>
-var prefixedLocalStorage = new PrefixedLocalStorageResource({
-  close_on_cleanup: true
-});
-function checkOpener () {
-  if (window.name == 'iShouldSetOpenerToNull') {
-    window.opener = null;
-    return prefixedLocalStorage.setItem('openerIsNull', window.opener === null);
-  }
-  if (window.name == 'iShouldSetOpenerToTest') {
-    window.opener = 'test';
-    return prefixedLocalStorage.setItem('openerIsTest', window.opener === "test");
-  }
-}
-</script>
-<body onload="checkOpener()">
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html b/tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html
new file mode 100644
index 00000000000..82aa08d2150
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/the-css-user-agent-style-sheet-and-presentational-hints/no-help-cursor-on-links.historical.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>link with rel="help" cursor tests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<link rel="help" href="https://html.spec.whatwg.org/#phrasing-content-3">
+<link rel="help" href="https://github.com/whatwg/html/pull/3902">
+
+<div id="log"></div>
+
+<a href="/common/blank.html?unvisited" rel="help" id="unvisited">unvisited</a>
+<a href="/common/blank.html?willbevisited" rel="help" id="willbevisited">will be visited</a>
+
+<script>
+"use strict";
+
+
+test(() => {
+  const el = document.querySelector("#unvisited");
+  const style = window.getComputedStyle(el);
+
+  assert_equals(style.cursor, "pointer");
+},"Unvisited help links must have pointer cursor, not help cursor");
+
+
+// This test is kind of dubious. Browsers don't allow you to distinguish visited and unvisited links
+// from script, for privacy reasons. So we can't really be sure that loading the iframe would make
+// the link count as visited. Manually running this test turns the link purple in some browsers,
+// but leaves it blue in others. Even then it's not clear whether it turned purple before or after
+// the onload; this test assumes that once the iframe onload fires, it counts as visited, which
+// may not be justified even in the purple-turning browsers.
+//
+// Still, the test doesn't really hurt. At worst it's redundant with the above.
+//
+// If someone comes up with a better way of testing this (i.e. something that truly guarantees that
+// the link will count as "visited" for UA stylesheet purposes), then please submit a PR.
+async_test(t => {
+  const el = document.querySelector("#willbevisited");
+
+  const iframe = document.createElement("iframe");
+  iframe.src = el.href;
+  iframe.onload = t.step_func_done(() => {
+    const style = window.getComputedStyle(el);
+    assert_equals(style.cursor, "pointer");
+  });
+
+  document.body.appendChild(iframe);
+}, "Visited help links must have pointer cursor, not help cursor");
+</script>
diff --git a/tests/wpt/web-platform-tests/user-timing/measure.html b/tests/wpt/web-platform-tests/user-timing/measure.html
index 8f2a618f261..d114ecd18fe 100644
--- a/tests/wpt/web-platform-tests/user-timing/measure.html
+++ b/tests/wpt/web-platform-tests/user-timing/measure.html
@@ -76,7 +76,7 @@
 
         function onload_test()
         {
-            // test for existance of User Timing and Performance Timeline interface
+            // test for existence of User Timing and Performance Timeline interface
             if (!has_required_interfaces())
             {
                 test_true(false,
diff --git a/tests/wpt/web-platform-tests/user-timing/measure_navigation_timing.html b/tests/wpt/web-platform-tests/user-timing/measure_navigation_timing.html
index fa472fd3f96..d6480d27a26 100644
--- a/tests/wpt/web-platform-tests/user-timing/measure_navigation_timing.html
+++ b/tests/wpt/web-platform-tests/user-timing/measure_navigation_timing.html
@@ -73,7 +73,7 @@
 
         function onload_test()
         {
-            // test for existance of User Timing and Performance Timeline interface
+            // test for existence of User Timing and Performance Timeline interface
             if (!has_required_interfaces())
             {
                 test_true(false,
diff --git a/tests/wpt/web-platform-tests/web-locks/META.yml b/tests/wpt/web-platform-tests/web-locks/META.yml
index 39acca82900..24e7d283406 100644
--- a/tests/wpt/web-platform-tests/web-locks/META.yml
+++ b/tests/wpt/web-platform-tests/web-locks/META.yml
@@ -1,4 +1,4 @@
-spec: https://inexorabletash.github.io/web-locks/
+spec: https://wicg.github.io/web-locks/
 suggested_reviewers:
   - inexorabletash
   - pwnall
diff --git a/tests/wpt/web-platform-tests/web-locks/README.md b/tests/wpt/web-platform-tests/web-locks/README.md
index e8091f8cd30..8ff534e1b6f 100644
--- a/tests/wpt/web-platform-tests/web-locks/README.md
+++ b/tests/wpt/web-platform-tests/web-locks/README.md
@@ -1,5 +1,5 @@
 This directory contains a test suite for the proposed Web Locks API.
 
-Explainer: https://github.com/inexorabletash/web-locks
+Explainer: https://github.com/WICG/web-locks/
 
-Spec: https://inexorabletash.github.io/web-locks/
+Spec: https://wicg.github.io/web-locks/
diff --git a/tests/wpt/web-platform-tests/web-locks/acquire.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/acquire.tentative.https.html
index 3c360ab4ff0..65bf0e4e064 100644
--- a/tests/wpt/web-platform-tests/web-locks/acquire.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/acquire.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: navigator.locks.request method</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/clientids.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/clientids.tentative.https.html
index 8a99d7d2e7f..9ce4c4e9d18 100644
--- a/tests/wpt/web-platform-tests/web-locks/clientids.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/clientids.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Client IDs in query() vs. Service Worker</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/frames.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/frames.tentative.https.html
index 366a7eafc40..7d8383cffc1 100644
--- a/tests/wpt/web-platform-tests/web-locks/frames.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/frames.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Frames</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/held.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/held.tentative.https.html
index ccf7c0b8f67..aecbbd3df89 100644
--- a/tests/wpt/web-platform-tests/web-locks/held.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/held.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Lock held until callback result resolves</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/ifAvailable.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/ifAvailable.tentative.https.html
index ee190b2bf0c..2b6e1ff3c81 100644
--- a/tests/wpt/web-platform-tests/web-locks/ifAvailable.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/ifAvailable.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: ifAvailable option</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/interfaces-serviceworker.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/interfaces-serviceworker.tentative.https.html
index ea2a3d77c84..ca4d768546a 100644
--- a/tests/wpt/web-platform-tests/web-locks/interfaces-serviceworker.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/interfaces-serviceworker.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: WebIDL tests in service worker</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/lock-attributes.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/lock-attributes.tentative.https.html
index e0c1c5b3c80..89ffec41ba9 100644
--- a/tests/wpt/web-platform-tests/web-locks/lock-attributes.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/lock-attributes.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Lock Attributes</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/mode-exclusive.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/mode-exclusive.tentative.https.html
index 7769ca5ec69..8c6005d04a5 100644
--- a/tests/wpt/web-platform-tests/web-locks/mode-exclusive.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/mode-exclusive.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Exclusive Mode</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/mode-mixed.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/mode-mixed.tentative.https.html
index ac8f36534d7..0ce0583645e 100644
--- a/tests/wpt/web-platform-tests/web-locks/mode-mixed.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/mode-mixed.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Mixed Modes</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/mode-shared.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/mode-shared.tentative.https.html
index cac3a571f35..309ee57b5a9 100644
--- a/tests/wpt/web-platform-tests/web-locks/mode-shared.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/mode-shared.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Shared Mode</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/non-secure-context.tentative.html b/tests/wpt/web-platform-tests/web-locks/non-secure-context.tentative.html
index 328e4512b8f..568eb30e1ba 100644
--- a/tests/wpt/web-platform-tests/web-locks/non-secure-context.tentative.html
+++ b/tests/wpt/web-platform-tests/web-locks/non-secure-context.tentative.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: API not available in non-secure context</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/opaque-origin.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/opaque-origin.tentative.https.html
index 7abae82ab41..589c2a7cdd8 100644
--- a/tests/wpt/web-platform-tests/web-locks/opaque-origin.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/opaque-origin.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Opaque origins</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/query-empty.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/query-empty.tentative.https.html
index a6133218ee6..38fed37b9a5 100644
--- a/tests/wpt/web-platform-tests/web-locks/query-empty.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/query-empty.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: navigator.locks.query method - no locks held</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/query-order.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/query-order.tentative.https.html
index 25ac10a29ac..e4fb7c5e262 100644
--- a/tests/wpt/web-platform-tests/web-locks/query-order.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/query-order.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: navigator.locks.query ordering</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/query.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/query.tentative.https.html
index 77d37f34f8b..218e984993c 100644
--- a/tests/wpt/web-platform-tests/web-locks/query.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/query.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: navigator.locks.query method</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/resource-names.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/resource-names.tentative.https.html
index 1dfe11d554f..d4ac7437a9d 100644
--- a/tests/wpt/web-platform-tests/web-locks/resource-names.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/resource-names.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Resources DOMString edge cases</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/secure-context.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/secure-context.tentative.https.html
index b5b6feaa030..a90b55dfb59 100644
--- a/tests/wpt/web-platform-tests/web-locks/secure-context.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/secure-context.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: API requires secure context</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/web-locks/signal.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/signal.tentative.https.html
index 94f07a52fa3..a070bde21b1 100644
--- a/tests/wpt/web-platform-tests/web-locks/signal.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/signal.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: AbortSignal integration</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/steal.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/steal.tentative.https.html
index b796c24f7d3..169d849b6ac 100644
--- a/tests/wpt/web-platform-tests/web-locks/steal.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/steal.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: steal option</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-locks/workers.tentative.https.html b/tests/wpt/web-platform-tests/web-locks/workers.tentative.https.html
index 1e699194c4b..04af72c8ad0 100644
--- a/tests/wpt/web-platform-tests/web-locks/workers.tentative.https.html
+++ b/tests/wpt/web-platform-tests/web-locks/workers.tentative.https.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
 <title>Web Locks API: Workers</title>
-<link rel=help href="https://github.com/inexorabletash/web-locks">
+<link rel=help href="https://wicg.github.io/web-locks/">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/helpers.js"></script>