diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
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-layout-2020/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata-layout-2020/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    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
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
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 4d6fa00d996..1a9022f0008 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,15 +315,24 @@
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: 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 ac4cbcba706..d2df9b78483 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
@@ -53,9 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
   [separate text/javascript x/x]
     expected: FAIL
 
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
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[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_3.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 51f8272a6de..dc2e45516de 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[traverse_the_history_5.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 9a85a905394..8e2a63e3b7f 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,4 +1,5 @@
 [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 d81ae5a4949..f45aaafe1c5 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
@@ -1,17 +1,16 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Element with tabindex should support autofocus]
     expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 5c3ac06f42a..09ae27d7480 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -171,3 +171,6 @@
   [XHTML img usemap="#hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 9eb581fcf1f..0407f0cc2b7 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_nonescaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index f4f994c5d6f..7a36937927c 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,5 +1,4 @@
 [iframe_sandbox_popups_nonescaping-3.html]
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata-layout-2020/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     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 b1afa3eb3f7..7c902c29509 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
@@ -191,3 +191,9 @@
   [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[28696\]\t-1.8581761986985164e-15\t9.3139332532882690e-1\t9.3139332532882879e-1\t1.0000000000000020e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882879e-1 at index of 28696.\n\tMax RelError of 1.0000000000000020e+0 at index of 28696.\n]
     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[28696\]\t4.3599933296234016e+28\t9.3139332532882690e-1\t4.3599933296234016e+28\t4.6811515726549934e+28\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 4.3599933296234016e+28 at index of 28696.\n\tMax RelError of 4.6811515726549934e+28 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-529.35563055275 dB) is not greater than or equal to 65.737. Got -529.35563055275.]
+    expected: FAIL
+
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
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
similarity index 100%
rename from tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
rename to tests/wpt/metadata-layout-2020/webmessaging/without-ports/017.html.ini
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index cb3490ccc6a..fc4f23802b9 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -120595,6 +120595,34 @@
       ]
      ]
     },
