diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-all-auto.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-all-auto.html.ini
index 1f2cdee738e..ded2ad80dd5 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-all-auto.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-all-auto.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-height-20.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-height-20.html.ini
index 15c3d641cc6..09c2baf44e0 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-height-20.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-height-20.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-height-20.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-max-height-20.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-height-20.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-max-height-20.html.ini
index 7f1f75f5306..61d762f779d 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-height-20.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-max-height-20.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-max-height-20.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-width-40.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-max-width-40.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-width-40.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-max-width-40.html.ini
index c792be0c72f..abb65105ee6 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-width-40.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-max-width-40.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-max-width-40.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-20.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-height-20.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-20.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-height-20.html.ini
index a200b3c47dc..661772b249d 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-20.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-height-20.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-min-height-20.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-height-40.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-height-40.html.ini
index ef456829f63..7052899d424 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-height-40.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-min-height-40.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-40.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-width-40.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-40.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-width-40.html.ini
index bdf5faafcea..5e1b95007de 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-40.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-width-40.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-min-width-40.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-width-80.html.ini
similarity index 77%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-width-80.html.ini
index e0b1ffdb24a..056b92be881 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-min-width-80.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-min-width-80.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-width-40.html.ini
similarity index 76%
rename from tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40.html.ini
rename to tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-width-40.html.ini
index a0d694ed481..de09cd659e3 100644
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/visudet/replaced-elements-width-40.html.ini
@@ -1,3 +1,2 @@
 [replaced-elements-width-40.html]
-  type: reftest
   expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