+    "composite-bgcolor-animation": {
+     "bg-color-with-gradient.html": [
+      "7ef5d611bcf2c131dbeef8e72877328ef1be7710",
+      [
+       null,
+       [
+        [
+         "/css/composite-bgcolor-animation/bg-color-with-gradient-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
+     "simple-bg-color.html": [
+      "07bea44d21964b832cd9e4b4f32098ec41a2c206",
+      [
+       null,
+       [
+        [
+         "/css/composite-bgcolor-animation/simple-bg-color-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ]
+    },
     "compositing": {
      "background-blending": {
       "background-blend-mode-gradient-image.html": [
@@ -137187,19 +137215,6 @@
      ]
     },
     "css-flexbox": {
-     "Flexible-order.html": [
-      "9b61e1e8a8fd4cc41e461b10b86051ed0e536ef5",
-      [
-       null,
-       [
-        [
-         "/css/css-flexbox/reference/Flexible-order-ref.html",
-         "=="
-        ]
-       ],
-       {}
-      ]
-     ],
      "abspos-autopos-htb-ltr.html": [
       "095936edf8b982bc228316d1a4f449621e94a1c3",
       [
@@ -142792,6 +142807,19 @@
        {}
       ]
      ],
+     "flexible-order.html": [
+      "6f8d5f691a4be328999f375aa4ef940d01021e74",
+      [
+       null,
+       [
+        [
+         "/css/css-flexbox/reference/flexible-order-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "flexitem-stretch-range.html": [
       "43ecc81d52ddfbcf3d42ad2ed10577e851822636",
       [
@@ -228279,188 +228307,6 @@
           {}
          ]
         ],
-        "flexbox-intrinsic-ratio-001.html": [
-         "43d512dcdf3fa0d80adb4c59b6de303b095deea7",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-001v.html": [
-         "4cc910b9e289315b9b634d1eeec1ac77ba51957f",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-002.html": [
-         "229540ff445b5d3d9f398f59a3f0237348d54ae8",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-002v.html": [
-         "0df92f9954c14149d5e07a7ba362fd34249d6b6c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-003.html": [
-         "cf1c7a74c7abe5ae7c5c1c20540a65435fae17cc",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-003v.html": [
-         "cb9275fd8cfdb2e17a46e31454b2799a3f1e44d0",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-004.html": [
-         "bf2912f04bc2ef2ff5e588710f6c81976664aa8d",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-004v.html": [
-         "01c5271c4556b2e3d43abbbb014482a4bab9740e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-005.html": [
-         "fe7d806bcfee80331d9e9d071caa1bc672f50fe2",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-005v.html": [
-         "ed1dcace0f3385118af82726734778d6a74336eb",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-006.html": [
-         "764075c106b712686afc00188e5c40cad042646c",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-006v.html": [
-         "8c12fad8c791623a86ddca8936248189d698a0a4",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-007.html": [
-         "ea9179c32ca7916792132f4a73c159fca89a19b6",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
-        "flexbox-intrinsic-ratio-007v.html": [
-         "2efb8b1c18fa65c2ea4b08c2c797476bdc79273e",
-         [
-          null,
-          [
-           [
-            "/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007-ref.html",
-            "=="
-           ]
-          ],
-          {}
-         ]
-        ],
         "flexbox-items-as-stacking-contexts-001.xhtml": [
          "fac905339110967578289f18ae156e4a651d81ab",
          [
@@ -298290,6 +298136,16 @@
      "5cb26179b8dbe4423885bcc7c8d687bab224df91",
      []
     ],
+    "composite-bgcolor-animation": {
+     "bg-color-with-gradient-ref.html": [
+      "5c76f3408aebe6e2964215af3f98745e833e190e",
+      []
+     ],
+     "simple-bg-color-ref.html": [
+      "d8003b58e3ac1c5e917500a59b60c0d2e56287a3",
+      []
+     ]
+    },
     "compositing": {
      "Blending_in_a_group_with_filter-ref.html": [
       "ad512028adae91920814b79714ea99ec51de4dc2",
@@ -302276,10 +302132,6 @@
       []
      ],
      "reference": {
-      "Flexible-order-ref.html": [
-       "12e94ba598e74cd253f0f91daf7e88f44884b7fc",
-       []
-      ],
       "align-baseline-ref.html": [
        "d5b88e8c7dae73b57c7f993260d7cce363eeebaa",
        []
@@ -302468,6 +302320,10 @@
        "0a8869a1452962b4895e60d8cebe987b55499666",
        []
       ],
+      "flexible-order-ref.html": [
+       "12e94ba598e74cd253f0f91daf7e88f44884b7fc",
+       []
+      ],
       "flexitem-stretch-range-ref.html": [
        "01c617698e26960960be4210fd726ce102e188bc",
        []
@@ -328400,30 +328256,6 @@
          "f9a4553ccbee361f31491dc91989d341ad9ac1d3",
          []
         ],
-        "flexbox-intrinsic-ratio-001-ref.html": [
-         "7441b282f4daf007e2876e72f257b093317d5854",
-         []
-        ],
-        "flexbox-intrinsic-ratio-003-ref.html": [
-         "38071c22fb2724d245dfe64e6fa17f0706d8a3c6",
-         []
-        ],
-        "flexbox-intrinsic-ratio-004-ref.html": [
-         "38e43a835eb07a322e0970b497fabc2a6f656628",
-         []
-        ],
-        "flexbox-intrinsic-ratio-005-ref.html": [
-         "2bfd4550c1d81c012a69a73cd871923f06d504c6",
-         []
-        ],
-        "flexbox-intrinsic-ratio-006-ref.html": [
-         "513fc0dcafacef04418c6bcd0d5121bdadea31f9",
-         []
-        ],
-        "flexbox-intrinsic-ratio-007-ref.html": [
-         "ccde6012b5f74ede005dad74814be62cdffa9ac6",
-         []
-        ],
         "flexbox-items-as-stacking-contexts-001-ref.xhtml": [
          "7e02b799f0f75b5d238ecc3c7bbaf87a53572e88",
          []
@@ -334529,6 +334361,10 @@
       "0d6db5399118372da9ca783eeb2551e435ea85d7",
       []
      ],
+     "window-tests-chooser.js": [
+      "bb9e0bf128c7885ae2b3c32ceb98f28947460209",
+      []
+     ],
      "window-tests-enumeration.js": [
       "6e60910251fc59012d28f3c9a42adac7b7cb6d7a",
       []
@@ -446581,6 +446417,32 @@
       }
      ]
     ],
+    "font_access-chooser.tentative.https.window.js": [
+     "047521a7f7ab86ddddeb8f95ee711757f81bccf4",
+     [
+      "font-access/font_access-chooser.tentative.https.window.html",
+      {
+       "script_metadata": [
+        [
+         "script",
+         "/resources/testdriver.js"
+        ],
+        [
+         "script",
+         "/resources/testdriver-vendor.js"
+        ],
+        [
+         "script",
+         "resources/test-expectations.js"
+        ],
+        [
+         "script",
+         "resources/window-tests-chooser.js"
+        ]
+       ]
+      }
+     ]
+    ],
     "font_access-enumeration.tentative.https.window.js": [
      "677fe82c70233de2e1cbeab4beb41437319688b3",
      [
@@ -487046,7 +486908,7 @@
      ]
     ],
     "input-events-get-target-ranges-backspace.tentative.html": [
-     "a67bc76364d9675f2048161544b26eee02bf1185",
+     "d057654a77c494934e1116045ec7541a7e8878da",
      [
       null,
       {
@@ -487065,7 +486927,7 @@
      ]
     ],
     "input-events-get-target-ranges-forwarddelete.tentative.html": [
-     "62a33c094000680bd5981f0e2e1cddb1a3c6c1f5",
+     "136a4a6be4b31fa79508104d8da42cce36d8a887",
      [
       null,
       {
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
deleted file mode 100644
index f64b45fea6b..00000000000
--- a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-002.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[hit-test-floats-002.html]
-  [Hit test float]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
new file mode 100644
index 00000000000..4bfb0c2053a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-004.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-004.html]
+  [Miss float below something else]
+    expected: FAIL
+
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/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309b..00000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    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
new file mode 100644
index 00000000000..e6e1f29e274
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
@@ -0,0 +1,2 @@
+[matchMedia-display-none-iframe.html]
+  expected: ERROR
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001.html.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001.html.ini
deleted file mode 100644
index 4da3586e0da..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-intrinsic-ratio-001.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002.html.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002.html.ini
deleted file mode 100644
index ae0ce8452ed..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-intrinsic-ratio-002.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003.html.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003.html.ini
deleted file mode 100644
index 11478099c54..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-intrinsic-ratio-003.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004.html.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004.html.ini
deleted file mode 100644
index 55d82e44f0d..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-intrinsic-ratio-004.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005.html.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005.html.ini
deleted file mode 100644
index 8c90821be8c..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-intrinsic-ratio-005.html]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006.html.ini b/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006.html.ini
deleted file mode 100644
index 46162509d60..00000000000
--- a/tests/wpt/metadata/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[flexbox-intrinsic-ratio-006.html]
-  type: reftest
-  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 3bbe40e7588..48c0876ceb6 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,15 +315,24 @@
   [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*]
     expected: FAIL
 
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
+    expected: FAIL
+
+  [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: 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 ac4cbcba706..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -53,9 +53,6 @@
   [combined text/javascript ]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
   [separate text/javascript x/x]
     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
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[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_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 51f8272a6de..dc2e45516de 100644
--- a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_3.html]
+[traverse_the_history_5.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 442db3cb549..2532dceabac 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,4 +1,5 @@
 [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 dab21cae5d8..6b68e9094e4 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
@@ -1,5 +1,4 @@
 [supported-elements.html]
-  expected: TIMEOUT
   [Contenteditable element should support autofocus]
     expected: FAIL
 
@@ -7,11 +6,11 @@
     expected: FAIL
 
   [Host element with delegatesFocus including no focusable descendants should be skipped]
-    expected: NOTRUN
+    expected: FAIL
 
   [Area element should support autofocus]
-    expected: NOTRUN
+    expected: FAIL
 
   [Host element with delegatesFocus should support autofocus]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index 1de3f8d68b2..98163335e40 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,3 +172,6 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
+  [HTML (standards) IMG usemap="no-hash-name"]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
index e63fe7c263e..c6f45be1eb2 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-2.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-2.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
index 45d8be1c898..d43f38b40cd 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-2.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-2.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index e440b1e38c6..dc856a3d5a3 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,5 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
new file mode 100644
index 00000000000..59a54fe88e4
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
@@ -0,0 +1,4 @@
+[module-delayed.html]
+  [async document.write in a module]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
deleted file mode 100644
index fca4d908c89..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-static-import-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-static-import-delayed.html]
-  [document.write in an imported module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     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 e0398c75344..91b0965b452 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
@@ -419,3 +419,9 @@
   [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[28696\]\t-1.8581761986985164e-15\t9.3139332532882690e-1\t9.3139332532882879e-1\t1.0000000000000020e+0\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 9.3139332532882879e-1 at index of 28696.\n\tMax RelError of 1.0000000000000020e+0 at index of 28696.\n]
     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[28696\]\t4.3599933296234016e+28\t9.3139332532882690e-1\t4.3599933296234016e+28\t4.6811515726549934e+28\t3.8985999999999999e-3\n\t[28697\]\t7.0477002859115601e-1\t9.0675884485244751e-1\t2.0198881626129150e-1\t2.2275913536212616e-1\t3.8985999999999999e-3\n\tMax AbsError of 4.3599933296234016e+28 at index of 28696.\n\tMax RelError of 4.6811515726549934e+28 at index of 28696.\n]
+    expected: FAIL
+
+  [X SNR (-529.35563055275 dB) is not greater than or equal to 65.737. Got -529.35563055275.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini b/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
deleted file mode 100644
index 663a1f8fa30..00000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/018.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[018.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, javascript:]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/without-ports/017.html.ini
similarity index 100%
rename from tests/wpt/metadata/webmessaging/with-ports/017.html.ini
rename to tests/wpt/metadata/webmessaging/without-ports/017.html.ini
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient-ref.html b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient-ref.html
new file mode 100644
index 00000000000..5c76f3408ae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient-ref.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<body>
+  <canvas id="canvas" width="100" height="100"></canvas>
+</body>
+<script>
+  var canvas = document.getElementById('canvas');
+  var ctx = canvas.getContext('2d');
+  var grad = ctx.createLinearGradient(0, 0, 0, 100);
+  grad.addColorStop(0, 'red');
+  grad.addColorStop(1, 'black');
+  ctx.fillStyle = grad;
+  ctx.fillRect(0, 0, 100, 100);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient.html b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient.html
new file mode 100644
index 00000000000..7ef5d611bcf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/bg-color-with-gradient.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#background-color">
+<link rel="match" href="bg-color-with-gradient-ref.html">
+<div style="width: 100px; height: 100px; background: linear-gradient(red, black); background-color: green;"></div>
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color-ref.html b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color-ref.html
new file mode 100644
index 00000000000..d8003b58e3a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color-ref.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<body>
+  <canvas id="canvas" width="200" height="400"></canvas>
+</body>
+<script>
+  var canvas = document.getElementById('canvas');
+  var ctx = canvas.getContext('2d');
+  ctx.fillStyle = 'green';
+  ctx.fillRect(0, 0, 100, 150);
+  ctx.fillStyle = 'red';
+  ctx.fillRect(0, 150, 200, 250);
+</script>
diff --git a/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color.html b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color.html
new file mode 100644
index 00000000000..07bea44d219
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/composite-bgcolor-animation/simple-bg-color.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#background-color">
+<link rel="match" href="simple-bg-color-ref.html">
+<style>
+.box1 {
+  width: 100px;
+  height: 150px;
+  background-color: green;
+}
+.box2 {
+  width: 200px;
+  height: 250px;
+  background-color: red;
+}
+</style>
+<body>
+  <div class='box1'></div>
+  <div class='box2'></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/Flexible-order.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexible-order.html
similarity index 93%
rename from tests/wpt/web-platform-tests/css/css-flexbox/Flexible-order.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/flexible-order.html
index 9b61e1e8a8f..6f8d5f691a4 100644
--- a/tests/wpt/web-platform-tests/css/css-flexbox/Flexible-order.html
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexible-order.html
@@ -4,7 +4,7 @@
 
 <meta name="assert" content="The order of three should be blue-red-black" />
 
-<link rel="match" href="reference/Flexible-order-ref.html">
+<link rel="match" href="reference/flexible-order-ref.html">
 <link rel="author" title="KeynesQu" href="mailto:keynesqu@sohu.com" />
 <link rel="help" href="http://www.w3.org/TR/css-flexbox-1/#order-property" />
 
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/reference/Flexible-order-ref.html b/tests/wpt/web-platform-tests/css/css-flexbox/reference/flexible-order-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-flexbox/reference/Flexible-order-ref.html
rename to tests/wpt/web-platform-tests/css/css-flexbox/reference/flexible-order-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001-ref.html
deleted file mode 100644
index 7441b282f4d..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001-ref.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style>
-      .flexbox {
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-        vertical-align: top;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 34px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 6px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001.html
deleted file mode 100644
index 43d512dcdf3..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flex item w/ intrinsic ratio.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-001-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001v.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001v.html
deleted file mode 100644
index 4cc910b9e28..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-001v.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flex item w/ intrinsic ratio
-      (with a vertical writing-mode on the flex items).
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-001-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        writing-mode: vertical-lr;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002.html
deleted file mode 100644
index 229540ff445..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flex item w/ intrinsic ratio.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-001-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: column;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002v.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002v.html
deleted file mode 100644
index 0df92f9954c..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-002v.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flex item w/ intrinsic ratio
-      (with a vertical writing-mode on the flex items).
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-001-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: column;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        writing-mode: vertical-lr;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003-ref.html
deleted file mode 100644
index 38071c22fb2..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003-ref.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style>
-      .flexbox {
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-        vertical-align: top;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 16px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 40px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003.html
deleted file mode 100644
index cf1c7a74c7a..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on stretched flex item w/ intrinsic ratio.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-003-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: stretch;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003v.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003v.html
deleted file mode 100644
index cb9275fd8cf..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-003v.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on stretched flex item w/ intrinsic ratio
-      (with a vertical writing-mode on the flex items).
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-003-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: stretch;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        writing-mode: vertical-rl;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004-ref.html
deleted file mode 100644
index 38e43a835eb..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004-ref.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style>
-      .flexbox {
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-        vertical-align: top;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 16px">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 34px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 6px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004.html
deleted file mode 100644
index bf2912f04bc..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004.html
+++ /dev/null
@@ -1,125 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on stretched flex item w/ intrinsic ratio.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-004-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: column;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: stretch;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004v.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004v.html
deleted file mode 100644
index 01c5271c455..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-004v.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on stretched flex item w/ intrinsic ratio
-      (with a vertical writing-mode on the flex items).
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-004-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: column;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: stretch;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        writing-mode: vertical-rl;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005-ref.html
deleted file mode 100644
index 2bfd4550c1d..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005-ref.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style>
-      .flexbox {
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-        vertical-align: top;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 6px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005.html
deleted file mode 100644
index fe7d806bcfe..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flexible flex item w/ intrinsic ratio.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-005-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        flex: 1;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 1 1 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005v.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005v.html
deleted file mode 100644
index ed1dcace0f3..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-005v.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flexible flex item w/ intrinsic ratio
-      (with a vertical writing-mode on the flex items).
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-005-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        flex: 1;
-        writing-mode: vertical-lr;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 1 1 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006-ref.html
deleted file mode 100644
index 513fc0dcafa..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006-ref.html
+++ /dev/null
@@ -1,123 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style>
-      .flexbox {
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-        vertical-align: top;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 6px;
-                                              height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 40px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 40px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 40px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 40px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006.html
deleted file mode 100644
index 764075c106b..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006.html
+++ /dev/null
@@ -1,127 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flexible flex item w/ intrinsic ratio.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-006-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: column;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        flex: 1;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 1 1 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006v.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006v.html
deleted file mode 100644
index 8c12fad8c79..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-006v.html
+++ /dev/null
@@ -1,129 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flexible flex item w/ intrinsic ratio
-      (with a vertical writing-mode on the flex items).
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-006-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: column;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      br { clear: both; }
-
-      .flexbox > * {
-        flex: 1;
-        writing-mode: vertical-lr;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 1 1 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              max-height: 6px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 6px;
-                                              max-height: 10px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007-ref.html
deleted file mode 100644
index ccde6012b5f..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007-ref.html
+++ /dev/null
@@ -1,128 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>CSS Reftest Reference</title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <style>
-      .flexbox {
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        float: left; /* For testing in "rows" */
-      }
-      img {
-        padding: 1px 2px 3px 4px;
-        box-sizing: border-box;
-        background: pink;
-      }
-
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-        vertical-align: top;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 28px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 32px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 28px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 32px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 36px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 36px;
-                                              height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 34px;
-                                              height: 32px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 16px;
-                                              height: 14px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 18px;
-                                              height: 16px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 16px;
-                                              height: 14px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 14px;
-                                              height: 12px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007.html
deleted file mode 100644
index ea9179c32ca..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007.html
+++ /dev/null
@@ -1,132 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flex item w/ intrinsic ratio,
-      some padding, and box-sizing:border-box.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-007-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      img {
-        padding: 1px 2px 3px 4px;
-        box-sizing: border-box;
-        background: pink;
-      }
-
-      br { clear: both; }
-
-      .flexbox > * {
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 16px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 16px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 20px;
-                                              max-height: 14px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 14px;
-                                              max-height: 20px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007v.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007v.html
deleted file mode 100644
index 2efb8b1c18f..00000000000
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/flexbox/flexbox-intrinsic-ratio-007v.html
+++ /dev/null
@@ -1,134 +0,0 @@
-<!DOCTYPE html>
-<!--
-     Any copyright is dedicated to the Public Domain.
-     http://creativecommons.org/publicdomain/zero/1.0/
--->
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>
-      CSS Test: Testing how explicit main-size & cross-size constraints
-      influence sizing on non-stretched flex item w/ intrinsic ratio,
-      some padding, box-sizing:border-box, and a vertical writing-mode.
-    </title>
-    <link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-main-size">
-    <link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#hypothetical-cross-size">
-    <link rel="match" href="flexbox-intrinsic-ratio-007-ref.html">
-    <style>
-      .flexbox {
-        display: flex;
-        flex-direction: row;
-        border: 1px solid black;
-        margin: 0 2px 2px 0; /* (Just for spacing things out, visually) */
-        width: 40px;
-        height: 40px;
-
-        justify-content: flex-start;
-        align-items: flex-start;
-
-        float: left; /* For testing in "rows" */
-      }
-      img {
-        padding: 1px 2px 3px 4px;
-        box-sizing: border-box;
-        background: pink;
-      }
-
-      br { clear: both; }
-
-      .flexbox > * {
-        writing-mode: vertical-lr;
-
-        /* Disable "min-width:auto"/"min-height:auto" to focus purely on
-           later channels of influence. */
-        min-width: 0;
-        min-height: 0;
-      }
-    </style>
-  </head>
-  <body>
-    <!-- NOTE: solidblue.png has an intrinsic size of 16px by 16px. -->
-
-    <!-- Row 1: no special sizing: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png">
-    </div>
-    <br>
-
-    <!-- Row 2: Specified main-size, cross-size, or flex-basis: -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="flex: 0 0 30px">
-    </div>
-    <br>
-
-    <!-- Row 3: min main-size OR min cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              min-height: 34px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 34px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 4: max main-size OR max cross-size, or both -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 16px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-height: 16px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 20px;
-                                              max-height: 14px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 14px;
-                                              max-height: 20px">
-    </div>
-    <br>
-
-    <!-- Row 5: min main-size vs. max cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              min-height: 30px">
-    </div>
-    <br>
-
-    <!-- Row 6: min|max main-size vs. explicit cross-size, & vice versa -->
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="min-width: 30px;
-                                              height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 30px;
-                                              max-height: 10px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="max-width: 10px;
-                                              height: 30px">
-    </div>
-    <div class="flexbox">
-      <img src="support/solidblue.png" style="width: 10px;
-                                              min-height: 30px">
-    </div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/font-access/font_access-chooser.tentative.https.window.js b/tests/wpt/web-platform-tests/font-access/font_access-chooser.tentative.https.window.js
new file mode 100644
index 00000000000..047521a7f7a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/font_access-chooser.tentative.https.window.js
@@ -0,0 +1,4 @@
+// META: script=/resources/testdriver.js
+// META: script=/resources/testdriver-vendor.js
+// META: script=resources/test-expectations.js
+// META: script=resources/window-tests-chooser.js
diff --git a/tests/wpt/web-platform-tests/font-access/resources/window-tests-chooser.js b/tests/wpt/web-platform-tests/font-access/resources/window-tests-chooser.js
new file mode 100644
index 00000000000..bb9e0bf128c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/font-access/resources/window-tests-chooser.js
@@ -0,0 +1,8 @@
+'use strict';
+
+font_access_test(async t => {
+  await promise_rejects_dom(
+      t, 'NotSupportedError', navigator.fonts.showFontChooser());
+  await promise_rejects_dom(
+      t, 'NotSupportedError', navigator.fonts.showFontChooser({all: false}));
+});
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
index a67bc76364d..d057654a77c 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-backspace.tentative.html
@@ -1169,6 +1169,78 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDoNothing();
 }, 'Backspace at "<p>abc</p><table><caption>{}<br></caption><tr><td>cell</td></tr></table>"');
 
+// If a table cell element is selected, only its content should be deleted.
+promise_test(async () => {
+  initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
+  let cell1 = gEditor.querySelector("td");
+  let tr = cell1.parentNode;
+  gSelection.setBaseAndExtent(tr, 0, tr, 1);
+  await sendBackspaceKey();
+  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr></tbody></table>",
+                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>"]);
+  // XXX Perhaps, target range should be selecting only all children of
+  //     cell1 instead.
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: tr,
+    startOffset: 0,
+    endContainer: tr,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr></table>"');
+
+promise_test(async () => {
+  initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
+  let cell2 = gEditor.querySelector("td + td");
+  let tr = cell2.parentNode;
+  gSelection.setBaseAndExtent(tr, 1, tr, 2);
+  await sendBackspaceKey();
+  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell1</td><td></td></tr></tbody></table>",
+                                      "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>"]);
+  // XXX Perhaps, target range should be selecting only all children of
+  //     cell1 instead.
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: tr,
+    startOffset: 1,
+    endContainer: tr,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<table><tr><td>cell1</td>{<td>cell2</td>}</tr></table>"');
+
+// If the last table cell element is selected, what browsers should do?
+promise_test(async () => {
+  initializeTest("<table><tr><td>cell</td></tr></table>");
+  let cell = gEditor.querySelector("td");
+  let tr = cell.parentNode;
+  let table = gEditor.querySelector("table");
+  gSelection.setBaseAndExtent(tr, 0, tr, 1);
+  await sendBackspaceKey();
+  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td></tr></tbody></table>",
+                                      "<table><tbody><tr><td><br></td></tr></tbody></table>",
+                                      "<br>"]);
+  if (gEditor.querySelector("table")) {
+    // XXX Perhaps, target range should be selecting only all children of
+    //     cell1 instead.
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: tr,
+      startOffset: 0,
+      endContainer: tr,
+      endOffset: 1,
+    });
+  } else {
+    // If it causes deleting entire the table, the `<table>` element should
+    // be in the target range.
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: gEditor,
+      startOffset: 0,
+      endContainer: gEditor,
+      endOffset: 1,
+    });
+  }
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Backspace at "<table><tr>{<td>cell</td>}</tr></table>"');
+
 // If caret is not adjacent of deleting character, browser may not delete the
 // character, but update the caret position for next deletion.
 promise_test(async () => {
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
index 62a33c09400..136a4a6be4b 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-get-target-ranges-forwarddelete.tentative.html
@@ -1286,6 +1286,78 @@ promise_test(async () => {
   checkGetTargetRangesOfInputOnDoNothing();
 }, 'Delete at "<table><caption>{}<br></caption><tr><td>cell</td></tr></table>"');
 
+// If a table cell element is selected, only its content should be deleted.
+promise_test(async () => {
+  initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
+  let cell1 = gEditor.querySelector("td");
+  let tr = cell1.parentNode;
+  gSelection.setBaseAndExtent(tr, 0, tr, 1);
+  await sendDeleteKey();
+  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td><td>cell2</td></tr></tbody></table>",
+                                      "<table><tbody><tr><td><br></td><td>cell2</td></tr></tbody></table>"]);
+  // XXX Perhaps, target range should be selecting only all children of
+  //     cell1 instead.
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: tr,
+    startOffset: 0,
+    endContainer: tr,
+    endOffset: 1,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<table><tr>{<td>cell1</td>}<td>cell2</td></tr></table>"');
+
+promise_test(async () => {
+  initializeTest("<table><tr><td>cell1</td><td>cell2</td></tr></table>");
+  let cell2 = gEditor.querySelector("td + td");
+  let tr = cell2.parentNode;
+  gSelection.setBaseAndExtent(tr, 1, tr, 2);
+  await sendDeleteKey();
+  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td>cell1</td><td></td></tr></tbody></table>",
+                                      "<table><tbody><tr><td>cell1</td><td><br></td></tr></tbody></table>"]);
+  // XXX Perhaps, target range should be selecting only all children of
+  //     cell1 instead.
+  checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+    startContainer: tr,
+    startOffset: 1,
+    endContainer: tr,
+    endOffset: 2,
+  });
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<table><tr><td>cell1</td>{<td>cell2</td>}</tr></table>"');
+
+// If the last table cell element is selected, what browsers should do?
+promise_test(async () => {
+  initializeTest("<table><tr><td>cell</td></tr></table>");
+  let cell = gEditor.querySelector("td");
+  let tr = cell.parentNode;
+  let table = gEditor.querySelector("table");
+  gSelection.setBaseAndExtent(tr, 0, tr, 1);
+  await sendDeleteKey();
+  assert_in_array(gEditor.innerHTML, ["<table><tbody><tr><td></td></tr></tbody></table>",
+                                      "<table><tbody><tr><td><br></td></tr></tbody></table>",
+                                      "<br>"]);
+  if (gEditor.querySelector("table")) {
+    // XXX Perhaps, target range should be selecting only all children of
+    //     cell1 instead.
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: tr,
+      startOffset: 0,
+      endContainer: tr,
+      endOffset: 1,
+    });
+  } else {
+    // If it causes deleting entire the table, the `<table>` element should
+    // be in the target range.
+    checkGetTargetRangesOfBeforeinputOnDeleteSomething({
+      startContainer: gEditor,
+      startOffset: 0,
+      endContainer: gEditor,
+      endOffset: 1,
+    });
+  }
+  checkGetTargetRangesOfInputOnDeleteSomething();
+}, 'Delete at "<table><tr>{<td>cell</td>}</tr></table>"');
+
 // If caret is not adjacent of deleting character, browser may not delete the
 // character, but update the caret position for next deletion.
 promise_test(async () => {
diff --git a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
index d5ab33a0c55..00516f36caf 100644
--- a/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
+++ b/tests/wpt/webgl/meta/conformance2/rendering/draw-buffers.html.ini
@@ -227,3 +227,6 @@
   [WebGL test #40: attachment 3 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 0,47,0,0]
     expected: FAIL
 
+  [WebGL test #44: attachment 7 should be 0,255,0,255\nat (0, 0) expected: 0,255,0,255 was 255,255,0,0]
+    expected: FAIL
+