index d1c4afc27d1..c495e1becc7 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
@@ -326,453 +326,3 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
-  [max-height length(ex) / values]
-    expected: FAIL
-
-  [max-height length(mm) / values]
-    expected: FAIL
-
-  [max-height length(cm) / values]
-    expected: FAIL
-
-  [max-height length(in) / values]
-    expected: FAIL
-
-  [max-height percentage(%) / values]
-    expected: FAIL
-
-  [max-width length(pt) / values]
-    expected: FAIL
-
-  [max-width length(pc) / values]
-    expected: FAIL
-
-  [max-width length(px) / values]
-    expected: FAIL
-
-  [max-width length(em) / values]
-    expected: FAIL
-
-  [max-width length(ex) / values]
-    expected: FAIL
-
-  [max-width length(mm) / values]
-    expected: FAIL
-
-  [max-width length(cm) / values]
-    expected: FAIL
-
-  [max-width length(in) / values]
-    expected: FAIL
-
-  [max-width percentage(%) / values]
-    expected: FAIL
-
-  [top length(pt) / values]
-    expected: FAIL
-
-  [top length(pc) / values]
-    expected: FAIL
-
-  [top length(px) / values]
-    expected: FAIL
-
-  [top length(em) / values]
-    expected: FAIL
-
-  [top length(ex) / values]
-    expected: FAIL
-
-  [top length(mm) / values]
-    expected: FAIL
-
-  [top length(cm) / values]
-    expected: FAIL
-
-  [top length(in) / values]
-    expected: FAIL
-
-  [top percentage(%) / values]
-    expected: FAIL
-
-  [right length(pt) / values]
-    expected: FAIL
-
-  [right length(pc) / values]
-    expected: FAIL
-
-  [right length(px) / values]
-    expected: FAIL
-
-  [right length(em) / values]
-    expected: FAIL
-
-  [right length(ex) / values]
-    expected: FAIL
-
-  [right length(mm) / values]
-    expected: FAIL
-
-  [right length(cm) / values]
-    expected: FAIL
-
-  [right length(in) / values]
-    expected: FAIL
-
-  [right percentage(%) / values]
-    expected: FAIL
-
-  [bottom length(pt) / values]
-    expected: FAIL
-
-  [bottom length(pc) / values]
-    expected: FAIL
-
-  [bottom length(px) / values]
-    expected: FAIL
-
-  [bottom length(em) / values]
-    expected: FAIL
-
-  [bottom length(ex) / values]
-    expected: FAIL
-
-  [bottom length(mm) / values]
-    expected: FAIL
-
-  [bottom length(cm) / values]
-    expected: FAIL
-
-  [bottom length(in) / values]
-    expected: FAIL
-
-  [bottom percentage(%) / values]
-    expected: FAIL
-
-  [left length(pt) / values]
-    expected: FAIL
-
-  [left length(pc) / values]
-    expected: FAIL
-
-  [left length(px) / values]
-    expected: FAIL
-
-  [left length(em) / values]
-    expected: FAIL
-
-  [left length(ex) / values]
-    expected: FAIL
-
-  [left length(mm) / values]
-    expected: FAIL
-
-  [left length(cm) / values]
-    expected: FAIL
-
-  [left length(in) / values]
-    expected: FAIL
-
-  [left percentage(%) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata-layout-2020/dom/slot-recalc.html.ini b/tests/wpt/metadata-layout-2020/dom/slot-recalc.html.ini
new file mode 100644
index 00000000000..887763d3d5f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/dom/slot-recalc.html.ini
@@ -0,0 +1,2 @@
+[slot-recalc.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 78cc65756df..13342cc966b 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -315,6 +315,15 @@
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index 5c001592859..258fe374697 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/metadata/serviceworker-accessors.https.sub.html.ini b/tests/wpt/metadata-layout-2020/fetch/metadata/serviceworker-accessors.https.sub.html.ini
new file mode 100644
index 00000000000..2ed5e869c2f
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/fetch/metadata/serviceworker-accessors.https.sub.html.ini
@@ -0,0 +1,4 @@
+[serviceworker-accessors.https.sub.html]
+  [Sec-Fetch headers in Service Worker fetch handler.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/cors-rfc1918/idlharness.tentative.any.js.ini b/tests/wpt/metadata-layout-2020/fetch/private-network-access/idlharness.tentative.any.js.ini
similarity index 72%
rename from tests/wpt/metadata/fetch/cors-rfc1918/idlharness.tentative.any.js.ini
rename to tests/wpt/metadata-layout-2020/fetch/private-network-access/idlharness.tentative.any.js.ini
index 2f1c340daf3..e9224102c90 100644
--- a/tests/wpt/metadata/fetch/cors-rfc1918/idlharness.tentative.any.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/private-network-access/idlharness.tentative.any.js.ini
@@ -1,18 +1,10 @@
-[idlharness.tentative.any.html]
-  [idlharness]
-    expected: FAIL
-
-  [Document interface: attribute addressSpace]
-    expected: FAIL
-
-  [Document interface: document must inherit property "addressSpace" with the proper type]
-    expected: FAIL
+[idlharness.tentative.any.serviceworker.html]
+  expected: ERROR
 
+[idlharness.tentative.any.sharedworker.html]
+  expected: ERROR
 
 [idlharness.tentative.any.worker.html]
-  [idlharness]
-    expected: FAIL
-
   [WorkerGlobalScope interface: attribute addressSpace]
     expected: FAIL
 
@@ -20,17 +12,10 @@
     expected: FAIL
 
 
-[idlharness.tentative.any.serviceworker.html]
-  expected: ERROR
-  [idlharness]
+[idlharness.tentative.any.html]
+  [Document interface: attribute addressSpace]
     expected: FAIL
 
-
-[idlharness.tentative.https.any.serviceworker.html]
-  expected: TIMEOUT
-
-[idlharness.tentative.any.sharedworker.html]
-  expected: ERROR
-  [idlharness]
+  [Document interface: document must inherit property "addressSpace" with the proper type]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/cors-rfc1918/non-secure-context.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/private-network-access/non-secure-context.window.js.ini
similarity index 100%
rename from tests/wpt/metadata/fetch/cors-rfc1918/non-secure-context.window.js.ini
rename to tests/wpt/metadata-layout-2020/fetch/private-network-access/non-secure-context.window.js.ini
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
new file mode 100644
index 00000000000..75d75b4cda2
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_2.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 8e2a63e3b7f..9a85a905394 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener of discarded nested browsing context]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index 4e69eb752b6..3538891dae8 100644
--- a/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -4,13 +4,13 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..295031c1812 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index fa8395ff183..0d96c859d89 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -23,57 +23,42 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: select() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionDirection a second time (must not fire select)]
+  [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setSelectionRange() a second time (must not fire select)]
+  [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
+  [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart a second time (must not fire select)]
+  [input type tel: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 450c88bd32b..dbec6f2c2ff 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,6 +3,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html.ini b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html.ini
new file mode 100644
index 00000000000..f36329c8cda
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html.ini
@@ -0,0 +1,7 @@
+[popup-inheritance-about-blank.html]
+  [The fetch() API in an about:blank popup with a custom URL referrer is fetched with a 'Referer` header that uses the outer document's URL along with its referrer policy]
+    expected: FAIL
+
+  [The value of document.referrer in an about:blank popup is the outer document's full URL, regardless of referrer policy]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index a92d7180986..f481a66be18 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -596,3 +596,15 @@
   [# AUDIT TASK RUNNER FINISHED: 2 out of 2 tasks were failed.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[15240\]\t1.0525508072630054e-31\t3.3531737327575684e-1\t3.3531737327575684e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\t[15241\]\t4.5612265013772796e-41\t3.9367997646331787e-1\t3.9367997646331787e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 3.9367997646331787e-1 at index of 15241.\n\tMax RelError of 1.0000000000000000e+0 at index of 15240.\n]
+    expected: FAIL
+
+  [X SNR (49.1621200615592 dB) is not greater than or equal to 85.58. Got 49.1621200615592.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[7189\]\t1.0841088339017911e-31\t-9.8956179618835449e-1\t9.8956179618835449e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[7190\]\t-8.8409073650836945e-2\t-9.9664616584777832e-1\t9.0823709219694138e-1\t9.1129341918891205e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.8956179618835449e-1 at index of 7189.\n\tMax RelError of 1.0000000000000000e+0 at index of 7189.\n]
+    expected: FAIL
+
+  [X SNR (40.857403325570765 dB) is not greater than or equal to 65.737. Got 40.857403325570765.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
index 1af95add6bf..e71bce4c95c 100644
--- a/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
+++ b/tests/wpt/metadata-layout-2020/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
@@ -1,4 +1,5 @@
 [user_prompts.py]
+  expected: ERROR
   [test_accept_and_notify[capabilities0-prompt-\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 1ff6ee4cbed..436937e6a12 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -23349,6 +23349,569 @@
   },
   "print-reftest": {
    "css": {
+    "CSS2": {
+     "pagination": {
+      "block-page-break-inside-avoid-1-print.html": [
+       "abfe11fd3ea264382f8fcd9a3f4f5d59c7b845c0",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-10-print.html": [
+       "b29e72fc3771e59fc5695c5299e17e3616f9186d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-11-print.html": [
+       "64409156ec0d4bc995c9bfd79a48d4f0af0d9b1e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-12-print.html": [
+       "1f132e8d7333669be519f6348c237540ab1cd722",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-13-print.html": [
+       "3d3765fddb12926b6c2b01ea011a30cac4a5fcfa",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-14-print.html": [
+       "f3b57e0d069868c61b3a70e0e81c97ee61ae7904",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-14-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-15-print.html": [
+       "655f70c39a28823f072d18342d541de40170b0ed",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-15-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-2-print.html": [
+       "3a32a357ad89fbe52534b0122a186216c7a322d5",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-3-print.html": [
+       "8469e8acdbe44256ce63c721d5690c658a73bcb5",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-4-print.html": [
+       "a9566672e50dc6a6cd1048d88c68a949c2d83242",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-5-print.html": [
+       "f525cf01dc8c7fb5e1ff7073acfc3ccecc2c9bce",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-6-print.html": [
+       "dc0ce687551da57f6644ab547c162a0bcd10e628",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-7-print.html": [
+       "0100b508fa8c1251f56e49a7cde0f5ce5bad46dd",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-8-print.html": [
+       "ad67b69ab51c97b4e5059ecdccc3aeb984ff4c7b",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "block-page-break-inside-avoid-9-print.html": [
+       "d6774410da839eaf1f82f87e7c7403d3283adf32",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-1-print.html": [
+       "b932b38ee85807efafe27894f97396dedde17556",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-2-print.html": [
+       "0039ab5194500fa17ea9616b7b3c7f05bb42063a",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/float-page-break-inside-avoid-2-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-3-print.html": [
+       "56be8379f71ffd6d183b0ffb361aacd3d622ff6f",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-4-print.html": [
+       "e3793170bdd045fe2b4459d7c0066d77e9c53273",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-5-print.html": [
+       "c818c9165b15263434afbe8e6ad5dd05bf6a45f7",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/float-page-break-inside-avoid-5-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-6-print.html": [
+       "1b53472ba88219880d3219744519823263660626",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/float-page-break-inside-avoid-6-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-7-print.html": [
+       "595a3aca45b285dfb4508ffbd9537c00e2b654d4",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/float-page-break-inside-avoid-7-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-8-print.html": [
+       "45c19878f9a2bc33d7af66932cd82007e084ad64",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/float-page-break-inside-avoid-8-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "float-page-break-inside-avoid-9-print.html": [
+       "c32597bb215d55079fc7b44d991a2613a5e24e74",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/float-page-break-inside-avoid-9-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "inline-page-break-inside-avoid-1-print.html": [
+       "a7555890b8a22822b8f6b45fb254f4a739c7f8ce",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/inline-page-break-inside-avoid-1-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "row-page-break-inside-avoid-1-print.html": [
+       "ba84330bd588cce93fc93f0b30fbff263baf94bc",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "row-page-break-inside-avoid-2-print.html": [
+       "1f4b24e4fb71803e2540e721f5af8ae8ac19cb4e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-1-print.html": [
+       "b13bf2e623f310847386c1160fc8b9abf6e069b0",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-2-print.html": [
+       "947412d0d0c8e22bfa8e85c7dc521793e3e223a1",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-3-print.html": [
+       "5efba525ff86926dcfca7a7b7c66ce3e2947268c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-4-print.html": [
+       "38290b0f27f8cf16c92fe1f568f752b34dfa9de6",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-5-print.html": [
+       "ea6e722b9d70b860f580a4fd06f554bd56c57037",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-6-print.html": [
+       "41e6d477f321da0526a6903748204e69786e15c9",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-7-print.html": [
+       "4a6bba180bbb47c560f6c4905e341f0538b93d71",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "rowgroup-page-break-inside-avoid-8-print.html": [
+       "fbb8a1218c979e2deed2ad55a254719a9d82204e",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-1-print.html": [
+       "f5a2e43ff6774289ec95f12a799709146496211d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-2-print.html": [
+       "418561d904e420c262032f89b0318fbc5a54005c",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-2-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-3-print.html": [
+       "c5a6be6bf111d53c5464d54cab6df4070d7f04b6",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-3-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-4-print.html": [
+       "8836b100681a34dbc4939d2421322542cd4b3c9d",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-4-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-5-print.html": [
+       "dd3d2c42f7c4c8d971670970c8cf71f8a0a18262",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-5-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-6-print.html": [
+       "3d327d9d00d286c92eba5abdef24c05835adabec",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-7-print.html": [
+       "bb85d62ce8d86801134586319539b4375b1c5ebd",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-7-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "table-page-break-inside-avoid-8-print.html": [
+       "f100a1b50a8d863e2cfa0b3ca46d9933100cd8ff",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ]
+     }
+    },
     "css-break": {
      "block-001-wm-vlr-print.html": [
       "6cd5ea07c7b2a132cef7d26abd4204cb157b5eae",
@@ -23609,569 +24172,6 @@
           {}
          ]
         ]
-       },
-       "css21": {
-        "pagination": {
-         "moz-css21-block-page-break-inside-avoid-1-print.html": [
-          "25e1c44c78b40622a074bdb1bba6784632d20073",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-10-print.html": [
-          "3b1c13ee91df7a5dc7160e3400bb2411a2e0e2f7",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-11-print.html": [
-          "e4fed2afe3eb0301e97db60f1b20474a092fed1d",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-12-print.html": [
-          "74e01baf54b6c3646255d022d4f71c899e44999a",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-13-print.html": [
-          "b91b27efdeb42b07c93e6709626e24a2ed93e6d8",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-8-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-14-print.html": [
-          "8d4d5b10579d61f6d4e7c922713e413a26ba5249",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-14-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-15-print.html": [
-          "88109bbcd168eb2489ac0f84f3846b001229d22a",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-15-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-2-print.html": [
-          "0f744520c07b4a92449d15a707f0778decb09cd8",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-3-print.html": [
-          "7421667b5d656d83e87769af92dcedf55fde9e2a",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-4-print.html": [
-          "57c74da91be4859e7141c063fbcc339f1ab38655",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-5-print.html": [
-          "c79952314d2d5748046f53ac1ad979505ed84dac",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-6-print.html": [
-          "a66a8b252784ef8bee1a0d1d21632b7b86b9c591",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-7-print.html": [
-          "790f65027c717d1c3e87583249cb59ad4ea0cc5f",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-8-print.html": [
-          "66d7caa1cc49abc03f59a89abb08172e609dfb8a",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-8-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-block-page-break-inside-avoid-9-print.html": [
-          "63e6a6e84f6611dd2a4a8320c2dfd801a72c5d19",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-1-print.html": [
-          "863598e2c120e58b4e1b81620838e49602693d5b",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-2-print.html": [
-          "da98a6e8a2db6033f369b15aefe41f7331729bc0",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-2-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-3-print.html": [
-          "98536cc9f13fce7b62992991e64bf254503c15e6",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-4-print.html": [
-          "005adc6619d584f0329aaeb24491da363e5d4528",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-5-print.html": [
-          "856cd98674b273dbdab26d0eacaa65068154dd3d",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-5-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-6-print.html": [
-          "b8642fe5686334d1f7ab9bbcadb05384d8324025",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-6-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-7-print.html": [
-          "1a80825c52327780b48de780087c2cc0b6265a22",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-8-print.html": [
-          "83806d551e226889b18a90924f51ff19c0d4413e",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-float-page-break-inside-avoid-9-print.html": [
-          "8a601fa6d8426db37be272639e8c7cb167a969ff",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-inline-page-break-inside-avoid-1-print.html": [
-          "7993051103c51a291697453cdc9168a0d75d6ce5",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-inline-page-break-inside-avoid-1-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-row-page-break-inside-avoid-1-print.html": [
-          "64793ae1056bfee260a4cfb0443cf67ca3e2e784",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-row-page-break-inside-avoid-2-print.html": [
-          "bad70cedcdb3543c8b5bffaca35d65533a4133bf",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-1-print.html": [
-          "e3b4be6c7a00b3b873f85811ebd47469b81b2e34",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-2-print.html": [
-          "0d05e60fcd8d3e3bfd4c38fb8e3c3da4d0352876",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-3-print.html": [
-          "3a238673b6ce496636e855b4c17c686e9c05d585",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-4-print.html": [
-          "d3d65813e6dba16c7ab3f82e8a54503fcb2ce61b",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-5-print.html": [
-          "1e5a5f63eb75215b9574b505b3b23925dd25cc2e",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-6-print.html": [
-          "683d99224361610344acd5bcf0daebf76b980507",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-7-print.html": [
-          "0c4b35b90357359552b8a83ee542a6d7b72b9fa4",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-8-print.html": [
-          "8cde0d5aa5b77c78758b20c84c9d30b8e3f95f56",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-1-print.html": [
-          "ea4ded5d1bfe7b9e9b137cfec34bc985b1766ad6",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-2-print.html": [
-          "14e529e12a951e1cba3017f21950e405b16cd7fe",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-2-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-3-print.html": [
-          "bd236d1adf512b5f69da19e34ac79616784fdcc3",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-3-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-4-print.html": [
-          "0c22aff7a0d5d8a4a531b489d2c244cfef8dbb6d",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-4-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-5-print.html": [
-          "a1a9c5844fb09d5485ff12107dfba3f629da0d8b",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-5-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-6-print.html": [
-          "622129945ce1bb3e7e457f47196e3cc47d70d77d",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-6-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-7-print.html": [
-          "1248e7470913fe32f8b82d586e64eeec5a0f8ac5",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-7-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "moz-css21-table-page-break-inside-avoid-8-print.html": [
-          "c1740f2c63c0457ae6ad231e3b44522dda1145d1",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-6-print-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ]
-        }
        }
       }
      }
@@ -114689,6 +114689,123 @@
         ],
         {}
        ]
+      ],
+      "replaced-elements-all-auto.html": [
+       "bc2b4593abf793505e3e99b1b6c99c90666dab93",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-all-auto-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-height-20.html": [
+       "2ca34befffba0a9bf1aa1302ed47b53f54ad52fc",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-height-20-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-max-height-20.html": [
+       "eb2ee98443b045e58173518b158871fdcf34a5a6",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-height-20-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-max-width-40.html": [
+       "9fb7aad4ee93802a5d58a09084a1bd8f3568aec5",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-width-40-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-min-height-20.html": [
+       "5294aadcb4ed6c87e3d8ccd7acbeba0b1e4dee38",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-all-auto-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-min-height-40.html": [
+       "700909ec52d24dd8125a0680e63a237244879cf6",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-min-height-40-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-min-width-40.html": [
+       "03e6a9cba97436a1864fd19a24ace562495e55e5",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-all-auto-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-min-width-80.html": [
+       "852864aa18cc27d480490039a959a103b234e683",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-min-width-80-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "replaced-elements-width-40.html": [
+       "4a8db48f6962666c0cbdbb6cc5692d38ab53aa6a",
+       [
+        null,
+        [
+         [
+          "/css/CSS2/visudet/replaced-elements-width-40-ref.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
       ]
      },
      "visufx": {
@@ -160071,12 +160188,12 @@
        ]
       ],
       "grid-areas-overflowing-grid-container-003.html": [
-       "e5c7d994f6a1ea4d13a95cfa5225b931bbeef6d6",
+       "aaba4f924427e07c6f21c9aaf417fb83fdf21151",
        [
         null,
         [
          [
-          "/css/css-grid/grid-model/reference/100x100-grey-box.html",
+          "/css/css-grid/grid-model/reference/100x100-grey-box-with-scrollbars.html",
           "=="
          ]
         ],
@@ -160578,7 +160695,7 @@
        ]
       ],
       "grid-overflow-padding-001.html": [
-       "b231c64be1dd519c20e03620aa0cf9aeac99febf",
+       "6c4a71031f1effd14c7106616cd94d1a4dd21665",
        [
         null,
         [
@@ -160591,7 +160708,7 @@
        ]
       ],
       "grid-overflow-padding-002.html": [
-       "e3b4cd95296b7bba8b3df21b09213c9b20131b29",
+       "88bce26a9823b61084cc4d128c77adb95337a742",
        [
         null,
         [
@@ -241906,127 +242023,6 @@
          ]
         ]
        },
-       "css21": {
-        "replaced-sizing": {
-         "replaced-elements-all-auto.html": [
-          "bc2b4593abf793505e3e99b1b6c99c90666dab93",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-height-20.html": [
-          "2ca34befffba0a9bf1aa1302ed47b53f54ad52fc",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-max-height-20.html": [
-          "eb2ee98443b045e58173518b158871fdcf34a5a6",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-max-width-40.html": [
-          "9fb7aad4ee93802a5d58a09084a1bd8f3568aec5",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-min-height-20.html": [
-          "5294aadcb4ed6c87e3d8ccd7acbeba0b1e4dee38",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-min-height-40.html": [
-          "700909ec52d24dd8125a0680e63a237244879cf6",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-min-width-40.html": [
-          "03e6a9cba97436a1864fd19a24ace562495e55e5",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-min-width-80.html": [
-          "852864aa18cc27d480490039a959a103b234e683",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ],
-         "replaced-elements-width-40.html": [
-          "4a8db48f6962666c0cbdbb6cc5692d38ab53aa6a",
-          [
-           null,
-           [
-            [
-             "/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40-ref.html",
-             "=="
-            ]
-           ],
-           {}
-          ]
-         ]
-        }
-       },
        "filters": {
         "filter-containing-block-dynamic-1a.html": [
          "83230174c383f64b3941bf6dc1deda6819397b55",
@@ -247041,7 +247037,20 @@
        {}
       ]
      ]
-    }
+    },
+    "slot-recalc.html": [
+     "5124336ad275d699e9dfc43100262320dbbda0c2",
+     [
+      null,
+      [
+       [
+        "/dom/slot-recalc-ref.html",
+        "=="
+       ]
+      ],
+      {}
+     ]
+    ]
    },
    "encoding": {
     "eof-shift_jis.html": [
@@ -296253,6 +296262,66 @@
       }
      },
      "pagination": {
+      "block-page-break-inside-avoid-14-print-ref.html": [
+       "434ecac9456934b815540bb33fa608f31bc6428d",
+       []
+      ],
+      "block-page-break-inside-avoid-15-print-ref.html": [
+       "b46ea73e77e8ca070264ba074e92f35485fffaf2",
+       []
+      ],
+      "block-page-break-inside-avoid-8-print-ref.html": [
+       "6c47d6af76580970755613a87865d9d2c9dfef84",
+       []
+      ],
+      "block-page-break-inside-avoid-print-ref.html": [
+       "7dfe3f126be89bb86bcf7d2ebe6d8eada3d7fc03",
+       []
+      ],
+      "float-page-break-inside-avoid-2-print-ref.html": [
+       "3e4f04cc72b5c8d17a91570cc022b51569cf130b",
+       []
+      ],
+      "float-page-break-inside-avoid-5-print-ref.html": [
+       "0da2e292f15333f48ec67e55aae743229243dfe0",
+       []
+      ],
+      "float-page-break-inside-avoid-6-print-ref.html": [
+       "5f45af72e0987e39b4cf11f8bf17177b82b68d65",
+       []
+      ],
+      "float-page-break-inside-avoid-7-print-ref.html": [
+       "9698e5018d89693f31599d347e407b509c8931f8",
+       []
+      ],
+      "float-page-break-inside-avoid-8-print-ref.html": [
+       "d80fc4b0b62531d886fd3917e5a287b04aa58405",
+       []
+      ],
+      "float-page-break-inside-avoid-9-print-ref.html": [
+       "69e213c876330697d366b134abf706866d7af954",
+       []
+      ],
+      "inline-page-break-inside-avoid-1-print-ref.html": [
+       "ac129c03aa294c041c736c941a1f2834e5f9fb50",
+       []
+      ],
+      "rowgroup-page-break-inside-avoid-4-print-ref.html": [
+       "c7c0abdf1964c6bd61474d9a74a13865155a11cb",
+       []
+      ],
+      "rowgroup-page-break-inside-avoid-5-print-ref.html": [
+       "c08a376bfaff00ae5a99c338b938a9279d3b39da",
+       []
+      ],
+      "rowgroup-page-break-inside-avoid-7-print-ref.html": [
+       "e425f034acb47c7755bca659b86dbf99378e11fa",
+       []
+      ],
+      "rowgroup-page-break-inside-avoid-8-print-ref.html": [
+       "0ff37fc97e98e84443ac1207d845ec2ffef87f53",
+       []
+      ],
       "support": {
        "1x1-green.png": [
         "b98ca0ba0a03c580ac339e4a3653539cfa8edc71",
@@ -296382,7 +296451,35 @@
         "59843ae54b64f6ce4f7e616d4be491c911ea84cf",
         []
        ]
-      }
+      },
+      "table-page-break-inside-avoid-2-print-ref.html": [
+       "61f1c9735b696daa79a1a946dfc4adcf3355bcba",
+       []
+      ],
+      "table-page-break-inside-avoid-3-print-ref.html": [
+       "19b0c40b209bd7d74bd313e020033d85724f6e23",
+       []
+      ],
+      "table-page-break-inside-avoid-4-print-ref.html": [
+       "87abef85414bd7555c7ef5ab7712bcdd8fbb58e4",
+       []
+      ],
+      "table-page-break-inside-avoid-5-print-ref.html": [
+       "ddb23f6f4476ec2ce5e16a67c22e2ed07063831b",
+       []
+      ],
+      "table-page-break-inside-avoid-6-print-ref.html": [
+       "b9adb9082fce8924e69be59fb507e5b16a6ae6d7",
+       []
+      ],
+      "table-page-break-inside-avoid-7-print-ref.html": [
+       "46b41fb0c15f34db0db8d7bd679b48aab70d3b17",
+       []
+      ],
+      "table-page-break-inside-avoid-print-ref.html": [
+       "afbaf992cf8f7b8dce4f7675a2b3af1cd5b405e0",
+       []
+      ]
      },
      "positioning": {
       "absolute-non-replaced-height-002-ref.xht": [
@@ -302123,14 +302220,62 @@
         []
        ]
       },
+      "replaced-elements-all-auto-ref.html": [
+       "5a1df9485fdf481739fd7a13df3898a88fab9983",
+       []
+      ],
+      "replaced-elements-height-20-ref.html": [
+       "503d83bd78a6ba4cd8ede0e0a022b348295084bd",
+       []
+      ],
+      "replaced-elements-min-height-40-ref.html": [
+       "668be594f0886c03be8c869ea3b7598cfa57d663",
+       []
+      ],
+      "replaced-elements-min-width-80-ref.html": [
+       "6caa1c48093f654c4600b00bd1f130023195b214",
+       []
+      ],
+      "replaced-elements-width-40-ref.html": [
+       "c110910c41e812bb3c4c155dec45a61ab139e20c",
+       []
+      ],
       "support": {
        "1x1-green.png": [
         "b98ca0ba0a03c580ac339e4a3653539cfa8edc71",
         []
        ],
+       "height-25-no-ratio.svg": [
+        "d046272299a370a22f12788b78a9a1351c7554e8",
+        []
+       ],
+       "height-25-ratio-2.svg": [
+        "d6e71e31e85ab8889a1f248466d510f784646683",
+        []
+       ],
+       "height-25-width-50.svg": [
+        "a45d7243c325089a176ebc773a2e54766c5eaae6",
+        []
+       ],
+       "no-ratio.svg": [
+        "80429f1d1a6412fd7d42e820d9ea1b53258a3043",
+        []
+       ],
+       "ratio-2.svg": [
+        "fe4fe70168533f57f201023510d05aac006afe08",
+        []
+       ],
        "swatch-blue.png": [
         "bf2759634d45dbe3df13868341eddb7e4bf24172",
         []
+       ],
+       "width-50-no-ratio.svg": [
+        "bf43cee7db0f4bc900a679365c446e90140c614f",
+        []
+       ],
+       "width-50-ratio-2.svg": [
+        "62fa3cb420cb1a362e7d091c9a7a61341ab0fcde",
+        []
        ]
       }
      },
@@ -337156,150 +337301,6 @@
          []
         ]
        },
-       "css21": {
-        "pagination": {
-         "moz-css21-block-page-break-inside-avoid-14-print-ref.html": [
-          "434ecac9456934b815540bb33fa608f31bc6428d",
-          []
-         ],
-         "moz-css21-block-page-break-inside-avoid-15-print-ref.html": [
-          "b46ea73e77e8ca070264ba074e92f35485fffaf2",
-          []
-         ],
-         "moz-css21-block-page-break-inside-avoid-8-print-ref.html": [
-          "6c47d6af76580970755613a87865d9d2c9dfef84",
-          []
-         ],
-         "moz-css21-block-page-break-inside-avoid-print-ref.html": [
-          "7dfe3f126be89bb86bcf7d2ebe6d8eada3d7fc03",
-          []
-         ],
-         "moz-css21-float-page-break-inside-avoid-2-print-ref.html": [
-          "3e4f04cc72b5c8d17a91570cc022b51569cf130b",
-          []
-         ],
-         "moz-css21-float-page-break-inside-avoid-5-print-ref.html": [
-          "0da2e292f15333f48ec67e55aae743229243dfe0",
-          []
-         ],
-         "moz-css21-float-page-break-inside-avoid-6-print-ref.html": [
-          "5f45af72e0987e39b4cf11f8bf17177b82b68d65",
-          []
-         ],
-         "moz-css21-float-page-break-inside-avoid-7-print-ref.html": [
-          "9698e5018d89693f31599d347e407b509c8931f8",
-          []
-         ],
-         "moz-css21-float-page-break-inside-avoid-8-print-ref.html": [
-          "d80fc4b0b62531d886fd3917e5a287b04aa58405",
-          []
-         ],
-         "moz-css21-float-page-break-inside-avoid-9-print-ref.html": [
-          "69e213c876330697d366b134abf706866d7af954",
-          []
-         ],
-         "moz-css21-inline-page-break-inside-avoid-1-print-ref.html": [
-          "ac129c03aa294c041c736c941a1f2834e5f9fb50",
-          []
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-4-print-ref.html": [
-          "c7c0abdf1964c6bd61474d9a74a13865155a11cb",
-          []
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html": [
-          "c08a376bfaff00ae5a99c338b938a9279d3b39da",
-          []
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-7-print-ref.html": [
-          "e425f034acb47c7755bca659b86dbf99378e11fa",
-          []
-         ],
-         "moz-css21-rowgroup-page-break-inside-avoid-8-print-ref.html": [
-          "0ff37fc97e98e84443ac1207d845ec2ffef87f53",
-          []
-         ],
-         "moz-css21-table-page-break-inside-avoid-2-print-ref.html": [
-          "61f1c9735b696daa79a1a946dfc4adcf3355bcba",
-          []
-         ],
-         "moz-css21-table-page-break-inside-avoid-3-print-ref.html": [
-          "19b0c40b209bd7d74bd313e020033d85724f6e23",
-          []
-         ],
-         "moz-css21-table-page-break-inside-avoid-4-print-ref.html": [
-          "87abef85414bd7555c7ef5ab7712bcdd8fbb58e4",
-          []
-         ],
-         "moz-css21-table-page-break-inside-avoid-5-print-ref.html": [
-          "ddb23f6f4476ec2ce5e16a67c22e2ed07063831b",
-          []
-         ],
-         "moz-css21-table-page-break-inside-avoid-6-print-ref.html": [
-          "b9adb9082fce8924e69be59fb507e5b16a6ae6d7",
-          []
-         ],
-         "moz-css21-table-page-break-inside-avoid-7-print-ref.html": [
-          "46b41fb0c15f34db0db8d7bd679b48aab70d3b17",
-          []
-         ],
-         "moz-css21-table-page-break-inside-avoid-print-ref.html": [
-          "afbaf992cf8f7b8dce4f7675a2b3af1cd5b405e0",
-          []
-         ]
-        },
-        "replaced-sizing": {
-         "replaced-elements-all-auto-ref.html": [
-          "5a1df9485fdf481739fd7a13df3898a88fab9983",
-          []
-         ],
-         "replaced-elements-height-20-ref.html": [
-          "503d83bd78a6ba4cd8ede0e0a022b348295084bd",
-          []
-         ],
-         "replaced-elements-min-height-40-ref.html": [
-          "668be594f0886c03be8c869ea3b7598cfa57d663",
-          []
-         ],
-         "replaced-elements-min-width-80-ref.html": [
-          "6caa1c48093f654c4600b00bd1f130023195b214",
-          []
-         ],
-         "replaced-elements-width-40-ref.html": [
-          "c110910c41e812bb3c4c155dec45a61ab139e20c",
-          []
-         ],
-         "support": {
-          "height-25-no-ratio.svg": [
-           "d046272299a370a22f12788b78a9a1351c7554e8",
-           []
-          ],
-          "height-25-ratio-2.svg": [
-           "d6e71e31e85ab8889a1f248466d510f784646683",
-           []
-          ],
-          "height-25-width-50.svg": [
-           "a45d7243c325089a176ebc773a2e54766c5eaae6",
-           []
-          ],
-          "no-ratio.svg": [
-           "80429f1d1a6412fd7d42e820d9ea1b53258a3043",
-           []
-          ],
-          "ratio-2.svg": [
-           "fe4fe70168533f57f201023510d05aac006afe08",
-           []
-          ],
-          "width-50-no-ratio.svg": [
-           "bf43cee7db0f4bc900a679365c446e90140c614f",
-           []
-          ],
-          "width-50-ratio-2.svg": [
-           "62fa3cb420cb1a362e7d091c9a7a61341ab0fcde",
-           []
-          ]
-         }
-        }
-       },
        "filters": {
         "filter-containing-block-dynamic-1-ref.html": [
          "7b746b82b2e75d6b6026dab081e99248adc7c34d",
@@ -338591,7 +338592,7 @@
       []
      ],
      "making-a-testing-plan.md": [
-      "520c5a32e0705e9a692a96f2e6ac998a191acf4b",
+      "fc6604a8e5b5ac6d929a5431ec9019faffb3cd39",
       []
      ],
      "manual.md": [
@@ -339311,6 +339312,10 @@
       []
      ]
     },
+    "slot-recalc-ref.html": [
+     "521eedb42a007f365cad3f39236a931e85b9cf54",
+     []
+    ],
     "traversal": {
      "support": {
       "assert-node.js": [
@@ -341967,38 +341972,6 @@
       ]
      }
     },
-    "cors-rfc1918": {
-     "META.yml": [
-      "6a7359c01bbd223c876463d5f379335d4c7e357c",
-      []
-     ],
-     "README.md": [
-      "5ee9c8a01e8172480533a55e392ece4198e50939",
-      []
-     ],
-     "resources": {
-      "support.js": [
-       "be49c515ef5422743e618e67a420bd048abce89c",
-       []
-      ],
-      "treat-as-public-address.html": [
-       "7a8f6f09a517f0db695a55436870790a7763870d",
-       []
-      ],
-      "treat-as-public-address.html.headers": [
-       "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
-       []
-      ],
-      "treat-as-public-address.https.html": [
-       "7a8f6f09a517f0db695a55436870790a7763870d",
-       []
-      ],
-      "treat-as-public-address.https.html.headers": [
-       "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
-       []
-      ]
-     }
-    },
     "cross-origin-resource-policy": {
      "resources": {
       "green.png": [
@@ -342177,6 +342150,14 @@
        "0aec19d4ee78b1425d34925e22ee618aafba1862",
        []
       ],
+      "serviceworker-accessors-frame.html": [
+       "98798025005497f48537aa8a8a5e1061fc88abe4",
+       []
+      ],
+      "serviceworker-accessors.sw.js": [
+       "36c55a778600f48bc40a401fb37c4ed80d756d0d",
+       []
+      ],
       "sharedWorker.js": [
        "5eb89cb4f68a098154cf3605f53318af2f5e56f1",
        []
@@ -342235,6 +342216,38 @@
       ]
      }
     },
+    "private-network-access": {
+     "META.yml": [
+      "50fab067a4364e4aa64ecabfaa7e70387e049160",
+      []
+     ],
+     "README.md": [
+      "a69aab487239021088f944b0a8cee2dad4b3d111",
+      []
+     ],
+     "resources": {
+      "support.js": [
+       "be49c515ef5422743e618e67a420bd048abce89c",
+       []
+      ],
+      "treat-as-public-address.html": [
+       "7a8f6f09a517f0db695a55436870790a7763870d",
+       []
+      ],
+      "treat-as-public-address.html.headers": [
+       "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
+       []
+      ],
+      "treat-as-public-address.https.html": [
+       "7a8f6f09a517f0db695a55436870790a7763870d",
+       []
+      ],
+      "treat-as-public-address.https.html.headers": [
+       "76371c6209e46f24e611a6689d26b6f1bbfaff9c",
+       []
+      ]
+     }
+    },
     "range": {
      "resources": {
       "basic.html": [
@@ -356843,10 +356856,6 @@
      "e0cdf0bc8fb16e32e3ea5465247756957ec1b73e",
      []
     ],
-    "SRI.idl": [
-     "78f916fe64d78a6314138f06d139b03cb1416675",
-     []
-    ],
     "SVG.idl": [
      "e0b013bfa0bbe1dfb868518354e2d10cfe475606",
      []
@@ -357112,7 +357121,7 @@
      []
     ],
     "html.idl": [
-     "6e1a4a133d76a65af27b83a6ba2c2529355c8af4",
+     "f6789644339b4c2ecdb6bde54e4cf3cbffd1b267",
      []
     ],
     "idle-detection.idl": [
@@ -363135,7 +363144,7 @@
       []
      ],
      "webusb-test.js": [
-      "f6a793dc956a0ba9f8d23fc0023eaf98680b1fd5",
+      "5775c071b2299c8eb62c6ffff53b05358448172d",
       []
      ],
      "webusb-test.js.headers": [
@@ -377823,7 +377832,7 @@
         []
        ],
        "openssl.py": [
-        "040fc3ac55b98432ac78a39ef2401e0b1c2b8871",
+        "87a8cc9cc783cd5471ce996b96dfe8737b6d03f9",
         []
        ],
        "pregenerated.py": [
@@ -379615,16 +379624,44 @@
      "2c510e2a7cad389be9b70df7f24f59f4928d0d88",
      []
     ],
+    "README.md": [
+     "6bdc582bbaac1126aeb274d23f38c4a1bad099d3",
+     []
+    ],
+    "four-colors.avif": [
+     "38ed02e69d14daa53a63f8120c2a6ff31fe368ce",
+     []
+    ],
+    "four-colors.gif": [
+     "d189e98900fd394405c5801123155b61cff2b93d",
+     []
+    ],
+    "four-colors.jpg": [
+     "f888e8e84455785b26e509120b074a1991225a2b",
+     []
+    ],
+    "four-colors.png": [
+     "2a8b31c426269996f0280d1c7d3033120cc93850",
+     []
+    ],
+    "four-colors.webp": [
+     "f7dd40bee9a6d4bbfcb3712c5524b264713dfba4",
+     []
+    ],
     "h264.mp4": [
      "e21fcba32c125fba820ffa2269013c612d2b78fc",
      []
     ],
+    "image-decoder-utils.js": [
+     "0e99031cb7a10db69d0f8c4009b73aff36bc62cd",
+     []
+    ],
     "pattern.png": [
      "85676f29ff5806a32ac6713e601fdcb71dd03777",
      []
     ],
     "utils.js": [
-     "168d3722048cab1e0a6c01b693df7e9a93593482",
+     "854efc3cd232be5082922021445631c590a823ab",
      []
     ],
     "vp9.mp4": [
@@ -414767,7 +414804,7 @@
       ]
      ],
      "display-first-line-001.html": [
-      "fd8501a06814e94db68a55243e02eef302456726",
+      "6a714629e0fda8d09621f66993f82c1a0d359f7f",
       [
        null,
        {}
@@ -423516,7 +423553,14 @@
       ]
      ],
      "first-letter-allowed-properties.html": [
-      "e4f5fe68f077cd4c700b46296e1ec5674ab4f76c",
+      "df1458888cb63e92185d9cbf1111779bb40cf573",
+      [
+       null,
+       {}
+      ]
+     ],
+     "first-line-allowed-properties.html": [
+      "57aab39d3757003239daee9c533fad0e731cfe17",
       [
        null,
        {}
@@ -464061,135 +464105,6 @@
       ]
      ]
     },
-    "cors-rfc1918": {
-     "idlharness.tentative.any.js": [
-      "1dad943072589a40fd3d685c7cb4f5201a3073d5",
-      [
-       "fetch/cors-rfc1918/idlharness.tentative.any.html",
-       {
-        "script_metadata": [
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "script",
-          "/resources/WebIDLParser.js"
-         ],
-         [
-          "script",
-          "/resources/idlharness.js"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "fetch/cors-rfc1918/idlharness.tentative.any.serviceworker.html",
-       {
-        "script_metadata": [
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "script",
-          "/resources/WebIDLParser.js"
-         ],
-         [
-          "script",
-          "/resources/idlharness.js"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "fetch/cors-rfc1918/idlharness.tentative.any.sharedworker.html",
-       {
-        "script_metadata": [
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "script",
-          "/resources/WebIDLParser.js"
-         ],
-         [
-          "script",
-          "/resources/idlharness.js"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ],
-      [
-       "fetch/cors-rfc1918/idlharness.tentative.any.worker.html",
-       {
-        "script_metadata": [
-         [
-          "global",
-          "window,worker"
-         ],
-         [
-          "script",
-          "/resources/WebIDLParser.js"
-         ],
-         [
-          "script",
-          "/resources/idlharness.js"
-         ],
-         [
-          "timeout",
-          "long"
-         ]
-        ],
-        "timeout": "long"
-       }
-      ]
-     ],
-     "non-secure-context.window.js": [
-      "8f49a5cbedda7ece8a598cb1c668abd90051fe65",
-      [
-       "fetch/cors-rfc1918/non-secure-context.window.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "resources/support.js"
-         ]
-        ]
-       }
-      ]
-     ],
-     "secure-context.https.window.js": [
-      "8ed028a390c19cddf75587910718b2d5867c318a",
-      [
-       "fetch/cors-rfc1918/secure-context.https.window.html",
-       {
-        "script_metadata": [
-         [
-          "script",
-          "resources/support.js"
-         ]
-        ]
-       }
-      ]
-     ]
-    },
     "cross-origin-resource-policy": {
      "fetch-in-iframe.html": [
       "cc6a3a81bcf4cbabfec265a1874442f53e7d8a30",
@@ -466233,6 +466148,13 @@
        {}
       ]
      ],
+     "serviceworker-accessors.https.sub.html": [
+      "03a8321d4cab5dc0e7005d1fb3ecfde95a4b9898",
+      [
+       null,
+       {}
+      ]
+     ],
      "serviceworker.https.sub.html": [
       "51bc7f29e593081bb2f1c959f36a78562a3bd833",
       [
@@ -466421,6 +466343,135 @@
       ]
      ]
     },
+    "private-network-access": {
+     "idlharness.tentative.any.js": [
+      "070de34c72a7f3beaa807c6b374dfd775ac7d2e0",
+      [
+       "fetch/private-network-access/idlharness.tentative.any.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/resources/WebIDLParser.js"
+         ],
+         [
+          "script",
+          "/resources/idlharness.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fetch/private-network-access/idlharness.tentative.any.serviceworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/resources/WebIDLParser.js"
+         ],
+         [
+          "script",
+          "/resources/idlharness.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fetch/private-network-access/idlharness.tentative.any.sharedworker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/resources/WebIDLParser.js"
+         ],
+         [
+          "script",
+          "/resources/idlharness.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ],
+      [
+       "fetch/private-network-access/idlharness.tentative.any.worker.html",
+       {
+        "script_metadata": [
+         [
+          "global",
+          "window,worker"
+         ],
+         [
+          "script",
+          "/resources/WebIDLParser.js"
+         ],
+         [
+          "script",
+          "/resources/idlharness.js"
+         ],
+         [
+          "timeout",
+          "long"
+         ]
+        ],
+        "timeout": "long"
+       }
+      ]
+     ],
+     "non-secure-context.window.js": [
+      "47e08e8b77962d871cf7bdfad18e26d6df619c35",
+      [
+       "fetch/private-network-access/non-secure-context.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "resources/support.js"
+         ]
+        ]
+       }
+      ]
+     ],
+     "secure-context.https.window.js": [
+      "0a706e6aabe805bbc7e662b5408ee49ea925fc60",
+      [
+       "fetch/private-network-access/secure-context.https.window.html",
+       {
+        "script_metadata": [
+         [
+          "script",
+          "resources/support.js"
+         ]
+        ]
+       }
+      ]
+     ]
+    },
     "range": {
      "general.any.js": [
       "80791c3847eac7501191b44e541d85f5b8f293b7",
@@ -535535,6 +535586,13 @@
         null,
         {}
        ]
+      ],
+      "popup-inheritance-about-blank.html": [
+       "c8e9a9c012a508f910f332332664121f90c0df5b",
+       [
+        null,
+        {}
+       ]
       ]
      },
      "link-rel-prefetch.html": [
@@ -536181,7 +536239,7 @@
      ]
     ],
     "entry-attributes.html": [
-     "78d05107162bb6c791dbf821073ef10f77402e9d",
+     "1aee1a3958b4fd111ba9695559217dab4093a1cf",
      [
       null,
       {}
@@ -562479,6 +562537,46 @@
       }
      ]
     ],
+    "image-decoder-image-orientation-none.html": [
+     "9c4e91bb915a114e1278a8c28a8d5aa58c0e8ba0",
+     [
+      null,
+      {}
+     ]
+    ],
+    "image-decoder.any.js": [
+     "f33a60a1f6ca28851a8d85d6ffbbc6c6566140a0",
+     [
+      "webcodecs/image-decoder.any.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/webcodecs/image-decoder-utils.js"
+        ]
+       ]
+      }
+     ],
+     [
+      "webcodecs/image-decoder.any.worker.html",
+      {
+       "script_metadata": [
+        [
+         "global",
+         "window,dedicatedworker"
+        ],
+        [
+         "script",
+         "/webcodecs/image-decoder-utils.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "video-decoder.any.js": [
      "48568c170fc6195d924ac2b14be85dff00d3709d",
      [
@@ -562602,7 +562700,7 @@
      ]
     ],
     "video-frame.any.js": [
-     "71a73c4ee3455001105f9a5d28d3e022246af018",
+     "07ab30c03272cca52611b211c42a79b27a02c80f",
      [
       "webcodecs/video-frame.any.html",
       {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
new file mode 100644
index 00000000000..baa9f1a7541
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-005.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-005.html]
+  [Miss clipped float]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-all-auto.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-all-auto.html.ini
new file mode 100644
index 00000000000..ded2ad80dd5
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-all-auto.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-all-auto.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-height-20.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-height-20.html.ini
new file mode 100644
index 00000000000..09c2baf44e0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-height-20.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-height-20.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-max-height-20.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-max-height-20.html.ini
new file mode 100644
index 00000000000..61d762f779d
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-max-height-20.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-max-height-20.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-max-width-40.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-max-width-40.html.ini
new file mode 100644
index 00000000000..abb65105ee6
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-max-width-40.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-max-width-40.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-height-20.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-height-20.html.ini
new file mode 100644
index 00000000000..661772b249d
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-height-20.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-min-height-20.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-height-40.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-height-40.html.ini
new file mode 100644
index 00000000000..7052899d424
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-height-40.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-min-height-40.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-width-40.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-width-40.html.ini
new file mode 100644
index 00000000000..5e1b95007de
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-width-40.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-min-width-40.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-width-80.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-width-80.html.ini
new file mode 100644
index 00000000000..056b92be881
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-min-width-80.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-min-width-80.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-width-40.html.ini b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-width-40.html.ini
new file mode 100644
index 00000000000..de09cd659e3
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/replaced-elements-width-40.html.ini
@@ -0,0 +1,2 @@
+[replaced-elements-width-40.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6f..f8e7e539aae 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index d1c4afc27d1..c495e1becc7 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
@@ -326,453 +326,3 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
-  [max-height length(ex) / values]
-    expected: FAIL
-
-  [max-height length(mm) / values]
-    expected: FAIL
-
-  [max-height length(cm) / values]
-    expected: FAIL
-
-  [max-height length(in) / values]
-    expected: FAIL
-
-  [max-height percentage(%) / values]
-    expected: FAIL
-
-  [max-width length(pt) / values]
-    expected: FAIL
-
-  [max-width length(pc) / values]
-    expected: FAIL
-
-  [max-width length(px) / values]
-    expected: FAIL
-
-  [max-width length(em) / values]
-    expected: FAIL
-
-  [max-width length(ex) / values]
-    expected: FAIL
-
-  [max-width length(mm) / values]
-    expected: FAIL
-
-  [max-width length(cm) / values]
-    expected: FAIL
-
-  [max-width length(in) / values]
-    expected: FAIL
-
-  [max-width percentage(%) / values]
-    expected: FAIL
-
-  [top length(pt) / values]
-    expected: FAIL
-
-  [top length(pc) / values]
-    expected: FAIL
-
-  [top length(px) / values]
-    expected: FAIL
-
-  [top length(em) / values]
-    expected: FAIL
-
-  [top length(ex) / values]
-    expected: FAIL
-
-  [top length(mm) / values]
-    expected: FAIL
-
-  [top length(cm) / values]
-    expected: FAIL
-
-  [top length(in) / values]
-    expected: FAIL
-
-  [top percentage(%) / values]
-    expected: FAIL
-
-  [right length(pt) / values]
-    expected: FAIL
-
-  [right length(pc) / values]
-    expected: FAIL
-
-  [right length(px) / values]
-    expected: FAIL
-
-  [right length(em) / values]
-    expected: FAIL
-
-  [right length(ex) / values]
-    expected: FAIL
-
-  [right length(mm) / values]
-    expected: FAIL
-
-  [right length(cm) / values]
-    expected: FAIL
-
-  [right length(in) / values]
-    expected: FAIL
-
-  [right percentage(%) / values]
-    expected: FAIL
-
-  [bottom length(pt) / values]
-    expected: FAIL
-
-  [bottom length(pc) / values]
-    expected: FAIL
-
-  [bottom length(px) / values]
-    expected: FAIL
-
-  [bottom length(em) / values]
-    expected: FAIL
-
-  [bottom length(ex) / values]
-    expected: FAIL
-
-  [bottom length(mm) / values]
-    expected: FAIL
-
-  [bottom length(cm) / values]
-    expected: FAIL
-
-  [bottom length(in) / values]
-    expected: FAIL
-
-  [bottom percentage(%) / values]
-    expected: FAIL
-
-  [left length(pt) / values]
-    expected: FAIL
-
-  [left length(pc) / values]
-    expected: FAIL
-
-  [left length(px) / values]
-    expected: FAIL
-
-  [left length(em) / values]
-    expected: FAIL
-
-  [left length(ex) / values]
-    expected: FAIL
-
-  [left length(mm) / values]
-    expected: FAIL
-
-  [left length(cm) / values]
-    expected: FAIL
-
-  [left length(in) / values]
-    expected: FAIL
-
-  [left percentage(%) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
new file mode 100644
index 00000000000..e38782d8c85
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
@@ -0,0 +1,4 @@
+[elementFromPoint-001.html]
+  [CSSOM View - 5 - extensions to the Document interface]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
deleted file mode 100644
index e181af5397f..00000000000
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-invalid-cases.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementsFromPoint-invalid-cases.html]
-  [The root element is the last element returned for otherwise empty queries within the viewport]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e274..00000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/dom/slot-recalc.html.ini b/tests/wpt/metadata/dom/slot-recalc.html.ini
new file mode 100644
index 00000000000..887763d3d5f
--- /dev/null
+++ b/tests/wpt/metadata/dom/slot-recalc.html.ini
@@ -0,0 +1,2 @@
+[slot-recalc.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 9b0256f93da..2ea13ffe823 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,6 +315,15 @@
   [<iframe>: combined response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html */*]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 5c001592859..258fe374697 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
+  [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/metadata/serviceworker-accessors.https.sub.html.ini b/tests/wpt/metadata/fetch/metadata/serviceworker-accessors.https.sub.html.ini
new file mode 100644
index 00000000000..2ed5e869c2f
--- /dev/null
+++ b/tests/wpt/metadata/fetch/metadata/serviceworker-accessors.https.sub.html.ini
@@ -0,0 +1,4 @@
+[serviceworker-accessors.https.sub.html]
+  [Sec-Fetch headers in Service Worker fetch handler.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/private-network-access/idlharness.tentative.any.js.ini b/tests/wpt/metadata/fetch/private-network-access/idlharness.tentative.any.js.ini
new file mode 100644
index 00000000000..fa327136024
--- /dev/null
+++ b/tests/wpt/metadata/fetch/private-network-access/idlharness.tentative.any.js.ini
@@ -0,0 +1,21 @@
+[idlharness.tentative.any.serviceworker.html]
+  expected: ERROR
+
+[idlharness.tentative.any.sharedworker.html]
+  expected: ERROR
+
+[idlharness.tentative.any.html]
+  [Document interface: attribute addressSpace]
+    expected: FAIL
+
+  [Document interface: document must inherit property "addressSpace" with the proper type]
+    expected: FAIL
+
+
+[idlharness.tentative.any.worker.html]
+  [WorkerGlobalScope interface: attribute addressSpace]
+    expected: FAIL
+
+  [WorkerGlobalScope interface: self must inherit property "addressSpace" with the proper type]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/private-network-access/non-secure-context.window.js.ini b/tests/wpt/metadata/fetch/private-network-access/non-secure-context.window.js.ini
new file mode 100644
index 00000000000..834261b53fe
--- /dev/null
+++ b/tests/wpt/metadata/fetch/private-network-access/non-secure-context.window.js.ini
@@ -0,0 +1,4 @@
+[non-secure-context.window.html]
+  [Public non secure page fetches local page.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
deleted file mode 100644
index 87b07c3e670..00000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
new file mode 100644
index 00000000000..75d75b4cda2
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_2.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
index 2532dceabac..442db3cb549 100644
--- a/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
+++ b/tests/wpt/metadata/html/browsers/windows/embedded-opener-remove-frame.html.ini
@@ -1,5 +1,4 @@
 [embedded-opener-remove-frame.html]
-  expected: CRASH
   [opener and "removed" embedded documents]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
index f4d11768961..d1ca01ebc5f 100644
--- a/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
+++ b/tests/wpt/metadata/html/interaction/focus/the-autofocus-attribute/supported-elements.html.ini
@@ -7,10 +7,10 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: TIMEOUT
 
   [Host element with delegatesFocus should support autofocus]
     expected: FAIL
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..5f60c78e73c 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
new file mode 100644
index 00000000000..9f416703229
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-3.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit-3.html]
+  [<button> should have the same double-submit protection as <input type=submit>]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
new file mode 100644
index 00000000000..b193c33c2b6
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit.html.ini
@@ -0,0 +1,4 @@
+[form-double-submit.html]
+  [default submit action should supersede onclick submit()]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index fa8395ff183..0d96c859d89 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -23,57 +23,42 @@
   [input type url: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type text: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type tel: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: select() a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionDirection a second time (must not fire select)]
+  [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: setSelectionRange() a second time (must not fire select)]
+  [input type text: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type url: selectionEnd out of range a second time (must not fire select)]
+  [input type search: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: selectionStart a second time (must not fire select)]
+  [input type tel: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type password: setRangeText() a second time (must not fire select)]
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: setSelectionRange() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionStart out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 01f7b72cbe7..0cef5158fae 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,6 +4,3 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
-  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html.ini b/tests/wpt/metadata/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html.ini
new file mode 100644
index 00000000000..f36329c8cda
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html.ini
@@ -0,0 +1,7 @@
+[popup-inheritance-about-blank.html]
+  [The fetch() API in an about:blank popup with a custom URL referrer is fetched with a 'Referer` header that uses the outer document's URL along with its referrer policy]
+    expected: FAIL
+
+  [The value of document.referrer in an about:blank popup is the outer document's full URL, regardless of referrer policy]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
index 73e64ebba8c..022df1a3dcb 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-audiobuffersourcenode-interface/sub-sample-buffer-stitching.html.ini
@@ -824,3 +824,15 @@
   [# AUDIT TASK RUNNER FINISHED: 2 out of 2 tasks were failed.]
     expected: FAIL
 
+  [X Stitched sine-wave buffers at sample rate 44100 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.000090957,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[15240\]\t1.0525508072630054e-31\t3.3531737327575684e-1\t3.3531737327575684e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\t[15241\]\t4.5612265013772796e-41\t3.9367997646331787e-1\t3.9367997646331787e-1\t1.0000000000000000e+0\t9.0957000000000003e-5\n\tMax AbsError of 3.9367997646331787e-1 at index of 15241.\n\tMax RelError of 1.0000000000000000e+0 at index of 15240.\n]
+    expected: FAIL
+
+  [X SNR (49.1621200615592 dB) is not greater than or equal to 85.58. Got 49.1621200615592.]
+    expected: FAIL
+
+  [X Stitched sine-wave buffers at sample rate 43800 does not equal [0,0.06264832615852356,0.12505052983760834,0.18696144223213196,0.24813786149024963,0.308339387178421,0.36732959747314453,0.4248766601085663,0.480754554271698,0.5347436666488647,0.5866320133209229,0.6362156271934509,0.6832997798919678,0.7276994585990906,0.7692402601242065,0.8077589869499207...\] with an element-wise tolerance of {"absoluteThreshold":0.0038986,"relativeThreshold":0}.\n\tIndex\tActual\t\t\tExpected\t\tAbsError\t\tRelError\t\tTest threshold\n\t[7189\]\t1.0841088339017911e-31\t-9.8956179618835449e-1\t9.8956179618835449e-1\t1.0000000000000000e+0\t3.8985999999999999e-3\n\t[7190\]\t-8.8409073650836945e-2\t-9.9664616584777832e-1\t9.0823709219694138e-1\t9.1129341918891205e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.8956179618835449e-1 at index of 7189.\n\tMax RelError of 1.0000000000000000e+0 at index of 7189.\n]
+    expected: FAIL
+
+  [X SNR (40.857403325570765 dB) is not greater than or equal to 65.737. Got 40.857403325570765.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
index 1af95add6bf..e71bce4c95c 100644
--- a/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
+++ b/tests/wpt/metadata/webdriver/tests/find_elements_from_shadow_root/user_prompts.py.ini
@@ -1,4 +1,5 @@
 [user_prompts.py]
+  expected: ERROR
   [test_accept_and_notify[capabilities0-prompt-\]]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-1-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-1-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-1-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-1-print.html
index 25e1c44c78b..abfe11fd3ea 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-1-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-1-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-10-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-10-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-10-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-10-print.html
index 3b1c13ee91d..b29e72fc377 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-10-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-10-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-11-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-11-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-11-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-11-print.html
index e4fed2afe3e..64409156ec0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-11-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-11-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-12-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-12-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-12-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-12-print.html
index 74e01baf54b..1f132e8d733 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-12-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-12-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-13-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-13-print.html
similarity index 87%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-13-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-13-print.html
index b91b27efdeb..3d3765fddb1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-13-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-13-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-8-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-8-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-14-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-14-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-14-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print.html
similarity index 87%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-14-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print.html
index 8d4d5b10579..f3b57e0d069 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-14-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-14-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-14-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-14-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-15-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-15-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-15-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print.html
similarity index 87%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-15-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print.html
index 88109bbcd16..655f70c39a2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-15-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-15-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-15-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-15-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-2-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-2-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-2-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-2-print.html
index 0f744520c07..3a32a357ad8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-2-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-2-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-3-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-3-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-3-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-3-print.html
index 7421667b5d6..8469e8acdbe 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-3-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-3-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-4-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-4-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-4-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-4-print.html
index 57c74da91be..a9566672e50 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-4-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-4-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-5-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-5-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-5-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-5-print.html
index c79952314d2..f525cf01dc8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-5-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-5-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-6-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-6-print.html
similarity index 87%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-6-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-6-print.html
index a66a8b25278..dc0ce687551 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-6-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-6-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-7-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-7-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-7-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-7-print.html
index 790f65027c7..0100b508fa8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-7-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-7-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-8-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-8-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-8-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-8-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print.html
index 66d7caa1cc4..ad67b69ab51 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-8-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-8-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-8-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-8-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-9-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-9-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-9-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-9-print.html
index 63e6a6e84f6..d6774410da8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-9-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-9-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-block-page-break-inside-avoid-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/block-page-break-inside-avoid-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-1-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-1-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-1-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-1-print.html
index 863598e2c12..b932b38ee85 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-1-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-1-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-2-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-2-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-2-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-2-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print.html
index da98a6e8a2d..0039ab51945 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-2-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-2-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-float-page-break-inside-avoid-2-print-ref.html">
+  <link rel="match" href="float-page-break-inside-avoid-2-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-3-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-3-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-3-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-3-print.html
index 98536cc9f13..56be8379f71 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-3-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-3-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-4-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-4-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-4-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-4-print.html
index 005adc6619d..e3793170bdd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-4-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-4-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-block-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="block-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-5-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-5-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-5-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print.html
similarity index 91%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-5-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print.html
index 856cd98674b..c818c9165b1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-5-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-5-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-float-page-break-inside-avoid-5-print-ref.html">
+  <link rel="match" href="float-page-break-inside-avoid-5-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-6-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-6-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-6-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-6-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print.html
index b8642fe5686..1b53472ba88 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-6-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-6-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-float-page-break-inside-avoid-6-print-ref.html">
+  <link rel="match" href="float-page-break-inside-avoid-6-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print.html
index 1a80825c523..595a3aca45b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-7-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-float-page-break-inside-avoid-7-print-ref.html">
+  <link rel="match" href="float-page-break-inside-avoid-7-print-ref.html">
   <meta name="flags" content="paged"><style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
 html,body {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print.html
index 83806d551e2..45c19878f9a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-8-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-float-page-break-inside-avoid-8-print-ref.html">
+  <link rel="match" href="float-page-break-inside-avoid-8-print-ref.html">
   <meta name="flags" content="paged"><style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
 html,body {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print.html
similarity index 91%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print.html
index 8a601fa6d84..c32597bb215 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-9-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/float-page-break-inside-avoid-9-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-float-page-break-inside-avoid-9-print-ref.html">
+  <link rel="match" href="float-page-break-inside-avoid-9-print-ref.html">
   <meta name="flags" content="paged"><style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
 html,body {
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-inline-page-break-inside-avoid-1-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-inline-page-break-inside-avoid-1-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-inline-page-break-inside-avoid-1-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-inline-page-break-inside-avoid-1-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print.html
index 7993051103c..a7555890b8a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-inline-page-break-inside-avoid-1-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/inline-page-break-inside-avoid-1-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-inline-page-break-inside-avoid-1-print-ref.html">
+  <link rel="match" href="inline-page-break-inside-avoid-1-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-1-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-1-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-1-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-1-print.html
index 64793ae1056..ba84330bd58 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-1-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-1-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html">
+  <link rel="match" href="rowgroup-page-break-inside-avoid-5-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-2-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-2-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-2-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-2-print.html
index bad70cedcdb..1f4b24e4fb7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-row-page-break-inside-avoid-2-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/row-page-break-inside-avoid-2-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html">
+  <link rel="match" href="rowgroup-page-break-inside-avoid-5-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-1-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-1-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-1-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-1-print.html
index e3b4be6c7a0..b13bf2e623f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-1-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-1-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-2-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-2-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-2-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-2-print.html
index 0d05e60fcd8..947412d0d0c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-2-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-2-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-3-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-3-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-3-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-3-print.html
index 3a238673b6c..5efba525ff8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-3-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-3-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print.html
index d3d65813e6d..38290b0f27f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-4-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-4-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-4-print-ref.html">
+  <link rel="match" href="rowgroup-page-break-inside-avoid-4-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print.html
index 1e5a5f63eb7..ea6e722b9d7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-5-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-5-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html">
+  <link rel="match" href="rowgroup-page-break-inside-avoid-5-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-6-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-6-print.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-6-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-6-print.html
index 683d9922436..41e6d477f32 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-6-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-6-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-5-print-ref.html">
+  <link rel="match" href="rowgroup-page-break-inside-avoid-5-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print.html
index 0c4b35b9035..4a6bba180bb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-7-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-7-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-7-print-ref.html">
+  <link rel="match" href="rowgroup-page-break-inside-avoid-7-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print.html
index 8cde0d5aa5b..fbb8a1218c9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-rowgroup-page-break-inside-avoid-8-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/rowgroup-page-break-inside-avoid-8-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-rowgroup-page-break-inside-avoid-8-print-ref.html">
+  <link rel="match" href="rowgroup-page-break-inside-avoid-8-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-1-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-1-print.html
similarity index 87%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-1-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-1-print.html
index ea4ded5d1bf..f5a2e43ff67 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-1-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-1-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-2-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-2-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-2-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print.html
similarity index 89%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-2-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print.html
index 14e529e12a9..418561d904e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-2-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-2-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-2-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-2-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-3-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-3-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-3-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-3-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print.html
index bd236d1adf5..c5a6be6bf11 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-3-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-3-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-3-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-3-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-4-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-4-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-4-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-4-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print.html
index 0c22aff7a0d..8836b100681 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-4-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-4-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-4-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-4-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-5-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-5-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-5-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print.html
similarity index 90%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-5-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print.html
index a1a9c5844fb..dd3d2c42f7c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-5-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-5-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-5-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-5-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-6-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-6-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-6-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-6-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print.html
index 622129945ce..3d327d9d00d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-6-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-6-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-6-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-6-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-7-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-7-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-7-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-7-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print.html
index 1248e747091..bb85d62ce8d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-7-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-7-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-7-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-7-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-8-print.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-8-print.html
similarity index 88%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-8-print.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-8-print.html
index c1740f2c63c..f100a1b50a8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-8-print.html
+++ b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-8-print.html
@@ -4,7 +4,7 @@
   <title>CSS Test: CSS 2.1 page-break-inside:avoid</title>
   <link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=685012">
   <link rel="help" href="http://www.w3.org/TR/CSS21/page.html#propdef-page-break-inside">
-  <link rel="match" href="moz-css21-table-page-break-inside-avoid-6-print-ref.html">
+  <link rel="match" href="table-page-break-inside-avoid-6-print-ref.html">
   <meta name="flags" content="paged">
 <style type="text/css">
 @page { size:5in 3in; margin:0.5in; }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-print-ref.html b/tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-table-page-break-inside-avoid-print-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/pagination/table-page-break-inside-avoid-print-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto-ref.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-all-auto.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-all-auto.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20-ref.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-height-20.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-height-20.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-height-20.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-height-20.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-height-20.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-height-20.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-width-40.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-width-40.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-max-width-40.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-max-width-40.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-20.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-20.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-20.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-20.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40-ref.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-height-40.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-height-40.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-40.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-40.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-40.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-40.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80-ref.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-min-width-80.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-min-width-80.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40-ref.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40-ref.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40.html b/tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/replaced-elements-width-40.html
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/replaced-elements-width-40.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/height-25-no-ratio.svg b/tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-no-ratio.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/height-25-no-ratio.svg
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-no-ratio.svg
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/height-25-ratio-2.svg b/tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-ratio-2.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/height-25-ratio-2.svg
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-ratio-2.svg
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/height-25-width-50.svg b/tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-width-50.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/height-25-width-50.svg
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/support/height-25-width-50.svg
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/no-ratio.svg b/tests/wpt/web-platform-tests/css/CSS2/visudet/support/no-ratio.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/no-ratio.svg
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/support/no-ratio.svg
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/ratio-2.svg b/tests/wpt/web-platform-tests/css/CSS2/visudet/support/ratio-2.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/ratio-2.svg
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/support/ratio-2.svg
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/width-50-no-ratio.svg b/tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-no-ratio.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/width-50-no-ratio.svg
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-no-ratio.svg
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/width-50-ratio-2.svg b/tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-ratio-2.svg
similarity index 100%
rename from tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/css21/replaced-sizing/support/width-50-ratio-2.svg
rename to tests/wpt/web-platform-tests/css/CSS2/visudet/support/width-50-ratio-2.svg
diff --git a/tests/wpt/web-platform-tests/css/css-display/display-first-line-001.html b/tests/wpt/web-platform-tests/css/css-display/display-first-line-001.html
index fd8501a0681..6a714629e0f 100644
--- a/tests/wpt/web-platform-tests/css/css-display/display-first-line-001.html
+++ b/tests/wpt/web-platform-tests/css/css-display/display-first-line-001.html
@@ -23,20 +23,20 @@
 <div id="t7">First line is flex but not float.</div>
 <div id="t8">First line is not float or flex.</div>
 <script>
-  function getFistLetterDisplayFor(id) {
+  function getFirstLetterDisplayFor(id) {
     return window.getComputedStyle(document.getElementById(id), "::first-letter").display;
   }
-  function getFistLineDisplayFor(id) {
+  function getFirstLineDisplayFor(id) {
     return window.getComputedStyle(document.getElementById(id), "::first-line").display;
   }
   test(function() {
-    assert_equals(getFistLetterDisplayFor("t1"), "block");
-    assert_equals(getFistLetterDisplayFor("t2"), "block");
-    assert_equals(getFistLetterDisplayFor("t3"), "inline");
-    assert_equals(getFistLetterDisplayFor("t4"), "inline");
-    assert_equals(getFistLineDisplayFor("t5"), "inline");
-    assert_equals(getFistLineDisplayFor("t6"), "inline");
-    assert_equals(getFistLineDisplayFor("t7"), "inline");
-    assert_equals(getFistLineDisplayFor("t8"), "inline");
+    assert_equals(getFirstLetterDisplayFor("t1"), "block");
+    assert_equals(getFirstLetterDisplayFor("t2"), "block");
+    assert_equals(getFirstLetterDisplayFor("t3"), "inline");
+    assert_equals(getFirstLetterDisplayFor("t4"), "inline");
+    assert_equals(getFirstLineDisplayFor("t5"), "inline");
+    assert_equals(getFirstLineDisplayFor("t6"), "inline");
+    assert_equals(getFirstLineDisplayFor("t7"), "inline");
+    assert_equals(getFirstLineDisplayFor("t8"), "inline");
   }, "display of first-letter and first-line");
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html
index e5c7d994f6a..aaba4f92442 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-areas-overflowing-grid-container-003.html
@@ -4,7 +4,7 @@
 <link rel="author" title="Javier Fernandez" href="mailto:jfernandez@igalia.com">
 <link rel="help" href="https://drafts.csswg.org/css-grid/#grid-model">
 <link rel="help" href="https://drafts.csswg.org/css-overflow-3/#propdef-overflow">
-<link rel="match" href="reference/100x100-grey-box.html">
+<link rel="match" href="reference/100x100-grey-box-with-scrollbars.html">
 <meta name="assert" content="This test verifies that the scrollbars are shown on a grid with an item placed inside the boundaries of the grid container, if there are grid areas which exceed the grid container size.">
 <link href="/css/support/grid.css" rel="stylesheet">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-001.html
index b231c64be1d..6c4a71031f1 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-001.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-001.html
@@ -13,7 +13,9 @@
        grid: 100px / 100px;
        width: 100px;
        height: 100px;
+       box-sizing: border-box;
        padding: 0 50px 50px 0;
+       overflow: auto;
     }
 </style>
 <p>The test passes if you see a grey square below and both scrollbars are visible.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-002.html b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-002.html
index e3b4cd95296..88bce26a982 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-002.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-model/grid-overflow-padding-002.html
@@ -13,6 +13,7 @@
        grid: 120px / 120px;
        width: 100px;
        height: 100px;
+       box-sizing: border-box;
        padding: 10px 20px 20px 10px;
        overflow: auto;
     }
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-allowed-properties.html b/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-allowed-properties.html
index e4f5fe68f07..df1458888cb 100644
--- a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-allowed-properties.html
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-allowed-properties.html
@@ -56,6 +56,7 @@ var validProperties = {
 };
 
 var invalidProperties = {
+  position: 'absolute',
   transition: 'transform 1s',
   transform: 'rotate(45deg)',
   wordBreak: 'break-all'
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-line-allowed-properties.html b/tests/wpt/web-platform-tests/css/css-pseudo/first-line-allowed-properties.html
new file mode 100644
index 00000000000..57aab39d375
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/first-line-allowed-properties.html
@@ -0,0 +1,83 @@
+<!DOCTYPE html>
+<title>CSS Test: Properties allowed on ::first-line pseudo elements</title>
+<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#first-line-styling">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target::first-line {}
+  #target { visibility: hidden; }
+</style>
+<div id="target">text</div>
+<script>
+  let style;
+  const target = document.querySelector("#target");
+  const defaultComputedStyle = getComputedStyle(target);
+
+  test(() => {
+    var styleRule = document.styleSheets[0].cssRules[0];
+    assert_equals(styleRule.selectorText, "#target::first-line", "make sure we have the correct style rule");
+    style = styleRule.style;
+  }, "retrieve style rule");
+
+  const validProperties = {
+    backgroundAttachment: "fixed",
+    backgroundBlendMode: "hue",
+    backgroundClip: "padding-box",
+    backgroundColor: "rgb(10, 20, 30)",
+    backgroundImage: "linear-gradient(rgb(0, 0, 0), rgb(255, 255, 255))",
+    backgroundOrigin: "border-box",
+    backgroundPosition: "50% 50%",
+    backgroundRepeat: "no-repeat",
+    backgroundSize: "10px 20px",
+    color: "rgba(10, 20, 30, 0.4)",
+    fontFamily: "sans-serif",
+    fontFeatureSettings: '"vert" 2',
+    fontKerning: "none",
+    fontSize: "30px",
+    fontSizeAdjust: "0.5",
+    fontStyle: "italic",
+    fontVariant: "small-caps",
+    fontWeight: "900",
+    fontVariationSettings: '"XHGT" 0.7',
+    letterSpacing: "12px",
+    opacity: "0.5",
+    textDecoration: "overline wavy rgb(10, 20, 30)",
+    textJustify: "none",
+    textShadow: "rgb(10, 20, 30) 10px 20px 30px",
+    textTransform: "capitalize",
+    textUnderlinePosition: "under",
+    verticalAlign: "12%",
+    wordSpacing: "12px"
+  };
+
+  const invalidProperties = {
+    border: "40px dotted rgb(10, 20, 30)",
+    borderImage: "linear-gradient(rgb(0, 0, 0), rgb(255, 255, 255)) 10% / 20 / 30px repeat",
+    borderRadius: "10px 20px",
+    margin: "10px 20px 30px 40px",
+    padding: "10px 20px 30px 40px",
+    position: "absolute",
+    transition: "transform 1s",
+    transform: "rotate(45deg)",
+    wordBreak: "break-all"
+  };
+
+  function testFirstLineProperty(property, rule, expected, reason) {
+    test(function() {
+      style[property] = "";
+      style[property] = rule;
+      assert_equals(getComputedStyle(target, "::first-line")[property], expected);
+      style[property] = "";
+    }, reason);
+  }
+
+  for (let property in validProperties) {
+    testFirstLineProperty(property, validProperties[property], validProperties[property],
+                            property + " should be applied to first-line pseudo elements.");
+  }
+
+  for (let property in invalidProperties) {
+    testFirstLineProperty(property, invalidProperties[property], defaultComputedStyle[property],
+                            property + " should not be applied to first-line pseudo elements.");
+  }
+</script>
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/making-a-testing-plan.md b/tests/wpt/web-platform-tests/docs/writing-tests/making-a-testing-plan.md
index 520c5a32e07..fc6604a8e5b 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/making-a-testing-plan.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/making-a-testing-plan.md
@@ -381,13 +381,14 @@ all), you can review the contents of the `fetch/` directory in WPT. Here's how
 that looks on a UNIX-like command line:
 
     $ ls fetch
-    api/                           data-urls/   range/
-    content-encoding/              http-cache/  README.md
-    content-length/                images/      redirect-navigate/
-    content-type/                  metadata/    security/
-    corb/                          META.yml     stale-while-revalidate/
-    cors-rfc1918/                  nosniff/
-    cross-origin-resource-policy/  origin/
+    api/                           DIR_METADATA  OWNERS
+    connection-pool/               h1-parsing/   private-network-access/
+    content-encoding/              http-cache/   range/
+    content-length/                images/       README.md
+    content-type/                  metadata/     redirect-navigate/
+    corb/                          META.yml      redirects/
+    cross-origin-resource-policy/  nosniff/      security/
+    data-urls/                     origin/       stale-while-revalidate/
 
 This test is for a behavior directly exposed through the API, so we should look
 in the `api/` directory:
diff --git a/tests/wpt/web-platform-tests/dom/slot-recalc-ref.html b/tests/wpt/web-platform-tests/dom/slot-recalc-ref.html
new file mode 100644
index 00000000000..521eedb42a0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/slot-recalc-ref.html
@@ -0,0 +1,5 @@
+<!DOCTYPE html>
+<div>
+  <p>there should be more text below this</p>
+  <p>PASS if this text is visible</p>
+</div>
diff --git a/tests/wpt/web-platform-tests/dom/slot-recalc.html b/tests/wpt/web-platform-tests/dom/slot-recalc.html
new file mode 100644
index 00000000000..5124336ad27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/dom/slot-recalc.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="Joey Arhar" href="mailto:jarhar@chromium.org">
+<link rel="help" href="https://bugs.chromium.org/p/chromium/issues/detail?id=1184357">
+
+<link rel="match" href="/dom/slot-recalc-ref.html">
+
+<body>
+<script>
+const host = document.createElement('div');
+document.body.appendChild(host);
+const root = host.attachShadow({mode: 'open'});
+
+const slot = document.createElement('slot');
+slot.innerHTML = `<p>there should be more text below this</p>`;
+root.appendChild(slot);
+
+onload = () => {
+  const shouldBeVisible = document.createElement('p');
+  shouldBeVisible.textContent = 'PASS if this text is visible';
+  slot.appendChild(shouldBeVisible);
+};
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/README.md b/tests/wpt/web-platform-tests/fetch/cors-rfc1918/README.md
deleted file mode 100644
index 5ee9c8a01e8..00000000000
--- a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# CORS-RFC1918 tests
-
-This directory contains tests for CORS-RFC1918's integration with Fetch.
-
-See also:
-
-* [The specification](https://wicg.github.io/cors-rfc1918/)
-* [The repository](https://github.com/WICG/cors-rfc1918/)
-* [Open issues](https://github.com/WICG/cors-rfc1918/issues/)
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors-frame.html b/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors-frame.html
new file mode 100644
index 00000000000..98798025005
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors-frame.html
@@ -0,0 +1,3 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Page Title</title>
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors.sw.js b/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors.sw.js
new file mode 100644
index 00000000000..36c55a77860
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/metadata/resources/serviceworker-accessors.sw.js
@@ -0,0 +1,14 @@
+addEventListener("fetch", event => {
+  event.waitUntil(async function () {
+    if (!event.clientId) return;
+    const client = await clients.get(event.clientId);
+    if (!client) return;
+
+    client.postMessage({
+      "dest": event.request.headers.get("sec-fetch-dest"),
+      "mode": event.request.headers.get("sec-fetch-mode"),
+      "site": event.request.headers.get("sec-fetch-site"),
+      "user": event.request.headers.get("sec-fetch-user")
+    });
+  }());
+});
diff --git a/tests/wpt/web-platform-tests/fetch/metadata/serviceworker-accessors.https.sub.html b/tests/wpt/web-platform-tests/fetch/metadata/serviceworker-accessors.https.sub.html
new file mode 100644
index 00000000000..03a8321d4ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/metadata/serviceworker-accessors.https.sub.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<!--
+  This test verifies that Fetch Metadata headers are not exposed to Service
+  Workers via the request's `headers` accessor.
+-->
+<meta charset="utf-8"/>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=/fetch/metadata/resources/helper.js></script>
+<script src=/service-workers/service-worker/resources/test-helpers.sub.js></script>
+<script src=/common/utils.js></script>
+<script>
+  const SCOPE = 'resources/serviceworker-accessors-frame.html';
+  const SCRIPT = 'resources/serviceworker-accessors.sw.js';
+
+  function assert_headers_not_seen_in_service_worker(frame) {
+    return new Promise((resolve, reject) => {
+      frame.contentWindow.fetch(SCOPE, {mode:'no-cors'});
+      frame.contentWindow.navigator.serviceWorker.addEventListener('message', e => {
+        assert_header_equals(e.data, {
+          "dest": null,
+          "mode": null,
+          "site": null,
+          "user": null
+        });
+        resolve();
+      });
+    });
+  }
+
+  promise_test(async function(t) {
+    const reg = await service_worker_unregister_and_register(t, SCRIPT, SCOPE);
+
+    t.add_cleanup(async () => {
+      if (reg)
+        await reg.unregister();
+    });
+
+    await wait_for_state(t, reg.installing, 'activated');
+
+    const frame = await with_iframe(SCOPE);
+    t.add_cleanup(async () => {
+      if (frame)
+        frame.remove();
+    });
+
+    // Trigger a fetch that will go through the service worker, and validate
+    // the visible headers.
+    await assert_headers_not_seen_in_service_worker(frame);
+  }, 'Sec-Fetch headers in Service Worker fetch handler.');
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/META.yml b/tests/wpt/web-platform-tests/fetch/private-network-access/META.yml
similarity index 58%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/META.yml
rename to tests/wpt/web-platform-tests/fetch/private-network-access/META.yml
index 6a7359c01bb..50fab067a43 100644
--- a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/META.yml
+++ b/tests/wpt/web-platform-tests/fetch/private-network-access/META.yml
@@ -1,4 +1,4 @@
-spec: https://wicg.github.io/cors-rfc1918/
+spec: https://wicg.github.io/private-network-access/
 suggested_reviewers:
   - letitz
   - hemeryar
diff --git a/tests/wpt/web-platform-tests/fetch/private-network-access/README.md b/tests/wpt/web-platform-tests/fetch/private-network-access/README.md
new file mode 100644
index 00000000000..a69aab48723
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/private-network-access/README.md
@@ -0,0 +1,10 @@
+# Private Network Access tests
+
+This directory contains tests for Private Network Access' integration with
+the Fetch specification.
+
+See also:
+
+* [The specification](https://wicg.github.io/private-network-access/)
+* [The repository](https://github.com/WICG/private-network-access/)
+* [Open issues](https://github.com/WICG/private-network-access/issues/)
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/idlharness.tentative.any.js b/tests/wpt/web-platform-tests/fetch/private-network-access/idlharness.tentative.any.js
similarity index 89%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/idlharness.tentative.any.js
rename to tests/wpt/web-platform-tests/fetch/private-network-access/idlharness.tentative.any.js
index 1dad9430725..070de34c72a 100644
--- a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/idlharness.tentative.any.js
+++ b/tests/wpt/web-platform-tests/fetch/private-network-access/idlharness.tentative.any.js
@@ -5,7 +5,7 @@
 
 'use strict';
 
-// https://wicg.github.io/cors-rfc1918/
+// https://wicg.github.io/private-network-access/
 
 idl_test(
   ['cors-rfc1918'],
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/non-secure-context.window.js b/tests/wpt/web-platform-tests/fetch/private-network-access/non-secure-context.window.js
similarity index 93%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/non-secure-context.window.js
rename to tests/wpt/web-platform-tests/fetch/private-network-access/non-secure-context.window.js
index 8f49a5cbedd..47e08e8b779 100644
--- a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/non-secure-context.window.js
+++ b/tests/wpt/web-platform-tests/fetch/private-network-access/non-secure-context.window.js
@@ -1,6 +1,6 @@
 // META: script=resources/support.js
 //
-// Spec: https://wicg.github.io/cors-rfc1918/#integration-fetch
+// Spec: https://wicg.github.io/private-network-access/#integration-fetch
 //
 // This file covers only those tests that must execute in a non secure context.
 // Other tests are defined in: secure-context.window.js
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/support.js b/tests/wpt/web-platform-tests/fetch/private-network-access/resources/support.js
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/support.js
rename to tests/wpt/web-platform-tests/fetch/private-network-access/resources/support.js
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html b/tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.html
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html
rename to tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.html
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers b/tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.html.headers
rename to tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.html.headers
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html b/tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html
rename to tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.https.html
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers b/tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.https.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/resources/treat-as-public-address.https.html.headers
rename to tests/wpt/web-platform-tests/fetch/private-network-access/resources/treat-as-public-address.https.html.headers
diff --git a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/secure-context.https.window.js b/tests/wpt/web-platform-tests/fetch/private-network-access/secure-context.https.window.js
similarity index 93%
rename from tests/wpt/web-platform-tests/fetch/cors-rfc1918/secure-context.https.window.js
rename to tests/wpt/web-platform-tests/fetch/private-network-access/secure-context.https.window.js
index 8ed028a390c..0a706e6aabe 100644
--- a/tests/wpt/web-platform-tests/fetch/cors-rfc1918/secure-context.https.window.js
+++ b/tests/wpt/web-platform-tests/fetch/private-network-access/secure-context.https.window.js
@@ -1,6 +1,6 @@
 // META: script=resources/support.js
 //
-// Spec: https://wicg.github.io/cors-rfc1918/#integration-fetch
+// Spec: https://wicg.github.io/private-network-access/#integration-fetch
 //
 // This file covers only those tests that must execute in a secure context.
 // Other tests are defined in: non-secure-context.window.js
diff --git a/tests/wpt/web-platform-tests/interfaces/SRI.idl b/tests/wpt/web-platform-tests/interfaces/SRI.idl
deleted file mode 100644
index 78f916fe64d..00000000000
--- a/tests/wpt/web-platform-tests/interfaces/SRI.idl
+++ /dev/null
@@ -1,12 +0,0 @@
-// GENERATED CONTENT - DO NOT EDIT
-// Content was automatically extracted by Reffy into webref
-// (https://github.com/w3c/webref)
-// Source: Subresource Integrity (https://w3c.github.io/webappsec-subresource-integrity/)
-
-partial interface HTMLLinkElement {
-  attribute DOMString integrity;
-};
-
-partial interface HTMLScriptElement {
-  attribute DOMString integrity;
-};
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 6e1a4a133d7..f6789644339 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -469,7 +469,6 @@ interface HTMLObjectElement : HTMLElement {
   [CEReactions] attribute USVString data;
   [CEReactions] attribute DOMString type;
   [CEReactions] attribute DOMString name;
-  [CEReactions] attribute DOMString useMap;
   readonly attribute HTMLFormElement? form;
   [CEReactions] attribute DOMString width;
   [CEReactions] attribute DOMString height;
@@ -2526,6 +2525,7 @@ partial interface HTMLObjectElement {
   [CEReactions] attribute unsigned long vspace;
   [CEReactions] attribute DOMString codeBase;
   [CEReactions] attribute DOMString codeType;
+  [CEReactions] attribute DOMString useMap;
 
   [CEReactions] attribute [LegacyNullToEmptyString] DOMString border;
 };
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html
new file mode 100644
index 00000000000..c8e9a9c012a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/popup-inheritance-about-blank.html
@@ -0,0 +1,105 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Referrer Policy: popup src="about:blank"</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<meta name="referrer" content="origin">
+<body>
+<script>
+const testFetchClientReferrer =
+  async_test("The fetch() API in an about:blank popup with the 'client' " +
+             "referrer is fetched with no 'Referer' header");
+const testFetchURLReferrer =
+  async_test("The fetch() API in an about:blank popup with a custom URL " +
+             "referrer is fetched with a 'Referer` header that uses the " +
+             "outer document's URL along with its referrer policy");
+const testDocumentReferrer =
+  async_test("The value of document.referrer in an about:blank popup is the " +
+             "outer document's full URL, regardless of referrer policy");
+const testSubresource =
+  async_test("A subresource fetched from an about:blank popup is fetched " +
+             "with no 'Referer' header");
+
+window.addEventListener("message", msg => {
+  const test_name = msg.data.test;
+  const referrer = msg.data.referrer;
+  if (test_name === "testFetchClientReferrer") {
+    // Because the URL of the document of the popup opened through
+    // `window.open()` is "about:blank", the stripped URL is no referrer:
+    // https://w3c.github.io/webappsec-referrer-policy/#strip-url.
+    testFetchClientReferrer.step_func_done(() => {
+      assert_equals(referrer, undefined);
+    })();
+  } else if (test_name === "testFetchURLReferrer") {
+    // The "about:blank" popup inherits its opener's referrer policy.
+    // Note: Setting an explicit URL as referrer is allowed per spec because the
+    // same-origin check at https://fetch.spec.whatwg.org/#dom-request is done
+    // against the popup's origin, which inherits the opener document's origin.
+    testFetchURLReferrer.step_func_done(() => {
+      assert_equals(referrer, location.origin + '/');
+    })();
+  } else if (test_name === "testDocumentReferrer") {
+    // The referrer of the initial document in an about:blank popup is set to
+    // its creating document's URL, unredacted by a referrer policy, as per step
+    // 17 of:
+    // https://html.spec.whatwg.org/multipage/browsers.html#creating-a-new-browsing-context.
+    testDocumentReferrer.step_func_done(() => {
+      assert_equals(referrer, location.href);
+    })();
+  } else if (test_name === "testSubresource") {
+    // Because the URL of the document of the popup is "about:blank", the
+    // stripped URL is no referrer:
+    // https://w3c.github.io/webappsec-referrer-policy/#strip-url.
+    //
+    // Note: this test is essentially the same as "testFetchClientReferrer" (the
+    // only difference is that the fetch is not initiated by javascript).
+    // Compared to the other test, we expect the empty string here instead of
+    // `undefined` just because of a testing quirk.
+    testSubresource.step_func_done(() => {
+      assert_equals(referrer, "");
+    })();
+  }
+});
+
+const popup = window.open();
+const script = popup.document.createElement('script');
+
+script.textContent = `
+  // Test fetch() API with default "client" referrer.
+  fetch("${location.origin}/common/security-features/subresource/xhr.py?name=testFetchClientReferrer")
+    .then(r => r.json())
+    .then(j => {
+        opener.postMessage({test: "testFetchClientReferrer", referrer: j.headers.referer}, "*")
+      }).catch(e => {
+        opener.postMessage({test: "testFetchClientReferrer", referrer: "FAILURE"}, "*");
+      });
+
+  // Test fetch() API with custom URL referrer.
+  fetch("${location.origin}/common/security-features/subresource/xhr.py?name=URL",
+      {referrer: "${location.href}/custom"})
+    .then(r => r.json())
+    .then(j => {
+        opener.postMessage({test: "testFetchURLReferrer", referrer: j.headers.referer}, "*")
+      }).catch(e => {
+        opener.postMessage({test: "testFetchURLReferrer", referrer: "FAILURE"}, "*");
+      });
+
+  // Test document.referrer.
+  opener.postMessage({test: "testDocumentReferrer", referrer: document.referrer}, "*");
+
+  // Test a subresource being fetched by the popup.
+  // This is practicallty the same as the first test: the only difference is
+  // that here the fetch is not triggered by a javascript fetch function but by
+  // a script element with a src tag embedded in the html source.
+  const subresource_script = document.createElement('script');
+  subresource_script.src = "${location.origin}/common/security-features/subresource/referrer.py";
+  subresource_script.onload = e => {
+    opener.postMessage({test: "testSubresource", referrer: window.referrer}, "*");
+  }
+  subresource_script.onerror = function(e) {
+    opener.postMessage({test: "testSubresource", referrer: "FAILURE"}, "*");
+  };
+  document.head.appendChild(subresource_script);
+`;
+popup.document.body.appendChild(script);
+</script>
diff --git a/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html b/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html
index 78d05107162..1aee1a3958b 100644
--- a/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html
+++ b/tests/wpt/web-platform-tests/resource-timing/entry-attributes.html
@@ -17,6 +17,35 @@ function load_image(path) {
   });
 }
 
+function assert_ordered(entry, attributes) {
+  let before = attributes[0];
+  attributes.slice(1).forEach(after => {
+    assert_greater_than_equal(entry[after], entry[before],
+      `${after} should be greater than ${before}`);
+    before = after;
+  });
+}
+
+function assert_zeroed(entry, attributes) {
+  attributes.forEach(attribute => {
+    assert_equals(entry[attribute], 0, `${attribute} should be 0`);
+  });
+}
+
+function assert_not_negative(entry, attributes) {
+  attributes.forEach(attribute => {
+    assert_greater_than_equal(entry[attribute], 0,
+      `${attribute} should be greater than or equal to 0`);
+  });
+}
+
+function assert_positive(entry, attributes) {
+  attributes.forEach(attribute => {
+    assert_greater_than(entry[attribute], 0,
+      `${attribute} should be greater than 0`);
+  });
+}
+
 promise_test(async () => {
   // Clean up entries from scripts includes.
   performance.clearResourceTimings();
@@ -25,8 +54,38 @@ promise_test(async () => {
   if (entry_list.length != 1) {
     throw new Error("There should be one entry for one resource");
   }
-  assert_true(entry_list[0].name.includes('#hash=1'),
-      "There should be a hash in the resource name");
+  const entry = entry_list[0];
+  assert_true(entry.name.includes('#hash=1'),
+    "There should be a hash in the resource name");
+
+  assert_ordered(entry, [
+    "fetchStart",
+    "domainLookupStart",
+    "domainLookupEnd",
+    "connectStart",
+    "connectEnd",
+    "requestStart",
+    "responseStart",
+    "responseEnd",
+  ]);
+
+  assert_zeroed(entry, [
+    "workerStart",
+    "secureConnectionStart",
+    "redirectStart",
+    "redirectEnd",
+  ]);
+
+  assert_not_negative(entry, [
+    "duration",
+  ]);
+
+  assert_positive(entry, [
+    "fetchStart",
+    "transferSize",
+    "encodedBodySize",
+    "decodedBodySize",
+  ]);
 }, "URL fragments should be present in the 'name' attribute");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js b/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js
index f6a793dc956..5775c071b22 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js
@@ -206,17 +206,33 @@ class FakeDevice {
     return Promise.resolve({ success: true });
   }
 
-  claimInterface(interfaceNumber) {
+  async claimInterface(interfaceNumber) {
     assert_true(this.opened_);
     assert_false(this.currentConfiguration_ == null, 'device configured');
     assert_false(this.claimedInterfaces_.has(interfaceNumber),
                  'interface already claimed');
 
-    // Blink should never request an invalid interface.
-    assert_true(this.currentConfiguration_.interfaces.some(
-            iface => iface.interfaceNumber == interfaceNumber));
+    const protectedInterfaces = new Set([
+      mojom.USB_AUDIO_CLASS,
+      mojom.USB_HID_CLASS,
+      mojom.USB_MASS_STORAGE_CLASS,
+      mojom.USB_SMART_CARD_CLASS,
+      mojom.USB_VIDEO_CLASS,
+      mojom.USB_AUDIO_VIDEO_CLASS,
+      mojom.USB_WIRELESS_CLASS,
+    ]);
+
+    let iface = this.currentConfiguration_.interfaces.find(
+        iface => iface.interfaceNumber == interfaceNumber);
+    // Blink should never request an invalid interface or alternate.
+    assert_false(iface == undefined);
+    if (iface.alternates.some(
+            alt => protectedInterfaces.has(alt.interfaceClass))) {
+      return {result: mojom.UsbClaimInterfaceResult.kProtectedClass};
+    }
+
     this.claimedInterfaces_.set(interfaceNumber, 0);
-    return Promise.resolve({ success: true });
+    return {result: mojom.UsbClaimInterfaceResult.kSuccess};
   }
 
   releaseInterface(interfaceNumber) {
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
index 040fc3ac55b..87a8cc9cc78 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
@@ -318,7 +318,7 @@ class OpenSSLEnvironment(object):
             end_date_str = openssl("x509",
                                    "-noout",
                                    "-enddate",
-                                   "-in", cert_path).split("=", 1)[1].strip()
+                                   "-in", cert_path).decode("utf8").split("=", 1)[1].strip()
             # Not sure if this works in other locales
             end_date = datetime.strptime(end_date_str, "%b %d %H:%M:%S %Y %Z")
             time_buffer = timedelta(**CERT_EXPIRY_BUFFER)
diff --git a/tests/wpt/web-platform-tests/webcodecs/README.md b/tests/wpt/web-platform-tests/webcodecs/README.md
new file mode 100644
index 00000000000..6bdc582bbaa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/README.md
@@ -0,0 +1,41 @@
+# WebCodecs Test Files
+
+[TOC]
+
+## Instructions
+
+To add, update or remove a test file, please update the list below.
+
+Please provide full reference and steps to generate the test file so that
+any people can regenerate or update the file in the future.
+
+## List of Test Files
+
+### four-colors.png
+Generated using MSPaint like a true professional.
+
+### four-colors.avif
+Lossless encoding must be used to ensure colors are perfect.
+```
+avifenc -l four-colors.png -o four-colors.avif
+```
+
+### four-colors.webp
+Lossless encoding must be used to ensure colors are perfect.
+```
+ffmpeg -i four-colors.png -lossless 1 -y four-colors.webp
+```
+
+### four-colors.gif
+High quality encoding must be used to ensure colors are perfect.
+```
+cp four-colors.png four-colors2.png
+gifski -o four-colors.gif four-colors*.png
+```
+
+### four-colors.jpg
+Used [Sqoosh.app](https://squoosh.app/) with MozJPEG compression then used
+exiftool to add an orientation marker.
+```
+exiftool -Orientation=1 -n four-colors.jpg
+```
diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.avif b/tests/wpt/web-platform-tests/webcodecs/four-colors.avif
new file mode 100644
index 00000000000..38ed02e69d1
Binary files /dev/null and b/tests/wpt/web-platform-tests/webcodecs/four-colors.avif differ
diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.gif b/tests/wpt/web-platform-tests/webcodecs/four-colors.gif
new file mode 100644
index 00000000000..d189e98900f
Binary files /dev/null and b/tests/wpt/web-platform-tests/webcodecs/four-colors.gif differ
diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.jpg b/tests/wpt/web-platform-tests/webcodecs/four-colors.jpg
new file mode 100644
index 00000000000..f888e8e8445
Binary files /dev/null and b/tests/wpt/web-platform-tests/webcodecs/four-colors.jpg differ
diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.png b/tests/wpt/web-platform-tests/webcodecs/four-colors.png
new file mode 100644
index 00000000000..2a8b31c4262
Binary files /dev/null and b/tests/wpt/web-platform-tests/webcodecs/four-colors.png differ
diff --git a/tests/wpt/web-platform-tests/webcodecs/four-colors.webp b/tests/wpt/web-platform-tests/webcodecs/four-colors.webp
new file mode 100644
index 00000000000..f7dd40bee9a
Binary files /dev/null and b/tests/wpt/web-platform-tests/webcodecs/four-colors.webp differ
diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder-image-orientation-none.html b/tests/wpt/web-platform-tests/webcodecs/image-decoder-image-orientation-none.html
new file mode 100644
index 00000000000..9c4e91bb915
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/image-decoder-image-orientation-none.html
@@ -0,0 +1,46 @@
+<title>Test ImageDecoder outputs to a image-orientation: none canvas.</title>
+<canvas style="image-orientation: none"></canvas>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/webcodecs/image-decoder-utils.js"></script>
+<script>
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      1, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation top-left on canvas w/o orientation');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      2, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation top-right on canvas w/o orientation.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      3, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation bottom-right on canvas w/o orientation.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      4, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation bottom-left on canvas w/o orientation.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      5, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation left-top on canvas w/o orientation.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      6, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation right-top on canvas w/o orientation.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      7, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation right-bottom on canvas w/o orientation.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(
+      8, document.querySelector('canvas'));
+}, 'Test JPEG w/ EXIF orientation left-bottom on canvas w/o orientation.');
+</script>
diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder-utils.js b/tests/wpt/web-platform-tests/webcodecs/image-decoder-utils.js
new file mode 100644
index 00000000000..0e99031cb7a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/image-decoder-utils.js
@@ -0,0 +1,111 @@
+function toUInt32(pixelArray) {
+  let p = pixelArray.data;
+  return ((p[0] << 24) + (p[1] << 16) + (p[2] << 8) + p[3]) >>> 0;
+}
+
+function flipMatrix(m) {
+  return m.map(row => row.reverse());
+}
+
+function rotateMatrix(m, count) {
+  for (var i = 0; i < count; ++i)
+    m = m[0].map((val, index) => m.map(row => row[index]).reverse());
+  return m;
+}
+
+function testFourColorDecodeWithExifOrientation(orientation, canvas) {
+  return fetch('four-colors.jpg')
+      .then(response => {
+        return response.arrayBuffer();
+      })
+      .then(buffer => {
+        let u8buffer = new Uint8Array(buffer);
+        u8buffer[0x1F] = orientation;  // Location derived via diff.
+        let decoder = new ImageDecoder({data: u8buffer, type: 'image/jpeg'});
+        return decoder.decode();
+      })
+      .then(result => {
+        let respectOrientation = true;
+        if (canvas)
+          respectOrientation = canvas.style.imageOrientation != 'none';
+
+        let expectedWidth = 320;
+        let expectedHeight = 240;
+        if (orientation > 4 && respectOrientation)
+          [expectedWidth, expectedHeight] = [expectedHeight, expectedWidth];
+
+        if (respectOrientation) {
+          assert_equals(result.image.displayWidth, expectedWidth);
+          assert_equals(result.image.displayHeight, expectedHeight);
+        } else if (orientation > 4) {
+          assert_equals(result.image.displayHeight, expectedWidth);
+          assert_equals(result.image.displayWidth, expectedHeight);
+        }
+
+        if (!canvas) {
+          canvas = new OffscreenCanvas(
+              result.image.displayWidth, result.image.displayHeight);
+        } else {
+          canvas.width = expectedWidth;
+          canvas.height = expectedHeight;
+        }
+
+        let ctx = canvas.getContext('2d');
+        ctx.drawImage(result.image, 0, 0);
+
+        let matrix = [
+          [0xFFFF00FF, 0xFF0000FF],  // yellow, red
+          [0x0000FFFF, 0x00FF00FF],  // blue, green
+        ];
+        if (respectOrientation) {
+          switch (orientation) {
+            case 1:  // kOriginTopLeft, default
+              break;
+            case 2:  // kOriginTopRight, mirror along y-axis
+              matrix = flipMatrix(matrix);
+              break;
+            case 3:  // kOriginBottomRight, 180 degree rotation
+              matrix = rotateMatrix(matrix, 2);
+              break;
+            case 4:  // kOriginBottomLeft, mirror along the x-axis
+              matrix = flipMatrix(rotateMatrix(matrix, 2));
+              break;
+            case 5:  // kOriginLeftTop, mirror along x-axis + 270 degree CW
+                     // rotation
+              matrix = flipMatrix(rotateMatrix(matrix, 1));
+              break;
+            case 6:  // kOriginRightTop, 90 degree CW rotation
+              matrix = rotateMatrix(matrix, 1);
+              break;
+            case 7:  // kOriginRightBottom, mirror along x-axis + 90 degree CW
+                     // rotation
+              matrix = flipMatrix(rotateMatrix(matrix, 3));
+              break;
+            case 8:  // kOriginLeftBottom, 270 degree CW rotation
+              matrix = rotateMatrix(matrix, 3);
+              break;
+            default:
+              assert_between_inclusive(
+                  orientation, 1, 8, 'unknown image orientation');
+              break;
+          };
+        }
+
+        let expectedTopLeft = matrix[0][0];
+        let expectedTopRight = matrix[0][1];
+        let expectedBottomLeft = matrix[1][0];
+        let expectedBottomRight = matrix[1][1];
+
+        let topLeft = toUInt32(ctx.getImageData(0, 0, 1, 1));
+        let topRight = toUInt32(ctx.getImageData(expectedWidth - 1, 0, 1, 1));
+        let bottomLeft =
+            toUInt32(ctx.getImageData(0, expectedHeight - 1, 1, 1));
+        let bottomRight = toUInt32(
+            ctx.getImageData(expectedWidth - 1, expectedHeight - 1, 1, 1));
+
+        assert_equals(topLeft, expectedTopLeft, 'top left corner');
+        assert_equals(topRight, expectedTopRight, 'top right corner');
+        assert_equals(bottomLeft, expectedBottomLeft, 'bottom left corner');
+        assert_equals(bottomRight, expectedBottomRight, 'bottom right corner');
+      });
+}
diff --git a/tests/wpt/web-platform-tests/webcodecs/image-decoder.any.js b/tests/wpt/web-platform-tests/webcodecs/image-decoder.any.js
new file mode 100644
index 00000000000..f33a60a1f6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webcodecs/image-decoder.any.js
@@ -0,0 +1,87 @@
+// META: global=window,dedicatedworker
+// META: script=/webcodecs/image-decoder-utils.js
+
+function testFourColorsDecode(filename, mimeType) {
+  return fetch(filename)
+      .then(response => {
+        let decoder = new ImageDecoder({data: response.body, type: mimeType});
+        return decoder.decode();
+      })
+      .then(result => {
+        assert_equals(result.image.displayWidth, 320);
+        assert_equals(result.image.displayHeight, 240);
+
+        let canvas = new OffscreenCanvas(
+            result.image.displayWidth, result.image.displayHeight);
+        let ctx = canvas.getContext('2d');
+        ctx.drawImage(result.image, 0, 0);
+
+        let top_left = toUInt32(ctx.getImageData(0, 0, 1, 1));
+        assert_equals(top_left, 0xFFFF00FF, 'top left corner is yellow');
+
+        let top_right =
+            toUInt32(ctx.getImageData(result.image.displayWidth - 1, 0, 1, 1));
+        assert_equals(top_right, 0xFF0000FF, 'top right corner is red');
+
+        let bottom_left =
+            toUInt32(ctx.getImageData(0, result.image.displayHeight - 1, 1, 1));
+        assert_equals(bottom_left, 0x0000FFFF, 'bottom left corner is blue');
+
+        let left_corner = toUInt32(ctx.getImageData(
+            result.image.displayWidth - 1, result.image.displayHeight - 1, 1,
+            1));
+        assert_equals(left_corner, 0x00FF00FF, 'bottom right corner is green');
+      });
+}
+
+promise_test(t => {
+  return testFourColorsDecode('four-colors.jpg', 'image/jpeg');
+}, 'Test JPEG image decoding.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(1);
+}, 'Test JPEG w/ EXIF orientation top-left.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(2);
+}, 'Test JPEG w/ EXIF orientation top-right.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(3);
+}, 'Test JPEG w/ EXIF orientation bottom-right.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(4);
+}, 'Test JPEG w/ EXIF orientation bottom-left.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(5);
+}, 'Test JPEG w/ EXIF orientation left-top.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(6);
+}, 'Test JPEG w/ EXIF orientation right-top.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(7);
+}, 'Test JPEG w/ EXIF orientation right-bottom.');
+
+promise_test(t => {
+  return testFourColorDecodeWithExifOrientation(8);
+}, 'Test JPEG w/ EXIF orientation left-bottom.');
+
+promise_test(t => {
+  return testFourColorsDecode('four-colors.png', 'image/png');
+}, 'Test PNG image decoding.');
+
+promise_test(t => {
+  return testFourColorsDecode('four-colors.avif', 'image/avif');
+}, 'Test AVIF image decoding.');
+
+promise_test(t => {
+  return testFourColorsDecode('four-colors.webp', 'image/webp');
+}, 'Test WEBP image decoding.');
+
+promise_test(t => {
+  return testFourColorsDecode('four-colors.gif', 'image/gif');
+}, 'Test GIF image decoding.');
diff --git a/tests/wpt/web-platform-tests/webcodecs/utils.js b/tests/wpt/web-platform-tests/webcodecs/utils.js
index 168d3722048..854efc3cd23 100644
--- a/tests/wpt/web-platform-tests/webcodecs/utils.js
+++ b/tests/wpt/web-platform-tests/webcodecs/utils.js
@@ -1,11 +1,13 @@
-function makeImageBitmap(width, height) {
+function makeOffscreenCanvas(width, height) {
   let canvas = new OffscreenCanvas(width, height);
-
   let ctx = canvas.getContext('2d');
   ctx.fillStyle = 'rgba(50, 100, 150, 255)';
   ctx.fillRect(0, 0, width, height);
+  return canvas;
+}
 
-  return canvas.transferToImageBitmap();
+function makeImageBitmap(width, height) {
+  return makeOffscreenCanvas(width, height).transferToImageBitmap();
 }
 
 // Gives a chance to pending output and error callbacks to complete before
diff --git a/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js b/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js
index 71a73c4ee34..07ab30c0327 100644
--- a/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js
+++ b/tests/wpt/web-platform-tests/webcodecs/video-frame.any.js
@@ -446,3 +446,11 @@ test(t => {
 
   frame.close();
 }, 'Test VideoFrame constructed VideoFrame');
+
+test(t => {
+  let canvas = makeOffscreenCanvas(16, 16);
+  let frame = new VideoFrame(canvas);
+  assert_equals(frame.displayWidth, 16);
+  assert_equals(frame.displayHeight, 16);
+  frame.close();
+}, 'Test we can construct a VideoFrame from an offscreen canvas.');