diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
index a9e46713244..76b398963ae 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags-revoke.window.js.ini
@@ -7,7 +7,7 @@
     expected: FAIL
 
   [Opening a blob URL in a new window immediately before revoking it works.]
-    expected: TIMEOUT
+    expected: FAIL
 
   [Opening a blob URL in a noopener about:blank window immediately before revoking it works.]
     expected: FAIL
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 8810c9bae09..3ed7c848d7a 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -19657,99 +19657,99 @@
      {}
     ]
    ],
-   "web-share/share-cancel-manual.html": [
+   "web-share/share-cancel-manual.https.html": [
     [
-     "web-share/share-cancel-manual.html",
+     "web-share/share-cancel-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-extra-argument-manual.html": [
+   "web-share/share-extra-argument-manual.https.html": [
     [
-     "web-share/share-extra-argument-manual.html",
+     "web-share/share-extra-argument-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-extra-field-manual.html": [
+   "web-share/share-extra-field-manual.https.html": [
     [
-     "web-share/share-extra-field-manual.html",
+     "web-share/share-extra-field-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-files-manual.html": [
+   "web-share/share-files-manual.tentative.https.html": [
     [
-     "web-share/share-files-manual.html",
+     "web-share/share-files-manual.tentative.https.html",
      {}
     ]
    ],
-   "web-share/share-image-manual.html": [
+   "web-share/share-image-manual.https.html": [
     [
-     "web-share/share-image-manual.html",
+     "web-share/share-image-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-non-string-manual.html": [
+   "web-share/share-non-string-manual.https.html": [
     [
-     "web-share/share-non-string-manual.html",
+     "web-share/share-non-string-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-null-manual.html": [
+   "web-share/share-null-manual.https.html": [
     [
-     "web-share/share-null-manual.html",
+     "web-share/share-null-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-simple-manual.html": [
+   "web-share/share-simple-manual.https.html": [
     [
-     "web-share/share-simple-manual.html",
+     "web-share/share-simple-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-unicode-strings-manual.html": [
+   "web-share/share-unicode-strings-manual.https.html": [
     [
-     "web-share/share-unicode-strings-manual.html",
+     "web-share/share-unicode-strings-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-unicode-strings-nonutf8-manual.html": [
+   "web-share/share-unicode-strings-nonutf8-manual.https.html": [
     [
-     "web-share/share-unicode-strings-nonutf8-manual.html",
+     "web-share/share-unicode-strings-nonutf8-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-url-data-manual.html": [
+   "web-share/share-url-data-manual.https.html": [
     [
-     "web-share/share-url-data-manual.html",
+     "web-share/share-url-data-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-url-empty-manual.html": [
+   "web-share/share-url-empty-manual.https.html": [
     [
-     "web-share/share-url-empty-manual.html",
+     "web-share/share-url-empty-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-url-encoding-manual.html": [
+   "web-share/share-url-encoding-manual.https.html": [
     [
-     "web-share/share-url-encoding-manual.html",
+     "web-share/share-url-encoding-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-url-noscheme-manual.html": [
+   "web-share/share-url-noscheme-manual.https.html": [
     [
-     "web-share/share-url-noscheme-manual.html",
+     "web-share/share-url-noscheme-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-url-pathonly-manual.html": [
+   "web-share/share-url-pathonly-manual.https.html": [
     [
-     "web-share/share-url-pathonly-manual.html",
+     "web-share/share-url-pathonly-manual.https.html",
      {}
     ]
    ],
-   "web-share/share-url-relative-manual.html": [
+   "web-share/share-url-relative-manual.https.html": [
     [
-     "web-share/share-url-relative-manual.html",
+     "web-share/share-url-relative-manual.https.html",
      {}
     ]
    ],
@@ -56511,6 +56511,18 @@
      {}
     ]
    ],
+   "css/CSS2/linebox/vertical-align-negative-leading-001.html": [
+    [
+     "css/CSS2/linebox/vertical-align-negative-leading-001.html",
+     [
+      [
+       "/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/linebox/vertical-align-nested-top-001.html": [
     [
      "css/CSS2/linebox/vertical-align-nested-top-001.html",
@@ -112263,6 +112275,18 @@
      {}
     ]
    ],
+   "css/css-conditional/at-supports-043.html": [
+    [
+     "css/css-conditional/at-supports-043.html",
+     [
+      [
+       "/css/css-conditional/at-supports-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-animation-001.html": [
     [
      "css/css-contain/contain-animation-001.html",
@@ -135001,6 +135025,18 @@
      {}
     ]
    ],
+   "css/css-paint-api/non-registered-property-value.https.html": [
+    [
+     "css/css-paint-api/non-registered-property-value.https.html",
+     [
+      [
+       "/css/css-paint-api/parse-input-arguments-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-paint-api/one-custom-property-animation.https.html": [
     [
      "css/css-paint-api/one-custom-property-animation.https.html",
@@ -137029,6 +137065,18 @@
      {}
     ]
    ],
+   "css/css-pseudo/first-letter-width.html": [
+    [
+     "css/css-pseudo/first-letter-width.html",
+     [
+      [
+       "/css/css-pseudo/first-letter-width-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-pseudo/first-line-and-placeholder.html": [
     [
      "css/css-pseudo/first-line-and-placeholder.html",
@@ -143009,6 +143057,18 @@
      {}
     ]
    ],
+   "css/css-tables/percent-height-replaced-in-percent-cell.tentative.html": [
+    [
+     "css/css-tables/percent-height-replaced-in-percent-cell.tentative.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-tables/percent-width-cell-dynamic.html": [
     [
      "css/css-tables/percent-width-cell-dynamic.html",
@@ -168025,18 +168085,6 @@
      {}
     ]
    ],
-   "css/css-values/minmax-length-percentage-interpolate.html": [
-    [
-     "css/css-values/minmax-length-percentage-interpolate.html",
-     [
-      [
-       "/css/reference/ref-filled-green-100px-square-only.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "css/css-values/q-unit-case-insensitivity-001.html": [
     [
      "css/css-values/q-unit-case-insensitivity-001.html",
@@ -200663,6 +200711,246 @@
      {}
     ]
    ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-01.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-01.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-02.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-02.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-03.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-03.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-04.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-04.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-05.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-05.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-06.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-06.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-08.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-08.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-09.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-09.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-10.html": [
+    [
+     "forced-colors-mode/backplate/forced-colors-mode-backplate-10.html",
+     [
+      [
+       "/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-01.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-01.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-01-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-02.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-02.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-02-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-05.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-05.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-05-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-06.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-06.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-06-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-07.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-07.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-07-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-08.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-08.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-08-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-14.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-14.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-14-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-17.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-17.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-17-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-18.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-18.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-18-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-19.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-19.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-19-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-23.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-23.html",
+     [
+      [
+       "/forced-colors-mode/forced-colors-mode-23-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "html/browsers/sandboxing/sandbox-parse-noscript.html": [
     [
      "html/browsers/sandboxing/sandbox-parse-noscript.html",
@@ -205311,6 +205599,18 @@
      {}
     ]
    ],
+   "mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html": [
+    [
+     "mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html",
+     [
+      [
+       "/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "mathml/presentation-markup/fractions/frac-visibility-001.html": [
     [
      "mathml/presentation-markup/fractions/frac-visibility-001.html",
@@ -205395,6 +205695,18 @@
      {}
     ]
    ],
+   "mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html": [
+    [
+     "mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html",
+     [
+      [
+       "/mathml/presentation-markup/operators/mo-movablelimits-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "mathml/presentation-markup/operators/mo-movablelimits.html": [
     [
      "mathml/presentation-markup/operators/mo-movablelimits.html",
@@ -205419,6 +205731,18 @@
      {}
     ]
    ],
+   "mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html": [
+    [
+     "mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html",
+     [
+      [
+       "/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "mathml/presentation-markup/spaces/mspace-children.html": [
     [
      "mathml/presentation-markup/spaces/mspace-children.html",
@@ -215238,6 +215562,9 @@
    "client-hints/META.yml": [
     []
    ],
+   "client-hints/accept-ch-cache-revalidation.https.html.headers": [
+    []
+   ],
    "client-hints/accept_ch.http.html.headers": [
     []
    ],
@@ -215298,6 +215625,9 @@
    "client-hints/resources/square.png": [
     []
    ],
+   "client-hints/resources/stale-echo-client-hints.py": [
+    []
+   ],
    "clipboard-apis/META.yml": [
     []
    ],
@@ -236742,6 +237072,9 @@
    "css/CSS2/linebox/vertical-align-baseline-008-ref.xht": [
     []
    ],
+   "css/CSS2/linebox/vertical-align-negative-leading-001-ref.html": [
+    []
+   ],
    "css/CSS2/linebox/vertical-align-nested-top-001-ref.html": [
     []
    ],
@@ -253938,6 +254271,9 @@
    "css/css-pseudo/first-letter-opacity-float-001-ref.html": [
     []
    ],
+   "css/css-pseudo/first-letter-width-ref.html": [
+    []
+   ],
    "css/css-pseudo/first-line-and-placeholder-ref.html": [
     []
    ],
@@ -268185,6 +268521,75 @@
    "fonts/tcu-font.woff": [
     []
    ],
+   "forced-colors-mode/README.txt": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html": [
+    []
+   ],
+   "forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-01-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-02-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-05-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-06-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-07-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-08-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-14-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-17-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-18-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-19-ref.html": [
+    []
+   ],
+   "forced-colors-mode/forced-colors-mode-23-ref.html": [
+    []
+   ],
+   "forced-colors-mode/resources/float-image.jpg": [
+    []
+   ],
+   "forced-colors-mode/resources/test-image.jpg": [
+    []
+   ],
    "fullscreen/META.yml": [
     []
    ],
@@ -274137,6 +274542,12 @@
    "html/semantics/scripting-1/the-script-element/module/resources/import-remote-origin-referrer-checker.sub.js": [
     []
    ],
+   "html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js": [
+    []
+   ],
+   "html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers": [
+    []
+   ],
    "html/semantics/scripting-1/the-script-element/module/resources/import-utf8-with-charset-header.js": [
     []
    ],
@@ -275154,6 +275565,9 @@
    "infrastructure/metadata/infrastructure/server/wpt-server-websocket.sub.html.ini": [
     []
    ],
+   "infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini": [
+    []
+   ],
    "infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini": [
     []
    ],
@@ -275898,6 +276312,9 @@
    "mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html": [
     []
    ],
+   "mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html": [
+    []
+   ],
    "mathml/presentation-markup/fractions/frac-visibility-001-ref.html": [
     []
    ],
@@ -275919,12 +276336,18 @@
    "mathml/presentation-markup/operators/mo-movablelimits-dynamic-ref.html": [
     []
    ],
+   "mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html": [
+    []
+   ],
    "mathml/presentation-markup/operators/mo-movablelimits-ref.html": [
     []
    ],
    "mathml/presentation-markup/operators/mo-paint-lspace-rspace-ref.html": [
     []
    ],
+   "mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html": [
+    []
+   ],
    "mathml/presentation-markup/spaces/mspace-children-ref.html": [
     []
    ],
@@ -276123,6 +276546,9 @@
    "mathml/support/box-comparison.js": [
     []
    ],
+   "mathml/support/box-navigation.js": [
+    []
+   ],
    "mathml/support/feature-detection.js": [
     []
    ],
@@ -277089,9 +277515,6 @@
    "mixed-content/gen/worker-classic-data.http-rp/opt-in/fetch/same-https.no-redirect.https.html.headers": [
     []
    ],
-   "mixed-content/generic/mixed-content-test-case.js": [
-    []
-   ],
    "mixed-content/generic/sanity-checker.js": [
     []
    ],
@@ -277578,6 +278001,9 @@
    "portals/resources/postmessage-referrer.sub.html": [
     []
    ],
+   "portals/resources/simple-portal-adopts-predecessor.html": [
+    []
+   ],
    "portals/resources/simple-portal.html": [
     []
    ],
@@ -279753,9 +280179,6 @@
    "referrer-policy/generic/multiple-headers.html.headers": [
     []
    ],
-   "referrer-policy/generic/referrer-policy-test-case.sub.js": [
-    []
-   ],
    "referrer-policy/generic/sanity-checker.js": [
     []
    ],
@@ -279978,6 +280401,9 @@
    "resource-timing/resources/self_navigation.html": [
     []
    ],
+   "resource-timing/resources/status-code.py": [
+    []
+   ],
    "resource-timing/resources/webperftestharness.js": [
     []
    ],
@@ -309772,6 +310198,12 @@
      {}
     ]
    ],
+   "client-hints/accept-ch-cache-revalidation.https.html": [
+    [
+     "client-hints/accept-ch-cache-revalidation.https.html",
+     {}
+    ]
+   ],
    "client-hints/accept-ch-lifetime.tentative.https.html": [
     [
      "client-hints/accept-ch-lifetime.tentative.https.html",
@@ -313727,6 +314159,12 @@
      {}
     ]
    ],
+   "css/CSS2/linebox/vertical-align-top-bottom-001.html": [
+    [
+     "css/CSS2/linebox/vertical-align-top-bottom-001.html",
+     {}
+    ]
+   ],
    "css/CSS2/linebox/video-needs-layout-crash.html": [
     [
      "css/CSS2/linebox/video-needs-layout-crash.html",
@@ -313799,6 +314237,12 @@
      {}
     ]
    ],
+   "css/CSS2/positioning/inline-static-position-001.html": [
+    [
+     "css/CSS2/positioning/inline-static-position-001.html",
+     {}
+    ]
+   ],
    "css/compositing/inheritance.html": [
     [
      "css/compositing/inheritance.html",
@@ -315335,6 +315779,12 @@
      {}
     ]
    ],
+   "css/css-backgrounds/parsing/border-radius-computed.html": [
+    [
+     "css/css-backgrounds/parsing/border-radius-computed.html",
+     {}
+    ]
+   ],
    "css/css-backgrounds/parsing/border-radius-invalid.html": [
     [
      "css/css-backgrounds/parsing/border-radius-invalid.html",
@@ -317041,6 +317491,12 @@
      {}
     ]
    ],
+   "css/css-fonts/parsing/font-computed.html": [
+    [
+     "css/css-fonts/parsing/font-computed.html",
+     {}
+    ]
+   ],
    "css/css-fonts/parsing/font-family-computed.html": [
     [
      "css/css-fonts/parsing/font-family-computed.html",
@@ -319751,6 +320207,12 @@
      {}
     ]
    ],
+   "css/css-lists/inherit-overwrites.html": [
+    [
+     "css/css-lists/inherit-overwrites.html",
+     {}
+    ]
+   ],
    "css/css-lists/inheritance.html": [
     [
      "css/css-lists/inheritance.html",
@@ -325391,6 +325853,12 @@
      {}
     ]
    ],
+   "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html": [
+    [
+     "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html",
+     {}
+    ]
+   ],
    "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html": [
     [
      "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html",
@@ -331575,6 +332043,12 @@
      {}
     ]
    ],
+   "css/motion/parsing/offset-anchor-computed.html": [
+    [
+     "css/motion/parsing/offset-anchor-computed.html",
+     {}
+    ]
+   ],
    "css/motion/parsing/offset-anchor-parsing-invalid.html": [
     [
      "css/motion/parsing/offset-anchor-parsing-invalid.html",
@@ -331587,6 +332061,12 @@
      {}
     ]
    ],
+   "css/motion/parsing/offset-distance-computed.html": [
+    [
+     "css/motion/parsing/offset-distance-computed.html",
+     {}
+    ]
+   ],
    "css/motion/parsing/offset-distance-parsing-invalid.html": [
     [
      "css/motion/parsing/offset-distance-parsing-invalid.html",
@@ -331611,6 +332091,12 @@
      {}
     ]
    ],
+   "css/motion/parsing/offset-path-computed.html": [
+    [
+     "css/motion/parsing/offset-path-computed.html",
+     {}
+    ]
+   ],
    "css/motion/parsing/offset-path-parsing-invalid.html": [
     [
      "css/motion/parsing/offset-path-parsing-invalid.html",
@@ -331623,6 +332109,12 @@
      {}
     ]
    ],
+   "css/motion/parsing/offset-position-computed.html": [
+    [
+     "css/motion/parsing/offset-position-computed.html",
+     {}
+    ]
+   ],
    "css/motion/parsing/offset-position-parsing-invalid.html": [
     [
      "css/motion/parsing/offset-position-parsing-invalid.html",
@@ -349877,6 +350369,48 @@
      {}
     ]
    ],
+   "forced-colors-mode/forced-colors-mode-03.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-03.html",
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-04.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-04.html",
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-09.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-09.html",
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-10.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-10.html",
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-11.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-11.html",
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-20.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-20.html",
+     {}
+    ]
+   ],
+   "forced-colors-mode/forced-colors-mode-21.html": [
+    [
+     "forced-colors-mode/forced-colors-mode-21.html",
+     {}
+    ]
+   ],
    "fullscreen/api/document-exit-fullscreen-active-document.html": [
     [
      "fullscreen/api/document-exit-fullscreen-active-document.html",
@@ -350054,9 +350588,9 @@
      {}
     ]
    ],
-   "geolocation-API/idlharness.window.js": [
+   "geolocation-API/idlharness.https.window.js": [
     [
-     "geolocation-API/idlharness.window.html",
+     "geolocation-API/idlharness.https.window.html",
      {
       "script_metadata": [
        [
@@ -366947,6 +367481,12 @@
      {}
     ]
    ],
+   "mathml/presentation-markup/scripts/cramped-001.html": [
+    [
+     "mathml/presentation-markup/scripts/cramped-001.html",
+     {}
+    ]
+   ],
    "mathml/presentation-markup/scripts/subsup-1.html": [
     [
      "mathml/presentation-markup/scripts/subsup-1.html",
@@ -367201,6 +367741,21 @@
      {}
     ]
    ],
+   "mathml/relations/html5-tree/tabindex-001.html": [
+    [
+     "mathml/relations/html5-tree/tabindex-001.html",
+     {}
+    ]
+   ],
+   "mathml/relations/html5-tree/tabindex-002.html": [
+    [
+     "mathml/relations/html5-tree/tabindex-002.html",
+     {
+      "testdriver": true,
+      "timeout": "long"
+     }
+    ]
+   ],
    "mathml/relations/html5-tree/unique-identifier-2.html": [
     [
      "mathml/relations/html5-tree/unique-identifier-2.html",
@@ -383443,6 +383998,12 @@
      {}
     ]
    ],
+   "portals/portals-set-src-after-activate.html": [
+    [
+     "portals/portals-set-src-after-activate.html",
+     {}
+    ]
+   ],
    "preload/avoid-delaying-onload-link-preload.html": [
     [
      "preload/avoid-delaying-onload-link-preload.html",
@@ -395912,12 +396473,6 @@
      {}
     ]
    ],
-   "resource-timing/resource_ignore_failures.html": [
-    [
-     "resource-timing/resource_ignore_failures.html",
-     {}
-    ]
-   ],
    "resource-timing/resource_initiator_types.html": [
     [
      "resource-timing/resource_initiator_types.html",
@@ -396004,6 +396559,12 @@
      }
     ]
    ],
+   "resource-timing/status-codes-create-entry.html": [
+    [
+     "resource-timing/status-codes-create-entry.html",
+     {}
+    ]
+   ],
    "resource-timing/supported_resource_type.any.js": [
     [
      "resource-timing/supported_resource_type.any.html",
@@ -412682,21 +413243,21 @@
      {}
     ]
    ],
-   "web-share/canShare-files.https.html": [
+   "web-share/canShare-files.tentative.https.html": [
     [
-     "web-share/canShare-files.https.html",
+     "web-share/canShare-files.tentative.https.html",
      {}
     ]
    ],
-   "web-share/canShare-insecure.http.html": [
+   "web-share/canShare-insecure.tentative.http.html": [
     [
-     "web-share/canShare-insecure.http.html",
+     "web-share/canShare-insecure.tentative.http.html",
      {}
     ]
    ],
-   "web-share/canShare.https.html": [
+   "web-share/canShare.tentative.https.html": [
     [
-     "web-share/canShare.https.html",
+     "web-share/canShare.tentative.https.html",
      {}
     ]
    ],
@@ -412729,6 +413290,14 @@
      {}
     ]
    ],
+   "web-share/share-sharePromise-internal-slot.https.html": [
+    [
+     "web-share/share-sharePromise-internal-slot.https.html",
+     {
+      "testdriver": true
+     }
+    ]
+   ],
    "web-share/share-url-invalid.https.html": [
     [
      "web-share/share-url-invalid.https.html",
@@ -446604,7 +447173,7 @@
  },
  "paths": {
   ".azure-pipelines.yml": [
-   "58e8d6ee1dd9520008ccd43649242157994c94e8",
+   "a25f2a256ebd2c972560d93f4baa3f3fedfb473d",
    "support"
   ],
   ".codecov.yml": [
@@ -446616,15 +447185,15 @@
    "support"
   ],
   ".github/workflows/pull_request.yml": [
-   "8f3940a291b25f48e578b22dc68f7cf94ce32202",
+   "9d288c0c9209904091a9b66b9334929aee02c3c7",
    "support"
   ],
   ".github/workflows/push-build-publish-documentation-website.yml": [
-   "de226d173fb300dd07e4ff5855b3fa2b7325434b",
+   "167e0d930f4da142ffab22b8c685119495c52702",
    "support"
   ],
   ".github/workflows/push-build-release-manifest.yml": [
-   "6c97a2f7b9f952a41df100a9982e31617498347b",
+   "af677454fdd2cf692929c68ef80bcfe8fb52b69f",
    "support"
   ],
   ".gitignore": [
@@ -446640,7 +447209,7 @@
    "support"
   ],
   ".taskcluster.yml": [
-   "0b7b50b35d4d616f89474f9236a2da87bf21705a",
+   "dfe3b36e3a52192ed23b5a6788fddf728e20ff35",
    "support"
   ],
   ".well-known/README.md": [
@@ -457951,6 +458520,14 @@
    "e3a5edae1c7f9541c6309181f274ff2a4c4e2f80",
    "support"
   ],
+  "client-hints/accept-ch-cache-revalidation.https.html": [
+   "6133e8ad2d7ca0c9c806af364255deb7688c79fd",
+   "testharness"
+  ],
+  "client-hints/accept-ch-cache-revalidation.https.html.headers": [
+   "05b7a4a6f6fcb91b18f2a0e767010e81c9329fb8",
+   "support"
+  ],
   "client-hints/accept-ch-lifetime.tentative.https.html": [
    "f0b03ba0a8c311642af793a341653995fb73cbd9",
    "testharness"
@@ -458079,6 +458656,10 @@
    "01c9666a8de9d5535615aff830810e5df4b2156f",
    "support"
   ],
+  "client-hints/resources/stale-echo-client-hints.py": [
+   "769fa909fa4b3b960fbde2e6df282efc970b35d0",
+   "support"
+  ],
   "client-hints/sec-ch-ua.http.html": [
    "e333c605301e621133ee5e6f3d01e2525d5c058a",
    "testharness"
@@ -458304,7 +458885,7 @@
    "support"
   ],
   "common/security-features/resources/common.sub.js": [
-   "d503ae9696157220d4d83a11b83bd8761bcea769",
+   "64d2b9ffb4e3b2231f3b90313c4376ba2f4d867a",
    "support"
   ],
   "common/security-features/resources/common.sub.js.headers": [
@@ -458368,7 +458949,7 @@
    "support"
   ],
   "common/security-features/subresource/subresource.py": [
-   "f11f3250568b662118d658388a2e4725357d7fd4",
+   "582378d41fa38a29da1bbda9a3065d4585a36875",
    "support"
   ],
   "common/security-features/subresource/svg.py": [
@@ -458428,7 +459009,7 @@
    "support"
   ],
   "common/security-features/tools/spec_validator.py": [
-   "fff4c5dd6f688a733c1a48c5fe818f7f2979c8dd",
+   "dae5c6e35a3fe978571e9976c6aaaf1c5d3c1076",
    "support"
   ],
   "common/security-features/tools/template/disclaimer.template": [
@@ -506875,6 +507456,14 @@
    "3534f496514ec6bc68f7877f63b8ebab5c9c6e29",
    "visual"
   ],
+  "css/CSS2/linebox/vertical-align-negative-leading-001-ref.html": [
+   "912cd378e1bede5bb25126f3e76cdae9b286ce07",
+   "support"
+  ],
+  "css/CSS2/linebox/vertical-align-negative-leading-001.html": [
+   "4ce5f6d2ad879c093139482e2d0a4672d8207f7d",
+   "reftest"
+  ],
   "css/CSS2/linebox/vertical-align-nested-top-001-ref.html": [
    "1fd155e38013e555c140908310c36b1416ac2ded",
    "support"
@@ -506895,6 +507484,10 @@
    "80100809b3490a336dbbb08d79275d011da46d92",
    "reftest"
   ],
+  "css/CSS2/linebox/vertical-align-top-bottom-001.html": [
+   "2e03bc0d2fbed51589545b0b62d0ccb3d161556d",
+   "testharness"
+  ],
   "css/CSS2/linebox/vertical-align-top-bottom-padding-ref.html": [
    "f855bab6a2f4a8845aebd98fb33b7c9e0d4adc8c",
    "support"
@@ -518027,6 +518620,10 @@
    "c74a27be78db56c8313327857b5cdac800b98a25",
    "visual"
   ],
+  "css/CSS2/positioning/inline-static-position-001.html": [
+   "b627fbcab58d0a988de8ef572f64a67c2929536b",
+   "testharness"
+  ],
   "css/CSS2/positioning/left-004-ref.xht": [
    "237186090738866c86455de96d580e7afe02f8c3",
    "support"
@@ -542640,7 +543237,7 @@
    "testharness"
   ],
   "css/css-backgrounds/animations/background-position-interpolation.html": [
-   "35100fb33622c03f6454ebc051569ccba67564e9",
+   "2e7f2e24a1db1c6dd34033a753327e0ed3b08276",
    "testharness"
   ],
   "css/css-backgrounds/animations/background-position-origin-interpolation.html": [
@@ -545512,7 +546109,7 @@
    "testharness"
   ],
   "css/css-backgrounds/parsing/background-invalid.html": [
-   "4ea58da801961ba9c8a315ebb0b1de846e16f889",
+   "76ff18f35d1f7471f165c61d731f8838a8563059",
    "testharness"
   ],
   "css/css-backgrounds/parsing/background-origin-computed.html": [
@@ -545675,12 +546272,16 @@
    "71404f2ce3e18fe336f076ce72ad028c4f665861",
    "testharness"
   ],
+  "css/css-backgrounds/parsing/border-radius-computed.html": [
+   "9799be68ec73a36c3e956a9c1f3931e838e684ed",
+   "testharness"
+  ],
   "css/css-backgrounds/parsing/border-radius-invalid.html": [
-   "4e004af8f36beb4651a8069e38f246136bb35451",
+   "f6d1bcb081e233eaab41c39290a0d16813800274",
    "testharness"
   ],
   "css/css-backgrounds/parsing/border-radius-valid.html": [
-   "317803bf8819b2147390434e78d4efdcdc6d906b",
+   "738362f96933c34fae38e6adfa9a82a556fc1f3b",
    "testharness"
   ],
   "css/css-backgrounds/parsing/border-style-computed.html": [
@@ -547576,7 +548177,7 @@
    "support"
   ],
   "css/css-conditional/META.yml": [
-   "ae24e3b1f6b0decfc4d8b77b11b6b95eb1d3b0d6",
+   "0b9cc5ac3d69363f4ad472166d59f7779a7a125c",
    "support"
   ],
   "css/css-conditional/at-media-whitespace-optional-001.html": [
@@ -547763,6 +548364,10 @@
    "47241f37a35792c554545b3f8f6365afc835b07d",
    "reftest"
   ],
+  "css/css-conditional/at-supports-043.html": [
+   "bf74ca6614b93c01bd93b3a98594c4dc9030b159",
+   "reftest"
+  ],
   "css/css-conditional/idlharness.html": [
    "63cf750933737d3a221ccb48d2a667c110dd0bf9",
    "testharness"
@@ -556119,6 +556724,10 @@
    "56cb1eca09d7741275df03ea217e2b31acb04371",
    "testharness"
   ],
+  "css/css-fonts/parsing/font-computed.html": [
+   "b3f104e62439d48d167559cfd2aeb5e509991f82",
+   "testharness"
+  ],
   "css/css-fonts/parsing/font-family-computed.html": [
    "2f5f7dd91cd22d1f161cd4b5b4c72b1c62b725d7",
    "testharness"
@@ -563912,11 +564521,11 @@
    "testharness"
   ],
   "css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html": [
-   "dc8a2e96f0231f33d1647a1583ea2504e8a857b3",
+   "fd9e696a55e17dc12079df698860b30b192d149d",
    "testharness"
   ],
   "css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html": [
-   "ab933844e9c2f1bec3b766c74578cfb1ae7ba940",
+   "4492f9b1ebbe7cbc6eadecd9cde2c1de1afd6192",
    "testharness"
   ],
   "css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-007.html": [
@@ -566831,6 +567440,10 @@
    "a4792599826cf13bb40a70c36d850e6593fbce55",
    "reftest"
   ],
+  "css/css-lists/inherit-overwrites.html": [
+   "d1f8072993abf47b2944f7e90c29390dae44af5c",
+   "testharness"
+  ],
   "css/css-lists/inheritance.html": [
    "590319d63fd09466f4d5fffe6943b4ff0430fcee",
    "testharness"
@@ -569612,11 +570225,11 @@
    "reftest"
   ],
   "css/css-multicol/multicol-span-all-children-height-006-ref.html": [
-   "e34036b008b6d30fe5784a5519e54b52412590e5",
+   "85dfa522c7de9152020342ddb67484b7f1e6977b",
    "support"
   ],
   "css/css-multicol/multicol-span-all-children-height-006.html": [
-   "dd63cd8716f58c4cae15b894196081607c1cb4fd",
+   "479fb2d0ced056f24b39126fa29574a6a811f8e6",
    "reftest"
   ],
   "css/css-multicol/multicol-span-all-children-height-007-ref.html": [
@@ -571271,6 +571884,10 @@
    "20a61eff41b68e8f756de2f3fe81bd20e736c92c",
    "reftest"
   ],
+  "css/css-paint-api/non-registered-property-value.https.html": [
+   "5b237e01eae6ca03672ecb7c533773754d79abab",
+   "reftest"
+  ],
   "css/css-paint-api/one-custom-property-animation-ref.html": [
    "c221aa0e89d30c68781be2c2c512e81b4403f921",
    "support"
@@ -572635,6 +573252,14 @@
    "e3b3f532fefe0ed88b01e19457a747bd3013ac21",
    "testharness"
   ],
+  "css/css-pseudo/first-letter-width-ref.html": [
+   "4a556189ccef81c03eb2a79a5035ab501416b26b",
+   "support"
+  ],
+  "css/css-pseudo/first-letter-width.html": [
+   "a912e764ef25a7dabae353af7c39056f67d288a6",
+   "reftest"
+  ],
   "css/css-pseudo/first-line-and-placeholder-ref.html": [
    "dbadd365c25a9e3214e9920948d2a5c934075e2c",
    "support"
@@ -578495,6 +579120,10 @@
    "ffbb796b6afe0fe9fa93e15de3586bef96174d8b",
    "reftest"
   ],
+  "css/css-tables/percent-height-replaced-in-percent-cell.tentative.html": [
+   "ed5effa8a755d9533054e0b6005900305735b3d6",
+   "reftest"
+  ],
   "css/css-tables/percent-width-cell-dynamic.html": [
    "5c7ef3bf8a2b7eac7371c7d86594f52cfb42815d",
    "reftest"
@@ -578828,7 +579457,7 @@
    "testharness"
   ],
   "css/css-text-decor/parsing/text-decoration-computed.html": [
-   "75a6f6b601adbc979c2ba8da8b44fd4afc372462",
+   "af577b17416596d630e982b47dfca42ad5669893",
    "testharness"
   ],
   "css/css-text-decor/parsing/text-decoration-invalid.html": [
@@ -579400,7 +580029,7 @@
    "reftest"
   ],
   "css/css-text-decor/text-decoration-serialization.tentative.html": [
-   "2f7b2f55fea63bbb2c752c4c79e4e3415f1578be",
+   "73cb5cc5cea7c6f63609bcf32f34e9096e479a2f",
    "testharness"
   ],
   "css/css-text-decor/text-decoration-shorthands-001.html": [
@@ -582791,6 +583420,10 @@
    "39426d0420287a730dcac47696bd69520e8a6b72",
    "testharness"
   ],
+  "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html": [
+   "085e5b6f12d6f9cf0ae1e0028be8cfeca5cc565f",
+   "testharness"
+  ],
   "css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash.html": [
    "2bea6aed780679f9eb0de3130e3acf4ffa2b9e98",
    "testharness"
@@ -597275,10 +597908,6 @@
    "ee086ef269d07bf6b0db5d1306a0f24af0ad8fab",
    "testharness"
   ],
-  "css/css-values/minmax-length-percentage-interpolate.html": [
-   "14af1352d1740d32cd52ab069ab1799f87803f5d",
-   "reftest"
-  ],
   "css/css-values/minmax-number-computed.html": [
    "c72c276625466a193bf8829e3ddbb87d7a565dc0",
    "testharness"
@@ -597804,7 +598433,7 @@
    "testharness"
   ],
   "css/css-variables/variable-presentation-attribute.html": [
-   "924c8e1c053afd4ae8949d13b03a0e6921369883",
+   "6c8a4430bc7bcffcb6b85c018cc92c0d25320fe6",
    "testharness"
   ],
   "css/css-variables/variable-pseudo-element.html": [
@@ -605688,7 +606317,7 @@
    "testharness"
   ],
   "css/cssom/CSSStyleSheet.html": [
-   "5fb6d6afa5663c71245441356040c9c1b958e6fc",
+   "90cfb02751fa540ae29d12357deb41c3671a7567",
    "testharness"
   ],
   "css/cssom/HTMLLinkElement-disabled-001.tentative.html": [
@@ -607883,6 +608512,10 @@
    "907694f7fc32ebb1c44787fcfbf5980627d2919e",
    "testharness"
   ],
+  "css/motion/parsing/offset-anchor-computed.html": [
+   "fc9ddb3d0c05030ce63951ad1b3d0867a507950e",
+   "testharness"
+  ],
   "css/motion/parsing/offset-anchor-parsing-invalid.html": [
    "af32ae2c5a588131d2404836af50cd114030c5b3",
    "testharness"
@@ -607891,6 +608524,10 @@
    "6cb4d44117fa6361fc87efdee22e79bc6df749b5",
    "testharness"
   ],
+  "css/motion/parsing/offset-distance-computed.html": [
+   "e9de1ef255f4936b8a5ae18121e62b8bd8061ad4",
+   "testharness"
+  ],
   "css/motion/parsing/offset-distance-parsing-invalid.html": [
    "2d0be83e03b455813bc3107ba758d9108081e935",
    "testharness"
@@ -607907,6 +608544,10 @@
    "3fe8a5b20d805ae3d330b8c653593b6b0c0e0d9e",
    "testharness"
   ],
+  "css/motion/parsing/offset-path-computed.html": [
+   "95210dd2376722f32d846bf033921c504ed2705c",
+   "testharness"
+  ],
   "css/motion/parsing/offset-path-parsing-invalid.html": [
    "c69f7c81a9d479c2334769b85d0553f659b8bd83",
    "testharness"
@@ -607915,6 +608556,10 @@
    "0ed360f6e369e5b53ae4ae0b1b535a7ff8e31ca9",
    "testharness"
   ],
+  "css/motion/parsing/offset-position-computed.html": [
+   "1cbdbdb0fe212c229c3b627cf6790a59a517a8bb",
+   "testharness"
+  ],
   "css/motion/parsing/offset-position-parsing-invalid.html": [
    "5e749e5b4ec5fe9bb39d1135a9ae74c524677e26",
    "testharness"
@@ -616140,259 +616785,259 @@
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html": [
-   "c6bf016f701649c2976a43e58c09990541cd8ade",
+   "ea248f1457b553f8eaa6d1d55b0d1d3cd10fa861",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html": [
-   "f2b2ed65e075a3ad20f51cb3cec232ebe2af6e96",
+   "86887baff0f7b9b38f674e4c1f7222e04b14f63f",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html": [
-   "da64efa2b2bf7c1582bff441615e49be9d10aad2",
+   "f7137463d59a6e96fd0eda539aceca1281651a26",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html": [
-   "25cd8eb9414a541be12792f7b3cf8a1bd553ac47",
+   "f47219e82ec915bb7c6448dd733f73f908e9b9f6",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html": [
-   "8be3ffa28e8440f6ec73dc70deff26186ee5d68a",
+   "d6d061dc1b5052d409d4d23c3871842f10c1aeae",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html": [
-   "ef26dec60492c1689176508490823bbae43ed9e8",
+   "136bc10d205f4ed8c8f74c2a7c91e9dca07a6006",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html": [
-   "95221583185e33eaca442f57d66fdc9902a08ce0",
+   "f66a499116e6356350fc6cce24680700990a174a",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html": [
-   "2632590be85cdfe228ac0aed91bcb4ea399433d4",
+   "ee48b439ae6c7ed7528a7556c4724f9829714c76",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html": [
-   "6075ce68587d863356eb8fae4d6e1d1549c2ffa7",
+   "4639acc920430d6f03463b4e3a5699cbbaf8a7b5",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html": [
-   "7d08fc4f9ac1d6f09c6692a01364b3fdcf89ba09",
+   "2b5375890967f720d948e81d81a73bf9b011d909",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html": [
-   "3e9cbbd06c487bfde65d18aca144ed1f349af341",
+   "bb9bdcb82d9fbd73e85c3992013a84370dfd7486",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html": [
-   "c90e13f29ca46a62df5f7ef6c1db37e9c1c95712",
+   "1a3c72c5d02712f7e34b28249f6aecffd3c678fa",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html": [
-   "6c56ff4de2029e45693cf05d080ff39b18d75f17",
+   "f0e0305caa72e5e9fa3d148d5bea2a758d26afe3",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html": [
-   "4187e962899eb55308632909f9bb1e2d9596613f",
+   "2c6acebe58c7f17ddc86b9857fdfa6e814f8529b",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html": [
-   "2f4ab38257982766b2784c1e4fc7994326cf0eba",
+   "3f6cf9762fc8b28c8ef5c67bbba0d64d2d0304ba",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html": [
-   "1dfb586093f08c63c756b2b5ce91f1484679b974",
+   "4f8742ceba37ef3e5240c1edfc1a250505f58af4",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html": [
-   "1a1b0e39cf280639c831f9ac1d71d08931f9f071",
+   "0d137557c3d16b24b1b3e7f492527b983b447e17",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html": [
-   "c5b781171e815470170ceef2490334875481f689",
+   "1a90a08c5fddf484ebb0cf4ff194c33dc6d59a3c",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html": [
-   "bf155edd2a096fbb3b7aba672c3d0e9c961d999b",
+   "964b38949a11c5e758a4da85363756db18e4700b",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html": [
-   "0e3176d745f951e1be89a2c6bd7fd7e09cf6976e",
+   "59b25c4b61073be02bf77f98a401513292d243ba",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html": [
-   "0dde92c78b8596faf42d9a0477fff764627083fb",
+   "1fd0a1d9b284b913c82e0aaa1b80f4137031b994",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html": [
-   "9cf0ec258f234fb30b4e3bd62b7056649646061d",
+   "9d2a8092c6bafc6a68a053924091e657db2a5ea4",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html": [
-   "00ce96cf5b45a297ae9e73eb97be58fe0d3d520d",
+   "c96d926d62f4fac391267f921a1acc2919c3a4aa",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html": [
-   "bf38c4dc4b54073a91c48edbf344739abfb20c1c",
+   "280c7e2b6ff82e0047e370f2dad2cffe63ee66b6",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html": [
-   "7097a6452e637f1560b22f15795860a9b49acead",
+   "667cdf9b940cabad060a6122df7a1c5eb611c637",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html": [
-   "2138e9496a84df41cf332f5c1db563ebbf5d5e9c",
+   "34f4c69e69d1e4201b6f9ecfa88918862c9a9cd6",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html": [
-   "775d984d1d9ceeca8e4b0a713c6498564470d0a3",
+   "683c4590ecc79ae99778e05e857273be7f4129f1",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html": [
-   "b963b2b164692ea1f62461bd5f548f1b38eafa23",
+   "7bf8efe9309f34c6012a8c3a74a685313ba2e7d8",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html": [
-   "fd38ecdb403f92f4bce7845cfa12f6807eb12ad2",
+   "e6b0fe1db83ca9a38119f5f8d7396a96b88dd04e",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html": [
-   "17dd3f97793a3b7c913410cb715ca6fa4d5656a7",
+   "d6cadf81d5f68b50ac17e4dc7a7426aaf6465b8c",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html": [
-   "5950768909d009360257dff43562e0a282d8eadc",
+   "3814e2eebd2f98d7a33c44077304f188f9afde0a",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html": [
-   "e2fef0c0b12db0b288e699ef0fc453e78dc98984",
+   "8ce9557a681d98a9291102cbd6541be9a8ae7cc4",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html": [
-   "fce4c56c52e787fbbe60c2db48642c68c54268fe",
+   "5cf26ced5991d23940ade42e8adddf91ca34250a",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html": [
-   "0faa58b63cf91257630afc5c4e7d8ba4645d4310",
+   "2f8a485a259c6370cd84c3706daaa9ac6601219d",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html": [
-   "1e3fd7d0c722f9a69561a2f847efbe32267eea3d",
+   "7fcd50eff0e03c752b663fbd0a81d2f2f30c9d6d",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html": [
-   "089705deded37cccc5492cf12f82f926ad4fd82e",
+   "7608bce23f5b9c6c889b58425ff2229e5925650d",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html": [
-   "13f0210e9d1e0531d315669c86d62d28accfa9a5",
+   "a731f206a2f0924c53c974b3a1e11a8016bb6277",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html": [
-   "e67d6b80bb9e10c65ce13ceca577e1259c51b994",
+   "0c558719d4f2303b9621cd34f0358e90d9ef7d29",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html": [
-   "192c8e3e975a325624abd0826c44a03399f06865",
+   "67446b6104c28e631f070d9c8361545f4c01184b",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html": [
-   "885aa1de62569b536896f310f931f7d985eda46a",
+   "979650c102cebf445278506220926b20ce75befd",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html": [
-   "1701347059f2fda70178a270fda4ee5df038a976",
+   "fbf2516bbd6128ae51db2cf72333775a093f35b2",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html": [
-   "86a8a458d63429e837a3878ac3ac76f5781020c5",
+   "b120bfcc46f2d25f0ba81674df70bae384e1e0ec",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html": [
-   "a8603d7414dec5438f907892dfc1f919741c7805",
+   "c7a49302ca9bd8408af89b608a948c25a07fdf92",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html": [
-   "2962263a1605a8bd9c377811fe3feaca5754ef04",
+   "3748d1d476f3744e2ae8e864c7028255aaaa19f8",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html": [
-   "869a8642cfc979bae3a678e96bbc526ee477c326",
+   "200f59ce49099969f0ac804f38a61443b2aa1fd1",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html": [
-   "1764a86b89e3e0c4104a617d6884e5ed11d4c3bf",
+   "f07985b3d63eb4e330538c3b57588984ddc1c76c",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html": [
-   "77b1190c0ea2f4342f9d8bb62cd40b74ce0f228d",
+   "a518cfd3617a732ccfea717be359012bfb9f31ed",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html": [
-   "2f3db82def4ba2a90ff218474e82d32389f67243",
+   "450748a098f10af502c22cfe8420f075db3274b6",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html": [
-   "668f2a8dafb570a74e2292ec35b7532bbe9f3a33",
+   "12ed0a1f525657f3e4fb35160a5e692c6893158b",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html": [
-   "32f58f73e911455247e5fbbb7f60bbf0d1f3a843",
+   "40cdc8f01167263041ba0c0bcd313768d2bff38b",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html": [
-   "d38adc31d443fe1beac23feed8ce8f49591002c5",
+   "8da63255648ba64dff82a4e0b09c428492d4b27e",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html": [
-   "d62dcef64de22da724bfe5879d78a3fa91dae5c4",
+   "150a0e0581f70ba6a172b1e405e646679afa5dbb",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html": [
-   "54359ed0338800f449d6f69e1ed2c7703746ae16",
+   "0991b5961f3dec0bedc2e5662aeef66d5b21c053",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html": [
-   "c635c56f897da81ad7e86f4d20b5525c817a1feb",
+   "0a4076211c4b72258b04dabd3e425ab0f10134c3",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html": [
-   "24fdb7fcf5b3b91c0846b8060a70fee474f4bb76",
+   "5178b55964e3221785726ce548cac5f7698957cc",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html": [
-   "b628316cd212c857fe59d7ced03482c2732be51c",
+   "02290fb8860057dfef66b6ff605fdc4a94b4afdf",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html": [
-   "a035a5b3e07bbad24095fca849f4c3a96b7e6f8b",
+   "12376fbc7acb95033a0fa1241393b25a1409ddf7",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html": [
-   "2ee97c26608824ff410aefc232a8b91de2e78d2b",
+   "eea3695fd9162a0f30a32246801ee87bef4dd9b7",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html": [
-   "7fac41372816b2e3f4b58f1171d42b9618c7b6fe",
+   "281bd8834e63292362f8ba417e6a75dc6551378c",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html": [
-   "371e15d49d4518c7c1b173bd23ea9dccfc887cf0",
+   "3732605bb982d2f388aa5fa7e2967000fb269bdb",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html": [
-   "8dc291eda68ca893a734a76253968ad64fb4c83c",
+   "4f1cdae15f0f97bd106ee3749c868e7eb4153734",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html": [
-   "ce7e446c466e989f95ebfa9664caf7920243bf56",
+   "fd85c795dd52ac0fc8b8eeb1e73e36e04995278f",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html": [
-   "cd7f9b282ab9c8e6e242073bed0614babf0aac41",
+   "97fc1e9fc83868c17c3c0953930f533f2582c356",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html": [
-   "8e0d4c6434317a76c770302b12ff77ab5073be0f",
+   "8280c0e8bb0f2a0b6f9b50453e8927746cb631b4",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html": [
@@ -616404,187 +617049,187 @@
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html": [
-   "f9c569ab1445ee2359946f3a6a0b281bb4b6ea1a",
+   "53c10c892f088345fca334e21f623e8a8d9b6c90",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html": [
-   "3ba603341cf3e39cef04bd1ec9cd8cb50956a778",
+   "d046de02d3c6f016f85eed5552774f1fbe3cefa2",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html": [
-   "ebb3a4c3feff461ea8a80fadb9f4354e3256930c",
+   "aa9c34ce9221b2f5e3ef9758406f008b2004b72e",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html": [
-   "240a0a4afb5968cd1952e039e740d256a0823d5e",
+   "e2040763dfbffe411d09ab5c5fbfdbcb37bb789c",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html": [
-   "d1c214d757e7a305b057f53409642d7b4c4d630c",
+   "0c773005226b563f8c241f6d5322bb87b0be822b",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html": [
-   "09a7400296503a61e1986dd315371e1a857fd3af",
+   "be5591ec6ac11446e9d6993e7417ab2e269d3f81",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html": [
-   "eda0180cb8a7d21951b127360edd45f149387d46",
+   "c3dc6de8d1de210cd0b38374e9901d417da93bfd",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html": [
-   "2eecbfe9834835bfada076dfcf8af9244ea8fab1",
+   "70c8bc9e2efc3d0c3f75ad53fbe480b096779c71",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html": [
-   "4fb0f025a731393e20c57b060a77e7d377198c49",
+   "41399373d8eb2636129d008d5f3d4ec0d20e9e3d",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html": [
-   "31ac2ed5b7beb8277284062b7d9f12c37673229c",
+   "d0c92b9df0bd254f30742eee3bf95a8829b006d2",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html": [
-   "83c7ba2bfe7d3176d0b5f912583f5c7c88027b51",
+   "6ed9f09562fa25a65a0f4f08280092a8b9ed4b22",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html": [
-   "eda79310becd0d8ad62cf8de0ec8b32a13fd60de",
+   "2e2fa577b22d4bde870f89d4310516e9d9b1848b",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html": [
-   "734b059108c71a87813574e9fa48950ead1d9900",
+   "c981e0710866c4bbd97a5c7ede6a8f331b681e69",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html": [
-   "9090a329622d0265b8368f86b88fed5ef456cc08",
+   "fb4d1331e69fba448e0098c32715397a38baf57e",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html": [
-   "66f26771088e2a9ec347ecf60f976aad7cb8fe63",
+   "c9d4bbb6b506ac54207174fe42075c7462fe6ce9",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html": [
-   "6c3b1e9a4e00cbf96e47840e3abb32ebc5b0bb6b",
+   "bc3814a244a133e55f19ea33962ce36daec1c467",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html": [
-   "c9d565cab7922d62ce19e20062e2c44263cf8d45",
+   "ddbb79eaa2bf8395d945a8202dc7600eda1355d3",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html": [
-   "5ad705d52e9c7fecc0d330e81c553500e750c399",
+   "9a14e65ba25c31c9b818adba0f762c51f604a5f3",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html": [
-   "4c9fcda5f964255325e5d7fe0342dc7a06b7e3b1",
+   "6dbe9ec777764610a3270b7b4a60542d2d95138a",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html": [
-   "6d1597c9b3d93c2fb04f127755834513f4f74a14",
+   "6015d2de0dd551083e53b2047445211618b06bd8",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html": [
-   "a9db519fd8bb91764c9800da0772c1e70f20af93",
+   "851d16ffab513cfbbe03fff17014a4f58e7de0c9",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html": [
-   "6eb9c7fc266129c42d27ff16d7bda38ccce28c1f",
+   "2d16fae743a954de7a915cb41ddd7ad5b0245fb0",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html": [
-   "45d2181ebff7d4cf46eff42e6c6d2005bf20311f",
+   "b7d4e5d97565df3dc4c21ccb49dbefa743f25439",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html": [
-   "7cfc4620c334da5f664f7cdc7d08556fcb88fc11",
+   "ca5078533900a3a415a9e818997d4a63e81099b7",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html": [
-   "2c0349dc9fc809f948bc34cfaf74e5c5efee92f8",
+   "c39885e056e2ef630f5868867dc73898b53ac043",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html": [
-   "d08969933708ebc4492234509031751f745a5138",
+   "a5b0ce730cb45a7019c69d126630077793217cb9",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html": [
-   "dc5afda9c61efce8ff585461e70c0bb1f61a0b80",
+   "2050e502dfacde8d82b528beb42c6063dcfdaac3",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html": [
-   "9a8b2a249c1e4c4b09aca453f1548ba97787043b",
+   "26c36948a74b4b27c1086594dea562aca308eb42",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html": [
-   "b52667ec708616ae4ec5c5e6cc2f3eacd3b6b9f9",
+   "5febab8939150b5d1e8b37b340106df459ba6c72",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html": [
-   "03bcc22076cf0b069c98b9bfea985d10f34f452c",
+   "4920dc040d7ee0d258773ca8d106de78fe0dfae4",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html": [
-   "dd92c3743d79fccad524e2f689b1798b9e33062d",
+   "5fd0f7141c902f0f8527e49dc0566a8b23be87b4",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html": [
-   "92524a89b93689413f884b52fce42c1b927925e3",
+   "0590b13203260a7708fcfa2f7a5f62db979ddee8",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html": [
-   "6c2165043d2e29943da904df6c77f90fbf16df7a",
+   "c33c34d3cc5a5ecb58fd6745e519d4f119239459",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html": [
-   "7066ea10ed112bfe2cd33e015994bf35a374cc8a",
+   "89c786f1abbdfd4b09cb58892dee9c8b11df1d38",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html": [
-   "85934258804dca037d2ee11074dd0d8a2e00831f",
+   "ec88f678a93d972d7b49af61f0e58d8864ef8d21",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html": [
-   "b8a2654b6ef9b7678a59bb2f9b92539d856279e3",
+   "98885fb49b5c7cc6939bf65c061fc6163903b4b5",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html": [
-   "d6c4215b4b194bd9f8a582a0016999630075b50e",
+   "cf340ee39de576d0c12b3c969f18596a8e38ffbf",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html": [
-   "d3166700948be15ca340e00cd362041087d45ae2",
+   "48f49a25aa06e0061316ebd02d1aa2d2c5c9daf2",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html": [
-   "0cb81c7d9850f7b1510b43900b90bf3cd14981d1",
+   "9e73dd550bc65d100a287f3439b9a8720f0d6de6",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html": [
-   "b43c49a19d4753748efdb72ae185b01b2fd1a704",
+   "f1b36447b064ae19121ddc9b602e6fb39ac023f9",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html": [
-   "494edc842308527329bdaf18b77a1b94f2fe7f8c",
+   "e021c6d688243cc34e487c23d41d3d21e65914db",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html": [
-   "64fac486ab9e7bbb1a657aa80006cf92a5096017",
+   "5a5919aa663907083aa8bbae915b66d600cbfbb9",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html": [
-   "5acbca772afe1db9997b3ea8aee9b8ef2525f5ae",
+   "aab9ddde0375e3b7dce567bf133edbedd4c08ce2",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html": [
-   "a8b96c8c648862117c043c588cdd57b007a90476",
+   "698cf2d40b67852a0d2cef633f5d0494e7dcdb77",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html": [
-   "d3bc6615b4381719c794cd7e8645f5eb33263552",
+   "7e0ef6463598f92c86484b0b0470eda448118f23",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html": [
-   "10ffd105efd15429e2636d394467c5b2f696c0eb",
+   "b3bf1b960ebeca9eebe7ecce284bd3a698e81c6a",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html": [
@@ -616596,147 +617241,147 @@
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html": [
-   "00f86a2a5ab3c62643c8cfce61d766b5a5d4bfe7",
+   "0ecdd155de1689c622f8d105f85adb996170e88e",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html": [
-   "b4f9e11b2d075d7988f5c0f0fa22d507bf5ebb6f",
+   "95b5eff0f762bf0fbdff54ccc8e8f5c0253135f2",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html": [
-   "dadb140135dcbd4751b4787ce5df0494f9cb5cad",
+   "73e73ee7a0650d815e68401e4ebeba95fe81ddd4",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html": [
-   "e194946b2b96d5c4c9f16e167f9e08973bbd3bc3",
+   "e936b709cec22d56b870db30b7a673464293b779",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html": [
-   "6d2121ca953b2e6864b6ba2bab38c612fd5f6119",
+   "216aae87f096fc25c7ce1f3028e8dc26c36964e2",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html": [
-   "9a7bb60b6612aa440933661cf0e2e51c1ca010bf",
+   "786da6c395965b8570a5e74adf56fe5928cd831d",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html": [
-   "daf161d82cbb557a68248888fd9b2e28e82ac000",
+   "093efad406861c8d9e86ec0e681cb3f76ba434da",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html": [
-   "446d8825b6f2cd7edc413f9874e3c42a7a906c20",
+   "96b5602f26572e50ac41f7b545df1f1c7f552d67",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html": [
-   "4f0378b00f81461412d0dfba62031508f3df5de0",
+   "b4816ce00f8b6d9152366bc226a86ef73b74c396",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html": [
-   "f54b15565246dcc4a6a6ad1d7531942e0f6fcfc5",
+   "762b53b9e69c659c227995d78214f6f0558a6f4c",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html": [
-   "f6e655f84bb595acd7c98c6e083f7d917320d941",
+   "9c7ca3593531e1660a2889e4abdfd79e9b9ab6be",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html": [
-   "a27ae4d570b3ec4ab1d212468a2005cc2247db4a",
+   "5ab5a069dc290afc6eebe6d43fa5966afad8450c",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html": [
-   "8fdfb4b3048969e1896785a955119819d7985e53",
+   "f2dc323c6d462d3200fcbc1d1b69503324f13192",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html": [
-   "120a98d695b114ca917ef9028dfa4439dacbe27e",
+   "6dd122c4b61906a57f5d0b42dd3491c011148de5",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html": [
-   "66b835f21c7e3618083771712c1c69596c3a2ac9",
+   "2758b88e7c9d2500f7afc02f6a47997ad0db75ca",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html": [
-   "474f715d88856f6a099fa71ec8eb516bdf42cee3",
+   "7b015c33724d8e5fc5bae8dd836dab2f6404a2cb",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html": [
-   "fbee45dd14bf494fe89376133199bc4bf7cbc178",
+   "c0325445cb36a4826c87253beb48cb667a955156",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html": [
-   "45d5a858af0b71bbb91201f14b0a12c8d612f9c6",
+   "4beec3f0bd96bdd2c0ad219e1e3eeba19023c35d",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html": [
-   "24ae7ee6460752a7500c6cf455a4392cf81f4830",
+   "3791a6f1bb2e3db5cbd69ee01728edd378bd869f",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html": [
-   "a75fc0cf4e18844120fb283ef47bfef75452a10d",
+   "3d8d0f5c07e71790c663eb40e7342edf629e80ff",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html": [
-   "a9b8687096c5e1a006ad3c44162c5acf45cdc2e0",
+   "55c7960876bc1953656e1eb7fef34c52f5250878",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html": [
-   "c93475452e6caf6dd43daa02734674966695fa82",
+   "3c0b0fbd6d1cb857c94d25d3c82bf614918d1128",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html": [
-   "cfb0bfd9b9d29434e8c9f78b33ca4b20355711a1",
+   "3806e09993c23b4ee2acfde7fe243018d701d539",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html": [
-   "1ca358ffc5db7abdf24284f9948764423cae017e",
+   "e8b71d126c25c2a7870ac759129eb3b90ec8daa9",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html": [
-   "3b2b02a2658ec61d26f37bbe147c5c5c0b1944ac",
+   "8b7e2955f6202cf7e047d446bf26c841b0860ead",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html": [
-   "481973cf855db1f58648f70f824c4e4a39476fbc",
+   "dcd261519271949691ef95eb9a042dcfdb84f7d6",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html": [
-   "b783572f789dc6361012bb4196ef89fdf45f79e7",
+   "d24afcd71127be198f850dfb6220c463367bbd16",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html": [
-   "5dc10a11373835ceb7895473ea174d1936db6d36",
+   "a49184aa5967f8ba3c1b5b4ef88860b5a7442d8f",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html": [
-   "4cce5432571a1f50c87aa2c9c0b6365260983438",
+   "aa74b164694f8ce3b7daa1c8ffbb7bf3a2a1fd4b",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html": [
-   "18d2fded95da0346669e4e9c1ea0751adc482f5b",
+   "450fe76fc5dde997157dbdb37dc49efcb02c30a3",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html": [
-   "c4b309b7d01741b40d1be11339bad6b76cfbcb6c",
+   "a96f6c30de1d8f9ae64968a1bb9d8c94b3ecc2d8",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html": [
-   "ea08d4959050370f9bf6c73dafb05cf5acd6c6b1",
+   "d4d131bc9e09e2b1dc98bcfc9ffddf715bccb7ff",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html": [
-   "c586f119f07b3841fe1098a44f57d6265197b804",
+   "73e4e91096bd70b4f6d83c22743ac831a7c92470",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html": [
-   "d1b90adbe4c7ebf87eb53bbd8c58aee0f40b835c",
+   "733659c75569ccb75aa19bddb7d3d40bd3e1800f",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html": [
-   "96a054ccb51a930091c814572bd95349f188209e",
+   "16ed0e557820ba3c527ae5c9020d0fa02ca45dbe",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html": [
-   "37c81b167f37e2728d959052f6669f89001434b6",
+   "383c0524e9a815da0b43b6d08a89d5e4b7f5c7bb",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-007-ref.html": [
@@ -616752,103 +617397,103 @@
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html": [
-   "ce2c66a1401effdcfaf8d2f0242d21b6e0fbbd68",
+   "a520c1cb2efb0c7dc16c97c1f2788f3609095a2e",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html": [
-   "67f665b4e1a787f2e8ce7e8b2731a7240b33d3e2",
+   "0aa6993e37c717b74e8c2763ce1261b30d778f6e",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html": [
-   "2fd8d50103a837d2a44729ad1e96ae28dcf6b96c",
+   "ff7d15abe8b7d8b57f8d0533ea201644bd612b83",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html": [
-   "767aa3a0118d81b3f6effc628d5630bf2a10f9af",
+   "8459758e50e88ec94644f62acca0d775ef3b98c6",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html": [
-   "70faca8d5c76fb05b5f808bd1a6a7b0632d0c9b9",
+   "4f0d1feea75d3d9c6b5e874eb4e09e5bf52aadce",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html": [
-   "1db76f3bcb747384e25558b664ffbf840ee42784",
+   "88abbd73f41039e3e0e905ad4e172bbc27d1f410",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html": [
-   "cf90885c039b2a95513cb0e235917efd550d4e77",
+   "1b02259de4faf92f03dbe4925c227e5cc53dd9b2",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html": [
-   "8e03b285a3e72d9d9662fe0e3d188fc8015cef49",
+   "b15f4e275b40ab6cec19ad4b176f89d6dc48c186",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html": [
-   "9616a24f1dcb7b044a101c149c531afdaf5376cf",
+   "59f9400fdc13d2cefbfb01bd0d0b87dce2568e0a",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html": [
-   "bf6036a306d5ff31c8a47241efd6bbd58160a430",
+   "86a84ad9707cdc662e578603f6d9636383757822",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html": [
-   "c32b164fa07bc84ae7d44230898d85523d464c58",
+   "b3f6397397508d731bda3bee7dde7c16fc4ed0e6",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html": [
-   "6065a235e536953f2a2f1c13c9b5163994488ffd",
+   "ec5cf47fdb9514d320b5550efeba3f791e8bed6c",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html": [
-   "ce13567c2daa53d88074a5375a6d3d03c746c1a1",
+   "af2d0c10a5d423a0d3b5ea10a1cd5239b1b0f5ef",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html": [
-   "f7287a1fcaaca35758ef1a18200afbb9fd77aa4f",
+   "7a7eb7120f8d56f1f8013be366bdff08cc7d684a",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html": [
-   "954a5bb7d0a233968a4f5e02ee8646aceb7b10ef",
+   "2973cd48c7adf9501d3de7eddb6027d9102a01b6",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html": [
-   "9e0cc4889f3948945fa66ac4a605e2bcde170ff0",
+   "2cb51b8f0ad65e870842f99f86dd7f02af59cca8",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html": [
-   "cfd7edf2cb7907a891dd487816c07984d2164235",
+   "ecc7c878ec25f69940aa09a5dbbe8edae7560ab3",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html": [
-   "40cb31fb46bc0669f01d1f7749846062ccdc2d68",
+   "7cc0eb6836b51e4188cc28e8f157e6aa67aeadc7",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html": [
-   "ea1d090f1babd85867097a29668a37c3203a2604",
+   "331fe177cd17ae39582a5b3f852253fe416f932d",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html": [
-   "445129dcf7ef4f58c09b505d1aa42598d451704b",
+   "5ec5c24b4cfe9c48055d8d6b3341aa6d80606aef",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html": [
-   "9c09a648827047e95ea343618f45d04d9b1fc07c",
+   "1564ccd6b365b2b0f7a80bfeeccce665b0eafb85",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html": [
-   "aba8605f5b9d9ce707dd6bae742cae8a06401d16",
+   "64bb8e6798df4b3243fda3bc557e8b6ee0e696df",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html": [
-   "7bd469cbef9d4d79b2ad1f3482dc7cbcbbc3192b",
+   "672908068872a247a3a980e0f6575bd1b89e9e63",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html": [
-   "6a334c5d1dac9fc3bb38dcd6f8a6e96fd069aa3f",
+   "c934b148f0b6c1f7250c880e9d7bba5beea2ab7a",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html": [
-   "90a9fb47a1dc8cf89f2879cda10486166d12f5c3",
+   "35db9799b90c6917205d818bb54890c4ed895757",
    "reftest"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html": [
@@ -620112,7 +620757,7 @@
    "support"
   ],
   "docs/running-tests/from-local-system.md": [
-   "35c1905a0c5690171489e93e1635c793433c402a",
+   "d1a5177894a826d0c8857a9b818d4a87ea022d71",
    "support"
   ],
   "docs/running-tests/from-web.md": [
@@ -620136,7 +620781,7 @@
    "support"
   ],
   "docs/writing-tests/assumptions.md": [
-   "eb25fccc55a5bb91813d0be4f7398717e91e517f",
+   "5afa41612120ff0feec19b01102e8cd8128c2652",
    "support"
   ],
   "docs/writing-tests/css-metadata.md": [
@@ -620152,7 +620797,7 @@
    "support"
   ],
   "docs/writing-tests/general-guidelines.md": [
-   "b39a77d1c7a2eabaa2aa340b832950e92ddc9719",
+   "b0e87b0391fb3c95e34ded8424dfcbee84c2ee6d",
    "support"
   ],
   "docs/writing-tests/github-intro.md": [
@@ -620192,7 +620837,7 @@
    "support"
   ],
   "docs/writing-tests/rendering.md": [
-   "13cc669bfe1842b1b873bec391c74d6abeb944db",
+   "e17b6ef879716ef49cc1ff21bd1aa6923282afaa",
    "support"
   ],
   "docs/writing-tests/server-features.md": [
@@ -628487,6 +629132,206 @@
    "c880aaab5cfbdfd11ebf885244cb7a5229c03ec5",
    "support"
   ],
+  "forced-colors-mode/README.txt": [
+   "de185c88aee4bc3711e47f13156138f56bf8a6c6",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html": [
+   "387aecacfb52afb1c6fe9c9fb535076e18e195ba",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-01.html": [
+   "05d362328a30c22324870626766a2f2c71465b5d",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html": [
+   "36bfaef0eeef70a7df21e6574bf06a26648b4d74",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-02.html": [
+   "cf521533c9e244d43edbb586cc66ffa22bb82bc6",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html": [
+   "81659a026c7af5dabc383965b2ce7d21dc19fae9",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-03.html": [
+   "936332a2d17be8800d1771e01c84dc0a3dc02662",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html": [
+   "f1fda49bf9b55205ab1e2b0e2eb578d67e952811",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-04.html": [
+   "c9b8136fdf9b8179ff5b60231532b3ed6c7c4476",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html": [
+   "e3665525188f7647c01449f097ea1d685bbfa4ef",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-05.html": [
+   "69ab33b23eb3a74232eaf6708da4f5be4488f522",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html": [
+   "a7cc320334db77409bd1bb70a6d3ff037e37a3ff",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-06.html": [
+   "c45a25a540b12fcbd87e078d5d084d65f57bbf85",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html": [
+   "ff2c8de952bb5b584756b7f2fd4462fec70f0cfb",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-08.html": [
+   "829d73900ce3eba7173e129558256cfdfd5a78c3",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html": [
+   "1e7aed22429261a64a3276097ebcb60028b35a3f",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-09.html": [
+   "4e9f517e08f3a16bbdc5b850305e4e0bfd7a7ee2",
+   "reftest"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html": [
+   "78148be9b865a274dbeca71e9798958fcbc2d818",
+   "support"
+  ],
+  "forced-colors-mode/backplate/forced-colors-mode-backplate-10.html": [
+   "cc7f977212bea378864c3668d57e57593ed190c1",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-01-ref.html": [
+   "5abe5867a94d2bbc311bcd7d2750c4d52ddc12d2",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-01.html": [
+   "1f4e3899a8a4d7db6fe0f484671eb69040fc1c2d",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-02-ref.html": [
+   "097f27eed8c673ac340ac5ce2f934431a9a6f74e",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-02.html": [
+   "414d3c1d4a726cf8551307ec86b2cdc132a3dba3",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-03.html": [
+   "ebe42e4e7502a327849fe2c65924480e00de4399",
+   "testharness"
+  ],
+  "forced-colors-mode/forced-colors-mode-04.html": [
+   "42b4efdba71bd959b5db159c1c448a27231b977e",
+   "testharness"
+  ],
+  "forced-colors-mode/forced-colors-mode-05-ref.html": [
+   "e2fffecd9c0c5e91bd1fa8fa830c1381717922c7",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-05.html": [
+   "6078d3a640291c5bdac6249af163f1ffa3f2cbce",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-06-ref.html": [
+   "9af878e25b18e62b41804be742c003c6b72b5def",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-06.html": [
+   "fc54186aac69f2af1ad03b3e1864c111714c9bdd",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-07-ref.html": [
+   "ac68e91485fe01938a78ceab0126f986b1f2f33e",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-07.html": [
+   "765868a2df4a6387531c66e828bee1a65d39cf19",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-08-ref.html": [
+   "775831ff7b75aeb733f9bda6c107a2fdef943a0f",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-08.html": [
+   "dac7989e509f5dc00fe2032ece111a7012755572",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-09.html": [
+   "16ca8a46104d06153b3e9bbd920d3187b0a7fa00",
+   "testharness"
+  ],
+  "forced-colors-mode/forced-colors-mode-10.html": [
+   "765013d9134cd0d901108d14c05610229ae0441a",
+   "testharness"
+  ],
+  "forced-colors-mode/forced-colors-mode-11.html": [
+   "5fa8ba4524adba8b6acde49efa3377131597bb76",
+   "testharness"
+  ],
+  "forced-colors-mode/forced-colors-mode-14-ref.html": [
+   "910b19df036d7e8a477ff41cd73d0fc0f8d51951",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-14.html": [
+   "c57193e99dbe5fb27be6082788f8fcb0c5b2ac2f",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-17-ref.html": [
+   "ca9616c8a1f93755500536e739c121c68ed3e601",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-17.html": [
+   "2202e0a7f94a2156c9bef42fb37d1fcce107d236",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-18-ref.html": [
+   "34eba583caa924d5aa9a6d0271acbc29c1b25a4b",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-18.html": [
+   "cc6ac8e4e09d38884cff63ee333052d02c832d2e",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-19-ref.html": [
+   "8d25ec5009c16caf4ce1b4e376f36d7602cb60a1",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-19.html": [
+   "5c4a09e4226e8e6109a1a136abcffb058f55ad68",
+   "reftest"
+  ],
+  "forced-colors-mode/forced-colors-mode-20.html": [
+   "6e9ef2f9c1c7653c2fd52550bd2ea0997adc58bf",
+   "testharness"
+  ],
+  "forced-colors-mode/forced-colors-mode-21.html": [
+   "4781ad2f7b089173a61893a1a41e8524d772689f",
+   "testharness"
+  ],
+  "forced-colors-mode/forced-colors-mode-23-ref.html": [
+   "a9501be396031f578bf0eedba4edff8de7ff8c85",
+   "support"
+  ],
+  "forced-colors-mode/forced-colors-mode-23.html": [
+   "20519ea181e82a64865b95f32f3486e52300eb06",
+   "reftest"
+  ],
+  "forced-colors-mode/resources/float-image.jpg": [
+   "ab06d5f94d16e22bb08fad79d6fef662b2a7de5a",
+   "support"
+  ],
+  "forced-colors-mode/resources/test-image.jpg": [
+   "93f6e196e58c74a515564a20e5afc944fd903847",
+   "support"
+  ],
   "fullscreen/META.yml": [
    "fbdb76390c7ad4390dac7d83004e5721fc62a37d",
    "support"
@@ -628724,7 +629569,7 @@
    "manual"
   ],
   "fullscreen/rendering/fullscreen-css-transition.html": [
-   "1d50502ee3bdb9b58eab3b516f1f743fa4e3a2f2",
+   "b494dc04e6d900ce3fcb6ece31dd987095f4cfdb",
    "testharness"
   ],
   "fullscreen/rendering/fullscreen-pseudo-class-manual.html": [
@@ -628820,7 +629665,7 @@
    "testharness"
   ],
   "geolocation-API/getCurrentPosition_IDL.https.html": [
-   "75426fc3b99d8663243e58ab9bbf0336a02a346c",
+   "1688c86278966552066235a514853e8b1064bb34",
    "testharness"
   ],
   "geolocation-API/getCurrentPosition_TypeError.html": [
@@ -628847,7 +629692,7 @@
    "50129608ac7e6e8d64e6dd966eda1172b5929a70",
    "testharness"
   ],
-  "geolocation-API/idlharness.window.js": [
+  "geolocation-API/idlharness.https.window.js": [
    "fe4ac8895dfb6e889eded7d694e3c87905868b4f",
    "testharness"
   ],
@@ -645872,23 +646717,23 @@
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html": [
-   "e50c7b525b495dd8cb1ce3540396a14aecec86af",
+   "e640fe468988b33bd992a07a195b7902c4d65d7a",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html": [
-   "3623ac2ccb2c5daa2a9f1294c1279083ddaa8ad5",
+   "1ca6b1dfda33e5a5dd7fa2b423979cbee8844a31",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html": [
-   "f512982a451b1d24d47965437162213dff919ec5",
+   "a554fb4b0c465136d636839eb96b463bec4f5c2b",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html": [
-   "67b055c217dd384fa66e27111254109957683960",
+   "1d470e668992ad546f721138441a80926dd630cb",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html": [
-   "11f60c010f05971d90b9f0bd30b68bd03ee0bf7e",
+   "443731c1b81375b737eeb9723a0c81d19ceab521",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/resources/404-but-js.asis": [
@@ -645939,6 +646784,14 @@
    "45a2520b68c84febc2d2f10c5c968fa682462d19",
    "support"
   ],
+  "html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js": [
+   "5a53bcd4d5ed92dc5ba9f035d96eed14fbca45a8",
+   "support"
+  ],
+  "html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers": [
+   "cb762eff806849df46dc758ef7b98b63f27f54c9",
+   "support"
+  ],
   "html/semantics/scripting-1/the-script-element/module/resources/import-utf8-with-charset-header.js": [
    "c2ccab7c621c09bdd7d871e9326e70c8a86e9ce3",
    "support"
@@ -648968,7 +649821,7 @@
    "testharness"
   ],
   "imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html": [
-   "9f9c3395733a8a39de61ce8a616c3871e20e7e4f",
+   "7e04da63ddb1f1132c53ab49e6bda713ace55ea1",
    "testharness"
   ],
   "imagebitmap-renderingcontext/tranferFromImageBitmap-null-offscreen.html": [
@@ -649671,12 +650524,16 @@
    "2cc364b610987ad5938c822287eb76079c2af2a3",
    "support"
   ],
+  "infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini": [
+   "2bac0b50db727ddc70b90ac3fb443954319723ef",
+   "support"
+  ],
   "infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini": [
-   "c34584ceec64be446532118dd12853106880c76f",
+   "4fc91a1c2b0f2e5ad121f837b50061791b9330d2",
    "support"
   ],
   "infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini": [
-   "49e4a40016e0eb2304a5e6e61b19556818c4ef3d",
+   "9ae71a6e73e22a855c69d3269936d71c17d6e9e5",
    "support"
   ],
   "infrastructure/metadata/infrastructure/testdriver/actions/eventOrder.html.ini": [
@@ -649996,7 +650853,7 @@
    "support"
   ],
   "interfaces/FileAPI.idl": [
-   "0ae43bbe38cf6cfd78d2f8f468d45ee3aea8ee2b",
+   "a630226c3df3d3dd09cb5ef85435319fdd8ef632",
    "support"
   ],
   "interfaces/IndexedDB.idl": [
@@ -650052,7 +650909,7 @@
    "support"
   ],
   "interfaces/background-fetch.idl": [
-   "0dbe3fbad3cf343c36977380653c73144c6659d8",
+   "cf3d75125402197f7b1a52b4a38fe9acc168643f",
    "support"
   ],
   "interfaces/battery-status.idl": [
@@ -650212,7 +651069,7 @@
    "support"
   ],
   "interfaces/geolocation-API.idl": [
-   "802e76ce85fed6b9ac5bf8d139b79ea8612182ed",
+   "e8dd1526fd071eb0ffe32f21d624d41c0ccfd1cd",
    "support"
   ],
   "interfaces/geolocation-sensor.idl": [
@@ -650324,7 +651181,7 @@
    "support"
   ],
   "interfaces/orientation-event.idl": [
-   "bfeca7a2ebcbe1a4e17f9aa9b48afa813fcd99c6",
+   "a8eef516f29b40c1b1604ad8d853e232f89eeabe",
    "support"
   ],
   "interfaces/orientation-sensor.idl": [
@@ -650376,7 +651233,7 @@
    "support"
   ],
   "interfaces/presentation-api.idl": [
-   "6ce0f5623ff1291406ca2d6191913a6df0b21c65",
+   "c1e566538aa0211ecebbd8d177765fc1dd02c2ce",
    "support"
   ],
   "interfaces/proximity.idl": [
@@ -650384,7 +651241,7 @@
    "support"
   ],
   "interfaces/push-api.idl": [
-   "74725a3025680c91af9d44d6aec80b89519d217f",
+   "419fe25e08b95eb45b0bb5da7e0aceb18163c1bf",
    "support"
   ],
   "interfaces/referrer-policy.idl": [
@@ -650412,7 +651269,7 @@
    "support"
   ],
   "interfaces/screen-capture.idl": [
-   "b5b0067650d3e6de5fa78991409a3744a1995066",
+   "4936ee9a519562d27531e7a4eeb28b76322d9486",
    "support"
   ],
   "interfaces/screen-orientation.idl": [
@@ -650436,7 +651293,7 @@
    "support"
   ],
   "interfaces/service-workers.idl": [
-   "0feabd389cf556a6ff6d3978fd23e2e288624054",
+   "c01fcab7f2d92491899907bc3c0505e8a4d4ba63",
    "support"
   ],
   "interfaces/shape-detection-api.idl": [
@@ -650484,7 +651341,7 @@
    "support"
   ],
   "interfaces/wasm-js-api.idl": [
-   "62bc0b7a839cce5308a85b162585bd387efb1163",
+   "828729071e4b5e77978bce021a8b5c36c3b9cd85",
    "support"
   ],
   "interfaces/wasm-web-api.idl": [
@@ -651504,7 +652361,7 @@
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-bar-001.html": [
-   "e381ffe77c391d91893789474bdd7530f3c969ac",
+   "9fc441230588216f5f5b20eab36b465c48cbb41b",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-color-001-notref.html": [
@@ -651556,7 +652413,7 @@
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-002.html": [
-   "85c7c58701042e3fd4494f7f2e04a7b16bccebb4",
+   "6cb1b8b4351dbf1f7afcbee3986fa8c7aee71810",
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-linethickness-003-notref.html": [
@@ -651592,59 +652449,67 @@
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-1.html": [
-   "ba47897c111b33f439fe9fde2e2ecb707c7b5585",
+   "b7efbc78ca01a3919b83edfed67c2721025d4e69",
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-2.html": [
-   "151265787ab3f5c8eb7b80588dc30d3e633d6e79",
+   "368fc0676d2135b6cd5381a822dd9ec92bf71512",
    "testharness"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html": [
-   "69be003195a82d28031de06156629a68457bfbcf",
+   "9c7db8a3cdcdd001909e84da770a8f1550a365a5",
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-001.html": [
-   "e87b357dd2ae7c06549538f5da422ff89f49ad1c",
+   "98fd807f91d35af3bfe2994d9283db5a185b357f",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html": [
-   "9169bb999c3096a886ee804a828ade453ef7abd1",
+   "b4e9a25f00b92a53654e2891dbb95f4ce985dc55",
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-002.html": [
-   "0b704dc801e85825359c34de3a5d6d081814ab5b",
+   "2bc848b415c9f69c08baff65993f515ea70ec0a7",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html": [
-   "3fe86faf9f36ef4ef4d4d2993eb8685c3fb70fa7",
+   "91b85450e3e86f5b53a8800ed3cc3ddd6b4a4c3a",
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-003.html": [
-   "9bd79836cc06fe7a05c806aa8c5083c914273472",
+   "44c4cf63e35a55a627746a6ab74ad9391399724e",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html": [
-   "10d0415304e8839ca0a4da38085df6dc69ca5aa5",
+   "9578254610b7221d8afa5938c97b4d9aa7b67b72",
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-004.html": [
-   "43410cba6089c23c7c960bb3c6207100cd341da2",
+   "431b0af4fff241640a53e3b70820b0e10eee4f99",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html": [
-   "9bfd7653d1d38a8e4b130eaf7bee00d0a39c9cc0",
+   "270a8ac2d9290c27953d57aa387b520dfed7f3f0",
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-005.html": [
-   "da77012b96dd9ebfb000df6ad22123bafe97ff4c",
+   "3be779734043dcded8a93761ed8bdfa13238220e",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html": [
-   "2abba28f0a34e42b0b0ced64af4499bb3b33fe0e",
+   "02cd8477d5bcb3bbe22a99bd87f2b68f388433e3",
    "support"
   ],
   "mathml/presentation-markup/fractions/frac-parameters-gap-006.html": [
-   "25bf644ec61fad2a82c794cd3bf5072ad644cb15",
+   "783696ace5ffcb0e0c9316b35dccec09abf9f045",
+   "reftest"
+  ],
+  "mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html": [
+   "1934bf4969adff014ec9e0d453b67687d08c84a0",
+   "support"
+  ],
+  "mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html": [
+   "8c92d665c738c322000bc76999ea92b3eac1585d",
    "reftest"
   ],
   "mathml/presentation-markup/fractions/frac-visibility-001-ref.html": [
@@ -651660,19 +652525,19 @@
    "testharness"
   ],
   "mathml/presentation-markup/mrow/inferred-mrow-stretchy.html": [
-   "ee40561a634c00eb9e29dd66d4a28f579a78af59",
+   "b6a51762dfda0b05cbcc272b9fb5cedad0c66a94",
    "testharness"
   ],
   "mathml/presentation-markup/operators/embellished-operator-001.html": [
-   "78c5069b90cab40ec2703c6c01c5d8643b5f836d",
+   "31bdff2fd7c2c4e463adfba2c3768d678c5c7424",
    "testharness"
   ],
   "mathml/presentation-markup/operators/embellished-operator-002.html": [
-   "da343dd0bc35a79e0f309c38bbff34a69aa7df34",
+   "1bbed4e229ef3cc010c9fab7b9541911abd310f6",
    "testharness"
   ],
   "mathml/presentation-markup/operators/mo-axis-height-1.html": [
-   "63595b0278445db92e3e5bfe8b7cfb03fd9bdc6e",
+   "3b28d976f0cf999fe4fd1f684696823eaff47749",
    "testharness"
   ],
   "mathml/presentation-markup/operators/mo-form-dynamic-ref.html": [
@@ -651723,6 +652588,14 @@
    "53cf76c0588ff2dd664b3fb9e622c7e30b5c6eb7",
    "reftest"
   ],
+  "mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html": [
+   "3efeaa0dfe0a28a635bde46ae0ef725c6d95c426",
+   "support"
+  ],
+  "mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html": [
+   "b36894e98f67929846224aaa56e9243fe1fc8646",
+   "reftest"
+  ],
   "mathml/presentation-markup/operators/mo-movablelimits-ref.html": [
    "cb868d2400e8b8e536e3103a06a5d4502b1dbfba",
    "support"
@@ -651739,8 +652612,20 @@
    "8fb095b61240d93caa3289f68fe52c37069f14c9",
    "reftest"
   ],
+  "mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html": [
+   "403a76f483e495fe085c26a7a94cc51ee0349555",
+   "support"
+  ],
+  "mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html": [
+   "c49a899a0faafec345d9379d25c4f34e3e5d4583",
+   "reftest"
+  ],
   "mathml/presentation-markup/radicals/root-parameters-1.html": [
-   "d09d117b8ad5b52ea3c8778dcd6c4dd56a7b9270",
+   "064336216805bf82528247d5ef888b84c97572db",
+   "testharness"
+  ],
+  "mathml/presentation-markup/scripts/cramped-001.html": [
+   "2be1c8ad2e8c17b3fcc0f857567fc7c18f040c16",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-1.html": [
@@ -651764,11 +652649,11 @@
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-parameters-1.html": [
-   "a5f21ec5458f0cce4b6517e39572d3e928585e20",
+   "0c6610cc18fe6f71523f6c2209b8f02328ffa634",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/subsup-parameters-2.html": [
-   "0abf01838c8c8c05f1c6cb4bf72e9fea57bca8d9",
+   "da7574ac4d0db19cd3174f42be161fbf6d7490bb",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-1.html": [
@@ -651776,19 +652661,19 @@
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-1.html": [
-   "26a1b3964cc10ced8762314390840db94efdb970",
+   "9217488a561735c75798e2c05197f5a84b233237",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-2.html": [
-   "aed22235b8c192ee69237c63face745e7e35e1bd",
+   "6f9aa4763a9b1a902224bb7e7902eceb80cada45",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-3.html": [
-   "6a1e51cdc4516ae1fdd2784c0e77682222773b2f",
+   "a09e2cbca32efc40f41de2924a382757a765a280",
    "testharness"
   ],
   "mathml/presentation-markup/scripts/underover-parameters-4.html": [
-   "e569c15a6993321051b2490f62c5b6ae39666b7a",
+   "8df0f4d8ef84b26618185830253cc80b8df493c6",
    "testharness"
   ],
   "mathml/presentation-markup/spaces/mspace-children-ref.html": [
@@ -651824,11 +652709,11 @@
    "testharness"
   ],
   "mathml/presentation-markup/spaces/space-like-004.html": [
-   "091a3ea0a628c9b18b4b262aef737d7a7c9dac0a",
+   "2ad6b0b772c39cad147604523409d85bee999564",
    "testharness"
   ],
   "mathml/presentation-markup/tables/table-axis-height.html": [
-   "3eaf9c8fff483232eb6794b603f270bb86c47d3d",
+   "f9354266a7c6c42a75519e9771eb2c61536ad8e5",
    "testharness"
   ],
   "mathml/relations/css-styling/attribute-mapping-001.html": [
@@ -651904,7 +652789,7 @@
    "support"
   ],
   "mathml/relations/css-styling/displaystyle-013.html": [
-   "60bc906452b670ff2edbed125172ca589234d4c3",
+   "30be35c02471388e3b0d59a9cb22ec006ca74511",
    "reftest"
   ],
   "mathml/relations/css-styling/displaystyle-014-ref.html": [
@@ -651912,7 +652797,7 @@
    "support"
   ],
   "mathml/relations/css-styling/displaystyle-014.html": [
-   "5f30f534e5eb51efa3738a41d3221aa67aa03786",
+   "d54a8043788a343e2b415256f59d611b49c89102",
    "reftest"
   ],
   "mathml/relations/css-styling/displaystyle-015-ref.html": [
@@ -651924,11 +652809,11 @@
    "reftest"
   ],
   "mathml/relations/css-styling/displaystyle-1.html": [
-   "73e5020e74ce3c77c38b0b7224ed4a0245f5f1b0",
+   "19494a3e17a0bd822a87ffa1cd105a48c85f7e58",
    "testharness"
   ],
   "mathml/relations/css-styling/displaystyle-2.html": [
-   "fc1bd7a432db692f695e101cf07d183fff71a5a5",
+   "e544f4534dd31463e6d0c3374aff1498991a5b46",
    "testharness"
   ],
   "mathml/relations/css-styling/dynamic-dir-1-ref.html": [
@@ -651948,7 +652833,7 @@
    "reftest"
   ],
   "mathml/relations/css-styling/lengths-2.html": [
-   "22fc40156f177564beb0eb0907637a6bce6e60ca",
+   "90b0887d03137e454b9d2e871de722594155b9b1",
    "testharness"
   ],
   "mathml/relations/css-styling/mathbackground-001-notref.html": [
@@ -652284,7 +653169,7 @@
    "testharness"
   ],
   "mathml/relations/html5-tree/clipboard-event-handlers.tentative.html": [
-   "0031004616886bc5933358d005d16d2299d52095",
+   "57ababb4a919d8a5ba876c9ecf7a72c7a113b676",
    "testharness"
   ],
   "mathml/relations/html5-tree/color-attributes-1-ref.html": [
@@ -652296,7 +653181,7 @@
    "reftest"
   ],
   "mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html": [
-   "13f0139273690992825daa68fcc0666679590490",
+   "19f3e6c82aa80a395b5d24c069303b7b9b4cf41a",
    "support"
   ],
   "mathml/relations/html5-tree/css-inline-style-dynamic.tentative.html": [
@@ -652372,7 +653257,7 @@
    "testharness"
   ],
   "mathml/relations/html5-tree/math-global-event-handlers.tentative.html": [
-   "807a29ee315f2a0d4680b693bb9137a6cd50ca1c",
+   "b5b9c75dac1c6c09b4bc74c464f468c681b43b4e",
    "testharness"
   ],
   "mathml/relations/html5-tree/required-extensions-2-ref.html": [
@@ -652383,6 +653268,14 @@
    "e1d7a853704ce5f9edf2f2d6d6a414be51fe4e4b",
    "reftest"
   ],
+  "mathml/relations/html5-tree/tabindex-001.html": [
+   "aaf82f77caa87cadd4dfa4706a2bc15192006a6a",
+   "testharness"
+  ],
+  "mathml/relations/html5-tree/tabindex-002.html": [
+   "a1788d562e3e20e7160d27ff2fd940e6d3851ca3",
+   "testharness"
+  ],
   "mathml/relations/html5-tree/unique-identifier-1-iframe-1.html": [
    "6b3ab07f1aa1dcf7edefd39a3e5f5bc4724ff960",
    "support"
@@ -652427,6 +653320,10 @@
    "a574b01706b5fecc232d62735ef7e89938594769",
    "support"
   ],
+  "mathml/support/box-navigation.js": [
+   "f4897cfe9998a230125a095a00e669cbedc39139",
+   "support"
+  ],
   "mathml/support/feature-detection.js": [
    "50ca926d25ea810177068a5f5de29f39749db7e6",
    "support"
@@ -656167,16 +657064,12 @@
    "3e86f97729bd29e3c57da12480e81a8a98457c43",
    "testharness"
   ],
-  "mixed-content/generic/mixed-content-test-case.js": [
-   "ee34c4973a9014acf78037d2e85c24aa994cc266",
-   "support"
-  ],
   "mixed-content/generic/sanity-checker.js": [
    "55a103adf0f29c615d40bc47943be1aec25c8f1e",
    "support"
   ],
   "mixed-content/generic/test-case.sub.js": [
-   "d25986e5c26745976e13d2d683c3bece3ac2ccc0",
+   "9e9e169f15ff07423065c38afc8a449de6513813",
    "support"
   ],
   "mixed-content/generic/tools/generate.py": [
@@ -663116,7 +664009,7 @@
    "testharness"
   ],
   "orientation-event/META.yml": [
-   "ba1811f6742078a6d05139527ac3873539a7d7ce",
+   "88014849d067082afcb56964bc3446ba93350c1b",
    "support"
   ],
   "orientation-event/devicemotionevent-init.https.html": [
@@ -664783,6 +665676,10 @@
    "0eae0ddfd6ef1e9de2251f50914a855f4142b9d5",
    "reftest"
   ],
+  "portals/portals-set-src-after-activate.html": [
+   "8da6b341840162dc7348b95cfed060c075a75135",
+   "testharness"
+  ],
   "portals/references/portals-rendering.html": [
    "4a8414ab5656593811772c3728e4ee83eb034457",
    "support"
@@ -664887,6 +665784,10 @@
    "92aef00380ae4a6180039ad0b10169c81a190441",
    "support"
   ],
+  "portals/resources/simple-portal-adopts-predecessor.html": [
+   "b199bdd93b3a03437ebde7abaef9b14ac61b1f76",
+   "support"
+  ],
   "portals/resources/simple-portal.html": [
    "29380099af1a3b9bf0990990ecefd8fa632d30c4",
    "support"
@@ -665584,15 +666485,15 @@
    "support"
   ],
   "referrer-policy/css-integration/child-css/external-import-stylesheet.html": [
-   "01dfd86b5643145609369ba0d6448e248a26a2ae",
+   "a4bbddb5646fb5bc7253f4a68591232fb94c1aa3",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/internal-import-stylesheet.html": [
-   "1c018e84ee8f6b5a809f9f813180de6f0c8837c4",
+   "32adf5adcad47982daef04ec1eb47d53ebf32629",
    "testharness"
   ],
   "referrer-policy/css-integration/child-css/processing-instruction.html": [
-   "87b123bbad05e2f3daf03aca2a2e2b2490182a7d",
+   "56db82c1d3c96cfd9ed772e1381d7dff6749c8f2",
    "testharness"
   ],
   "referrer-policy/css-integration/css-test-helper.js": [
@@ -665600,71 +666501,71 @@
    "support"
   ],
   "referrer-policy/css-integration/font-face/external-import-stylesheet.html": [
-   "f0782dff86c26cc6580a5e0c2b44eeb38b23816c",
+   "ac26aa2828ff3382288a715097b23efd2f49371b",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/external-stylesheet.html": [
-   "d242b08635f338350cc715a449ed52e564a722e6",
+   "fa21a1d53f73066fe22f28476012eebdbd2771b5",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-import-stylesheet.html": [
-   "f72ba3941fed6f28870fe36c4fac38a4ae73b27e",
+   "d2c8ae754fe865039496ec6ff350510768f07482",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/internal-stylesheet.html": [
-   "79c521b322dcec9d54794e4413c8107315e15c0d",
+   "43aa37151b4047e29341ca015677123c08b7b569",
    "testharness"
   ],
   "referrer-policy/css-integration/font-face/processing-instruction.html": [
-   "c38bbbc15f8072c1a74776c18370b4840f7fcd3c",
+   "6c864afd9ae2a0b40f2de6e9ecc645b8bc2a18e7",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-import-stylesheet.html": [
-   "b6d667654e3dbb577d4497034440a1be8afecd8a",
+   "15aae6f82479c94b643f27e88b3127dbd6d46010",
    "testharness"
   ],
   "referrer-policy/css-integration/image/external-stylesheet.html": [
-   "85ad8055c0a41327101c9a5698e6ef93868386d6",
+   "eed146dac0f4a7408f2fdf09b6a09cfcc3d67403",
    "testharness"
   ],
   "referrer-policy/css-integration/image/inline-style.html": [
-   "aa7778aea0a0e1338555f23f1cc16d846c4fb0b5",
+   "1e94b3df2cd9093dc489c46a079cd14adaffb90e",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-import-stylesheet.html": [
-   "63a8ef943747a54fa81fc282aa770b3217e106fb",
+   "75ca554381ea6226700891a227e0266b3625ea62",
    "testharness"
   ],
   "referrer-policy/css-integration/image/internal-stylesheet.html": [
-   "f7bc4b8ad1bbed8ecee68a6414a4dfe51039a87e",
+   "caef85329feaacf44f14cde39624ca2469a33ea7",
    "testharness"
   ],
   "referrer-policy/css-integration/image/presentation-attribute.html": [
-   "0d562712a071c4b17b24c5d834b93b3cf9db97ce",
+   "df5593b218f32e1d858b9c0595de5dddbae8a575",
    "testharness"
   ],
   "referrer-policy/css-integration/image/processing-instruction.html": [
-   "82a435a5212ac6972d7285f5d8688a23b302b1e1",
+   "5d88fcbb6db762a30172d12f77d57396d650d048",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/external-stylesheet.html": [
-   "b91bedee06b7a2f14a3d7010e306a6e0d2c4f091",
+   "12bc9eeba63f2a0447722839a53483300780daf9",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/inline-style.html": [
-   "a14ada69a50ed42300eff47c8bd068f9dd78f03c",
+   "2d4725e0bb1454035e560ad8218ccbbc0eb98107",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/internal-stylesheet.html": [
-   "e81fea3605cbdbbd1b33886c08eb78407ee61334",
+   "38f4cf8b569a815eb8ce00a608a96de1cf2b1d70",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/presentation-attribute.html": [
-   "393e8f67c58f02b698e8e12d76e8d3607dc3e642",
+   "e2104a6a6c1f2a6cd09e43a4c0b3c6eafb795871",
    "testharness"
   ],
   "referrer-policy/css-integration/svg/processing-instruction.html": [
-   "e405d0bd6de16ff439185d30c3956d766ed576e1",
+   "4ff9a5189029c5646d87d6693a507ee9445272a9",
    "testharness"
   ],
   "referrer-policy/gen/req.attr/no-referrer-when-downgrade/a-tag/cross-http.no-redirect.http.html": [
@@ -675680,7 +676581,7 @@
    "testharness"
   ],
   "referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html": [
-   "060fabdb1c8cf46a8ad69984954dd8bb2ccf27c4",
+   "6639ebd98731b28cef86e3743e4def21cfa14fa9",
    "testharness"
   ],
   "referrer-policy/generic/link-rel-prefetch.html": [
@@ -675688,7 +676589,7 @@
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-and-values.html": [
-   "8a94cd7c102becc811898597388e0a9e4a8e25aa",
+   "e6b7b07d517ee9cc94ff06775fef3b70a48124b8",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-and-values.html.headers": [
@@ -675696,7 +676597,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-combined.html": [
-   "799bba8a32ca2b36df9e11ac528d5b72c0218e65",
+   "b5c27515dff2bdbfea21ef1887de888b9d456603",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-combined.html.headers": [
@@ -675704,7 +676605,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-one-invalid.html": [
-   "7304df846c9feb8c84158191577fb2910ef2adc0",
+   "5561cd85009c8dfb153ba157543952d26b92e4af",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-one-invalid.html.headers": [
@@ -675712,7 +676613,7 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers-one-unknown-token.html": [
-   "57ca2f4384a45bd0dac1994f6ede849d9898c6da",
+   "f07500e546acc9d49f9ee472206a6d1752b1343a",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers-one-unknown-token.html.headers": [
@@ -675720,19 +676621,15 @@
    "support"
   ],
   "referrer-policy/generic/multiple-headers.html": [
-   "43f8bb72c18646fd710bf5ba62ac80bf26a0e672",
+   "d6c3a90ccb8089cb4f256f43cc8aa0165a974f91",
    "testharness"
   ],
   "referrer-policy/generic/multiple-headers.html.headers": [
    "dd1dd853f2030bac5c036f693a7cf0eca6daba1a",
    "support"
   ],
-  "referrer-policy/generic/referrer-policy-test-case.sub.js": [
-   "4722b0b1b8b373d4bc9ae4c7c41912e693dd9d1b",
-   "support"
-  ],
   "referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html": [
-   "65c48e242bf10a0e0125d7ed3b254ed54cd74b41",
+   "f6ecd884df3dd073e9440a0003d5d92135ed2c9c",
    "testharness"
   ],
   "referrer-policy/generic/sanity-checker.js": [
@@ -675740,7 +676637,7 @@
    "support"
   ],
   "referrer-policy/generic/subresource-test/area-navigate.html": [
-   "5de90e5b5101b19a083f0705b5b6df8036202281",
+   "2a4f29654df1da8e3f18359dacf6ce092c325a67",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/attr-referrer-invalid-value.html": [
@@ -675748,35 +676645,35 @@
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/fetch-messaging.html": [
-   "a20f6a11ca9e0dea77109c34abbd564142f01d38",
+   "2678af822ef40855424cbbcb655c2d220513539f",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/iframe-messaging.html": [
-   "15b6ab8f08816d9369b34fabd56361216ab149af",
+   "b8bdb0e5e034c447f4e4be900cf16cccca54b6ee",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/image-decoding.html": [
-   "f515ceb1fa335ec25f2107c43d654081ab49ce7a",
+   "76ce0e263a7843cbe4717692194d5cc859764f18",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/link-navigate.html": [
-   "dbb9a897208cff6460b20901f6f895ecc3ff55b9",
+   "21783d3e31d1cfcaf228440ee7f6e0852365ded4",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/script-messaging.html": [
-   "967c58a4a10c7ed932258a728a3255e2e627169f",
+   "1bc0ba13ef70f3bad20989c4ef56a82d511e004d",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/worker-messaging.html": [
-   "294fa574b5862daa58bd0b47c930c936e2771a93",
+   "c2db8fe845215a5b34d5f13d2a98eb72d51ec778",
    "testharness"
   ],
   "referrer-policy/generic/subresource-test/xhr-messaging.html": [
-   "f88e2e57595b8f9ae6acdf949ee6a3b6f07d64c6",
+   "c1f89919ca36a115d6184ef1a9983dd0e152385e",
    "testharness"
   ],
   "referrer-policy/generic/test-case.sub.js": [
-   "356f8054f6eca86f7e6f651ab1040ad0c39994a9",
+   "c8a6b139f33fa044ddb644409b1e4437d3df338c",
    "support"
   ],
   "referrer-policy/generic/tools/generate.py": [
@@ -675784,7 +676681,7 @@
    "support"
   ],
   "referrer-policy/generic/unsupported-csp-referrer-directive.html": [
-   "3c5cd740af9d5a4e072b829b6b7d3c37e4268aa8",
+   "a7f22210edd9703c67cf9df819c07117b5399445",
    "testharness"
   ],
   "referrer-policy/spec.src.json": [
@@ -676155,10 +677052,6 @@
    "f8ca2f1187e934fc9b07b5dbc31769f887528b51",
    "testharness"
   ],
-  "resource-timing/resource_ignore_failures.html": [
-   "fa9e411ea989218489adf02224b15aa46bcfbd9a",
-   "testharness"
-  ],
   "resource-timing/resource_initiator_types.html": [
    "9912da7c3400138d73245acc372463ca174e6f58",
    "testharness"
@@ -676439,6 +677332,10 @@
    "beb12f5da551780fcb4378bef4661b9699a5d009",
    "support"
   ],
+  "resource-timing/resources/status-code.py": [
+   "6ddad159524db2870acd4a56115af6d74c460387",
+   "support"
+  ],
   "resource-timing/resources/webperftestharness.js": [
    "203eb0d16b4f3ad8d22877ff7afc7064fe252892",
    "support"
@@ -676455,6 +677352,10 @@
    "c7f777a174a6a307c81fba3d6082fb152be99b1f",
    "testharness"
   ],
+  "resource-timing/status-codes-create-entry.html": [
+   "fb4236e6bbe856be21e5af577a3fea03d774b8e1",
+   "testharness"
+  ],
   "resource-timing/supported_resource_type.any.js": [
    "31e40096ddb2c3a8e38ddbeec00a67ca7a91ce59",
    "testharness"
@@ -676584,7 +677485,7 @@
    "support"
   ],
   "resources/chromium/nfc-mock.js": [
-   "9722f8ee57009254b9186bce2b195f02356a4f1b",
+   "01a4e70d0c9730d1bf9d8ab93037549acfbee61b",
    "support"
   ],
   "resources/chromium/sensor.mojom.js": [
@@ -676644,7 +677545,7 @@
    "support"
   ],
   "resources/chromium/webxr-test.js": [
-   "73dda0920f12fb0f674f41765b27bd1c3c4a6b6a",
+   "894e2a24f653e150b738fc576135ed4871a3a644",
    "support"
   ],
   "resources/chromium/webxr-test.js.headers": [
@@ -677168,11 +678069,11 @@
    "testharness"
   ],
   "scroll-to-text-fragment/scroll-to-text-fragment-target.html": [
-   "fa229dd032f29d45e847d9f03f7cd877852dbd87",
+   "bc513126ae625846ef16e15f23ff174e78709fdb",
    "support"
   ],
   "scroll-to-text-fragment/scroll-to-text-fragment.html": [
-   "db1b1ded3065775f7d763e21fa332c4d36b507c7",
+   "3e3cfcbbb5bdf9f9e7715f7c3c300211bfb1ab92",
    "testharness"
   ],
   "secure-contexts/META.yml": [
@@ -678656,7 +679557,7 @@
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-frozen.https.html": [
-   "ef27ac3d372e5d40fb576e2b59020026df8b66bc",
+   "479c28a60f2e4a2e32ea765a7480301360c34505",
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-include-uncontrolled.https.html": [
@@ -679284,7 +680185,7 @@
    "testharness"
   ],
   "service-workers/service-worker/resource-timing.sub.https.html": [
-   "f0502cac727896ce674f3b93a9dd4cfcbf54b41b",
+   "2a366087cd35e793a9544e97327bb3f5ed7b3091",
    "testharness"
   ],
   "service-workers/service-worker/resources/404.py": [
@@ -680724,7 +681625,7 @@
    "testharness"
   ],
   "shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html": [
-   "83cbc3d8185e1bb89ec74454e333522dc4c0155c",
+   "6893ad394b4e049416263257740925431cdbdab8",
    "testharness"
   ],
   "shadow-dom/Element-interface-attachShadow-custom-element.html": [
@@ -687348,7 +688249,7 @@
    "support"
   ],
   "tools/ci/run_tc.py": [
-   "e54f431955a55fd4bc70fed0952be8d260e93478",
+   "ea4a1ac1a6ac4a9a2b2a0265e74c70dc5fdc957d",
    "support"
   ],
   "tools/ci/taskcluster-run.py": [
@@ -687628,7 +688529,7 @@
    "support"
   ],
   "tools/manifest/item.py": [
-   "ea0c9b1742c63a8daac6b30572ffb9c7d4171b3a",
+   "9619813fc9beadb9f6584df2300c9d8e56b162b5",
    "support"
   ],
   "tools/manifest/log.py": [
@@ -687636,11 +688537,11 @@
    "support"
   ],
   "tools/manifest/manifest.py": [
-   "616f95eb2c692dfa0f19eb3aaad0d6fccd36baf2",
+   "8aace771cba32acca56c9c37887d4a900cafbeb0",
    "support"
   ],
   "tools/manifest/sourcefile.py": [
-   "54cd3b744886f7d1dd13dcd89465c20770603c22",
+   "4788fc9bdb640447eb9997808c5b7110661a3960",
    "support"
   ],
   "tools/manifest/tests/__init__.py": [
@@ -687656,7 +688557,7 @@
    "support"
   ],
   "tools/manifest/tests/test_manifest.py": [
-   "5717173b3f268b13fee9a1b1064e81e5c2a91698",
+   "8e008be091181dda3a08673a38e4faaebfb119c1",
    "support"
   ],
   "tools/manifest/tests/test_sourcefile.py": [
@@ -692116,7 +693017,7 @@
    "support"
   ],
   "tools/webdriver/webdriver/client.py": [
-   "5425572016076494cd1d7da6576a6c7a53c9015e",
+   "0bddd7b13738321ed57c6df1ed6f316b3a5c7eb5",
    "support"
   ],
   "tools/webdriver/webdriver/error.py": [
@@ -692136,7 +693037,7 @@
    "support"
   ],
   "tools/wpt/android.py": [
-   "1dc057ff502f2539afb848b45752ea5a2c3ddc61",
+   "51deb71e316538148e06b146bca7555fb7b046df",
    "support"
   ],
   "tools/wpt/browser.py": [
@@ -692172,11 +693073,11 @@
    "support"
   ],
   "tools/wpt/run.py": [
-   "0bccc687b7c044648d1270fff0def31d3f5a8796",
+   "b52137ec9fa4e7ced12982e4a8929392bb0c8b3b",
    "support"
   ],
   "tools/wpt/testfiles.py": [
-   "b5a0e6457398c840c368cfbd8e28e1450de1c8b4",
+   "cf12a59c8e68a70f782563a81c1511242962edf3",
    "support"
   ],
   "tools/wpt/tests/latest_mozilla_central.txt": [
@@ -692684,7 +693585,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/metadata.py": [
-   "ca6165f7ad09bb831552177d0df6e6dde8a80e52",
+   "c614cbaa888720699325be6c012ed42f13a90cbd",
    "support"
   ],
   "tools/wptrunner/wptrunner/products.py": [
@@ -692724,7 +693625,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/testrunner.py": [
-   "c6dbd70f1bfdcf00706317c1315a16a0a6128b2a",
+   "5c0c60a07a9613d70ac2f2166de753dc0a007a56",
    "support"
   ],
   "tools/wptrunner/wptrunner/tests/__init__.py": [
@@ -692768,7 +693669,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/tests/test_update.py": [
-   "3860ba6f36d1f6dea7c11616586c257fe7174e85",
+   "b6a564216cc2129d3de1af10e4c6c3f98661185d",
    "support"
   ],
   "tools/wptrunner/wptrunner/tests/test_wpttest.py": [
@@ -692800,7 +693701,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/update/update.py": [
-   "c4f1e7e93ec5b93efede7853103cb48ff52c0767",
+   "96302ee267e905aa8a48af12b65978e025ebd492",
    "support"
   ],
   "tools/wptrunner/wptrunner/vcs.py": [
@@ -692876,7 +693777,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/wptrunner.py": [
-   "6b4e70b30468618f71378c3be7c4779d79dbe6c1",
+   "8dcdcdebe154fc09087624f20f802a8b2e0717d7",
    "support"
   ],
   "tools/wptrunner/wptrunner/wpttest.py": [
@@ -693196,7 +694097,7 @@
    "support"
   ],
   "tools/wptserve/wptserve/server.py": [
-   "e58b4acd7195d798bd829ce0d10e8d4d1986e253",
+   "c037732a6baef31d58b3dff927b074dfcfabb4ff",
    "support"
   ],
   "tools/wptserve/wptserve/sslutils/__init__.py": [
@@ -693412,7 +694313,7 @@
    "testharness"
   ],
   "trusted-types/block-eval.tentative.html": [
-   "cd4f5827c5331318a86dc71a42bc9eb037eb5b95",
+   "f7d7132505fa42fb4e244a9d6e512c153e56dfbf",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html": [
@@ -693472,7 +694373,7 @@
    "testharness"
   ],
   "trusted-types/default-policy-report-only.tentative.html": [
-   "aa13e4252c4cbcd7c26d62e52b04e9dbe90773db",
+   "1170655c5f53088e6ff0815c98175af81f5bd1d2",
    "testharness"
   ],
   "trusted-types/default-policy-report-only.tentative.html.headers": [
@@ -693480,7 +694381,7 @@
    "support"
   ],
   "trusted-types/default-policy.tentative.html": [
-   "aa13e4252c4cbcd7c26d62e52b04e9dbe90773db",
+   "68e05c1305b0a55b73871cb3ab72f1b534a37c5e",
    "testharness"
   ],
   "trusted-types/default-policy.tentative.html.headers": [
@@ -693512,7 +694413,7 @@
    "support"
   ],
   "trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html": [
-   "f60bb9fe5140297b324e7e618c6c0230890feb30",
+   "dc8653617504f5ed895789cff92c2553dce972e7",
    "testharness"
   ],
   "trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html.headers": [
@@ -696080,7 +696981,7 @@
    "testharness"
   ],
   "web-animations/timing-model/animations/canceling-an-animation.html": [
-   "b0ef0b1bf96b64ddd052a8ad91401e9fb97f8388",
+   "b2a7a33e6e67e5d88ba2df5f91244860c7120d0f",
    "testharness"
   ],
   "web-animations/timing-model/animations/finishing-an-animation.html": [
@@ -696276,7 +697177,7 @@
    "testharness"
   ],
   "web-nfc/NDEFRecord_constructor.https.html": [
-   "9ce41a403217439ed19d46a33a554ff449630bac",
+   "aa3de01509c12b9ec1fba7b17d59abb633e932f0",
    "testharness"
   ],
   "web-nfc/NFCErrorEvent_constructor.https.html": [
@@ -696304,7 +697205,7 @@
    "support"
   ],
   "web-nfc/idlharness.https.window.js": [
-   "c19458aed83f505472e35c8f3affa3247a814989",
+   "869433d2ff5a6463f14193e3965c32eb66ab7dd1",
    "testharness"
   ],
   "web-nfc/nfc_insecure_context.html": [
@@ -696319,15 +697220,15 @@
    "d2eccca6f424e93cc463fafc5a3b16e5a7ecc565",
    "support"
   ],
-  "web-share/canShare-files.https.html": [
+  "web-share/canShare-files.tentative.https.html": [
    "98863a4e2112e870d675a657811a3f464552e299",
    "testharness"
   ],
-  "web-share/canShare-insecure.http.html": [
+  "web-share/canShare-insecure.tentative.http.html": [
    "ce81c7c0c8a4e6d023257fce6cbd5ed802fabc2c",
    "testharness"
   ],
-  "web-share/canShare.https.html": [
+  "web-share/canShare.tentative.https.html": [
    "bb263e542559d8676c2dd94b7521ecf345dc712e",
    "testharness"
   ],
@@ -696339,35 +697240,35 @@
    "15bb17936e4479f7338b7cefbaa87522a2a02df4",
    "support"
   ],
-  "web-share/share-cancel-manual.html": [
-   "b523fb5c221ec71e64ba74f3c9ac23f03d8e5760",
+  "web-share/share-cancel-manual.https.html": [
+   "b078a74251cff1f566107f14e39a3b926f74f16c",
    "manual"
   ],
   "web-share/share-empty.https.html": [
    "ee1051812c614abb1e3e0b45f27b6b80d03d6bd2",
    "testharness"
   ],
-  "web-share/share-extra-argument-manual.html": [
-   "29e7a5645440f5978f56491c1c2e4b730c89ba97",
+  "web-share/share-extra-argument-manual.https.html": [
+   "47ef7fa1158578e3b6bf51ac12fd3f486e52b054",
    "manual"
   ],
-  "web-share/share-extra-field-manual.html": [
-   "d601c7df7ab7896c775d26fb1a2488fa8f827dc7",
+  "web-share/share-extra-field-manual.https.html": [
+   "8b479bb02b9c91b82a7e71272fc26735a4ca1ca5",
    "manual"
   ],
-  "web-share/share-files-manual.html": [
+  "web-share/share-files-manual.tentative.https.html": [
    "c3941bb4065b28c7f8fd4f615b8ec595ea5281a7",
    "manual"
   ],
-  "web-share/share-image-manual.html": [
+  "web-share/share-image-manual.https.html": [
    "48ea4c378c194691b78d1b365999408322345a37",
    "manual"
   ],
-  "web-share/share-non-string-manual.html": [
+  "web-share/share-non-string-manual.https.html": [
    "b70f8fc23d2e31e1f0ddc0aa62c7ad28917faabf",
    "manual"
   ],
-  "web-share/share-null-manual.html": [
+  "web-share/share-null-manual.https.html": [
    "4c74225cbe7059be50deaf78722e6838cf086c21",
    "manual"
   ],
@@ -696375,27 +697276,31 @@
    "8139c411e128f6fc556e6f1d63682e066cb39992",
    "testharness"
   ],
-  "web-share/share-simple-manual.html": [
+  "web-share/share-sharePromise-internal-slot.https.html": [
+   "5a71eaa4abf359008d84d1f219083ec1a91a6458",
+   "testharness"
+  ],
+  "web-share/share-simple-manual.https.html": [
    "d88beda83c621fb78888557a97b1ff5a2bc08ed0",
    "manual"
   ],
-  "web-share/share-unicode-strings-manual.html": [
+  "web-share/share-unicode-strings-manual.https.html": [
    "8cdaa87de78d5aef6d157a9045320e4fd4ce5f0e",
    "manual"
   ],
-  "web-share/share-unicode-strings-nonutf8-manual.html": [
+  "web-share/share-unicode-strings-nonutf8-manual.https.html": [
    "deabec3def5ff4c3584a4efacf9031722f656aed",
    "manual"
   ],
-  "web-share/share-url-data-manual.html": [
+  "web-share/share-url-data-manual.https.html": [
    "e634c0c01c44c75eb7b348c3f9c6f6b1840fdb98",
    "manual"
   ],
-  "web-share/share-url-empty-manual.html": [
+  "web-share/share-url-empty-manual.https.html": [
    "4038dab8cf24dfc7705a17649c0162a916a9fe47",
    "manual"
   ],
-  "web-share/share-url-encoding-manual.html": [
+  "web-share/share-url-encoding-manual.https.html": [
    "0f03b5a8b7112a210a8b21cde7094a5f2540408f",
    "manual"
   ],
@@ -696403,20 +697308,20 @@
    "5f2545d5e120f8a8af0c5aeb586ec702b82a5c0c",
    "testharness"
   ],
-  "web-share/share-url-noscheme-manual.html": [
+  "web-share/share-url-noscheme-manual.https.html": [
    "e9d7eefeb74f84a38bc9c166731da952866cf986",
    "manual"
   ],
-  "web-share/share-url-pathonly-manual.html": [
+  "web-share/share-url-pathonly-manual.https.html": [
    "0487bc852168a45ecb9885f1691b4c462e851d8c",
    "manual"
   ],
-  "web-share/share-url-relative-manual.html": [
+  "web-share/share-url-relative-manual.https.html": [
    "bbea3860a5895d55fc160eed3ae474ee0b68f52c",
    "manual"
   ],
   "web-share/share-without-user-gesture.https.html": [
-   "cf933b8bc7fcac181ead4c2e1059539525e84197",
+   "48e03b0fc3b2db8f3c96231f49096e2eb7b92064",
    "testharness"
   ],
   "webaudio/META.yml": [
@@ -704500,11 +705405,11 @@
    "testharness"
   ],
   "webxr/xrReferenceSpace_originOffset.https.html": [
-   "fd5fa68e1fc4a837b8bef41876a36278e6bb84fb",
+   "e7fe576cb2013647c18111c7fc2d74afdd7ee04d",
    "testharness"
   ],
   "webxr/xrReferenceSpace_originOffsetBounded.https.html": [
-   "5e2bd39d2dee2d6c2146b7a421371db0360c0577",
+   "cfa3cc7ca2fe7cfbd656d9164b0d1ab3dd60ca41",
    "testharness"
   ],
   "webxr/xrRigidTransform_constructor.https.html": [
diff --git a/tests/wpt/metadata/css/CSS2/linebox/vertical-align-negative-leading-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/vertical-align-negative-leading-001.html.ini
new file mode 100644
index 00000000000..ccf6f305a6a
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/linebox/vertical-align-negative-leading-001.html.ini
@@ -0,0 +1,2 @@
+[vertical-align-negative-leading-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini b/tests/wpt/metadata/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
new file mode 100644
index 00000000000..8590ba0b818
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/linebox/vertical-align-top-bottom-001.html.ini
@@ -0,0 +1,4 @@
+[vertical-align-top-bottom-001.html]
+  [vertical-align-top-bottom-001]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/positioning/inline-static-position-001.html.ini b/tests/wpt/metadata/css/CSS2/positioning/inline-static-position-001.html.ini
new file mode 100644
index 00000000000..f0b909eb1ed
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/positioning/inline-static-position-001.html.ini
@@ -0,0 +1,4 @@
+[inline-static-position-001.html]
+  [CSS Test: Static positions and line wrapping]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-backgrounds/parsing/border-radius-computed.html.ini b/tests/wpt/metadata/css/css-backgrounds/parsing/border-radius-computed.html.ini
new file mode 100644
index 00000000000..913f868a0eb
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/parsing/border-radius-computed.html.ini
@@ -0,0 +1,28 @@
+[border-radius-computed.html]
+  [Property border-radius value '1px 2% 3px 4%' computes to '1px 2% 3px 4%']
+    expected: FAIL
+
+  [Property border-radius value '1px 2% 1px 1px' computes to '1px 2% 1px 1px']
+    expected: FAIL
+
+  [Property border-radius value '1px 1px 1px 1px / 1px 1px 2% 1px' computes to '1px / 1px 1px 2%']
+    expected: FAIL
+
+  [Property border-radius value '1px 2% 3px 4% / 5em' computes to '1px 2% 3px 4% / 200px']
+    expected: FAIL
+
+  [Property border-radius value '1px' computes to '1px']
+    expected: FAIL
+
+  [Property border-radius value '1px 1px 2% 2%' computes to '1px 1px 2% 2%']
+    expected: FAIL
+
+  [Property border-radius value '5em / 1px 2% 3px 4%' computes to '200px / 1px 2% 3px 4%']
+    expected: FAIL
+
+  [Property border-radius value '1px 1px 1px 2% / 1px 2% 1px 2%' computes to '1px 1px 1px 2% / 1px 2%']
+    expected: FAIL
+
+  [Property border-radius value '1px 2% 2% 2% / 1px 2% 3px 2%' computes to '1px 2% 2% / 1px 2% 3px']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/parsing/font-computed.html.ini b/tests/wpt/metadata/css/css-fonts/parsing/font-computed.html.ini
new file mode 100644
index 00000000000..6da0037cc4e
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/parsing/font-computed.html.ini
@@ -0,0 +1,946 @@
+[font-computed.html]
+  [Property font value '900 10px/normal cursive' computes to ['normal normal 900 normal 10px/normal cursive' or 'normal normal 900 normal 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps lighter semi-condensed normal xx-small fantasy' computes to ['normal small-caps 700 semi-condensed 9.6px/normal fantasy' or 'normal small-caps 700 semi-condensed 9.6px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded italic lighter smaller sans-serif' computes to ['italic normal 700 ultra-expanded 33.3333px/normal sans-serif' or 'italic normal 700 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal normal xx-small "Non-Generic Example Family Name"' computes to ['italic normal 400 normal 9.6px/normal "Non-Generic Example Family Name"' or 'italic normal 400 normal 9.6px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic bolder smaller Menu' computes to ['italic normal 900 normal 33.3333px/normal Menu' or 'italic normal 900 normal 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal normal 400 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal normal 400 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'bolder small-caps normal normal 10px/normal "Non-Generic Example Family Name"' computes to ['normal small-caps 900 normal 10px/normal "Non-Generic Example Family Name"' or 'normal small-caps 900 normal 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold italic normal xx-small cursive' computes to ['italic normal 700 normal 9.6px/normal cursive' or 'italic normal 700 normal 9.6px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded italic small-caps larger/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 extra-expanded 48px/115.2px serif' or 'italic small-caps 400 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic extra-expanded small-caps larger/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 extra-expanded 48px/115.2px serif' or 'italic small-caps 400 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal ultra-condensed larger/calc(120% + 1.2em) cursive' computes to ['italic normal 400 ultra-condensed 48px/115.2px cursive' or 'italic normal 400 ultra-condensed 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps extra-expanded lighter normal larger/calc(120% + 1.2em) serif' computes to ['normal small-caps 700 extra-expanded 48px/115.2px serif' or 'normal small-caps 700 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps extra-condensed normal 900 20%/1.2 cursive' computes to ['normal small-caps 900 extra-condensed 8px/1.2 cursive' or 'normal small-caps 900 extra-condensed 8px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic bold ultra-condensed small-caps 10px/normal sans-serif' computes to ['italic small-caps 700 ultra-condensed 10px/normal sans-serif' or 'italic small-caps 700 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal normal 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 400 normal 8px/1.2 "Non-Generic Example Family Name"' or 'italic small-caps 400 normal 8px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps condensed 20%/1.2 fantasy' computes to ['italic small-caps 400 condensed 8px/1.2 fantasy' or 'italic small-caps 400 condensed 8px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 100 italic smaller "Non-Generic Example Family Name"' computes to ['italic small-caps 100 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'italic small-caps 100 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '900 italic small-caps normal 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 900 normal 8px/1.2 "Non-Generic Example Family Name"' or 'italic small-caps 900 normal 8px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic semi-condensed normal normal xx-small monospace' computes to ['italic normal 400 semi-condensed 9.6px/normal monospace' or 'italic normal 400 semi-condensed 9.6px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value '900 normal italic extra-condensed calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['italic normal 900 extra-condensed 0px/0px Menu' or 'italic normal 900 extra-condensed 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic extra-expanded small-caps 10px/normal fantasy' computes to ['italic small-caps 400 extra-expanded 10px/normal fantasy' or 'italic small-caps 400 extra-expanded 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic normal medium/normal serif' computes to ['italic small-caps 400 normal 16px/normal serif' or 'italic small-caps 400 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['normal small-caps 400 normal 0px/0px Menu' or 'normal small-caps 400 normal 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'expanded 100 xx-large/1.2 monospace' computes to ['normal normal 100 expanded 32px/1.2 monospace' or 'normal normal 100 expanded 32px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed bolder normal italic 10px/normal serif' computes to ['italic normal 900 ultra-condensed 10px/normal serif' or 'italic normal 900 ultra-condensed 10px / normal serif'\]]
+    expected: FAIL
+
+  [message-box should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'italic small-caps bolder 10px/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 900 normal 10px/normal "Non-Generic Example Family Name"' or 'italic small-caps 900 normal 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '100 small-caps ultra-expanded normal smaller "Non-Generic Example Family Name"' computes to ['normal small-caps 100 ultra-expanded 33.3333px/normal "Non-Generic Example Family Name"' or 'normal small-caps 100 ultra-expanded 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal bolder italic small-caps medium/normal fantasy' computes to ['italic small-caps 900 normal 16px/normal fantasy' or 'italic small-caps 900 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps expanded xx-large/1.2 Menu' computes to ['normal small-caps 400 expanded 32px/1.2 Menu' or 'normal small-caps 400 expanded 32px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps bold 10px/normal cursive' computes to ['italic small-caps 700 normal 10px/normal cursive' or 'italic small-caps 700 normal 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal small-caps xx-small monospace' computes to ['italic small-caps 400 normal 9.6px/normal monospace' or 'italic small-caps 400 normal 9.6px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal xx-small "Non-Generic Example Family Name"' computes to ['normal small-caps 400 normal 9.6px/normal "Non-Generic Example Family Name"' or 'normal small-caps 400 normal 9.6px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded italic bold smaller monospace' computes to ['italic normal 700 ultra-expanded 33.3333px/normal monospace' or 'italic normal 700 ultra-expanded 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic lighter normal normal 10px/normal serif' computes to ['italic normal 700 normal 10px/normal serif' or 'italic normal 700 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed normal 900 xx-small "Non-Generic Example Family Name"' computes to ['normal normal 900 semi-condensed 9.6px/normal "Non-Generic Example Family Name"' or 'normal normal 900 semi-condensed 9.6px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps smaller fantasy' computes to ['italic small-caps 400 normal 33.3333px/normal fantasy' or 'italic small-caps 400 normal 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded 900 normal larger/calc(120% + 1.2em) Menu' computes to ['normal normal 900 extra-expanded 48px/115.2px Menu' or 'normal normal 900 extra-expanded 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'condensed italic normal small-caps calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic small-caps 400 condensed 0px/0px "Non-Generic Example Family Name"' or 'italic small-caps 400 condensed 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [status-bar should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'bolder normal expanded italic 20%/1.2 Menu' computes to ['italic normal 900 expanded 8px/1.2 Menu' or 'italic normal 900 expanded 8px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal bolder normal medium/normal sans-serif' computes to ['italic normal 900 normal 16px/normal sans-serif' or 'italic normal 900 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic lighter calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic small-caps 700 normal 0px/0px "Non-Generic Example Family Name"' or 'italic small-caps 700 normal 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps bold italic larger/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 700 normal 48px/115.2px fantasy' or 'italic small-caps 700 normal 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic 900 ultra-expanded normal smaller serif' computes to ['italic normal 900 ultra-expanded 33.3333px/normal serif' or 'italic normal 900 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps condensed xx-large/1.2 monospace' computes to ['normal small-caps 400 condensed 32px/1.2 monospace' or 'normal small-caps 400 condensed 32px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bolder italic normal small-caps larger/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 900 normal 48px/115.2px fantasy' or 'italic small-caps 900 normal 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps lighter normal ultra-condensed larger/calc(120% + 1.2em) Menu' computes to ['normal small-caps 700 ultra-condensed 48px/115.2px Menu' or 'normal small-caps 700 ultra-condensed 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal medium/normal cursive' computes to ['italic small-caps 400 normal 16px/normal cursive' or 'italic small-caps 400 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps extra-condensed calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic small-caps 400 extra-condensed 0px/0px "Non-Generic Example Family Name"' or 'italic small-caps 400 extra-condensed 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'lighter ultra-condensed italic small-caps 10px/normal sans-serif' computes to ['italic small-caps 700 ultra-condensed 10px/normal sans-serif' or 'italic small-caps 700 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value '900 expanded normal small-caps xx-large/1.2 Menu' computes to ['normal small-caps 900 expanded 32px/1.2 Menu' or 'normal small-caps 900 expanded 32px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal small-caps medium/normal serif' computes to ['italic small-caps 400 normal 16px/normal serif' or 'italic small-caps 400 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 small-caps normal smaller "Non-Generic Example Family Name"' computes to ['normal small-caps 900 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'normal small-caps 900 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'bolder small-caps italic expanded xx-large/1.2 monospace' computes to ['italic small-caps 900 expanded 32px/1.2 monospace' or 'italic small-caps 900 expanded 32px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps extra-expanded lighter xx-small sans-serif' computes to ['normal small-caps 700 extra-expanded 9.6px/normal sans-serif' or 'normal small-caps 700 extra-expanded 9.6px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic smaller monospace' computes to ['italic small-caps 400 normal 33.3333px/normal monospace' or 'italic small-caps 400 normal 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal small-caps 20%/1.2 "Non-Generic Example Family Name"' computes to ['normal small-caps 400 normal 8px/1.2 "Non-Generic Example Family Name"' or 'normal small-caps 400 normal 8px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'bold italic small-caps ultra-condensed calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic small-caps 700 ultra-condensed 0px/0px serif' or 'italic small-caps 700 ultra-condensed 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps larger/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 normal 48px/115.2px serif' or 'italic small-caps 400 normal 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'bold italic normal normal xx-large/1.2 cursive' computes to ['italic normal 700 normal 32px/1.2 cursive' or 'italic normal 700 normal 32px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal extra-expanded small-caps calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 700 extra-expanded 0px/0px "Non-Generic Example Family Name"' or 'normal small-caps 700 extra-expanded 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal extra-condensed xx-large/1.2 "Non-Generic Example Family Name"' computes to ['italic normal 400 extra-condensed 32px/1.2 "Non-Generic Example Family Name"' or 'italic normal 400 extra-condensed 32px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal condensed lighter larger/calc(120% + 1.2em) fantasy' computes to ['normal small-caps 700 condensed 48px/115.2px fantasy' or 'normal small-caps 700 condensed 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps italic xx-small cursive' computes to ['italic small-caps 400 normal 9.6px/normal cursive' or 'italic small-caps 400 normal 9.6px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal 100 xx-large/1.2 sans-serif' computes to ['italic normal 100 normal 32px/1.2 sans-serif' or 'italic normal 100 normal 32px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder italic extra-condensed xx-small sans-serif' computes to ['italic normal 900 extra-condensed 9.6px/normal sans-serif' or 'italic normal 900 extra-condensed 9.6px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 semi-expanded italic medium/normal monospace' computes to ['italic normal 900 semi-expanded 16px/normal monospace' or 'italic normal 900 semi-expanded 16px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed 900 italic normal xx-small fantasy' computes to ['italic normal 900 semi-condensed 9.6px/normal fantasy' or 'italic normal 900 semi-condensed 9.6px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal small-caps xx-small "Non-Generic Example Family Name"' computes to ['normal small-caps 700 normal 9.6px/normal "Non-Generic Example Family Name"' or 'normal small-caps 700 normal 9.6px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded italic small-caps medium/normal sans-serif' computes to ['italic small-caps 400 semi-expanded 16px/normal sans-serif' or 'italic small-caps 400 semi-expanded 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'expanded normal xx-large/1.2 "Non-Generic Example Family Name"' computes to ['normal normal 400 expanded 32px/1.2 "Non-Generic Example Family Name"' or 'normal normal 400 expanded 32px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [menu should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'normal medium/normal sans-serif' computes to ['normal normal 400 normal 16px/normal sans-serif' or 'normal normal 400 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic normal xx-large/1.2 fantasy' computes to ['italic normal 400 normal 32px/1.2 fantasy' or 'italic normal 400 normal 32px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal bold italic 10px/normal serif' computes to ['italic normal 700 normal 10px/normal serif' or 'italic normal 700 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps 100 ultra-condensed calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['italic small-caps 100 ultra-condensed 0px/0px sans-serif' or 'italic small-caps 100 ultra-condensed 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal bolder small-caps extra-condensed 20%/1.2 sans-serif' computes to ['normal small-caps 900 extra-condensed 8px/1.2 sans-serif' or 'normal small-caps 900 extra-condensed 8px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-condensed normal italic 20%/1.2 cursive' computes to ['italic normal 400 extra-condensed 8px/1.2 cursive' or 'italic normal 400 extra-condensed 8px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bolder condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal small-caps 900 condensed 0px/0px cursive' or 'normal small-caps 900 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps lighter normal 20%/1.2 serif' computes to ['italic small-caps 700 normal 8px/1.2 serif' or 'italic small-caps 700 normal 8px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps 100 medium/normal sans-serif' computes to ['normal small-caps 100 normal 16px/normal sans-serif' or 'normal small-caps 100 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal semi-condensed smaller monospace' computes to ['italic normal 400 semi-condensed 33.3333px/normal monospace' or 'italic normal 400 semi-condensed 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal italic normal 10px/normal fantasy' computes to ['italic normal 700 normal 10px/normal fantasy' or 'italic normal 700 normal 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal lighter small-caps larger/calc(120% + 1.2em) cursive' computes to ['normal small-caps 700 extra-expanded 48px/115.2px cursive' or 'normal small-caps 700 extra-expanded 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal bold italic 20%/1.2 Menu' computes to ['italic small-caps 700 normal 8px/1.2 Menu' or 'italic small-caps 700 normal 8px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed small-caps bolder normal xx-small cursive' computes to ['normal small-caps 900 semi-condensed 9.6px/normal cursive' or 'normal small-caps 900 semi-condensed 9.6px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal bolder 20%/1.2 monospace' computes to ['normal small-caps 900 normal 8px/1.2 monospace' or 'normal small-caps 900 normal 8px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'lighter small-caps extra-expanded larger/calc(120% + 1.2em) Menu' computes to ['normal small-caps 700 extra-expanded 48px/115.2px Menu' or 'normal small-caps 700 extra-expanded 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic bolder small-caps normal medium/normal monospace' computes to ['italic small-caps 900 normal 16px/normal monospace' or 'italic small-caps 900 normal 16px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic semi-expanded normal small-caps medium/normal Menu' computes to ['italic small-caps 400 semi-expanded 16px/normal Menu' or 'italic small-caps 400 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal 100 condensed larger/calc(120% + 1.2em) fantasy' computes to ['italic normal 100 condensed 48px/115.2px fantasy' or 'italic normal 100 condensed 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 semi-condensed normal xx-small fantasy' computes to ['normal normal 100 semi-condensed 9.6px/normal fantasy' or 'normal normal 100 semi-condensed 9.6px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal expanded italic normal xx-large/1.2 "Non-Generic Example Family Name"' computes to ['italic normal 400 expanded 32px/1.2 "Non-Generic Example Family Name"' or 'italic normal 400 expanded 32px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps semi-condensed 900 xx-large/1.2 monospace' computes to ['italic small-caps 900 semi-condensed 32px/1.2 monospace' or 'italic small-caps 900 semi-condensed 32px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal normal ultra-condensed larger/calc(120% + 1.2em) sans-serif' computes to ['normal normal 700 ultra-condensed 48px/115.2px sans-serif' or 'normal normal 700 ultra-condensed 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'expanded normal italic small-caps xx-large/1.2 serif' computes to ['italic small-caps 400 expanded 32px/1.2 serif' or 'italic small-caps 400 expanded 32px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-expanded normal normal smaller serif' computes to ['normal small-caps 400 ultra-expanded 33.3333px/normal serif' or 'normal small-caps 400 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'condensed normal normal bolder calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['normal normal 900 condensed 0px/0px monospace' or 'normal normal 900 condensed 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal normal larger/calc(120% + 1.2em) serif' computes to ['normal normal 400 extra-expanded 48px/115.2px serif' or 'normal normal 400 extra-expanded 48px / 115.2px serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic bold small-caps xx-small fantasy' computes to ['italic small-caps 700 normal 9.6px/normal fantasy' or 'italic small-caps 700 normal 9.6px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal condensed small-caps italic calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['italic small-caps 400 condensed 0px/0px monospace' or 'italic small-caps 400 condensed 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic bolder normal smaller "Non-Generic Example Family Name"' computes to ['italic normal 900 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'italic normal 900 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded small-caps normal normal medium/normal cursive' computes to ['normal small-caps 400 semi-expanded 16px/normal cursive' or 'normal small-caps 400 semi-expanded 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed small-caps italic normal 10px/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 400 ultra-condensed 10px/normal "Non-Generic Example Family Name"' or 'italic small-caps 400 ultra-condensed 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic expanded normal smaller cursive' computes to ['italic normal 400 expanded 33.3333px/normal cursive' or 'italic normal 400 expanded 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded lighter small-caps normal larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 700 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal small-caps 700 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal condensed normal small-caps calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['normal small-caps 400 condensed 0px/0px fantasy' or 'normal small-caps 400 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value '900 small-caps ultra-condensed italic 10px/normal serif' computes to ['italic small-caps 900 ultra-condensed 10px/normal serif' or 'italic small-caps 900 ultra-condensed 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-condensed normal italic 10px/normal sans-serif' computes to ['italic small-caps 400 ultra-condensed 10px/normal sans-serif' or 'italic small-caps 400 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed normal italic xx-small Menu' computes to ['italic normal 400 semi-condensed 9.6px/normal Menu' or 'italic normal 400 semi-condensed 9.6px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal 900 normal 10px/normal monospace' computes to ['normal small-caps 900 normal 10px/normal monospace' or 'normal small-caps 900 normal 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal semi-expanded xx-small fantasy' computes to ['normal normal 400 semi-expanded 9.6px/normal fantasy' or 'normal normal 400 semi-expanded 9.6px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal ultra-condensed 100 smaller serif' computes to ['normal normal 100 ultra-condensed 33.3333px/normal serif' or 'normal normal 100 ultra-condensed 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic 900 normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['italic normal 900 semi-expanded 0px/0px cursive' or 'italic normal 900 semi-expanded 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [icon should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'normal italic small-caps normal smaller sans-serif' computes to ['italic small-caps 400 normal 33.3333px/normal sans-serif' or 'italic small-caps 400 normal 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps bolder condensed smaller monospace' computes to ['normal small-caps 900 condensed 33.3333px/normal monospace' or 'normal small-caps 900 condensed 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal ultra-expanded small-caps larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 400 ultra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal small-caps 400 ultra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal ultra-expanded smaller Menu' computes to ['italic small-caps 400 ultra-expanded 33.3333px/normal Menu' or 'italic small-caps 400 ultra-expanded 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-expanded italic medium/normal Menu' computes to ['italic normal 400 semi-expanded 16px/normal Menu' or 'italic normal 400 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-expanded 900 medium/normal "Non-Generic Example Family Name"' computes to ['normal normal 900 semi-expanded 16px/normal "Non-Generic Example Family Name"' or 'normal normal 900 semi-expanded 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic ultra-expanded bold 20%/1.2 monospace' computes to ['italic normal 700 ultra-expanded 8px/1.2 monospace' or 'italic normal 700 ultra-expanded 8px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold normal normal larger/calc(120% + 1.2em) monospace' computes to ['normal normal 700 normal 48px/115.2px monospace' or 'normal normal 700 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [small-caption should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'normal normal 900 normal smaller "Non-Generic Example Family Name"' computes to ['normal normal 900 normal 33.3333px/normal "Non-Generic Example Family Name"' or 'normal normal 900 normal 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded 100 small-caps italic smaller serif' computes to ['italic small-caps 100 ultra-expanded 33.3333px/normal serif' or 'italic small-caps 100 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic ultra-condensed small-caps lighter 10px/normal cursive' computes to ['italic small-caps 700 ultra-condensed 10px/normal cursive' or 'italic small-caps 700 ultra-condensed 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'condensed small-caps calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['normal small-caps 400 condensed 0px/0px serif' or 'normal small-caps 400 condensed 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 normal ultra-expanded 20%/1.2 serif' computes to ['normal normal 100 ultra-expanded 8px/1.2 serif' or 'normal normal 100 ultra-expanded 8px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps lighter medium/normal fantasy' computes to ['normal small-caps 700 normal 16px/normal fantasy' or 'normal small-caps 700 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps medium/normal "Non-Generic Example Family Name"' computes to ['normal small-caps 400 normal 16px/normal "Non-Generic Example Family Name"' or 'normal small-caps 400 normal 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal lighter italic ultra-condensed xx-large/1.2 monospace' computes to ['italic normal 700 ultra-condensed 32px/1.2 monospace' or 'italic normal 700 ultra-condensed 32px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'condensed small-caps bold calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 700 condensed 0px/0px sans-serif' or 'normal small-caps 700 condensed 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic 10px/normal fantasy' computes to ['italic normal 400 normal 10px/normal fantasy' or 'italic normal 400 normal 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded medium/normal Menu' computes to ['normal normal 400 semi-expanded 16px/normal Menu' or 'normal normal 400 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 100 calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 100 normal 0px/0px sans-serif' or 'normal small-caps 100 normal 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic condensed 900 normal calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['italic normal 900 condensed 0px/0px monospace' or 'italic normal 900 condensed 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value '900 normal normal small-caps xx-large/1.2 serif' computes to ['normal small-caps 900 normal 32px/1.2 serif' or 'normal small-caps 900 normal 32px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal bold larger/calc(120% + 1.2em) monospace' computes to ['italic small-caps 700 normal 48px/115.2px monospace' or 'italic small-caps 700 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 normal xx-large/1.2 fantasy' computes to ['normal normal 900 normal 32px/1.2 fantasy' or 'normal normal 900 normal 32px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps extra-expanded normal larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 400 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'normal small-caps 400 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '900 small-caps italic xx-small cursive' computes to ['italic small-caps 900 normal 9.6px/normal cursive' or 'italic small-caps 900 normal 9.6px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'expanded bolder small-caps xx-large/1.2 Menu' computes to ['normal small-caps 900 expanded 32px/1.2 Menu' or 'normal small-caps 900 expanded 32px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal ultra-condensed normal medium/normal sans-serif' computes to ['normal small-caps 400 ultra-condensed 16px/normal sans-serif' or 'normal small-caps 400 ultra-condensed 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal 100 calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic small-caps 100 normal 0px/0px serif' or 'italic small-caps 100 normal 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal expanded normal medium/normal monospace' computes to ['normal normal 400 expanded 16px/normal monospace' or 'normal normal 400 expanded 16px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps ultra-expanded 100 italic smaller sans-serif' computes to ['italic small-caps 100 ultra-expanded 33.3333px/normal sans-serif' or 'italic small-caps 100 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder normal normal calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['normal normal 900 normal 0px/0px monospace' or 'normal normal 900 normal 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed italic normal 100 xx-small serif' computes to ['italic normal 100 semi-condensed 9.6px/normal serif' or 'italic normal 100 semi-condensed 9.6px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded normal smaller serif' computes to ['normal normal 400 ultra-expanded 33.3333px/normal serif' or 'normal normal 400 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic xx-small "Non-Generic Example Family Name"' computes to ['italic small-caps 400 normal 9.6px/normal "Non-Generic Example Family Name"' or 'italic small-caps 400 normal 9.6px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'lighter semi-condensed normal normal xx-small fantasy' computes to ['normal normal 700 semi-condensed 9.6px/normal fantasy' or 'normal normal 700 semi-condensed 9.6px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal semi-condensed xx-small sans-serif' computes to ['italic small-caps 400 semi-condensed 9.6px/normal sans-serif' or 'italic small-caps 400 semi-condensed 9.6px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 medium/normal cursive' computes to ['normal normal 100 normal 16px/normal cursive' or 'normal normal 100 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal bolder normal italic smaller Menu' computes to ['italic normal 900 normal 33.3333px/normal Menu' or 'italic normal 900 normal 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['normal small-caps 400 semi-expanded 0px/0px Menu' or 'normal small-caps 400 semi-expanded 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value '100 normal normal italic medium/normal "Non-Generic Example Family Name"' computes to ['italic normal 100 normal 16px/normal "Non-Generic Example Family Name"' or 'italic normal 100 normal 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold small-caps italic 10px/normal serif' computes to ['italic small-caps 700 normal 10px/normal serif' or 'italic small-caps 700 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic bold larger/calc(120% + 1.2em) Menu' computes to ['italic normal 700 normal 48px/115.2px Menu' or 'italic normal 700 normal 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded small-caps normal 100 larger/calc(120% + 1.2em) monospace' computes to ['normal small-caps 100 extra-expanded 48px/115.2px monospace' or 'normal small-caps 100 extra-expanded 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal 100 small-caps larger/calc(120% + 1.2em) Menu' computes to ['normal small-caps 100 normal 48px/115.2px Menu' or 'normal small-caps 100 normal 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic expanded larger/calc(120% + 1.2em) cursive' computes to ['italic small-caps 400 expanded 48px/115.2px cursive' or 'italic small-caps 400 expanded 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal ultra-condensed xx-small sans-serif' computes to ['normal normal 400 ultra-condensed 9.6px/normal sans-serif' or 'normal normal 400 ultra-condensed 9.6px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal semi-expanded normal 10px/normal Menu' computes to ['italic normal 400 semi-expanded 10px/normal Menu' or 'italic normal 400 semi-expanded 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal bold calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['normal normal 700 normal 0px/0px serif' or 'normal normal 700 normal 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal 900 italic calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['italic normal 900 normal 0px/0px sans-serif' or 'italic normal 900 normal 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal expanded bold normal xx-large/1.2 serif' computes to ['normal normal 700 expanded 32px/1.2 serif' or 'normal normal 700 expanded 32px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'expanded normal bolder italic xx-large/1.2 sans-serif' computes to ['italic normal 900 expanded 32px/1.2 sans-serif' or 'italic normal 900 expanded 32px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bolder normal italic xx-large/1.2 monospace' computes to ['italic small-caps 900 normal 32px/1.2 monospace' or 'italic small-caps 900 normal 32px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic medium/normal cursive' computes to ['italic normal 400 normal 16px/normal cursive' or 'italic normal 400 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value '100 italic semi-condensed small-caps xx-large/1.2 fantasy' computes to ['italic small-caps 100 semi-condensed 32px/1.2 fantasy' or 'italic small-caps 100 semi-condensed 32px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal extra-expanded italic xx-large/1.2 Menu' computes to ['italic normal 400 extra-expanded 32px/1.2 Menu' or 'italic normal 400 extra-expanded 32px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal normal calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['italic normal 400 normal 0px/0px Menu' or 'italic normal 400 normal 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value '900 normal semi-condensed smaller fantasy' computes to ['normal normal 900 semi-condensed 33.3333px/normal fantasy' or 'normal normal 900 semi-condensed 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal expanded small-caps 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 400 expanded 8px/1.2 "Non-Generic Example Family Name"' or 'italic small-caps 400 expanded 8px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic lighter normal xx-small Menu' computes to ['italic normal 700 normal 9.6px/normal Menu' or 'italic normal 700 normal 9.6px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value '100 small-caps normal semi-expanded calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 100 semi-expanded 0px/0px sans-serif' or 'normal small-caps 100 semi-expanded 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal italic xx-large/1.2 sans-serif' computes to ['italic small-caps 400 normal 32px/1.2 sans-serif' or 'italic small-caps 400 normal 32px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-condensed normal bolder xx-small monospace' computes to ['normal normal 900 semi-condensed 9.6px/normal monospace' or 'normal normal 900 semi-condensed 9.6px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed italic normal normal 20%/1.2 Menu' computes to ['italic normal 400 extra-condensed 8px/1.2 Menu' or 'italic normal 400 extra-condensed 8px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic normal 20%/1.2 Menu' computes to ['italic small-caps 400 normal 8px/1.2 Menu' or 'italic small-caps 400 normal 8px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic 100 small-caps medium/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 100 normal 16px/normal "Non-Generic Example Family Name"' or 'italic small-caps 100 normal 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'italic ultra-expanded small-caps normal smaller sans-serif' computes to ['italic small-caps 400 ultra-expanded 33.3333px/normal sans-serif' or 'italic small-caps 400 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bold normal normal medium/normal fantasy' computes to ['normal small-caps 700 normal 16px/normal fantasy' or 'normal small-caps 700 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal 100 larger/calc(120% + 1.2em) Menu' computes to ['normal normal 100 normal 48px/115.2px Menu' or 'normal normal 100 normal 48px / 115.2px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal italic lighter xx-large/1.2 sans-serif' computes to ['italic small-caps 700 normal 32px/1.2 sans-serif' or 'italic small-caps 700 normal 32px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps expanded bolder xx-large/1.2 "Non-Generic Example Family Name"' computes to ['normal small-caps 900 expanded 32px/1.2 "Non-Generic Example Family Name"' or 'normal small-caps 900 expanded 32px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic ultra-expanded lighter 20%/1.2 serif' computes to ['italic small-caps 700 ultra-expanded 8px/1.2 serif' or 'italic small-caps 700 ultra-expanded 8px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 900 italic normal 10px/normal serif' computes to ['italic small-caps 900 normal 10px/normal serif' or 'italic small-caps 900 normal 10px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value '100 extra-condensed small-caps 20%/1.2 cursive' computes to ['normal small-caps 100 extra-condensed 8px/1.2 cursive' or 'normal small-caps 100 extra-condensed 8px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value '100 italic xx-small serif' computes to ['italic normal 100 normal 9.6px/normal serif' or 'italic normal 100 normal 9.6px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic bold normal xx-large/1.2 fantasy' computes to ['italic small-caps 700 normal 32px/1.2 fantasy' or 'italic small-caps 700 normal 32px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'lighter small-caps normal italic 20%/1.2 serif' computes to ['italic small-caps 700 normal 8px/1.2 serif' or 'italic small-caps 700 normal 8px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic expanded normal bolder xx-large/1.2 "Non-Generic Example Family Name"' computes to ['italic normal 900 expanded 32px/1.2 "Non-Generic Example Family Name"' or 'italic normal 900 expanded 32px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 100 semi-expanded italic medium/normal monospace' computes to ['italic small-caps 100 semi-expanded 16px/normal monospace' or 'italic small-caps 100 semi-expanded 16px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal semi-condensed small-caps 100 xx-small Menu' computes to ['normal small-caps 100 semi-condensed 9.6px/normal Menu' or 'normal small-caps 100 semi-condensed 9.6px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed normal small-caps italic 20%/1.2 monospace' computes to ['italic small-caps 400 extra-condensed 8px/1.2 monospace' or 'italic small-caps 400 extra-condensed 8px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps condensed italic calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 400 condensed 0px/0px fantasy' or 'italic small-caps 400 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-expanded lighter small-caps smaller cursive' computes to ['normal small-caps 700 ultra-expanded 33.3333px/normal cursive' or 'normal small-caps 700 ultra-expanded 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded normal bold normal medium/normal serif' computes to ['normal normal 700 semi-expanded 16px/normal serif' or 'normal normal 700 semi-expanded 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic extra-condensed 100 20%/1.2 fantasy' computes to ['italic normal 100 extra-condensed 8px/1.2 fantasy' or 'italic normal 100 extra-condensed 8px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value '100 normal italic small-caps 20%/1.2 monospace' computes to ['italic small-caps 100 normal 8px/1.2 monospace' or 'italic small-caps 100 normal 8px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps expanded italic calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic small-caps 400 expanded 0px/0px serif' or 'italic small-caps 400 expanded 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'lighter italic normal ultra-expanded smaller monospace' computes to ['italic normal 700 ultra-expanded 33.3333px/normal monospace' or 'italic normal 700 ultra-expanded 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic extra-condensed 20%/1.2 cursive' computes to ['italic normal 400 extra-condensed 8px/1.2 cursive' or 'italic normal 400 extra-condensed 8px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed small-caps italic 900 20%/1.2 serif' computes to ['italic small-caps 900 extra-condensed 8px/1.2 serif' or 'italic small-caps 900 extra-condensed 8px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal 20%/1.2 cursive' computes to ['italic normal 400 normal 8px/1.2 cursive' or 'italic normal 400 normal 8px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-condensed small-caps normal 20%/1.2 fantasy' computes to ['normal small-caps 400 extra-condensed 8px/1.2 fantasy' or 'normal small-caps 400 extra-condensed 8px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded small-caps italic smaller Menu' computes to ['italic small-caps 400 ultra-expanded 33.3333px/normal Menu' or 'italic small-caps 400 ultra-expanded 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'lighter italic condensed normal medium/normal cursive' computes to ['italic normal 700 condensed 16px/normal cursive' or 'italic normal 700 condensed 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic extra-condensed 10px/normal "Non-Generic Example Family Name"' computes to ['italic normal 400 extra-condensed 10px/normal "Non-Generic Example Family Name"' or 'italic normal 400 extra-condensed 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'bold small-caps italic normal medium/normal fantasy' computes to ['italic small-caps 700 normal 16px/normal fantasy' or 'italic small-caps 700 normal 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'condensed normal small-caps 100 calc(30% - 40px)/calc(120% + 1.2em) Menu' computes to ['normal small-caps 100 condensed 0px/0px Menu' or 'normal small-caps 100 condensed 0px / 0px Menu'\]]
+    expected: FAIL
+
+  [Property font value 'xx-small serif' computes to ['normal normal 400 normal 9.6px/normal serif' or 'normal normal 400 normal 9.6px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'bold semi-condensed small-caps italic xx-small monospace' computes to ['italic small-caps 700 semi-condensed 9.6px/normal monospace' or 'italic small-caps 700 semi-condensed 9.6px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value '100 semi-expanded normal italic medium/normal monospace' computes to ['italic normal 100 semi-expanded 16px/normal monospace' or 'italic normal 100 semi-expanded 16px / normal monospace'\]]
+    expected: FAIL
+
+  [caption should be a supported system font.]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic extra-condensed xx-small serif' computes to ['italic small-caps 400 extra-condensed 9.6px/normal serif' or 'italic small-caps 400 extra-condensed 9.6px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic normal 10px/normal Menu' computes to ['italic small-caps 400 normal 10px/normal Menu' or 'italic small-caps 400 normal 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic 900 semi-condensed xx-large/1.2 serif' computes to ['italic normal 900 semi-condensed 32px/1.2 serif' or 'italic normal 900 semi-condensed 32px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded bold normal normal smaller "Non-Generic Example Family Name"' computes to ['normal normal 700 ultra-expanded 33.3333px/normal "Non-Generic Example Family Name"' or 'normal normal 700 ultra-expanded 33.3333px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic expanded smaller Menu' computes to ['italic small-caps 400 expanded 33.3333px/normal Menu' or 'italic small-caps 400 expanded 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic extra-expanded normal 10px/normal "Non-Generic Example Family Name"' computes to ['italic small-caps 400 extra-expanded 10px/normal "Non-Generic Example Family Name"' or 'italic small-caps 400 extra-expanded 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded normal small-caps smaller cursive' computes to ['normal small-caps 400 ultra-expanded 33.3333px/normal cursive' or 'normal small-caps 400 ultra-expanded 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps 900 20%/1.2 Menu' computes to ['italic small-caps 900 normal 8px/1.2 Menu' or 'italic small-caps 900 normal 8px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic bolder semi-expanded larger/calc(120% + 1.2em) monospace' computes to ['italic small-caps 900 semi-expanded 48px/115.2px monospace' or 'italic small-caps 900 semi-expanded 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded bold italic small-caps medium/normal monospace' computes to ['italic small-caps 700 semi-expanded 16px/normal monospace' or 'italic small-caps 700 semi-expanded 16px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic condensed normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['italic normal 400 condensed 0px/0px fantasy' or 'italic normal 400 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal bolder larger/calc(120% + 1.2em) cursive' computes to ['normal small-caps 900 normal 48px/115.2px cursive' or 'normal small-caps 900 normal 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'bold small-caps normal smaller Menu' computes to ['normal small-caps 700 normal 33.3333px/normal Menu' or 'normal small-caps 700 normal 33.3333px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps 900 normal xx-large/1.2 cursive' computes to ['normal small-caps 900 normal 32px/1.2 cursive' or 'normal small-caps 900 normal 32px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps semi-condensed 10px/normal Menu' computes to ['normal small-caps 400 semi-condensed 10px/normal Menu' or 'normal small-caps 400 semi-condensed 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed normal small-caps normal 10px/normal fantasy' computes to ['normal small-caps 400 ultra-condensed 10px/normal fantasy' or 'normal small-caps 400 ultra-condensed 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['italic normal 400 normal 0px/0px fantasy' or 'italic normal 400 normal 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal extra-expanded 900 calc(30% - 40px)/calc(120% + 1.2em) serif' computes to ['italic normal 900 extra-expanded 0px/0px serif' or 'italic normal 900 extra-expanded 0px / 0px serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps normal calc(30% - 40px)/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 400 normal 0px/0px sans-serif' or 'normal small-caps 400 normal 0px / 0px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder condensed normal calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal normal 900 condensed 0px/0px cursive' or 'normal normal 900 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'condensed 100 italic calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['italic normal 100 condensed 0px/0px cursive' or 'italic normal 100 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps italic 900 medium/normal cursive' computes to ['italic small-caps 900 normal 16px/normal cursive' or 'italic small-caps 900 normal 16px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal lighter semi-condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal normal 700 semi-condensed 0px/0px cursive' or 'normal normal 700 semi-condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-condensed small-caps 10px/normal cursive' computes to ['normal small-caps 400 ultra-condensed 10px/normal cursive' or 'normal small-caps 400 ultra-condensed 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic semi-condensed bold small-caps xx-small Menu' computes to ['italic small-caps 700 semi-condensed 9.6px/normal Menu' or 'italic small-caps 700 semi-condensed 9.6px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps bold italic extra-condensed 20%/1.2 sans-serif' computes to ['italic small-caps 700 extra-condensed 8px/1.2 sans-serif' or 'italic small-caps 700 extra-condensed 8px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal semi-expanded normal 10px/normal monospace' computes to ['normal normal 700 semi-expanded 10px/normal monospace' or 'normal normal 700 semi-expanded 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal bold expanded small-caps xx-large/1.2 Menu' computes to ['normal small-caps 700 expanded 32px/1.2 Menu' or 'normal small-caps 700 expanded 32px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal bolder small-caps 20%/1.2 sans-serif' computes to ['normal small-caps 900 normal 8px/1.2 sans-serif' or 'normal small-caps 900 normal 8px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal italic small-caps larger/calc(120% + 1.2em) monospace' computes to ['italic small-caps 400 normal 48px/115.2px monospace' or 'italic small-caps 400 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps 900 normal xx-small cursive' computes to ['normal small-caps 900 normal 9.6px/normal cursive' or 'normal small-caps 900 normal 9.6px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded normal italic normal medium/normal "Non-Generic Example Family Name"' computes to ['italic normal 400 semi-expanded 16px/normal "Non-Generic Example Family Name"' or 'italic normal 400 semi-expanded 16px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal 100 smaller fantasy' computes to ['normal small-caps 100 normal 33.3333px/normal fantasy' or 'normal small-caps 100 normal 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal ultra-condensed smaller fantasy' computes to ['normal small-caps 400 ultra-condensed 33.3333px/normal fantasy' or 'normal small-caps 400 ultra-condensed 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic bolder calc(30% - 40px)/calc(120% + 1.2em) monospace' computes to ['italic normal 900 normal 0px/0px monospace' or 'italic normal 900 normal 0px / 0px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal lighter small-caps xx-large/1.2 cursive' computes to ['italic small-caps 700 normal 32px/1.2 cursive' or 'italic small-caps 700 normal 32px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal 20%/1.2 monospace' computes to ['italic normal 400 normal 8px/1.2 monospace' or 'italic normal 400 normal 8px / 1.2 monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bold normal 20%/1.2 fantasy' computes to ['normal normal 700 normal 8px/1.2 fantasy' or 'normal normal 700 normal 8px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed normal normal italic 10px/normal cursive' computes to ['italic normal 400 ultra-condensed 10px/normal cursive' or 'italic normal 400 ultra-condensed 10px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal lighter normal small-caps 10px/normal "Non-Generic Example Family Name"' computes to ['normal small-caps 700 normal 10px/normal "Non-Generic Example Family Name"' or 'normal small-caps 700 normal 10px / normal "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic semi-expanded larger/calc(120% + 1.2em) sans-serif' computes to ['italic normal 400 semi-expanded 48px/115.2px sans-serif' or 'italic normal 400 semi-expanded 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded italic small-caps 900 larger/calc(120% + 1.2em) fantasy' computes to ['italic small-caps 900 extra-expanded 48px/115.2px fantasy' or 'italic small-caps 900 extra-expanded 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed normal normal small-caps 20%/1.2 fantasy' computes to ['normal small-caps 400 extra-condensed 8px/1.2 fantasy' or 'normal small-caps 400 extra-condensed 8px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps semi-expanded normal 20%/1.2 "Non-Generic Example Family Name"' computes to ['normal small-caps 400 semi-expanded 8px/1.2 "Non-Generic Example Family Name"' or 'normal small-caps 400 semi-expanded 8px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'extra-expanded normal italic lighter larger/calc(120% + 1.2em) sans-serif' computes to ['italic normal 700 extra-expanded 48px/115.2px sans-serif' or 'italic normal 700 extra-expanded 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps semi-condensed italic normal xx-small monospace' computes to ['italic small-caps 400 semi-condensed 9.6px/normal monospace' or 'italic small-caps 400 semi-condensed 9.6px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal extra-condensed italic xx-large/1.2 cursive' computes to ['italic small-caps 400 extra-condensed 32px/1.2 cursive' or 'italic small-caps 400 extra-condensed 32px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal ultra-condensed normal normal 10px/normal sans-serif' computes to ['normal normal 400 ultra-condensed 10px/normal sans-serif' or 'normal normal 400 ultra-condensed 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal italic 10px/normal Menu' computes to ['italic normal 400 normal 10px/normal Menu' or 'italic normal 400 normal 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal italic 10px/normal fantasy' computes to ['italic small-caps 400 normal 10px/normal fantasy' or 'italic small-caps 400 normal 10px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal extra-expanded bolder italic larger/calc(120% + 1.2em) sans-serif' computes to ['italic normal 900 extra-expanded 48px/115.2px sans-serif' or 'italic normal 900 extra-expanded 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed italic normal 10px/normal monospace' computes to ['italic normal 400 ultra-condensed 10px/normal monospace' or 'italic normal 400 ultra-condensed 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic 10px/normal sans-serif' computes to ['italic normal 400 normal 10px/normal sans-serif' or 'italic normal 400 normal 10px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-expanded small-caps lighter italic medium/normal fantasy' computes to ['italic small-caps 700 semi-expanded 16px/normal fantasy' or 'italic small-caps 700 semi-expanded 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic 100 extra-expanded larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic normal 100 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'italic normal 100 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value '100 italic small-caps 10px/normal Menu' computes to ['italic small-caps 100 normal 10px/normal Menu' or 'italic small-caps 100 normal 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value '900 small-caps larger/calc(120% + 1.2em) monospace' computes to ['normal small-caps 900 normal 48px/115.2px monospace' or 'normal small-caps 900 normal 48px / 115.2px monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bold extra-expanded italic larger/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['italic normal 700 extra-expanded 48px/115.2px "Non-Generic Example Family Name"' or 'italic normal 700 extra-expanded 48px / 115.2px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'expanded italic small-caps normal xx-large/1.2 cursive' computes to ['italic small-caps 400 expanded 32px/1.2 cursive' or 'italic small-caps 400 expanded 32px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'expanded small-caps normal italic xx-large/1.2 fantasy' computes to ['italic small-caps 400 expanded 32px/1.2 fantasy' or 'italic small-caps 400 expanded 32px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal ultra-expanded xx-small serif' computes to ['normal small-caps 400 ultra-expanded 9.6px/normal serif' or 'normal small-caps 400 ultra-expanded 9.6px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal bolder extra-expanded calc(30% - 40px)/calc(120% + 1.2em) "Non-Generic Example Family Name"' computes to ['normal small-caps 900 extra-expanded 0px/0px "Non-Generic Example Family Name"' or 'normal small-caps 900 extra-expanded 0px / 0px "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded normal normal normal smaller sans-serif' computes to ['normal normal 400 ultra-expanded 33.3333px/normal sans-serif' or 'normal normal 400 ultra-expanded 33.3333px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'semi-condensed small-caps normal xx-small sans-serif' computes to ['normal small-caps 400 semi-condensed 9.6px/normal sans-serif' or 'normal small-caps 400 semi-condensed 9.6px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal small-caps 20%/1.2 serif' computes to ['normal small-caps 400 normal 8px/1.2 serif' or 'normal small-caps 400 normal 8px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps normal normal medium/normal serif' computes to ['normal small-caps 400 normal 16px/normal serif' or 'normal small-caps 400 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal lighter condensed calc(30% - 40px)/calc(120% + 1.2em) cursive' computes to ['normal normal 700 condensed 0px/0px cursive' or 'normal normal 700 condensed 0px / 0px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal larger/calc(120% + 1.2em) sans-serif' computes to ['normal small-caps 400 normal 48px/115.2px sans-serif' or 'normal small-caps 400 normal 48px / 115.2px sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal normal smaller monospace' computes to ['normal normal 400 normal 33.3333px/normal monospace' or 'normal normal 400 normal 33.3333px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal xx-large/1.2 serif' computes to ['normal small-caps 400 normal 32px/1.2 serif' or 'normal small-caps 400 normal 32px / 1.2 serif'\]]
+    expected: FAIL
+
+  [Property font value '900 condensed small-caps normal calc(30% - 40px)/calc(120% + 1.2em) fantasy' computes to ['normal small-caps 900 condensed 0px/0px fantasy' or 'normal small-caps 900 condensed 0px / 0px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'bolder normal italic smaller cursive' computes to ['italic normal 900 normal 33.3333px/normal cursive' or 'italic normal 900 normal 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal normal larger/calc(120% + 1.2em) fantasy' computes to ['normal normal 400 normal 48px/115.2px fantasy' or 'normal normal 400 normal 48px / 115.2px fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps extra-condensed xx-small cursive' computes to ['italic small-caps 400 extra-condensed 9.6px/normal cursive' or 'italic small-caps 400 extra-condensed 9.6px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal bold xx-small serif' computes to ['italic normal 700 normal 9.6px/normal serif' or 'italic normal 700 normal 9.6px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value '900 italic normal medium/normal sans-serif' computes to ['italic normal 900 normal 16px/normal sans-serif' or 'italic normal 900 normal 16px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-expanded italic smaller fantasy' computes to ['italic normal 400 ultra-expanded 33.3333px/normal fantasy' or 'italic normal 400 ultra-expanded 33.3333px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'normal small-caps italic 10px/normal monospace' computes to ['italic small-caps 400 normal 10px/normal monospace' or 'italic small-caps 400 normal 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'bolder ultra-expanded italic normal smaller serif' computes to ['italic normal 900 ultra-expanded 33.3333px/normal serif' or 'italic normal 900 ultra-expanded 33.3333px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps normal normal xx-large/1.2 fantasy' computes to ['italic small-caps 400 normal 32px/1.2 fantasy' or 'italic small-caps 400 normal 32px / 1.2 fantasy'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal normal normal xx-small Menu' computes to ['normal normal 700 normal 9.6px/normal Menu' or 'normal normal 700 normal 9.6px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps condensed normal medium/normal fantasy' computes to ['italic small-caps 400 condensed 16px/normal fantasy' or 'italic small-caps 400 condensed 16px / normal fantasy'\]]
+    expected: FAIL
+
+  [Property font value '100 normal small-caps condensed larger/calc(120% + 1.2em) cursive' computes to ['normal small-caps 100 condensed 48px/115.2px cursive' or 'normal small-caps 100 condensed 48px / 115.2px cursive'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps semi-expanded italic bold medium/normal Menu' computes to ['italic small-caps 700 semi-expanded 16px/normal Menu' or 'italic small-caps 700 semi-expanded 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'lighter normal small-caps italic xx-large/1.2 sans-serif' computes to ['italic small-caps 700 normal 32px/1.2 sans-serif' or 'italic small-caps 700 normal 32px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed italic lighter small-caps 20%/1.2 "Non-Generic Example Family Name"' computes to ['italic small-caps 700 extra-condensed 8px/1.2 "Non-Generic Example Family Name"' or 'italic small-caps 700 extra-condensed 8px / 1.2 "Non-Generic Example Family Name"'\]]
+    expected: FAIL
+
+  [Property font value 'ultra-condensed italic bolder normal 10px/normal Menu' computes to ['italic normal 900 ultra-condensed 10px/normal Menu' or 'italic normal 900 ultra-condensed 10px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'extra-condensed lighter normal small-caps 20%/1.2 sans-serif' computes to ['normal small-caps 700 extra-condensed 8px/1.2 sans-serif' or 'normal small-caps 700 extra-condensed 8px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'bold extra-condensed 20%/1.2 sans-serif' computes to ['normal normal 700 extra-condensed 8px/1.2 sans-serif' or 'normal normal 700 extra-condensed 8px / 1.2 sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'bolder normal small-caps normal medium/normal serif' computes to ['normal small-caps 900 normal 16px/normal serif' or 'normal small-caps 900 normal 16px / normal serif'\]]
+    expected: FAIL
+
+  [Property font value 'small-caps normal normal normal smaller cursive' computes to ['normal small-caps 400 normal 33.3333px/normal cursive' or 'normal small-caps 400 normal 33.3333px / normal cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal normal xx-large/1.2 cursive' computes to ['normal normal 400 normal 32px/1.2 cursive' or 'normal normal 400 normal 32px / 1.2 cursive'\]]
+    expected: FAIL
+
+  [Property font value 'normal italic normal 900 medium/normal Menu' computes to ['italic normal 900 normal 16px/normal Menu' or 'italic normal 900 normal 16px / normal Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic lighter small-caps expanded xx-large/1.2 Menu' computes to ['italic small-caps 700 expanded 32px/1.2 Menu' or 'italic small-caps 700 expanded 32px / 1.2 Menu'\]]
+    expected: FAIL
+
+  [Property font value 'italic small-caps xx-small sans-serif' computes to ['italic small-caps 400 normal 9.6px/normal sans-serif' or 'italic small-caps 400 normal 9.6px / normal sans-serif'\]]
+    expected: FAIL
+
+  [Property font value 'italic normal small-caps normal 10px/normal monospace' computes to ['italic small-caps 400 normal 10px/normal monospace' or 'italic small-caps 400 normal 10px / normal monospace'\]]
+    expected: FAIL
+
+  [Property font value 'italic 100 normal small-caps 20%/1.2 sans-serif' computes to ['italic small-caps 100 normal 8px/1.2 sans-serif' or 'italic small-caps 100 normal 8px / 1.2 sans-serif'\]]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-text-decor/parsing/text-decoration-computed.html.ini b/tests/wpt/metadata/css/css-text-decor/parsing/text-decoration-computed.html.ini
index 08c27709bd7..f17954acc2a 100644
--- a/tests/wpt/metadata/css/css-text-decor/parsing/text-decoration-computed.html.ini
+++ b/tests/wpt/metadata/css/css-text-decor/parsing/text-decoration-computed.html.ini
@@ -23,3 +23,33 @@
   [Property text-decoration value 'currentcolor' computes to 'none solid rgb(0, 0, 255)']
     expected: FAIL
 
+  [Property text-decoration value 'line-through' computes to 'line-through rgb(0, 0, 255)']
+    expected: FAIL
+
+  [Property text-decoration value 'underline overline line-through red' computes to 'underline overline line-through rgb(255, 0, 0)']
+    expected: FAIL
+
+  [Property text-decoration value '10px' computes to 'rgb(0, 0, 255) 10px']
+    expected: FAIL
+
+  [Property text-decoration value 'auto' computes to 'rgb(0, 0, 255)']
+    expected: FAIL
+
+  [Property text-decoration value 'from-font' computes to 'rgb(0, 0, 255) from-font']
+    expected: FAIL
+
+  [Property text-decoration value 'none' computes to 'rgb(0, 0, 255)']
+    expected: FAIL
+
+  [Property text-decoration value 'underline red from-font' computes to 'underline rgb(255, 0, 0) from-font']
+    expected: FAIL
+
+  [Property text-decoration value 'currentcolor' computes to 'rgb(0, 0, 255)']
+    expected: FAIL
+
+  [Property text-decoration value 'solid' computes to 'rgb(0, 0, 255)']
+    expected: FAIL
+
+  [Property text-decoration value 'rgba(10, 20, 30, 0.4) dotted' computes to 'dotted rgba(10, 20, 30, 0.4)']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-variables/variable-presentation-attribute.html.ini b/tests/wpt/metadata/css/css-variables/variable-presentation-attribute.html.ini
index 4e4418a7cce..b9aec630898 100644
--- a/tests/wpt/metadata/css/css-variables/variable-presentation-attribute.html.ini
+++ b/tests/wpt/metadata/css/css-variables/variable-presentation-attribute.html.ini
@@ -113,3 +113,6 @@
   [Testing 'writing-mode'.]
     expected: FAIL
 
+  [Testing 'text-decoration-style'.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
index ff5b07adb77..e89282b04a1 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint-iframes.html.ini
@@ -1,5 +1,5 @@
 [elementsFromPoint-iframes.html]
-  expected: TIMEOUT
+  expected: CRASH
   [elementsFromPoint on the root document for points in iframe elements]
     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/cssom/CSSStyleSheet.html.ini b/tests/wpt/metadata/css/cssom/CSSStyleSheet.html.ini
index c69c84fc310..a083be58f67 100644
--- a/tests/wpt/metadata/css/cssom/CSSStyleSheet.html.ini
+++ b/tests/wpt/metadata/css/cssom/CSSStyleSheet.html.ini
@@ -2,3 +2,27 @@
   [CSSOM - CSSStyleSheet interface]
     expected: FAIL
 
+  [addRule with no argument adds "undefined" selector]
+    expected: FAIL
+
+  [removeRule on empty style sheet throws]
+    expected: FAIL
+
+  [cssRules and rules are the same object]
+    expected: FAIL
+
+  [addRule with index greater than length throws]
+    expected: FAIL
+
+  [addRule with #foo selectors]
+    expected: FAIL
+
+  [removeRule(1)]
+    expected: FAIL
+
+  [removeRule with no argument removes first rule]
+    expected: FAIL
+
+  [addRule with @media rule]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini
new file mode 100644
index 00000000000..c3916f8555d
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Document-contentType/contentType/contenttype_txt.html.ini
@@ -0,0 +1,2 @@
+[contenttype_txt.html]
+  expected: CRASH
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 c596033839a..cf750441e57 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -312,15 +312,6 @@
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html */*]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 5c001592859..d2df9b78483 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,6 +56,3 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini
new file mode 100644
index 00000000000..e495b626d2e
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/navigation-unload-same-origin-fragment.html.ini
@@ -0,0 +1,4 @@
+[navigation-unload-same-origin-fragment.html]
+  [Tests that a fragment navigation in the unload handler will not block the initial navigation]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
index 127392316de..702af61a3c4 100644
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-submission-algorithm.html.ini
@@ -1,7 +1,11 @@
 [form-submission-algorithm.html]
+  expected: TIMEOUT
   [If form's firing submission events is true, then return; 'submit' event]
     expected: FAIL
 
   [If form's firing submission events is true, then return; 'invalid' event]
     expected: FAIL
 
+  [Cannot navigate (after constructing the entry list)]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
deleted file mode 100644
index 9e522297c94..00000000000
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[toggleEvent.html]
-  [Calling open twice on 'details' fires only one toggle event]
-    expected: FAIL
-
-  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
-    expected: FAIL
-
diff --git a/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
new file mode 100644
index 00000000000..dbea4f293ad
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/transition_calc_implicit.html.ini
@@ -0,0 +1,2 @@
+[transition_calc_implicit.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index 58e8d6ee1dd..a25f2a256eb 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -328,7 +328,7 @@ jobs:
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/16229
-  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html
+  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html --exclude /web-share/share-sharePromise-internal-slot.https.html
     displayName: 'Run tests'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
@@ -361,7 +361,7 @@ jobs:
   - template: tools/ci/azure/update_hosts.yml
   - template: tools/ci/azure/update_manifest.yml
   # --exclude is a workaround for https://github.com/web-platform-tests/wpt/issues/16229
-  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel preview safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html --exclude /payment-request/
+  - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --channel preview safari --exclude /inert/inert-retargeting.tentative.html --exclude /inert/inert-retargeting-iframe.tentative.html --exclude /payment-request/ --exclude /web-share/share-sharePromise-internal-slot.https.html
     displayName: 'Run tests'
   - task: PublishBuildArtifacts@1
     displayName: 'Publish results'
diff --git a/tests/wpt/web-platform-tests/.github/workflows/pull_request.yml b/tests/wpt/web-platform-tests/.github/workflows/pull_request.yml
index 8f3940a291b..9d288c0c920 100644
--- a/tests/wpt/web-platform-tests/.github/workflows/pull_request.yml
+++ b/tests/wpt/web-platform-tests/.github/workflows/pull_request.yml
@@ -2,9 +2,9 @@ on: pull_request
 name: Synchronize the Pull Request Preview
 jobs:
   update-pr-preview:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@v1.0.0
+    - uses: actions/checkout@v1
       with:
         ref: refs/heads/master
         fetch-depth: 1
diff --git a/tests/wpt/web-platform-tests/.github/workflows/push-build-publish-documentation-website.yml b/tests/wpt/web-platform-tests/.github/workflows/push-build-publish-documentation-website.yml
index de226d173fb..167e0d930f4 100644
--- a/tests/wpt/web-platform-tests/.github/workflows/push-build-publish-documentation-website.yml
+++ b/tests/wpt/web-platform-tests/.github/workflows/push-build-publish-documentation-website.yml
@@ -1,10 +1,15 @@
-on: push
+on:
+  push:
+    branches:
+      - master
 name: Build & Publish Documentation Website
 jobs:
   website-build-and-publish:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
     - name: website-build-and-publish
       uses: ./tools/docker/documentation
       env:
diff --git a/tests/wpt/web-platform-tests/.github/workflows/push-build-release-manifest.yml b/tests/wpt/web-platform-tests/.github/workflows/push-build-release-manifest.yml
index 6c97a2f7b9f..af677454fdd 100644
--- a/tests/wpt/web-platform-tests/.github/workflows/push-build-release-manifest.yml
+++ b/tests/wpt/web-platform-tests/.github/workflows/push-build-release-manifest.yml
@@ -1,10 +1,15 @@
-on: push
+on:
+  push:
+    branches:
+      - master
 name: Build & Release Manifest
 jobs:
   manifest-build-and-tag:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-18.04
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v1
+      with:
+        fetch-depth: 1
     - name: manifest-build-and-tag
       uses: ./tools/docker/github
       env:
diff --git a/tests/wpt/web-platform-tests/.taskcluster.yml b/tests/wpt/web-platform-tests/.taskcluster.yml
index 0b7b50b35d4..dfe3b36e3a5 100644
--- a/tests/wpt/web-platform-tests/.taskcluster.yml
+++ b/tests/wpt/web-platform-tests/.taskcluster.yml
@@ -76,8 +76,6 @@ tasks:
                   public/results:
                     path: /home/test/artifacts
                     type: directory
-                env:
-                    TASK_EVENT: "${event_str}"
                 command:
                   - /bin/bash
                   - --login
@@ -106,6 +104,9 @@ tasks:
                         --test-type=${chunk[0]}
                         --this-chunk=${chunk[1]}
                         --total-chunks=${chunk[2]};
+              extra:
+                github_event: "${event_str}"
+
       - $if: tasks_for == "github-pull-request"
         # PR tasks that run the tests in various configurations
         then:
@@ -168,8 +169,6 @@ tasks:
                     public/results:
                       path: /home/test/artifacts
                       type: directory
-                  env:
-                    TASK_EVENT: "${event_str}"
                   # Fetch the GitHub-provided merge commit (rather than the pull
                   # request branch) so that the tasks simulate the behavior of the
                   # submitted patch after it is merged. Using the merge commit also
@@ -199,6 +198,9 @@ tasks:
                           --
                           --channel=${browser.channel}
                           ${operation.extra_args};
+                extra:
+                  github_event: "${event_str}"
+
       - $map:
           # This is the main point to define new CI checks other than stability checks
         - name: lint
@@ -334,8 +336,6 @@ tasks:
                     public/results:
                       path: /home/test/artifacts
                       type: directory
-                  env:
-                    TASK_EVENT: "${event_str}"
                   command:
                     - /bin/bash
                     - --login
@@ -347,3 +347,5 @@ tasks:
                         ${checkout_ref};
                       cd ~/web-platform-tests;
                       ${operation.script};
+                extra:
+                  github_event: "${event_str}"
diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html b/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html
new file mode 100644
index 00000000000..6133e8ad2d7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Tests Stale While Revalidate is not executed for fetch API</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/utils.js"></script>
+<script>
+function wait25ms(test) {
+  return new Promise(resolve => {
+    test.step_timeout(() => {
+      resolve();
+    }, 25);
+  });
+}
+
+promise_test(async (test) => {
+  var request_token = token();
+  var client_hint_headers = [
+    "device-memory",
+    "dpr",
+    "width",
+    "viewport-width",
+    "rtt",
+    "downlink",
+    "ect",
+    "sec-ch-lang",
+    "sec-ch-ua",
+    "sec-ch-ua-arch",
+    "sec-ch-ua-platform",
+    "sec-ch-ua-model",
+  ];
+
+  const response = await fetch(`resources/stale-echo-client-hints.py?token=` + request_token);
+  const response2 = await fetch(`resources/stale-echo-client-hints.py?token=` + request_token);
+
+  assert_equals(response.headers.get('Unique-Id'), response2.headers.get('Unique-Id'));
+
+  while(true) {
+    const revalidation_check = await fetch(`resources/stale-echo-client-hints.py?query&token=` + request_token);
+    if (revalidation_check.headers.get('Count') == '2') {
+      client_hint_headers.forEach(header => {
+        assert_equals(revalidation_check.headers.get(header+"-recieved"), revalidation_check.headers.get(header+"-previous"));
+      });
+      break;
+    }
+    await wait25ms(test);
+  }
+}, 'Same headers sent for revalidation request');
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html.headers b/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html.headers
new file mode 100644
index 00000000000..05b7a4a6f6f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/accept-ch-cache-revalidation.https.html.headers
@@ -0,0 +1 @@
+Accept-CH: dpr,device-memory,viewport-width,rtt,downlink,ect,lang,ua,arch,platform,model
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/client-hints/resources/stale-echo-client-hints.py b/tests/wpt/web-platform-tests/client-hints/resources/stale-echo-client-hints.py
new file mode 100644
index 00000000000..769fa909fa4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/resources/stale-echo-client-hints.py
@@ -0,0 +1,60 @@
+import random
+import string
+
+def id_token():
+   letters = string.ascii_lowercase
+   return ''.join(random.choice(letters) for i in range(20))
+
+def main(request, response):
+    client_hint_headers = [
+      "device-memory",
+      "dpr",
+      "width",
+      "viewport-width",
+      "rtt",
+      "downlink",
+      "ect",
+      "sec-ch-lang",
+      "sec-ch-ua",
+      "sec-ch-ua-arch",
+      "sec-ch-ua-platform",
+      "sec-ch-ua-model",
+    ]
+
+    client_hints_curr = {i:request.headers.get(i) for i in client_hint_headers}
+
+    token = request.GET.first("token", None)
+    is_query = request.GET.first("query", None) is not None
+    with request.server.stash.lock:
+      stash = request.server.stash.take(token)
+      if stash != None:
+        (value, client_hints_prev) = stash
+        count = int(value)
+      else:
+        count = 0
+        client_hints_prev = {}
+
+      if is_query:
+        if count < 2:
+          request.server.stash.put(token, (count, client_hints_curr))
+      else:
+        count = count + 1
+        request.server.stash.put(token, (count, client_hints_curr))
+
+    for header in client_hint_headers:
+      if client_hints_curr[header] is not None:
+        response.headers.set(header+"-recieved", client_hints_curr[header])
+      if (header in client_hints_prev) and (client_hints_prev[header] is not None):
+        response.headers.set(header+"-previous", client_hints_prev[header])
+
+    if is_query:
+      headers = [("Count", count)]
+      content = ""
+      return 200, headers, content
+    else:
+      unique_id = id_token()
+      headers = [("Content-Type", "text/html"),
+                 ("Cache-Control", "private, max-age=0, stale-while-revalidate=60"),
+                 ("Unique-Id", unique_id)]
+      content = "report('{}')".format(unique_id)
+      return 200, headers, content
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js b/tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js
index d503ae96961..64d2b9ffb4e 100644
--- a/tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js
+++ b/tests/wpt/web-platform-tests/common/security-features/resources/common.sub.js
@@ -857,11 +857,11 @@ const subresourceMap = {
     path: "/common/security-features/subresource/audio.py",
     invoker: requestViaAudio,
   },
-  "beacon-request": {
+  "beacon": {
     path: "/common/security-features/subresource/empty.py",
     invoker: requestViaSendBeacon,
   },
-  "fetch-request": {
+  "fetch": {
     path: "/common/security-features/subresource/xhr.py",
     invoker: requestViaFetch,
   },
@@ -901,45 +901,40 @@ const subresourceMap = {
     path: "/common/security-features/subresource/video.py",
     invoker: requestViaVideo,
   },
-  "xhr-request": {
+  "xhr": {
     path: "/common/security-features/subresource/xhr.py",
     invoker: requestViaXhr,
   },
 
-  "worker-request": {
+  "worker-classic": {
     path: "/common/security-features/subresource/worker.py",
     invoker: url => requestViaDedicatedWorker(url),
   },
-  // TODO: Merge "module-worker" and "module-worker-top-level".
-  "module-worker": {
+  "worker-module": {
     path: "/common/security-features/subresource/worker.py",
     invoker: url => requestViaDedicatedWorker(url, {type: "module"}),
   },
-  "module-worker-top-level": {
-    path: "/common/security-features/subresource/worker.py",
-    invoker: url => requestViaDedicatedWorker(url, {type: "module"}),
-  },
-  "module-data-worker-import": {
+  "worker-import-data": {
     path: "/common/security-features/subresource/worker.py",
     invoker: url =>
         requestViaDedicatedWorker(workerUrlThatImports(url), {type: "module"}),
   },
-  "shared-worker": {
+  "sharedworker-classic": {
     path: "/common/security-features/subresource/shared-worker.py",
     invoker: requestViaSharedWorker,
   },
 
-  "websocket-request": {
+  "websocket": {
     path: "/stash_responder",
     invoker: requestViaWebSocket,
   },
 };
 for (const workletType of ['animation', 'audio', 'layout', 'paint']) {
-  subresourceMap[`worklet-${workletType}-top-level`] = {
+  subresourceMap[`worklet-${workletType}`] = {
       path: "/common/security-features/subresource/worker.py",
       invoker: url => requestViaWorklet(workletType, url)
     };
-  subresourceMap[`worklet-${workletType}-data-import`] = {
+  subresourceMap[`worklet-${workletType}-import-data`] = {
       path: "/common/security-features/subresource/worker.py",
       invoker: url =>
           requestViaWorklet(workletType, workerUrlThatImports(url))
@@ -956,6 +951,70 @@ for (const workletType of ['animation', 'audio', 'layout', 'paint']) {
   /common/security-features/subresource/subresource.py for valid values.
 */
 
+/**
+  Construct subresource (and related) origin.
+
+  @param {string} originType
+  @returns {object} the origin of the subresource.
+*/
+function getSubresourceOrigin(originType) {
+  const httpProtocol = "http";
+  const httpsProtocol = "https";
+  const wsProtocol = "ws";
+  const wssProtocol = "wss";
+
+  const sameOriginHost = "{{host}}";
+  const crossOriginHost = "{{domains[www1]}}";
+
+  // These values can evaluate to either empty strings or a ":port" string.
+  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
+  const httpsRawPort = parseInt("{{ports[https][0]}}", 10);
+  const httpsPort = getNormalizedPort(httpsRawPort);
+  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
+  const wssRawPort = parseInt("{{ports[wss][0]}}", 10);
+  const wssPort = getNormalizedPort(wssRawPort);
+
+  /**
+    @typedef OriginType
+    @type {string}
+
+    Represents the origin of the subresource request URL.
+    The keys of `originMap` below are the valid values.
+
+    Note that there can be redirects from the specified origin
+    (see RedirectionType), and thus the origin of the subresource
+    response URL might be different from what is specified by OriginType.
+  */
+  const originMap = {
+    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
+    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
+    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
+    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
+    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
+    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
+    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
+    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
+
+    // The following origin types are used for upgrade-insecure-requests tests:
+    // These rely on some unintuitive cleverness due to WPT's test setup:
+    // 'Upgrade-Insecure-Requests' does not upgrade the port number,
+    // so we use URLs in the form `http://[domain]:[https-port]`,
+    // which will be upgraded to `https://[domain]:[https-port]`.
+    // If the upgrade fails, the load will fail, as we don't serve HTTP over
+    // the secure port.
+    "same-http-downgrade":
+        httpProtocol + "://" + sameOriginHost + ":" + httpsRawPort,
+    "cross-http-downgrade":
+        httpProtocol + "://" + crossOriginHost + ":" + httpsRawPort,
+    "same-ws-downgrade":
+        wsProtocol + "://" + sameOriginHost + ":" + wssRawPort,
+    "cross-ws-downgrade":
+        wsProtocol + "://" + crossOriginHost + ":" + wssRawPort,
+  };
+
+  return originMap[originType];
+}
+
 /**
   Construct subresource (and related) URLs.
 
diff --git a/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py b/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py
index f11f3250568..582378d41fa 100644
--- a/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py
+++ b/tests/wpt/web-platform-tests/common/security-features/subresource/subresource.py
@@ -32,10 +32,15 @@ def __get_swapped_origin_netloc(netloc, subdomain_prefix = "www1."):
 # current request URL `request.url`, except for:
 # - When `swap_scheme` or `swap_origin` is True, its scheme/origin is changed
 #   to the other one. (http <-> https, ws <-> wss, etc.)
+# - For `downgrade`, we redirect to a URL that would be successfully loaded
+#   if and only if upgrade-insecure-request is applied.
 # - `query_parameter_to_remove` parameter is removed from query part.
 #   Its default is "redirection" to avoid redirect loops.
-def create_url(request, swap_scheme = False, swap_origin = False,
-               query_parameter_to_remove = "redirection"):
+def create_url(request,
+               swap_scheme=False,
+               swap_origin=False,
+               downgrade=False,
+               query_parameter_to_remove="redirection"):
     parsed = urlparse.urlsplit(request.url)
     destination_netloc = parsed.netloc
 
@@ -46,6 +51,24 @@ def create_url(request, swap_scheme = False, swap_origin = False,
         port = request.server.config["ports"][scheme][0]
         destination_netloc = ":".join([hostname, str(port)])
 
+    if downgrade:
+        # These rely on some unintuitive cleverness due to WPT's test setup:
+        # 'Upgrade-Insecure-Requests' does not upgrade the port number,
+        # so we use URLs in the form `http://[domain]:[https-port]`,
+        # which will be upgraded to `https://[domain]:[https-port]`.
+        # If the upgrade fails, the load will fail, as we don't serve HTTP over
+        # the secure port.
+        if parsed.scheme == "https":
+            scheme = "http"
+        elif parsed.scheme == "wss":
+            scheme = "ws"
+        else:
+            raise ValueError("Downgrade redirection: Invalid scheme '%s'" %
+                             parsed.scheme)
+        hostname = parsed.netloc.split(':')[0]
+        port = request.server.config["ports"][parsed.scheme][0]
+        destination_netloc = ":".join([hostname, str(port)])
+
     if swap_origin:
         destination_netloc = __get_swapped_origin_netloc(destination_netloc)
 
@@ -71,13 +94,15 @@ def preprocess_redirection(request, response):
 
     if redirection == "no-redirect":
         return False
-    elif redirection == "keep-scheme-redirect":
+    elif redirection == "keep-scheme":
         redirect_url = create_url(request, swap_scheme=False)
-    elif redirection == "swap-scheme-redirect":
+    elif redirection == "swap-scheme":
         redirect_url = create_url(request, swap_scheme=True)
-    elif redirection == "keep-origin-redirect":
+    elif redirection == "downgrade":
+        redirect_url = create_url(request, downgrade=True)
+    elif redirection == "keep-origin":
         redirect_url = create_url(request, swap_origin=False)
-    elif redirection == "swap-origin-redirect":
+    elif redirection == "swap-origin":
         redirect_url = create_url(request, swap_origin=True)
     else:
         raise ValueError("Invalid redirection type '%s'" % redirection)
diff --git a/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py b/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py
index fff4c5dd6f6..dae5c6e35a3 100755
--- a/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py
+++ b/tests/wpt/web-platform-tests/common/security-features/tools/spec_validator.py
@@ -205,15 +205,20 @@ def validate(spec_json, details):
         test_expansion_schema, 'source_context_list',
         spec_json['source_context_list_schema'].keys())
 
+    # Should be consistent with `preprocess_redirection` in
+    # `/common/security-features/subresource/subresource.py`.
     assert_atom_or_list_items_from(test_expansion_schema, 'redirection', [
         'no-redirect', 'keep-origin', 'swap-origin', 'keep-scheme',
-        'swap-scheme'
+        'swap-scheme', 'downgrade'
     ])
     for subresource in leaf_values(test_expansion_schema['subresource']):
         assert subresource in valid_subresource_names, "Invalid subresource %s" % subresource
+    # Should be consistent with getSubresourceOrigin() in
+    # `/common/security-features/resources/common.sub.js`.
     assert_atom_or_list_items_from(test_expansion_schema, 'origin', [
         'same-http', 'same-https', 'same-ws', 'same-wss', 'cross-http',
-        'cross-https', 'cross-ws', 'cross-wss'
+        'cross-https', 'cross-ws', 'cross-wss', 'same-http-downgrade',
+        'cross-http-downgrade', 'same-ws-downgrade', 'cross-ws-downgrade'
     ])
 
     # Validate excluded tests.
diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html b/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html
new file mode 100644
index 00000000000..912cd378e1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+.container {
+  margin: 30px 0;
+  color: orange;
+  background-color: blue;
+  line-height: 10px;
+  font-size: 30px;
+  font-family: Ahem;
+}
+.lh20 { line-height: 20px; }
+.lh30 { line-height: 30px; }
+.up5 { position: relative; top: -5px; }
+.up10 { position: relative; top: -10px; }
+.down5 { position: relative; top: 5px; }
+.down10 { position: relative; top: 10px; }
+</style>
+<body>
+<div class="container">
+  <span>XX</span>
+  <span>XX</span>
+  <span>XX</span>
+</div>
+<div class="container lh30">
+  <span class="up10">XX</span>
+  <span>XX</span>
+  <span class="down10">XX</span>
+</div>
+<div class="container"><span>XX</span></div>
+<div class="container"><span>XX</span></div>
+<div class="container lh20"><span class="up5">XX</span></div>
+<div class="container lh20"><span class="down5">XX</span></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001.html b/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001.html
new file mode 100644
index 00000000000..4ce5f6d2ad8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-negative-leading-001.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<title>Test vertical-align: top and bottom do not affect the line height</title>
+<link rel="match" href="vertical-align-negative-leading-001-ref.html">
+<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#propdef-vertical-align">
+<link rel="author" href="mailto:kojii@chromium.org">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+.container {
+  margin: 30px 0;
+  color: orange;
+  background-color: blue;
+  line-height: 10px;
+  font-size: 30px;
+  font-family: Ahem;
+}
+span { background: purple; }
+.top { vertical-align: top; }
+.bottom { vertical-align: bottom; }
+.text-top { vertical-align: text-top; }
+.text-bottom { vertical-align: text-bottom; }
+</style>
+<body>
+<div class="container">
+  <span class="top">XX</span>
+  <span>XX</span>
+  <span class="bottom">XX</span>
+</div>
+<div class="container">
+  <span class="text-top">XX</span>
+  <span>XX</span>
+  <span class="text-bottom">XX</span>
+</div>
+<div class="container"><span class="top">XX</span></div>
+<div class="container"><span class="bottom">XX</span></div>
+<div class="container"><span class="text-top">XX</span></div>
+<div class="container"><span class="text-bottom">XX</span></div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-001.html b/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-001.html
new file mode 100644
index 00000000000..2e03bc0d2fb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/linebox/vertical-align-top-bottom-001.html
@@ -0,0 +1,87 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#propdef-vertical-align" />
+<link rel="author" href="mailto:kojii@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+section.test {
+  display: inline-block;
+  font-size: 20px;
+  line-height: 1.5;
+  font-family: Arial;
+  font-family: Ahem;
+}
+section.test > div {
+  background: blue;
+  margin-bottom: 1em;
+}
+.filler {
+  display: inline-block;
+  background: cyan;
+  height: 3em;
+  width: 1em;
+}
+.target {
+  display: inline-block;
+  background: orange;
+  width: 1em;
+  height: 1em;
+}
+div.top, section.top .target { vertical-align: top; }
+div.text-top, section.text-top .target { vertical-align: text-top; }
+div.text-bottom, section.text-bottom .target { vertical-align: text-bottom; }
+div.bottom, section.bottom .target { vertical-align: bottom; }
+.test .fail {
+  outline: red solid 5px;
+}
+</style>
+<body>
+<section class="test top">
+  <div><div class="filler"></div><div class="target" data-y="0"></div></div>
+  <div><div class="filler top"></div><div class="target" data-y="0"></div></div>
+  <div><div class="filler text-top"></div><div class="target" data-y="0"></div></div>
+  <div><div class="filler bottom"></div><div class="target" data-y="0"></div></div>
+  <div><div class="filler text-bottom"></div><div class="target" data-y="0"></div></div>
+</section>
+<section class="test text-top">
+  <div><div class="filler"></div><div class="target" data-y="44"></div></div>
+  <div><div class="filler top"></div><div class="target" data-y="5"></div></div>
+  <div><div class="filler text-top"></div><div class="target" data-y="5"></div></div>
+  <div><div class="filler bottom"></div><div class="target" data-y="35"></div></div>
+  <div><div class="filler text-bottom"></div><div class="target" data-y="40"></div></div>
+</section>
+<section class="test text-bottom">
+  <div><div class="filler"></div><div class="target" data-y="44"></div></div>
+  <div><div class="filler top"></div><div class="target" data-y="5"></div></div>
+  <div><div class="filler text-top"></div><div class="target" data-y="5"></div></div>
+  <div><div class="filler bottom"></div><div class="target" data-y="35"></div></div>
+  <div><div class="filler text-bottom"></div><div class="target" data-y="40"></div></div>
+</section>
+<section class="test bottom">
+  <div><div class="filler"></div><div class="target" data-y="49"></div></div>
+  <div><div class="filler top"></div><div class="target" data-y="40"></div></div>
+  <div><div class="filler text-top"></div><div class="target" data-y="45"></div></div>
+  <div><div class="filler bottom"></div><div class="target" data-y="40"></div></div>
+  <div><div class="filler text-bottom"></div><div class="target" data-y="45"></div></div>
+</section>
+<script>
+setup({explicit_done: true});
+document.fonts.ready.then(()=> {
+  for (let target of document.getElementsByClassName('target')) {
+    let container = target.parentElement;
+    let filler = container.firstElementChild;
+    let section = container.parentElement;
+    let pass = false;
+    test(() => {
+        let y = target.offsetTop - container.offsetTop;
+        assert_approx_equals(y, target.dataset.y, 0);
+        pass = true;
+    }, `${section.className.substr(5)}+${filler.className.substr(7)}`);
+    if (!pass)
+      container.classList.add('fail');
+  }
+  done();
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/positioning/inline-static-position-001.html b/tests/wpt/web-platform-tests/css/CSS2/positioning/inline-static-position-001.html
new file mode 100644
index 00000000000..b627fbcab58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/positioning/inline-static-position-001.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<title>CSS Test: Static positions and line wrapping</title>
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css2/visudet.html#static-position">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+.tests, .no-tests {
+  margin-bottom: 1em;
+  font-family: Ahem;
+  font-size: 10px;
+  line-height: 1;
+}
+.tests > div, .no-tests > div {
+  position: relative;
+  width: 10ch;
+  border: 1px solid blue;
+}
+.abs {
+  position: absolute;
+  color: orange;
+}
+</style>
+<body>
+  <section class="tests">
+    <div>12345<span class="abs" data-offset-x="50" data-offset-y="0">span</span>54321</div>
+    <div>123456<span class="abs" data-offset-x="60" data-offset-y="0">span</span>654321</div>
+    <div>12345<span class="abs" data-offset-x="50" data-offset-y="0">span</span> 54321</div>
+    <div>12345&nbsp;<span class="abs" data-offset-x="60" data-offset-y="0">span</span> 54321</div>
+    <div>12345&nbsp;<span class="abs" data-offset-x="60" data-offset-y="0">span</span>&nbsp;54321</div>
+  </section>
+  <section class="tests">
+    <!-- offsetTop is interoperable but offsetLeft is not due to white space collapsing. -->
+    <div>12345 <span class="abs" data-offset-y="0">span</span> 54321</div>
+  </section>
+  <section class="no-tests">
+    <!-- These tests are not interoperable. -->
+    <div>12345 <span class="abs">span</span>54321</div>
+    <div>12345 <span class="abs">span</span>&nbsp;54321</div>
+    <div>123456789012&nbsp;<span class="abs">span</span>&nbsp;54321</div>
+    <div>123456789012&nbsp;<span class="abs">span</span>&nbsp;543210987654321</div>
+  </section>
+<script>
+document.fonts.ready.then(()=> {
+  checkLayout('.tests .abs');
+});
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-interpolation.html b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-interpolation.html
index 35100fb3362..2e7f2e24a1d 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-interpolation.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/animations/background-position-interpolation.html
@@ -45,18 +45,20 @@ test_interpolation({
   {at: 1.25, expect:  '90px 90px, 90px 90px, 90px 90px, 90px 90px'},
 ]);
 
+// background-position's initial value is 0% 0%, and calcs involving percentages
+// are never resolved by the calc spec (even when the percentage is 0%).
 test_interpolation({
   property: 'background-position',
   from: 'initial',
   to: '80px 80px, 80px 80px, 80px 80px, 80px 80px',
 }, [
-  {at: -0.25, expect: '-20px -20px, -20px -20px, -20px -20px, -20px -20px'},
-  {at: 0, expect:     '  0%    0% ,   0%    0% ,   0%    0% ,   0%    0% '}, // TODO(alancutter): Should these be 0px?
-  {at: 0.25, expect:  ' 20px  20px,  20px  20px,  20px  20px,  20px  20px'},
-  {at: 0.5, expect:   ' 40px  40px,  40px  40px,  40px  40px,  40px  40px'},
-  {at: 0.75, expect:  ' 60px  60px,  60px  60px,  60px  60px,  60px  60px'},
-  {at: 1, expect:     ' 80px  80px,  80px  80px,  80px  80px,  80px  80px'},
-  {at: 1.25, expect:  '100px 100px, 100px 100px, 100px 100px, 100px 100px'},
+  {at: -0.25, expect: 'calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px)'},
+  {at: 0, expect:     '0% 0%, 0% 0%, 0% 0%, 0% 0%'},
+  {at: 0.25, expect:  'calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px)'},
+  {at: 0.5, expect:   'calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px)'},
+  {at: 0.75, expect:  'calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px)'},
+  {at: 1, expect:     'calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px)'},
+  {at: 1.25, expect:  'calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)'},
 ]);
 
 test_interpolation({
@@ -73,18 +75,19 @@ test_interpolation({
   {at: 1.25, expect:  '85px 85px, 85px 85px, 85px 85px, 85px 85px'},
 ]);
 
+// background-position is not inherited, so 'unset' is equivalent to initial.
 test_interpolation({
   property: 'background-position',
   from: 'unset',
   to: '80px 80px, 80px 80px, 80px 80px, 80px 80px',
 }, [
-  {at: -0.25, expect: '-20px -20px, -20px -20px, -20px -20px, -20px -20px'},
-  {at: 0, expect:     '  0%    0% ,   0%    0% ,   0%    0% ,   0%    0% '},
-  {at: 0.25, expect:  ' 20px  20px,  20px  20px,  20px  20px,  20px  20px'},
-  {at: 0.5, expect:   ' 40px  40px,  40px  40px,  40px  40px,  40px  40px'},
-  {at: 0.75, expect:  ' 60px  60px,  60px  60px,  60px  60px,  60px  60px'},
-  {at: 1, expect:     ' 80px  80px,  80px  80px,  80px  80px,  80px  80px'},
-  {at: 1.25, expect:  '100px 100px, 100px 100px, 100px 100px, 100px 100px'},
+  {at: -0.25, expect: 'calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px),  calc(0% - 20px)  calc(0% - 20px)'},
+  {at: 0, expect:     '0% 0%, 0% 0%, 0% 0%, 0% 0%'},
+  {at: 0.25, expect:  'calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px),  calc(0% + 20px)  calc(0% + 20px)'},
+  {at: 0.5, expect:   'calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px),  calc(0% + 40px)  calc(0% + 40px)'},
+  {at: 0.75, expect:  'calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px),  calc(0% + 60px)  calc(0% + 60px)'},
+  {at: 1, expect:     'calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px),  calc(0% + 80px)  calc(0% + 80px)'},
+  {at: 1.25, expect:  'calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px), calc(0% + 100px) calc(0% + 100px)'},
 ]);
 
 // Test equal number of position values as background images.
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-invalid.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-invalid.html
index 4ea58da8019..76ff18f35d1 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/background-invalid.html
@@ -12,7 +12,11 @@
 </head>
 <body>
 <script>
+// <bg-layer> does not allow a <color>.
 test_invalid_value("background", "red, green");
+
+// A `/ <bg-size>` is only allowed directly after a <bg-position>.
+test_invalid_value("background", "black 0 url(https://example.invalid/) / cover");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-computed.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-computed.html
new file mode 100644
index 00000000000..9799be68ec7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-computed.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Backgrounds and Borders Module Level 3: getComputedStyle().borderRadius</title>
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius">
+<meta name="assert" content="Computed value has computed length-percentage values.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("border-radius", "1px");
+test_computed_value("border-radius", "1px 2% 3px 4%");
+test_computed_value("border-radius", "5em / 1px 2% 3px 4%", "200px / 1px 2% 3px 4%");
+test_computed_value("border-radius", "1px 2% 3px 4% / 5em", "1px 2% 3px 4% / 200px");
+
+test_computed_value("border-radius", "1px 1px 1px 2% / 1px 2% 1px 2%", "1px 1px 1px 2% / 1px 2%");
+test_computed_value("border-radius", "1px 1px 1px 1px / 1px 1px 2% 1px", "1px / 1px 1px 2%");
+test_computed_value("border-radius", "1px 1px 2% 2%");
+test_computed_value("border-radius", "1px 2% 1px 1px");
+test_computed_value("border-radius", "1px 2% 2% 2% / 1px 2% 3px 2%", "1px 2% 2% / 1px 2% 3px");
+
+test_computed_value("border-top-left-radius", "calc(-0.5em + 10px)", "0px");
+test_computed_value("border-top-right-radius", "20%");
+test_computed_value("border-bottom-right-radius", "calc(0.5em + 10px) 40%", "30px 40%");
+test_computed_value("border-bottom-left-radius", "50% 60px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-invalid.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-invalid.html
index 4e004af8f36..f6d1bcb081e 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-invalid.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-invalid.html
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Backgrounds and Borders Module Level 3: parsing border-radius with invalid values</title>
-<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius">
 <meta name="assert" content="border-radius supports only the grammar '<length-percentage>{1,4} [ / <length-percentage>{1,4} ]?'.">
 <script src="/resources/testharness.js"></script>
@@ -12,12 +11,14 @@
 </head>
 <body>
 <script>
+test_invalid_value("border-radius", "auto");
 test_invalid_value("border-radius", "none");
 test_invalid_value("border-radius", "1px 2px 3px 4px 5px");
 test_invalid_value("border-radius", "-1px");
 test_invalid_value("border-radius", "1px -2px");
 test_invalid_value("border-radius", "1em /");
 test_invalid_value("border-radius", "1px / 2px / 3px");
+test_invalid_value("border-radius", "4 / 5");
 
 test_invalid_value("border-radius", "5em 1px 5em 2% 5em 3px 5em 4%");
 test_invalid_value("border-radius", "1px 5em 2% 5em 3px 5em 4% 5em");
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid.html b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid.html
index 317803bf881..738362f9693 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/border-radius-valid.html
@@ -3,7 +3,6 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Backgrounds and Borders Module Level 3: parsing border-radius with valid values</title>
-<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
 <link rel="help" href="https://drafts.csswg.org/css-backgrounds/#border-radius">
 <meta name="assert" content="border-radius supports the full grammar '<length-percentage>{1,4} [ / <length-percentage>{1,4} ]?'.">
 <script src="/resources/testharness.js"></script>
@@ -14,8 +13,14 @@
 <script>
 test_valid_value("border-radius", "1px");
 test_valid_value("border-radius", "1px 2% 3px 4%");
-test_valid_value("border-radius", "5em / 1px 2% 3px 4%"); // Blink and Webkit fail by serializing as "5em 1px 5em 2% 5em 3px 5em 4%"
-test_valid_value("border-radius", "1px 2% 3px 4% / 5em"); // Blink and Webkit fail by serializing as "1px 5em 2% 5em 3px 5em 4% 5em"
+test_valid_value("border-radius", "5em / 1px 2% 3px 4%");
+test_valid_value("border-radius", "1px 2% 3px 4% / 5em");
+
+test_valid_value("border-radius", "1px 1px 1px 2% / 1px 2% 1px 2%", "1px 1px 1px 2% / 1px 2%");
+test_valid_value("border-radius", "1px 1px 1px 1px / 1px 1px 2% 1px", "1px / 1px 1px 2%");
+test_valid_value("border-radius", "1px 1px 2% 2%");
+test_valid_value("border-radius", "1px 2% 1px 1px");
+test_valid_value("border-radius", "1px 2% 2% 2% / 1px 2% 3px 2%", "1px 2% 2% / 1px 2% 3px");
 
 test_valid_value("border-top-left-radius", "10px");
 test_valid_value("border-top-right-radius", "20%");
diff --git a/tests/wpt/web-platform-tests/css/css-conditional/META.yml b/tests/wpt/web-platform-tests/css/css-conditional/META.yml
index ae24e3b1f6b..0b9cc5ac3d6 100644
--- a/tests/wpt/web-platform-tests/css/css-conditional/META.yml
+++ b/tests/wpt/web-platform-tests/css/css-conditional/META.yml
@@ -1,4 +1,5 @@
 spec: https://drafts.csswg.org/css-conditional/
 suggested_reviewers:
+  - arkhi
   - dbaron
-  - frivoal
+  - frivoal
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-043.html b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-043.html
new file mode 100644
index 00000000000..bf74ca6614b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-043.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html lang="en">
+    <head>
+        <meta charset="UTF-8">
+
+        <title>CSS Conditional Test: Disjunction token `or` should not immediately precede its following opening paren.</title>
+
+        <link rel="author" title="Fabien Basmaison" href="https://arkhi.org/">
+        <link rel="help" href="https://www.w3.org/TR/css3-conditional/#at-supports">
+        <link rel="match" href="at-supports-001-ref.html">
+
+        <meta name="flags" content="invalid">
+        <meta name="assert" content="This tests that the `or` token requires at least one whitespace on its right hand. A string followed immediately by an opening paren is reserved for the functional notation syntax.">
+
+        <style>
+            div {
+                background-color: green;
+                height: 100px;
+                width: 100px;
+            }
+
+            @supports ( ( background-color: red ) or( background-color: green ) ) {
+                div { background-color: red; }
+            }
+        </style>
+    </head>
+
+    <body>
+        <p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+        <div></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-computed.html b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-computed.html
new file mode 100644
index 00000000000..b3f104e6243
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/parsing/font-computed.html
@@ -0,0 +1,261 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS Fonts Module Level 4: getComputedStyle().font</title>
+<link rel="help" href="https://drafts.csswg.org/css-fonts-4/#font-prop">
+<meta name="assert" content="font computed value round-trips.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #container {
+    font-weight: 800;
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+'use strict';
+
+const initial_style = 'normal';
+const initial_variant = 'normal';
+const initial_weight = 'normal';
+const initial_stretch = 'normal';
+const initial_line_height = 'normal';
+
+// Firefox and Edge 18 serialize these as supplied.
+// Blink and Safari have implementation-dependent or platform-dependent serializations.
+function test_system_font(keyword) {
+  test(() => {
+    const target = document.getElementById('target');
+    const previousValue = 'italic xx-large/0px fantasy';
+    target.style.font = previousValue;
+    target.style.font = keyword;
+    const readValue = getComputedStyle(target).font;
+    assert_not_equals(readValue, '', 'font should be set');
+    assert_not_equals(readValue, previousValue, 'font should be updated');
+    target.style.font = previousValue;
+    target.style.font = readValue;
+    assert_equals(getComputedStyle(target).font, readValue, "serialization should round-trip");
+  }, keyword + ' should be a supported system font.');
+}
+
+test_system_font('caption');
+test_system_font('icon');
+test_system_font('menu');
+test_system_font('message-box');
+test_system_font('small-caption');
+test_system_font('status-bar');
+
+// a value other than normal
+const generate_style = () => 'italic';
+
+// value other than normal
+const generate_variant = () => 'small-caps';
+
+// values other than normal
+const generate_weight = (() => {
+  const alternatives = [
+    'bold',
+    'bolder',
+    'lighter',
+    '100',
+    '900'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const compute_weight = (() => {
+  const cache = {}
+  return (weight) => {
+    if (!(weight in cache)) {
+      const weight_reference = document.createElement('div');
+      document.getElementById('container').appendChild(weight_reference);
+      weight_reference.style.fontWeight = weight;
+      cache[weight] = getComputedStyle(weight_reference).fontWeight;
+      weight_reference.remove();
+    }
+    return cache[weight];
+  }
+})();
+
+// values other than normal
+const generate_stretch = (() => {
+  const alternatives = [
+    'ultra-condensed',
+    'extra-condensed',
+    'condensed',
+    'semi-condensed',
+    'semi-expanded',
+    'expanded',
+    'extra-expanded',
+    'ultra-expanded'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_size = (() => {
+  const alternatives = [
+    // <absolute-size>
+    'xx-small',
+    'medium',
+    'xx-large',
+
+    // <relative-size>
+    'larger',
+    'smaller',
+
+    // <length-percentage>
+    '10px',
+    '20%',
+    'calc(30% - 40px)',
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_line_height = (() => {
+  const alternatives = [
+    null,
+    'normal',
+    '1.2',
+    'calc(120% + 1.2em)'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+const generate_family = (() => {
+  const alternatives = [
+    'serif',
+    'sans-serif',
+    'cursive',
+    'fantasy',
+    'monospace',
+    'Menu',
+    '"Non-Generic Example Family Name"'
+  ];
+  let counter = 0;
+  return () => alternatives[counter++ % alternatives.length];
+})();
+
+function test_specific(prefix) {
+  const reference = document.createElement('div');
+  document.getElementById('container').appendChild(reference);
+
+  let parts = [];
+  let canonical = [];
+  let style = null;
+  let variant = null;
+  let weight = null;
+  let stretch = null;
+  for (let entry of prefix) {
+    if (entry === 'style') {
+      style = generate_style();
+      parts.push(style);
+    } else if (entry === 'variant') {
+      variant = generate_variant();
+      parts.push(variant);
+    } else if (entry === 'weight') {
+      weight = generate_weight();
+      parts.push(weight);
+    } else if (entry === 'stretch') {
+      stretch = generate_stretch();
+      parts.push(stretch);
+    } else {
+      // normal
+      parts.push('normal');
+    }
+  }
+
+  if (style) {
+    canonical.push(style);
+    reference.style.fontStyle = style;
+  } else {
+    canonical.push(initial_style);
+  }
+
+  if (variant) {
+    canonical.push(variant);
+    reference.style.fontVariant = style;
+  } else {
+    canonical.push(initial_variant);
+  }
+  if (weight) {
+    canonical.push(compute_weight(weight));
+    reference.style.fontWeight = style;
+  } else {
+    canonical.push(compute_weight(initial_weight));
+  }
+  if (stretch) {
+    canonical.push(stretch);
+    reference.style.fontStretch = style;
+  } else {
+    canonical.push(initial_stretch);
+  }
+
+  const size = generate_size();
+  reference.style.fontSize = size;
+  const line_height = generate_line_height();
+  if (line_height) {
+    parts.push(size + '/' + line_height);
+    reference.style.lineHeight = line_height;
+  } else {
+    parts.push(size);
+  }
+
+  const family = generate_family();
+  parts.push(family);
+  reference.style.fontFamily = family;
+
+  canonical.push(getComputedStyle(reference).fontSize + '/' + getComputedStyle(reference).lineHeight);
+  canonical.push(family);
+
+  reference.remove();
+
+  // Implementations differ on adjacent space when serializing '/'
+  // https://github.com/w3c/csswg-drafts/issues/4282
+  const expected = canonical.join(' ');
+  test_computed_value('font', parts.join(' '), [expected, expected.replace('/', ' / ')]);
+}
+
+// Font style, variant, weight and stretch may appear in any order.
+// Any or all may be omitted. Each accepts the keyword 'normal'.
+// We generate every permutation of these four properties, treating
+// the cases of a property value being omitted or being explicitly
+// 'normal' as being distinct permutations from when the property
+// has a value other than 'normal'.
+function test_various(prefix) {
+  test_specific(prefix);
+  if (prefix.length === 4) {
+    // Font style, variant, weight and stretch may not appear
+    // more than once.
+    return;
+  }
+
+  const alternatives = [
+    'normal',
+    'style',
+    'variant',
+    'weight',
+    'stretch'
+  ];
+  for (let alternative of alternatives) {
+    // Since this is called recursively, check prefix for existing
+    // alternatives, otherwise we may have two styles or two variants, etc.
+    if (alternative === 'normal' || !prefix.includes(alternative))
+      test_various(prefix.concat(alternative));
+  }
+}
+
+test_various([]);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html
index dc8a2e96f02..fd9e696a55e 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-005.html
@@ -39,12 +39,14 @@
 document.fonts.ready.then(() => {
     item1.setAttribute("data-offset-x", "50");
     item2.setAttribute("data-offset-x", "325");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
 
     item2.style.fontSize = "30px";
 
     item1.setAttribute("data-offset-x", "50");
     item2.setAttribute("data-offset-x", "275");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
+
+    done();
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html
index ab933844e9c..4492f9b1ebb 100644
--- a/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html
+++ b/tests/wpt/web-platform-tests/css/css-grid/alignment/grid-inline-axis-alignment-auto-margins-006.html
@@ -38,12 +38,14 @@
 document.fonts.ready.then(() => {
     item1.setAttribute("data-offset-x", "80");
     item2.setAttribute("data-offset-x", "340");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
 
     grid.style.fontSize = "25px";
 
     item1.setAttribute("data-offset-x", "50");
     item2.setAttribute("data-offset-x", "325");
-    checkLayout('#grid');
+    checkLayout('#grid', false);
+
+    done();
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-lists/inherit-overwrites.html b/tests/wpt/web-platform-tests/css/css-lists/inherit-overwrites.html
new file mode 100644
index 00000000000..d1f8072993a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-lists/inherit-overwrites.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Inheritance replaces existing value of counter properties</title>
+<link rel="help" href="https://drafts.csswg.org/css-lists/#property-index">
+<meta name="assert" content="Inheritance replaces existing value of counter properties.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #container {
+    counter-reset: first 1;
+    counter-increment: second 2;
+    counter-set: third 3;
+  }
+  .target {
+    counter-reset: fourth 4;
+    counter-increment: fifth 5;
+    counter-set: sixth 6;
+  }
+</style>
+</head>
+<body>
+<div id="container">
+  <div id="target"></div>
+</div>
+<script>
+'use strict';
+const container = document.getElementById('container');
+
+// 'counter-set' can be added.
+for (let property of ['counter-reset', 'counter-increment']) {
+  test(() => {
+    const target = document.createElement('div');
+    target.classList += 'target';
+    container.appendChild(target);
+    target.style[property] = 'inherit';
+    assert_equals(getComputedStyle(target)[property], getComputedStyle(container)[property]);
+  }, 'Inheritance of ' + property + ' replaces existing value');
+}
+
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006-ref.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006-ref.html
index e34036b008b..85dfa522c7d 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006-ref.html
@@ -29,7 +29,7 @@
   </style>
 
   <article>
-    <div class="container" style="border-bottom: none; height: 200px;">
+    <div class="container" style="border-bottom: none; height: 200px; margin-top: 1em;">
       <div class="block">block1</div>
     </div>
   </article>
diff --git a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006.html b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006.html
index dd63cd8716f..479fb2d0ced 100644
--- a/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006.html
+++ b/tests/wpt/web-platform-tests/css/css-multicol/multicol-span-all-children-height-006.html
@@ -18,6 +18,7 @@
     height: 250px;
     background-color: pink;
     border: 20px solid purple;
+    margin-top: 1em;
   }
   div.block {
     width: 100px;
diff --git a/tests/wpt/web-platform-tests/css/css-paint-api/non-registered-property-value.https.html b/tests/wpt/web-platform-tests/css/css-paint-api/non-registered-property-value.https.html
new file mode 100644
index 00000000000..5b237e01eae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-paint-api/non-registered-property-value.https.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html class="reftest-wait">
+<link rel="help" href="https://drafts.css-houdini.org/css-paint-api/">
+<link rel="match" href="parse-input-arguments-ref.html">
+<style>
+.container {
+  width: 100px;
+  height: 100px;
+}
+
+#canvas-geometry {
+  --foo:100;
+  background-image: paint(geometry);
+}
+</style>
+<script src="/common/reftest-wait.js"></script>
+<script src="/common/worklet-reftest.js"></script>
+<body>
+<div id="canvas-geometry" class="container"></div>
+
+<script id="code" type="text/worklet">
+registerPaint('geometry', class {
+  static get inputProperties() { return ['--foo']; }
+  paint(ctx, geom, properties) {
+    let fooValue = parseFloat(properties.get('--foo').toString());
+    ctx.strokeStyle = 'green';
+    ctx.lineWidth = 4;
+    ctx.strokeRect(0, 0, fooValue, fooValue);
+  }
+});
+</script>
+
+<script>
+    importWorkletAndTerminateTestAfterAsyncPaint(CSS.paintWorklet, document.getElementById('code').textContent);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width-ref.html b/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width-ref.html
new file mode 100644
index 00000000000..4a556189cce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<html lang="en">
+<head>
+	<title>initial-letter width test</title>
+	<style>
+		span {
+			position: absolute;
+			color: transparent;
+		}
+		#control {
+			background-color: green;
+		}
+	</style>
+</head>
+<body>
+	<p>There should be no red</p>
+	<span id="control">Test.</span>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width.html b/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width.html
new file mode 100644
index 00000000000..a912e764ef2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-pseudo/first-letter-width.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<html lang="en">
+<head>
+	<title>initial-letter width test</title>
+	<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=362880">
+	<link rel="help" href="https://drafts.csswg.org/css-pseudo-4/#first-letter-styling">
+	<link rel="match" href="first-letter-width-ref.html">
+	<meta name="assert" content="The width of an element with first-letter styling should render correctly.">
+	<style>
+		div {
+			position: relative;
+		}
+		span {
+			position: absolute;
+			color: transparent;
+		}
+		#control {
+			background-color: green;
+		}
+		#test {
+			background-color: red;
+			line-height: 1;
+			top: 1px;
+		}
+		#test::first-letter {
+			text-transform: uppercase;
+		}
+	</style>
+</head>
+<body>
+	<p>There should be no red</p>
+	<div>
+	<span id="test">Test</span>
+	<span id="control">Test.</span>
+	</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-tables/percent-height-replaced-in-percent-cell.tentative.html b/tests/wpt/web-platform-tests/css/css-tables/percent-height-replaced-in-percent-cell.tentative.html
new file mode 100644
index 00000000000..ed5effa8a75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-tables/percent-height-replaced-in-percent-cell.tentative.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<link rel="help" href="http://crbug.com/1001083">
+<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<table style="width: 100px; height: 100px; background: green;">
+  <tr>
+    <td style="height: 20px;"></td>
+  </tr>
+  <tr>
+    <td style="height: 100%;">
+      <img style="width: 100%; height: 100%; visibility: hidden;" />
+    </td>
+  </tr>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed.html b/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed.html
index 75a6f6b601a..af577b17416 100644
--- a/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed.html
+++ b/tests/wpt/web-platform-tests/css/css-text-decor/parsing/text-decoration-computed.html
@@ -3,7 +3,7 @@
 <head>
 <meta charset="utf-8">
 <title>CSS Text Decoration Test: getComputedStyle().textDecoration</title>
-<link rel="help" href="https://drafts.csswg.org/css-text-decor-4/#text-decoration-line-property">
+<link rel="help" href="https://drafts.csswg.org/css-text-decor-3/#text-decoration-property">
 <meta name="assert" content="text-decoration computed value is as specified.">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -19,14 +19,20 @@
 <script>
 'use strict';
 const currentColor = "rgb(0, 0, 255)";
-test_computed_value("text-decoration", "none", "none solid " + currentColor);
-test_computed_value("text-decoration", "line-through", "line-through solid " + currentColor);
-test_computed_value("text-decoration", "solid", "none solid " + currentColor);
-test_computed_value("text-decoration", "currentcolor", "none solid " + currentColor);
+test_computed_value("text-decoration", "none", currentColor);
+test_computed_value("text-decoration", "line-through", "line-through " + currentColor);
+test_computed_value("text-decoration", "solid", currentColor);
+test_computed_value("text-decoration", "currentcolor", currentColor);
 
 test_computed_value("text-decoration", "double overline underline", "underline overline double " + currentColor);
-test_computed_value("text-decoration", "underline overline line-through red", "underline overline line-through solid rgb(255, 0, 0)");
-test_computed_value("text-decoration", "rgba(10, 20, 30, 0.4) dotted", "none dotted rgba(10, 20, 30, 0.4)");
+test_computed_value("text-decoration", "underline overline line-through red", "underline overline line-through rgb(255, 0, 0)");
+test_computed_value("text-decoration", "rgba(10, 20, 30, 0.4) dotted", "dotted rgba(10, 20, 30, 0.4)");
 
 test_computed_value("text-decoration", "underline dashed rgb(0, 255, 0)");
+
+// Add text-decoration-thickness in [css-text-decor-4].
+test_computed_value("text-decoration", "auto", currentColor);
+test_computed_value("text-decoration", "from-font", currentColor + " from-font");
+test_computed_value("text-decoration", "10px", currentColor + " 10px");
+test_computed_value("text-decoration", "underline red from-font", "underline rgb(255, 0, 0) from-font");
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative.html b/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative.html
index 2f7b2f55fea..73cb5cc5cea 100644
--- a/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-text-decor/text-decoration-serialization.tentative.html
@@ -8,10 +8,11 @@
 <script>
 test(() => {
   const style = getComputedStyle(document.querySelector('div'));
-  // Chrome serializes as "underline solid rgb(0, 0, 0)" while Edge, Firefox an
-  // Safari use "underline", which Chrome used to do as well. The spec should
-  // probably require "underline":
-  // https://github.com/w3c/csswg-drafts/issues/1564
-  assert_equals(style.getPropertyValue("text-decoration"), "underline");
+  const currentColor = "rgb(0, 0, 0)"; // The default color value is black.
+  // The default computed value of text-decoration-color is depended on the
+  // current color value, and it is an rgb() value, instead of `currentcolor`.
+  // This is an ambiguous part in the spec, anyway.
+  assert_equals(style.getPropertyValue("text-decoration"),
+                "underline " + currentColor);
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html b/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html
new file mode 100644
index 00000000000..085e5b6f12d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/overflow-wrap/overflow-wrap-break-word-white-space-crash-002.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<title>CSS Text Test: A combination of `overflow-wrap: break-word` and `white-space` should not crash</title>
+<link rel="help" href="https://crbug.com/1001359">
+<link rel="author" title="Koji Ishii" href="mailto:kojii@chromium.org">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+.container {
+  font-family: sans-serif;
+  font-size: 14px;
+  width: 680px;
+  word-wrap: break-word;
+}
+
+spacer {
+  display: inline-block;
+  width: 620px;
+}
+
+pre-wrap {
+  white-space: pre-wrap;
+}
+
+nowrap {
+  white-space: nowrap;
+}
+
+inline-block {
+  display: inline-block;
+}
+</style>
+<body>
+  <div class="container">
+    <spacer></spacer>
+    <nowrap><span><pre-wrap><inline-block></inline-block></pre-wrap></span>123456</nowrap>987654321
+</div>
+<script>
+test(() => { });
+</script>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-values/minmax-length-percentage-interpolate.html b/tests/wpt/web-platform-tests/css/css-values/minmax-length-percentage-interpolate.html
deleted file mode 100644
index 14af1352d17..00000000000
--- a/tests/wpt/web-platform-tests/css/css-values/minmax-length-percentage-interpolate.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!doctype html>
-<link rel="help" href="https://drafts.csswg.org/css-values-4/#comp-func">
-<link rel="author" title="Xiaocheng Hu" href="mailto:xiaochengh@chromium.org">
-<link rel="match" href="../reference/ref-filled-green-100px-square-only.html">
-<title>Tests interpolation between CSS comparison functions</title>
-<style>
-@keyframes anim {
-  from {
-    width:  min(50px, 30%);
-    height: min(75%, 160px);
-  }
-  to {
-    width:  max(75%, 100px);
-    height: max(50px, 20%);
-  }
-}
-
-.test {
-  background-color: green;
-  animation: anim 2000000s linear;
-  animation-delay: -1000000s;
-}
-
-.container {
-  position: absolute;
-  width: 200px;
-  height: 200px;
-}
-</style>
-<p>Test passes if there is a filled green square.</p>
-<div class="container">
-  <div class="test"></div>
-</div>
diff --git a/tests/wpt/web-platform-tests/css/css-variables/variable-presentation-attribute.html b/tests/wpt/web-platform-tests/css/css-variables/variable-presentation-attribute.html
index 924c8e1c053..6c8a4430bc7 100644
--- a/tests/wpt/web-platform-tests/css/css-variables/variable-presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/css/css-variables/variable-presentation-attribute.html
@@ -91,7 +91,8 @@
             { property: "stroke-opacity", valuesToTest:["0.221"], default: "1" },
             { property: "stroke-width", valuesToTest:["88%", "31px"], default: "1px" },
             { property: "text-anchor", valuesToTest:["start", "middle", "end"], default: "start" },
-            { property: "text-decoration", valuesToTest:["none", "underline", "overline", "line-through"], default: "none" },
+            { property: "text-decoration-line", valuesToTest:["none", "underline", "overline", "line-through"], default: "none" },
+            { property: "text-decoration-style", valuesToTest:["solid", "double", "dotted", "dashed", "wavy"], default: "solid" },
             { property: "visibility", valuesToTest:["visible", "hidden", "collapse"], default: "visible" },
             { property: "word-spacing", valuesToTest:["31px"], default: "0px" },
             { property: "writing-mode", valuesToTest:["lr-tb", "rl-tb"], default: "lr-tb" },
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html b/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html
index 5fb6d6afa56..90cfb02751f 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSSStyleSheet.html
@@ -4,25 +4,37 @@
     <meta charset="utf-8">
     <title>CSSOM - CSSStyleSheet interface</title>
     <link rel="help" href="https://drafts.csswg.org/cssom/#the-cssstylesheet-interface">
+    <link rel="help" href="https://drafts.csswg.org/cssom/#legacy-css-style-sheet-members">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <style id="my-stylesheet">
         body { width: 50%; }
         #foo { height: 100px; }
     </style>
+    <style id="empty-stylesheet"></style>
 
     <script>
-    test(function () {
-        var styleSheet = document.styleSheets[0];
+    var styleSheet, emptyStyleSheet;
+
+    setup(function() {
+        styleSheet = document.styleSheets[0];
         styleSheet.cssRules[0].randomProperty = 1;
         styleSheet.cssRules[1].randomProperty = 2;
+        emptyStyleSheet = document.styleSheets[1];
+    });
 
+    test(function() {
         assert_equals(styleSheet, document.getElementById("my-stylesheet").sheet, "CSSStyleSheet and LinkStyle's sheet attribute");
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute");
         assert_equals(styleSheet.cssRules[0].cssText, "body { width: 50%; }", "CSSStyleSheet cssRules attribute");
         assert_equals(styleSheet.cssRules[1].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute");
         assert_equals(styleSheet.cssRules[2], undefined, "CSSStyleSheet cssRules attribute");
 
+        assert_equals(emptyStyleSheet, document.getElementById("empty-stylesheet").sheet, "CSSStyleSheet and LinkStyle's sheet attribute");
+        assert_equals(emptyStyleSheet.cssRules.length, 0, "CSSStyleSheet cssRules attribute");
+    }, "preconditions");
+
+    test(function() {
         styleSheet.insertRule("#bar { margin: 10px; }", 1);
         assert_equals(styleSheet.cssRules.length, 3, "CSSStyleSheet cssRules attribute after insertRule function");
         assert_equals(styleSheet.cssRules[0].cssText, "body { width: 50%; }", "CSSStyleSheet cssRules attribute");
@@ -30,7 +42,19 @@
         assert_equals(styleSheet.cssRules[2].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute after insertRule function");
         assert_equals(styleSheet.cssRules[0].randomProperty, 1, "[SameObject] cssRules attribute after insertRule function");
         assert_equals(styleSheet.cssRules[2].randomProperty, 2, "[SameObject] cssRules attribute after insertRule function");
+    }, 'insertRule with #bar selector');
 
+    test(function() {
+        assert_throws(new TypeError, function() { styleSheet.insertRule() });
+    }, 'insertRule with no argument throws');
+
+    test(function() {
+        assert_throws("IndexSizeError", function() {
+            styleSheet.insertRule("#bar { margin: 10px; }", styleSheet.cssRules.length + 1)
+        });
+    }, 'insertRule with index greater than length throws');
+
+    test(function() {
         styleSheet.deleteRule(1);
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute after deleteRule function");
         assert_equals(styleSheet.cssRules[0].cssText, "body { width: 50%; }", "CSSStyleSheet cssRules attribute after deleteRule function");
@@ -38,19 +62,39 @@
         assert_equals(styleSheet.cssRules[2], undefined, "CSSStyleSheet cssRules attribute after deleteRule function");
         assert_equals(styleSheet.cssRules[0].randomProperty, 1, "[SameObject] cssRules attribute after deleteRule function");
         assert_equals(styleSheet.cssRules[1].randomProperty, 2, "[SameObject] cssRules attribute after deleteRule function");
+    }, 'deleteRule(1)');
 
+    test(function() {
+        assert_throws(new TypeError, function() { styleSheet.deleteRule() });
+    }, 'deleteRule with no argument throws');
+
+    test(function() {
+        assert_throws("IndexSizeError", function() { emptyStyleSheet.deleteRule(0) });
+    }, 'deleteRule on empty style sheet throws');
+
+    test(function() {
         styleSheet.removeRule();
         assert_equals(styleSheet.cssRules.length, 1, "CSSStyleSheet cssRules attribute after removeRule function");
         assert_equals(styleSheet.cssRules[0].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute after removeRule function");
+    }, 'removeRule with no argument removes first rule');
 
+    test(function() {
+        assert_throws("IndexSizeError", function() { emptyStyleSheet.removeRule(0) });
+    }, 'removeRule on empty style sheet throws');
+
+    test(function() {
         assert_equals(styleSheet.addRule("@media all", "#foo { color: red }"), -1);
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute after addRule function");
         assert_true(styleSheet.cssRules[1] instanceof CSSMediaRule, "CSSStyleSheet addRule does some silly string concatenation");
+    }, 'addRule with @media rule');
 
+    test(function() {
         styleSheet.removeRule(1);
         assert_equals(styleSheet.cssRules.length, 1, "CSSStyleSheet cssRules attribute after removeRule function with index");
         assert_equals(styleSheet.cssRules[0].cssText, "#foo { height: 100px; }", "CSSStyleSheet cssRules attribute after deleteRule function with index");
+    }, 'removeRule(1)');
 
+    test(function() {
         assert_equals(styleSheet.addRule("#foo", "color: red"), -1);
         assert_equals(styleSheet.cssRules.length, 2, "CSSStyleSheet cssRules attribute after addRule function with simple selector");
         assert_equals(styleSheet.cssRules[1].cssText, "#foo { color: red; }", "CSSStyleSheet cssRules attribute after addRule function without index appends to the end");
@@ -58,13 +102,31 @@
         assert_equals(styleSheet.addRule("#foo", "color: blue", 0), -1);
         assert_equals(styleSheet.cssRules.length, 3, "CSSStyleSheet cssRules attribute after addRule function with simple selector with index");
         assert_equals(styleSheet.cssRules[0].cssText, "#foo { color: blue; }", "addRule function with index performs an insertion");
+    }, 'addRule with #foo selectors');
 
+    test(function() {
         assert_equals(styleSheet.addRule(), -1);
         assert_equals(styleSheet.cssRules.length, 4, "CSSStyleSheet cssRules attribute after addRule function without arguments");
         assert_equals(styleSheet.cssRules[3].cssText, "undefined { }", "addRule arguments default to undefined");
+    }, 'addRule with no argument adds "undefined" selector');
 
-        assert_equals(styleSheet.cssRules, styleSheet.rules, "CSSStyleSheet.rules returns the same object as CSSStyleSheet.cssRules");
-    });
+    test(function() {
+        assert_throws("IndexSizeError", function() {
+            styleSheet.addRule("#foo", "color: red", styleSheet.cssRules.length + 1);
+        });
+    }, 'addRule with index greater than length throws');
+
+    test(function() {
+        assert_equals(styleSheet.cssRules, styleSheet.rules);
+    }, "cssRules and rules are the same object");
+
+    test(function() {
+        assert_equals(styleSheet.cssRules, styleSheet.cssRules);
+    }, "cssRules returns the same object twice");
+
+    test(function() {
+        assert_equals(styleSheet.rules, styleSheet.rules);
+    }, "rules returns the same object twice");
     </script>
 </head>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-computed.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-computed.html
new file mode 100644
index 00000000000..fc9ddb3d0c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-anchor-computed.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetAnchor</title>
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-anchor-property">
+<meta name="assert" content="offset-anchor is 'auto' or a computed position.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-anchor", "auto");
+
+test_computed_value("offset-anchor", "left bottom", "0% 100%");
+test_computed_value("offset-anchor", "center center", "50% 50%");
+test_computed_value("offset-anchor", "right center", "100% 50%");
+test_computed_value("offset-anchor", "center top", "50% 0%");
+test_computed_value("offset-anchor", "center bottom", "50% 100%");
+test_computed_value("offset-anchor", "calc(20% - 5em) center", "calc(20% - 200px) 50%");
+test_computed_value("offset-anchor", "right 4em", "100% 160px");
+test_computed_value("offset-anchor", "10px 20%");
+test_computed_value("offset-anchor", "left -10px top -20%", "-10px -20%");
+test_computed_value("offset-anchor", "right 10% bottom 20em", "90% calc(100% - 800px)");
+test_computed_value("offset-anchor", "top 10px right -20%", "120% 10px");
+test_computed_value("offset-anchor", "left 10% bottom 20em", "10% calc(100% - 800px)");
+test_computed_value('offset-anchor', 'calc(10px - 0.5em) calc(10px + 0.5em)', '-10px 30px');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-computed.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-computed.html
new file mode 100644
index 00000000000..e9de1ef255f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-distance-computed.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetDistance</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-distance-property">
+<meta name="assert" content="offset-distance is a computed '<length-percentage>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-distance", "10px");
+test_computed_value("offset-distance", "20%");
+test_computed_value("offset-distance", "calc(40% - 30px)");
+test_computed_value("offset-distance", "0", "0px");
+test_computed_value('offset-distance', 'calc(10px - 0.5em)', '-10px');
+test_computed_value('offset-distance', 'calc(10px + 0.5em)', '30px');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html
new file mode 100644
index 00000000000..95210dd2376
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-path-computed.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetPath</title>
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-path-property">
+<meta name="assert" content="offset-path has absolute path commands.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-path", "none");
+
+test_computed_value("offset-path", "ray(0rad closest-side)", "ray(0deg closest-side)");
+test_computed_value("offset-path", "ray(0.25turn closest-corner contain)", "ray(90deg closest-corner contain)");
+test_computed_value("offset-path", "ray(200grad farthest-side)", "ray(180deg farthest-side)");
+test_computed_value("offset-path", "ray(270deg farthest-corner contain)");
+test_computed_value("offset-path", "ray(-720deg sides)");
+test_computed_value("offset-path", "ray(calc(180deg - 45deg) farthest-side)", "ray(calc(135deg) farthest-side)");
+
+test_computed_value("offset-path", 'path("m 20 0 h -100")', 'path("M 20 0 H -80")');
+test_computed_value("offset-path", 'path("M 0 0 L 100 100 M 100 200 L 200 200 Z L 300 300 Z")');
+test_computed_value("offset-path", 'path("m 10 20 q 30 60 40 50 q 100 70 90 80")', 'path("M 10 20 Q 40 80 50 70 Q 150 140 140 150")');
+test_computed_value("offset-path", 'path("M 0 0 L 100 100 m 0 100 l 100 0 Z l 160 20 Z")', 'path("M 0 0 L 100 100 M 100 200 L 200 200 Z L 260 220 Z")');
+test_computed_value("offset-path", 'path("m 10 20 l 20 30 Z l 50 60 Z m 70 80 l 90 60 Z t 70 120")', 'path("M 10 20 L 30 50 Z L 60 80 Z M 80 100 L 170 160 Z T 150 220")');
+test_computed_value("offset-path", 'path("m 10 170 h 90 v 30 m 0 0 s 1 2 3 4 z c 9 8 7 6 5 4")', 'path("M 10 170 H 100 V 200 M 100 200 S 101 202 103 204 Z C 109 208 107 206 105 204")');
+test_computed_value("offset-path", 'path("m 10 20 a 10 20 30 1 0 40 50 a 110 120 30 1 1 140 50")', 'path("M 10 20 A 10 20 30 1 0 50 70 A 110 120 30 1 1 190 120")');
+
+// url, shape and geometry-box paths are not yet supported by implementations.
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-position-computed.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-position-computed.html
new file mode 100644
index 00000000000..1cbdbdb0fe2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-position-computed.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedStyle().offsetPosition</title>
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-position-property">
+<meta name="assert" content="offset-position is 'auto' or a computed position.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+<style>
+  #target {
+    font-size: 40px;
+  }
+</style>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-position", "auto");
+
+test_computed_value("offset-position", "left bottom", "0% 100%");
+test_computed_value("offset-position", "center center", "50% 50%");
+test_computed_value("offset-position", "right center", "100% 50%");
+test_computed_value("offset-position", "center top", "50% 0%");
+test_computed_value("offset-position", "center bottom", "50% 100%");
+test_computed_value("offset-position", "calc(5em + 20%) center", "calc(20% + 200px) 50%");
+test_computed_value("offset-position", "right 3em", "100% 120px");
+test_computed_value("offset-position", "10px 20%");
+test_computed_value("offset-position", "left -10px top -20%", "-10px -20%");
+test_computed_value("offset-position", "right 10% bottom 5em", "90% calc(100% - 200px)");
+test_computed_value("offset-position", "top 10px right -20%", "120% 10px");
+test_computed_value("offset-position", "left 10% bottom 2em", "10% calc(100% - 80px)");
+test_computed_value('offset-position', 'calc(10px - 0.5em) calc(10px + 0.5em)', '-10px 30px');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html
index c6bf016f701..ea248f1457b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div>  <!-- Saturate the margin space -->
     <div class="shape"></div>
     <div class="box"></div>
@@ -58,5 +58,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div>  <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html
index f2b2ed65e07..86887baff0f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html
index da64efa2b2b..f7137463d59 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div>  <!-- Saturate the margin space -->
     <div class="shape"></div>
     <div class="box"></div>
@@ -59,5 +59,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div>  <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html
index 25cd8eb9414..f47219e82ec 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-002.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -63,5 +63,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html
index 8be3ffa28e8..d6d061dc1b5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; left: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px; top: 20px; left: 128px;"></div> <!-- Box at corner -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 80px; left: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; left: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; left: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html
index ef26dec6049..136bc10d205 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-001.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html
index 95221583185..f66a499116e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002-ref.html
@@ -33,11 +33,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html
index 2632590be85..ee48b439ae6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-002.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html
index 6075ce68587..4639acc9204 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; right: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px; top: 20px; right: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px; top: 80px; right: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; right: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; right: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html
index 7d08fc4f9ac..2b537589096 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-003.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html
index 3e9cbbd06c4..bb9bdcb82d9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004-ref.html
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html
index c90e13f29ca..1a3c72c5d02 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-004.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html
index 6c56ff4de20..f0e0305caa7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html
index 4187e962899..2c6acebe58c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-005.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html
index 2f4ab382579..3f6cf9762fc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006-ref.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 128px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html
index 1dfb586093f..4f8742ceba3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-006.html
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html
index 1a1b0e39cf2..0d137557c3d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html
index c5b781171e8..1a90a08c5fd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-007.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html
index bf155edd2a0..964b38949a1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008-ref.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html
index 0e3176d745f..59b25c4b610 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-008.html
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html
index 0dde92c78b8..1fd0a1d9b28 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html
index 9cf0ec258f2..9d2a8092c6b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-009.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html
index 00ce96cf5b4..c96d926d62f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010-ref.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html
index bf38c4dc4b5..280c7e2b6ff 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-010.html
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html
index 7097a6452e6..667cdf9b940 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html
index 2138e9496a8..34f4c69e69d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-011.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html
index 775d984d1d9..683c4590ecc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012-ref.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px; inset-block-start: 20px; inset-inline-start: 140px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 140px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 116px; inset-inline-start: 132px;"></div> <!-- Box at corner -->
     <div class="longbox" style="inset-block-start: 140px; inset-inline-start: 0;"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html
index b963b2b1646..7bf8efe9309 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-border-radius-012.html
@@ -46,7 +46,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -54,5 +54,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html
index fd38ecdb403..e6b0fe1db83 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032-ref.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; left: 60px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="height: 36px; top: 120px; left: 60px;"></div>
     <div class="box" style="height: 12px; top: 156px; left: 48px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 168px; left: 36px;"></div>  <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html
index 17dd3f97793..d6cadf81d5f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-032.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html
index 5950768909d..3814e2eebd2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033-ref.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; left: 0px;"></div> <!-- Fill the space above the first float -->
@@ -48,5 +48,5 @@
     <div class="box" style="height: 36px; top: 180px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; left: 120px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html
index e2fef0c0b12..8ce9557a681 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-033.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -51,5 +51,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html
index fce4c56c52e..5cf26ced599 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034-ref.html
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; right: 60px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="height: 36px; top: 120px; right: 60px;"></div>
     <div class="box" style="height: 12px; top: 156px; right: 48px;"></div>
     <div class="box" style="height: 12px; top: 168px; right: 36px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html
index 0faa58b63cf..2f8a485a259 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-034.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html
index 1e3fd7d0c72..7fcd50eff0e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035-ref.html
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; right: 0px;"></div> <!-- Fill the space above the first float -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 180px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; right: 120px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html
index 089705deded..7608bce23f5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-035.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html
index 13f0210e9d1..a731f206a2f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036-ref.html
@@ -33,7 +33,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 108px;"></div> <!-- Box at corner -->
@@ -41,5 +41,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html
index e67d6b80bb9..0c558719d4f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-036.html
@@ -36,7 +36,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -44,5 +44,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html
index 192c8e3e975..67446b6104c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-037.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html
index 885aa1de625..979650c102c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-038.html
@@ -36,7 +36,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -44,5 +44,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html
index 1701347059f..fbf2516bbd6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041-ref.html
@@ -33,7 +33,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 12px; left: 120px;"></div>
@@ -41,5 +41,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 108px; left: 120px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html
index 86a8a458d63..b120bfcc46f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-041.html
@@ -36,7 +36,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
@@ -44,5 +44,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html
index a8603d7414d..c7a49302ca9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042-ref.html
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; right: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; right: 108px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; right: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html
index 2962263a160..3748d1d476f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-042.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html
index 869a8642cfc..200f59ce490 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-043.html
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -46,5 +46,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html
index 1764a86b89e..f07985b3d63 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-044.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html
index 77b1190c0ea..a518cfd3617 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047-ref.html
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 12px; right: 120px;"></div>
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 108px; right: 120px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html
index 2f3db82def4..450748a098f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-047.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html
index 668f2a8dafb..12ed0a1f525 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html
index 32f58f73e91..40cdc8f0116 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-048.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html
index d38adc31d44..8da63255648 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html
index d62dcef64de..150a0e0581f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-049.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html
index 54359ed0338..0991b5961f3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html
index c635c56f897..0a4076211c4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-050.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html
index 24fdb7fcf5b..5178b55964e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html
index b628316cd21..02290fb8860 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-051.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html
index a035a5b3e07..12376fbc7ac 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html
index 2ee97c26608..eea3695fd91 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-052.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html
index 7fac4137281..281bd8834e6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html
index 371e15d49d4..3732605bb98 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-053.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html
index 8dc291eda68..4f1cdae15f0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html
index ce7e446c466..fd85c795dd5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-054.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html
index cd7f9b282ab..97fc1e9fc83 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px; inset-block-start: 0px; inset-inline-start: 0;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px; inset-block-start: 20px; inset-inline-start: 96px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 12px; inset-block-start: 116px; inset-inline-start: 108px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px; inset-block-start: 128px; inset-inline-start: 0;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html
index 8e0d4c64343..8280c0e8bb0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-055.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 20px;"></div> <!-- Fill the border area due to the circle shifted -->
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 12px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 20px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html
index f9c569ab144..53c10c892f0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the padding space -->
@@ -58,5 +58,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html
index 3ba603341cf..d046de02d3c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html
index ebb3a4c3fef..aa9c34ce922 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the padding space -->
@@ -59,5 +59,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html
index 240a0a4afb5..e2040763dfb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-002.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="longbox"></div> <!-- Saturate the padding space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html
index d1c214d757e..0c773005226 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; left: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; left: 128px;"></div> <!-- Box at corner -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 80px; left: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; left: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; left: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html
index 09a74002965..be5591ec6ac 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-001.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html
index eda0180cb8a..c3dc6de8d1d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; right: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; right: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px; top: 80px; right: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; right: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; right: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html
index 2eecbfe9834..70c8bc9e2ef 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-border-radius-002.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html
index 4fb0f025a73..41399373d8e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032-ref.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; left: 40px;"></div>
@@ -45,5 +45,5 @@
     <div class="long box" style="height: 60px; top: 60px; left: 0px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px; top: 120px; left: 40px;"></div>
     <div class="box" style="height: 24px; top: 156px; left: 32px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html
index 31ac2ed5b7b..d0c92b9df0b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-032.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -48,5 +48,5 @@
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html
index 83c7ba2bfe7..6ed9f09562f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033-ref.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; left: 0px;"></div> <!-- Fill the space above the first float -->
@@ -48,5 +48,5 @@
     <div class="box" style="height: 36px; top: 180px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; left: 120px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html
index eda79310bec..2e2fa577b22 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-033.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -51,5 +51,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html
index 734b059108c..c981e071086 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034-ref.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px; top: 0px; right: 40px;"></div>
@@ -45,5 +45,5 @@
     <div class="long box" style="height: 60px; top: 60px; right: 0px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px; top: 120px; right: 40px;"></div>
     <div class="box" style="height: 24px; top: 156px; right: 32px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html
index 9090a329622..fb4d1331e69 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-034.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box" style="height: 36px;"></div>
@@ -49,5 +49,5 @@
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space between two floats -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html
index 66f26771088..c9d4bbb6b50 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035-ref.html
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px; top: 0px; right: 0px;"></div> <!-- Fill the space above the first float -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 180px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 216px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 228px; right: 120px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html
index 6c3b1e9a4e0..bc3814a244a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-035.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="long box" style="height: 60px;"></div> <!-- Fill the space above the first float -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div>
     <div class="box" style="height: 12px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html
index c9d565cab79..ddbb79eaa2b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036-ref.html
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html
index 5ad705d52e9..9a14e65ba25 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-036.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html
index 4c9fcda5f96..6dbe9ec7777 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037-ref.html
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html
index 6d1597c9b3d..6015d2de0dd 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-037.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html
index a9db519fd8b..851d16ffab5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038-ref.html
@@ -35,11 +35,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html
index 6eb9c7fc266..2d16fae743a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-038.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html
index 45d2181ebff..b7d4e5d9756 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039-ref.html
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html
index 7cfc4620c33..ca507853390 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-039.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html
index 2c0349dc9fc..c39885e056e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040-ref.html
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 0px;"></div>
     <div class="box" style="height: 36px; top: 24px; left: 0px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 0px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 0px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html
index d0896993370..a5b0ce730cb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-040.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html
index dc5afda9c61..2050e502dfa 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-041.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html
index 9a8b2a249c1..26c36948a74 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042-ref.html
@@ -35,11 +35,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 0px;"></div>
     <div class="box" style="height: 36px; top: 24px; right: 0px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 0px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 0px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html
index b52667ec708..5febab89391 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-042.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html
index 03bcc22076c..4920dc040d7 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-043.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html
index dd92c3743d7..5fd0f7141c9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044-ref.html
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 24px; left: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 80px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html
index 92524a89b93..0590b132032 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-044.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html
index 6c2165043d2..c33c34d3cc5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045-ref.html
@@ -35,11 +35,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 24px; right: 80px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 80px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 80px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html
index 7066ea10ed1..89c786f1abb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-045.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html
index 85934258804..ec88f678a93 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046-ref.html
@@ -36,11 +36,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html
index b8a2654b6ef..98885fb49b5 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-046.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html
index d6c4215b4b1..cf340ee39de 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047-ref.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html
index d3166700948..48f49a25aa0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-047.html
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html
index 0cb81c7d985..9e73dd550bc 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048-ref.html
@@ -36,11 +36,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html
index b43c49a19d4..f1b36447b06 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-048.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html
index 494edc84230..e021c6d6882 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049-ref.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html
index 64fac486ab9..5a5919aa663 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-049.html
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html
index 5acbca772af..aab9ddde037 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050-ref.html
@@ -36,11 +36,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html
index a8b96c8c648..698cf2d40b6 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-050.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html
index d3bc6615b43..7e0ef646359 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051-ref.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 0px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px; inset-block-start: 24px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 36px; inset-block-start: 60px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 96px; inset-inline-start: 72px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html
index 10ffd105efd..b3bf1b960eb 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-051.html
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html
index 00f86a2a5ab..0ecdd155de1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html
@@ -38,11 +38,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px; top: 0; left: 0;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px; top: 40px; left: 120px;"></div>
     <div class="box" style="height: 40px; top: 80px; left: 120px;"></div>
     <div class="long box" style="height: 40px; top: 120px; left: 0;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html
index b4f9e11b2d0..95b5eff0f76 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html
@@ -41,11 +41,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px;"></div>
     <div class="box" style="height: 40px;"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html
index dadb140135d..73e73ee7a06 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017-ref.html
@@ -39,11 +39,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px; top: 0; right: 0;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px; top: 40px; right: 120px;"></div>
     <div class="box" style="height: 40px; top: 80px; right: 120px;"></div>
     <div class="long box" style="height: 40px; top: 120px; right: 0;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html
index e194946b2b9..e936b709cec 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-017.html
@@ -42,11 +42,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
     <div class="box" style="height: 40px;"></div>
     <div class="box" style="height: 40px;"></div>
     <div class="long box" style="height: 40px;"></div> <!-- Fill the margin and inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html
index 6d2121ca953..216aae87f09 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html
index 9a7bb60b661..786da6c3959 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-020.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html
index daf161d82cb..093efad4068 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html
index 446d8825b6f..96b5602f265 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-021.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html
index 4f0378b00f8..b4816ce00f8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html
index f54b1556524..762b53b9e69 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-022.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html
index f6e655f84bb..9c7ca359353 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html
index a27ae4d570b..5ab5a069dc2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-023.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html
index 8fdfb4b3048..f2dc323c6d4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html
index 120a98d695b..6dd122c4b61 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-024.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html
index 66b835f21c7..2758b88e7c9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html
index 474f715d888..7b015c33724 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-025.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html
index fbee45dd14b..c0325445cb3 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html
index 45d5a858af0..4beec3f0bd9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-026.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html
index 24ae7ee6460..3791a6f1bb2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px; inset-block-start: 0px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px; inset-block-start: 10px; inset-inline-start: 90px;"></div> <!-- Box at corner -->
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 36px; inset-block-start: 70px; inset-inline-start: 90px;"></div>
     <div class="box" style="block-size: 24px; inset-block-start: 106px; inset-inline-start: 82px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px; inset-block-start: 130px; inset-inline-start: 0px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html
index a75fc0cf4e1..3d8d0f5c07e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-027.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 36px;"></div>
     <div class="box" style="block-size: 24px;"></div> <!-- Box at corner -->
     <div class="long box" style="block-size: 10px;"></div> <!-- Fill the inset space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html
index a9b8687096c..55c7960876b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001-ref.html
@@ -33,7 +33,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -50,5 +50,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html
index c93475452e6..3c0b0fbd6d1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-001.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -54,5 +54,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html
index cfb0bfd9b9d..3806e09993c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002-ref.html
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -51,5 +51,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html
index 1ca358ffc5d..e8b71d126c2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-002.html
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="box"></div>
@@ -55,5 +55,5 @@
     <div class="box"></div>
     <div class="box"></div>
     <div class="box"></div>
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html
index 3b2b02a2658..8b7e2955f62 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001-ref.html
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 108px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html
index 481973cf855..dcd26151927 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-001.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html
index b783572f789..d24afcd7112 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002-ref.html
@@ -34,11 +34,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; left: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html
index 5dc10a11373..a49184aa596 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-002.html
@@ -37,11 +37,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html
index 4cce5432571..aa74b164694 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003-ref.html
@@ -35,7 +35,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; right: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; right: 108px;"></div> <!-- Box at corner -->
@@ -43,5 +43,5 @@
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; right: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html
index 18d2fded95d..450fe76fc5d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-003.html
@@ -38,7 +38,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -46,5 +46,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html
index c4b309b7d01..a96f6c30de1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004-ref.html
@@ -42,11 +42,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px; top: 0px; right: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px; top: 24px; right: 120px;"></div>
     <div class="box" style="height: 36px; top: 60px; right: 120px;"></div>
     <div class="box" style="height: 24px; top: 96px; right: 108px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html
index ea08d495905..d4d131bc9e0 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-004.html
@@ -45,11 +45,11 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html
index c586f119f07..73e4e91096b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005-ref.html
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 96px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 108px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 120px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 120px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html
index d1b90adbe4c..733659c7556 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-005.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html
index 96a054ccb51..16ed0e55782 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006-ref.html
@@ -34,7 +34,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px; top: 0px; left: 120px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 12px; left: 120px;"></div> <!-- Box at corner -->
@@ -42,5 +42,5 @@
     <div class="box" style="height: 36px; top: 60px; left: 120px;"></div>
     <div class="box" style="height: 12px; top: 96px; left: 108px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px; top: 108px; left: 96px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html
index 37c81b167f3..383c0524e9a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-006.html
@@ -37,7 +37,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
@@ -45,5 +45,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html
index ce2c66a1401..a520c1cb2ef 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-margin-box-border-radius-008.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="bfc">
+  <main class="bfc">
     <span class="container">
       <div class="shape"></div>
     </span>
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
     <div class="box" style="height: 12px;"></div> <!-- Box at corner -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html
index 67f665b4e1a..0aa6993e37c 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="shape"></div>
@@ -58,5 +58,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html
index 2fd8d50103a..ff7d15abe8b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-001.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html
index 767aa3a0118..8459758e50e 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="longbox"></div> <!-- Saturate the margin space -->
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="shape"></div>
@@ -59,5 +59,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html
index 70faca8d5c7..4f0d1feea75 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-002.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin space -->
@@ -62,5 +62,5 @@
     <div class="box"></div>
     <div class="longbox"></div> <!-- Saturate the border space -->
     <div class="longbox"></div> <!-- Saturate the margin space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html
index 1db76f3bcb7..88abbd73f41 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001-ref.html
@@ -41,7 +41,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; left: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; left: 128px;"></div> <!-- Box at corner -->
@@ -49,5 +49,5 @@
     <div class="box" style="height: 36px; top: 80px; left: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; left: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; left: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html
index cf90885c039..1b02259de4f 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-001.html
@@ -44,7 +44,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -52,5 +52,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html
index 8e03b285a3e..b15f4e275b4 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002-ref.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox" style="top: 0; right: 0;"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px; top: 20px; right: 128px;"></div> <!-- Box at corner -->
@@ -50,5 +50,5 @@
     <div class="box" style="height: 36px; top: 80px; right: 140px;"></div>
     <div class="box" style="height: 24px; top: 116px; right: 128px;"></div> <!-- Box at corner -->
     <div class="longbox" style="top: 140px; right: 0;"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html
index 9616a24f1dc..59f9400fdc1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-padding-box-border-radius-002.html
@@ -45,7 +45,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
@@ -53,5 +53,5 @@
     <div class="box" style="height: 36px;"></div>
     <div class="box" style="height: 24px;"></div> <!-- Box at corner -->
     <div class="longbox"></div> <!-- Saturate the margin and border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html
index bf6036a306d..86a84ad9707 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px; top: 0; left: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px; top: 30px; left: 100px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="height: 20px; top: 80px; left: 80px;"></div>
     <div class="box" style="height: 30px; top: 100px; left: 80px;"></div>
     <div class="long box" style="height: 30px; top: 130px; left: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html
index c32b164fa07..b3f63973975 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-018.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="height: 20px;"></div>
     <div class="box" style="height: 30px;"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html
index 6065a235e53..ec5cf47fdb9 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px; top: 0; right: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px; top: 30px; right: 80px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="height: 20px; top: 80px; right: 120px;"></div>
     <div class="box" style="height: 30px; top: 100px; right: 100px;"></div>
     <div class="long box" style="height: 30px; top: 130px; right: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html
index ce13567c2da..af2d0c10a5d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-019.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="height: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="height: 20px;"></div>
     <div class="box" style="height: 30px;"></div>
     <div class="long box" style="height: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html
index f7287a1fcaa..7a7eb7120f8 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 80px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 100px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html
index 954a5bb7d0a..2973cd48c7a 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-020.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html
index 9e0cc4889f3..2cb51b8f0ad 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 100px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 80px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html
index cfd7edf2cb7..ecc7c878ec2 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-021.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html
index 40cb31fb46b..7cc0eb6836b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 100px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 80px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html
index ea1d090f1ba..331fe177cd1 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-022.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html
index 445129dcf7e..5ec5c24b4cf 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 80px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 100px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html
index 9c09a648827..1564ccd6b36 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-023.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html
index aba8605f5b9..64bb8e6798d 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024-ref.html
@@ -39,7 +39,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 80px;"></div>
@@ -47,5 +47,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 120px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 100px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html
index 7bd469cbef9..67290806887 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-024.html
@@ -42,7 +42,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -50,5 +50,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html
index 6a334c5d1da..c934b148f0b 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025-ref.html
@@ -40,7 +40,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 0; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px; inset-block-start: 30px; inset-inline-start: 100px;"></div>
@@ -48,5 +48,5 @@
     <div class="box" style="block-size: 20px; inset-block-start: 80px; inset-inline-start: 80px;"></div>
     <div class="box" style="block-size: 30px; inset-block-start: 100px; inset-inline-start: 80px;"></div>
     <div class="long box" style="block-size: 30px; inset-block-start: 130px; inset-inline-start: 0;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html
index 90a9fb47a1d..35db9799b90 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-025.html
@@ -43,7 +43,7 @@
   }
   </style>
 
-  <body class="container">
+  <main class="container">
     <div class="shape"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
     <div class="box" style="block-size: 30px;"></div>
@@ -51,5 +51,5 @@
     <div class="box" style="block-size: 20px;"></div>
     <div class="box" style="block-size: 30px;"></div>
     <div class="long box" style="block-size: 30px;"></div> <!-- Fill the margin and partial border space -->
-  </body>
+  </main>
 </html>
diff --git a/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md b/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md
index 35c1905a0c5..d1a5177894a 100644
--- a/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md
+++ b/tests/wpt/web-platform-tests/docs/running-tests/from-local-system.md
@@ -49,14 +49,13 @@ If you are behind a proxy, you also need to make sure the domains above are
 excluded from your proxy lookups.
 
 [The Ahem font](../writing-tests/ahem) is used to test precise rendering
-behavior. [Download the font][download-ahem] and install it using the
-appropriate steps for your platform:
+behavior. This font should be loaded as a web font in tests, using the
+`/fonts/ahem.css` stylesheet, as follows:
+
+```
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+```
 
-- On Windows, right-click the downloaded file in File Explorer/Windows Explorer
-  (depending on Windows version) and select "Install" from the menu.
-- On macOS, open the downloaded file in Font Book (the default application for
-  font files) and then click install.
-- On Linux, copy the file to `~/.local/share/fonts` and then run `fc-cache`.
 
 ### Windows Notes
 
@@ -147,5 +146,3 @@ Additional browser-specific documentation:
   android_webview
   safari
 ```
-
-[download-ahem]: https://github.com/web-platform-tests/wpt/raw/master/fonts/Ahem.ttf
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/assumptions.md b/tests/wpt/web-platform-tests/docs/writing-tests/assumptions.md
index eb25fccc55a..5afa4161212 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/assumptions.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/assumptions.md
@@ -11,7 +11,6 @@ tests can freely rely on these assumptions being true:
  * The initial value of `color` is `black`.
  * The user stylesheet is empty (except where indicated by the tests).
  * The device is interactive and uses scroll bars.
- * The device has the Ahem font installed.
  * The HTML `div` element is assigned `display: block;`, the
    `unicode-bidi` property may be declared, and no other property
    declarations.
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/general-guidelines.md b/tests/wpt/web-platform-tests/docs/writing-tests/general-guidelines.md
index b39a77d1c7a..b0e87b0391f 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/general-guidelines.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/general-guidelines.md
@@ -121,10 +121,10 @@ assumptions that can be relied on are documented [here][assumptions];
 tests that rely on anything else should be manual tests that document
 their assumptions.
 
-Aside from the [Ahem font][ahem], fonts cannot be relied on to be
-either installed or to have specific metrics. As such, in most cases
-when a known font is needed Ahem should be used. In other cases,
-`@font-face` should be used.
+Fonts cannot be relied on to be either installed or to have specific
+metrics. As such, in most cases when a known font is needed, [Ahem][ahem]
+should be used and loaded as a web font. In other cases, `@font-face`
+should be used.
 
 
 ### Be Self-Contained
diff --git a/tests/wpt/web-platform-tests/docs/writing-tests/rendering.md b/tests/wpt/web-platform-tests/docs/writing-tests/rendering.md
index 13cc669bfe1..e17b6ef8797 100644
--- a/tests/wpt/web-platform-tests/docs/writing-tests/rendering.md
+++ b/tests/wpt/web-platform-tests/docs/writing-tests/rendering.md
@@ -20,8 +20,8 @@ two ways:
    renders a green square when it passes; these can mostly be written to
    match [this][ref-filled-green-100px-square] reference. This green square is
    often rendered over a red square, such that when the test fails there is red
-   visible on the page; this can even be done using text by using the [Ahem][]
-   font.
+   visible on the page; this can even be done using text by using the
+   [Ahem][ahem] font.
 
 More occasionally, the entire canvas is rendered green, typically when
 testing parts of CSS that affect the entire page. Care has to be taken
@@ -81,3 +81,4 @@ color-related functionality will necessitate using some of these
 colors!
 
 [ref-filled-green-100px-square]: https://github.com/w3c/csswg-test/blob/master/reference/ref-filled-green-100px-square.xht
+[ahem]: ahem
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/README.txt b/tests/wpt/web-platform-tests/forced-colors-mode/README.txt
new file mode 100644
index 00000000000..de185c88aee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/README.txt
@@ -0,0 +1 @@
+This directory is for testing Forced Colors mode implementation.
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html
new file mode 100644
index 00000000000..387aecacfb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div id="a">
+    A backplate should be drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to auto.)
+  </div>
+  <br><br><br>
+  <div>
+    There should NOT be a backplate drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to none.)
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html
new file mode 100644
index 00000000000..05d362328a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-01.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-01-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    A backplate should be drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to auto.)
+  </div>
+  <br><br><br>
+  <div id="b">
+    There should NOT be a backplate drawn behind the text
+    <br>
+    in forced colors mode
+    <br>
+    (forced-color-adjust is set to none.)
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html
new file mode 100644
index 00000000000..36bfaef0eee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02-ref.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that the backplate feature with a varying number of line breaks.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div>
+   This text <br> should have <br> its own backplate <br> in forced colors mode.
+  </div>
+  <br>
+  <div>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    two br tags indicates a new paragraph.
+    <br>
+    This text should share a backplate with the above text:
+    <br>
+    one br tag used.
+  </div>
+  <br>
+  <br>
+  <br>
+  <div>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    four br tags indicates a new paragraph.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html
new file mode 100644
index 00000000000..cf521533c9e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-02.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that the backplate feature with a varying number of line breaks.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-02-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <span>
+    This text <br> should have <br> its own backplate <br> in forced colors mode.
+  </span>
+  <br>
+  <br>
+  <span>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    two br tags indicates a new paragraph.
+  </span>
+  <br>
+  <span>
+    This text should share a backplate with the above text:
+    <br>
+    one br tag used.
+  </span>
+  <br>
+  <br>
+  <br>
+  <br>
+  <span>
+    This text should have its own backplate in forced colors mode:
+    <br>
+    four br tags indicates a new paragraph.
+  </span>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html
new file mode 100644
index 00000000000..81659a026c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03-ref.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests the backplate feature behind lists.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    left: 0%;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  li {
+    margin-left: -8px;
+  }
+</style>
+<body>
+  <div>
+    <li style="background-color: Window;">
+      There should be a backplate drawn
+  </div>
+  <br>
+  <div>
+    <li style="background-color: Window;">
+      behind the first three list items
+  </div>
+  <br>
+  <div>
+    <li style="background-color: Window;">
+      in forced colors mode.
+  </div>
+  <br>
+  <div>
+    <li>
+      There should be NO backplate drawn
+  </div>
+  <br>
+  <div>
+    <li>
+      behind the last three list items
+  </div>
+  <br>
+  <div>
+    <li>
+      in forced colors mode.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html
new file mode 100644
index 00000000000..936332a2d17
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-03.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests the backplate feature behind lists.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-03-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    left: 0%;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  li {
+    margin-left: -8px;
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    <li>
+      There should be a backplate drawn
+  </div>
+  <br>
+  <div id="a">
+    <li>
+      behind the first three list items
+  </div>
+  <br>
+  <div id="a">
+    <li>
+      in forced colors mode.
+  </div>
+  <br>
+  <div id="b">
+    <li>
+      There should be NO backplate drawn
+  </div>
+  <br>
+  <div id="b">
+    <li>
+      behind the last three list items
+  </div>
+  <br>
+  <div id="b">
+    <li>
+      in forced colors mode.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html
new file mode 100644
index 00000000000..f1fda49bf9b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04-ref.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests the backplate feature behind links.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div id="a">
+    This text should have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    that includes the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+  <br><br><br><br>
+  <div>
+    This text should NOT have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    including for the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html
new file mode 100644
index 00000000000..c9b8136fdf9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-04.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests the backplate feature behind links.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-04-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    This text should have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    that includes the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+  <br><br><br><br>
+  <div id="b">
+    This text should NOT have a backplate drawn
+    <br>
+    in forced colors mode
+    <br>
+    including for the following link:
+    <br>
+    <a href="https://www.wikipedia.org/">LINK</a>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html
new file mode 100644
index 00000000000..e3665525188
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05-ref.html
@@ -0,0 +1,48 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests the backplate feature for display inline/relative position.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+  }
+  li {
+    display: inline;
+    position: relative;
+  }
+  div {
+    background: Window;
+    text-align: justify;
+    width: 110px;
+  }
+</style>
+<body>
+  <div>
+    <li>The backplate</li>
+    <li>for all of</li>
+    <li>the elements</li>
+    <li>in this list</li>
+    <li>should create</li>
+    <li>one single</li>
+    <li>paragraph</li>
+    <li>in forced</li>
+    <li>colors mode.</li>
+    <li>The backplate</li>
+    <li>should not be</li>
+    <li>painted for</li>
+    <li>each individual</li>
+    <li>list item</li>
+    <li>separately.</li>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html
new file mode 100644
index 00000000000..69ab33b23eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-05.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests the backplate feature for display inline/relative position.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-05-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+  }
+  li {
+    display: inline;
+    position: relative;
+  }
+  div {
+    text-align: justify;
+    width: 110px;
+  }
+</style>
+<body>
+  <div>
+    <li>The backplate</li>
+    <li>for all of</li>
+    <li>the elements</li>
+    <li>in this list</li>
+    <li>should create</li>
+    <li>one single</li>
+    <li>paragraph</li>
+    <li>in forced</li>
+    <li>colors mode.</li>
+    <li>The backplate</li>
+    <li>should not be</li>
+    <li>painted for</li>
+    <li>each individual</li>
+    <li>list item</li>
+    <li>separately.</li>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html
new file mode 100644
index 00000000000..a7cc320334d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06-ref.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that inline spans with different forced-color-adjust values from their
+  parent element follow the backplate behavior of that parent in forced colors
+  mode.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <div>
+    This text should not have a backplate in forced colors mode.
+    <br>
+    This text should not have a backplate in forced colors mode.
+  </div>
+  <br>
+  <br>
+  <br>
+  <br>
+  <div style="background: Window;">
+    This text should have a backplate in forced colors mode.
+    <br>
+    This text should have a backplate in forced colors mode.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html
new file mode 100644
index 00000000000..c45a25a540b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-06.html
@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that inline spans with different forced-color-adjust values from their
+  parent element follow the backplate behavior of that parent in forced colors
+  mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-06-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <div style="forced-color-adjust: none;">
+    This text should not have a backplate in forced colors mode.
+    <br>
+    <span style="forced-color-adjust: auto">
+      This text should not have a backplate in forced colors mode.
+    </span>
+  </div>
+  <br>
+  <br>
+  <br>
+  <br>
+  <div style="forced-color-adjust: auto;">
+    This text should have a backplate in forced colors mode.
+    <br>
+    <span style="forced-color-adjust: none">
+      This text should have a backplate in forced colors mode.
+    </span>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html
new file mode 100644
index 00000000000..ff2c8de952b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08-ref.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+    Forced colors mode - backplate reference.
+    Tests backplate is drawn when text is located outside the cull rect.
+  </title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in
+                                  forced colors mode. The backplate is
+                                  simulated in testing using a Window
+                                  background-color behind the text.
+                                */
+  }
+  span {
+    background-color: Window;
+  }
+</style>
+<body>
+  <span>
+    The text below should have a backplate in forced colors mode.
+  </span>
+  <div>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <span>This text should have a backplate.</span>
+  </div>
+</body>
+
+<script>
+  function scroll() {
+    window.scrollBy(0, 5000);
+  }
+  onload = scroll;
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html
new file mode 100644
index 00000000000..829d73900ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-08.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests backplate is drawn when text is located outside the cull rect.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-08-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+  }
+</style>
+<body>
+  The text below should have a backplate in forced colors mode.
+  <div>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <br><br><br><br><br><br><br><br><br><br><br><br><br><br><br>
+    <span>This text should have a backplate.</span>
+  </div>
+</body>
+
+<script>
+  function scroll() {
+    window.scrollBy(0, 5000);
+  }
+  onload = scroll;
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html
new file mode 100644
index 00000000000..1e7aed22429
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09-ref.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that backplate is not drawn above floats.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 20px;
+    forced-color-adjust: none; /* This turns the backplate feature off in forced colors mode.
+                                  The backplate is simulated in testing using a background-color
+                                  of Window behind the text.
+                                */
+    line-height: 20px;
+    text-align: justify;
+    width: 200px;
+  }
+  img {
+    float: left;
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div>
+    <img src="../resources/float-image.jpg" style="width:50px;height:50px;">
+    In forced colors mode, the backplate for this paragraph should lie below the
+    the floating image.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html
new file mode 100644
index 00000000000..4e9f517e08f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-09.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that backplate is not drawn above floats.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-09-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 20px;
+    line-height: 20px;
+    text-align: justify;
+    width: 200px;
+  }
+  img {
+    float: left;
+  }
+</style>
+<body>
+  <div>
+    <img src="../resources/float-image.jpg" style="width:50px;height:50px;">
+    In forced colors mode, the backplate for this paragraph should lie below the
+    the floating image.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html
new file mode 100644
index 00000000000..78148be9b86
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10-ref.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate reference.
+  Tests that backplates of overlapping inline boxes do not overlap.
+</title>
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    forced-color-adjust: none; /* This turns the backplate feature off in forced colors mode.
+                                  The backplate is simulated in testing using a background-color
+                                  of Window behind the text.
+                                */
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body>
+  <div>
+    <div>
+      The two backplates should not overlap
+    </div>
+    <br>
+    <div style="margin-top: -25px; z-index: -1;">
+      in forced colors mode.
+    </div>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html
new file mode 100644
index 00000000000..cc7f977212b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/backplate/forced-colors-mode-backplate-10.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - backplate.
+  Tests that backplates of overlapping inline boxes do not overlap.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced">
+<link rel=match href="forced-colors-mode-backplate-10-ref.html">
+<link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+<style>
+  body {
+    background-image: url("../resources/test-image.jpg");
+    font-family: Ahem;
+    font-size: 10px;
+    line-height: 10px;
+    text-align: justify;
+    width: 100px;
+  }
+</style>
+<body>
+  <div>
+    <div>
+      The two backplates should not overlap
+    </div>
+    <br>
+    <div style="margin-top: -25px; z-index: -1;">
+      in forced colors mode.
+    </div>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01-ref.html
new file mode 100644
index 00000000000..5abe5867a94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01-ref.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode on table styles reference</title>
+<style>
+  body {
+    forced-color-adjust: none;
+  }
+  table {
+    border-collapse: collapse;
+  }
+  td, th {
+    border: 1px solid;
+    border-bottom-color: WindowText;
+    border-left-color: WindowText;
+    border-right-color: WindowText;
+    border-top-color: WindowText;
+    forced-color-adjust: none;
+    padding: 8px;
+    text-align: left;
+  }
+  tr:nth-child(even) {
+    background-color: Window;
+    color: WindowText;
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <table>
+    <tr>
+      <th>Column1</th>
+      <th>Column2</th>
+      <th>Column3</th>
+    </tr>
+    <tr>
+      <td>Entry1</td>
+      <td>Entry1</td>
+      <td>Entry1</td>
+    </tr>
+    <tr>
+      <td>Entry2</td>
+      <td>Entry2</td>
+      <td>Entry2</td>
+    </tr>
+  </table>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01.html
new file mode 100644
index 00000000000..1f4e3899a8a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-01.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test forced colors mode on table styles</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-01-ref.html">
+<style>
+  table {
+    border-collapse: collapse;
+  }
+
+  td, th {
+    border: 1px solid;
+    border-bottom-color: black;
+    border-left-color: purple;
+    border-right-color: orange;
+    border-top-color: green;
+    padding: 8px;
+    text-align: left;
+  }
+
+  tr:nth-child(even) {
+    background-color: blue;
+    color: red;
+  }
+</style>
+<body>
+  <table>
+    <tr>
+      <th>Column1</th>
+      <th>Column2</th>
+      <th>Column3</th>
+    </tr>
+    <tr>
+      <td>Entry1</td>
+      <td>Entry1</td>
+      <td>Entry1</td>
+    </tr>
+    <tr>
+      <td>Entry2</td>
+      <td>Entry2</td>
+      <td>Entry2</td>
+    </tr>
+  </table>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02-ref.html
new file mode 100644
index 00000000000..097f27eed8c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02-ref.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - style overrides for text reference.</title>
+<style>
+  body {
+    background-color: lightblue;
+  }
+  #a {
+    background-color: Window;
+    border: 25px solid WindowText;
+    box-shadow: 2px 2px Window;
+    color: WindowText;
+    forced-color-adjust: none;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px Window;
+    width: 300px;
+  }
+  #b {
+    background-color: lightgreen;
+    border: 25px solid green;
+    box-shadow: 2px 2px purple;
+    color: orange;
+    forced-color-adjust: none;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px gray;
+    width: 300px;
+  }
+</style>
+<body>
+  <div id="a">
+    The colors and shadows of this text and text box should be overridden when in
+    forced colors mode (forced-color-adjust is set to auto.)
+  </div>
+  <div id="b">
+    The colors and shadows of this text and text box should NOT be overridden when in
+    forced colors mode (forced-color-adjust is set to none.)
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02.html
new file mode 100644
index 00000000000..414d3c1d4a7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-02.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - style overrides for text.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-02-ref.html">
+<style>
+  body {
+    background-color: lightblue;
+  }
+  #a {
+    background-color: lightgreen;
+    border: 25px solid green;
+    box-shadow: 2px 2px purple;
+    color: orange;
+    forced-color-adjust: auto;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px gray;
+    width: 300px;
+  }
+  #b {
+    background-color: lightgreen;
+    border: 25px solid green;
+    box-shadow: 2px 2px purple;
+    color: orange;
+    forced-color-adjust: none;
+    margin: 25px;
+    padding: 25px;
+    text-shadow: 1px 1px gray;
+    width: 300px;
+  }
+</style>
+<body>
+  <div id="a">
+    The colors and shadows of this text and text box should be overridden when in
+    forced colors mode (forced-color-adjust is set to auto.)
+  </div>
+  <div id="b">
+    The colors and shadows of this text and text box should NOT be overridden when in
+    forced colors mode (forced-color-adjust is set to none.)
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html
new file mode 100644
index 00000000000..ebe42e4e750
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-03.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - highlighted text.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #a {
+    color: orange;
+    forced-color-adjust: auto;
+  }
+  #b {
+    color: orange;
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <mark id="a">
+    This text should be black in forced colors mode because forced-color-adjust
+    is auto. The backgroud color should be yellow because the default
+    highlighted colors should not be overridden in forced colors mode.
+  </mark>
+  <mark id="b">
+    This text should be orange in forced colors mode because
+    forced-color-adjust is none. The backgroud color should be yellow because
+    the default highlighted colors should not be overridden in forced colors
+    mode.
+  </mark>
+</body>
+
+<script>
+  test(function(){
+    assert_equals(getComputedStyle(a).color, "rgb(0, 0, 0)");
+
+    assert_equals(getComputedStyle(b).color, "rgb(255, 165, 0)");
+
+    assert_equals(getComputedStyle(a).backgroundColor, "rgb(255, 255, 0)");
+
+    assert_equals(getComputedStyle(b).backgroundColor, "rgb(255, 255, 0)");
+
+  }, "Checks that default highlighted text style does not get overridden in forced colors mode.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-04.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-04.html
new file mode 100644
index 00000000000..42b4efdba71
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-04.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - webkit-tap-highlight-color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  a {
+    -webkit-tap-highlight-color: rgb(0, 0, 255);
+  }
+</style>
+<body>
+  <p>
+    <a href="https://www.wikipedia.org" id="link">
+      This link color should be overridden when forced colors mode is enabled.
+    </a>
+  </p>
+</body>
+
+<script>
+  test(function(){
+    assert_equals(getComputedStyle(link).webkitTapHighlightColor, "rgba(0, 0, 0, 0.18)");
+  }, "Checks hyperlinks are overridden in forced colors mode.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05-ref.html
new file mode 100644
index 00000000000..e2fffecd9c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05-ref.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - link color reference.</title>
+<style>
+  a {
+    color: LinkText;
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <p>
+    <a href="https://www.wikipedia.org" id="link">
+      This link color should be overridden when forced colors mode is enabled.
+    </a>
+  </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05.html
new file mode 100644
index 00000000000..6078d3a6402
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-05.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - link color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-05-ref.html">
+<style>
+  a {
+    color: rgb(255, 0, 0);
+  }
+</style>
+<body>
+  <p>
+    <a href="https://www.wikipedia.org" id="link">
+      This link color should be overridden when forced colors mode is enabled.
+    </a>
+  </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06-ref.html
new file mode 100644
index 00000000000..9af878e25b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06-ref.html
@@ -0,0 +1,9 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - iframe reference.
+  Test that styles are overridden inside iframes in forced colors mode.
+</title>
+<body>
+  <iframe src="forced-colors-mode-02-ref.html" width="500" height="500"></iframe>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06.html
new file mode 100644
index 00000000000..fc54186aac6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-06.html
@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - iframe.
+  Test that styles are overridden inside iframes in forced colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-06-ref.html">
+<body>
+  <iframe src="forced-colors-mode-02.html" width="500" height="500"></iframe>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07-ref.html
new file mode 100644
index 00000000000..ac68e91485f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07-ref.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - transparent colors reference.</title>
+<style>
+  p {
+    color: WindowText;
+    forced-color-adjust: none;
+  }
+  div {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div style="background-color: Window;">
+    <p>
+      The text color should be overridden, and the background color of the
+      div element should also be overridden in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: transparent;">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: rgba(0, 0, 0, 0);">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07.html
new file mode 100644
index 00000000000..765868a2df4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-07.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - transparent colors.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-07-ref.html">
+<style>
+  p {
+    color: transparent;
+  }
+</style>
+<body>
+  <div style="background-color: rgb(0, 0, 255);">
+    <p>
+      The text color should be overridden, and the background color of the
+      div element should also be overridden in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: transparent;">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+  <div style="background-color: rgba(0, 0, 0, 0);">
+    <p>
+      The text color should be overridden, but the background color of the
+      div element should remain transparent in forced colors mode.
+    </p>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html
new file mode 100644
index 00000000000..775831ff7b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08-ref.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - outline and column color reference.</title>
+<style>
+  h1 {
+    forced-color-adjust: none;
+    outline-color: WindowText;
+    outline-style: solid;
+    -webkit-column-count: 3;
+    -webkit-column-gap: 40px;
+    -webkit-column-rule-color: WindowText;
+    -webkit-column-rule-style: solid;
+  }
+</style>
+<body>
+  <h1>
+    The outline-color and column-rule-color should be blue when forced colors
+    mode is off and WindowText in forced colors mode.
+  </h1>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html
new file mode 100644
index 00000000000..dac7989e509
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-08.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - outline and column color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-08-ref.html">
+<style>
+  h1 {
+    outline-color: rgb(0, 0, 255);
+    outline-style: solid;
+    -webkit-column-count: 3;
+    -webkit-column-gap: 40px;
+    -webkit-column-rule-color: rgb(0, 0, 255);
+    -webkit-column-rule-style: solid;
+  }
+</style>
+<body>
+  <h1>
+    The outline-color and column-rule-color should be blue when forced colors
+    mode is off and WindowText in forced colors mode.
+  </h1>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-09.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-09.html
new file mode 100644
index 00000000000..16ca8a46104
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-09.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - forced-colors media query.
+  Tests that styles defined inside or outside a forced-colors media query are
+  overridden in forced colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @media (forced-colors) {
+    p {
+      color: rgb(0, 0, 255);
+    }
+  }
+  p {
+    color: rgb(0, 0, 255);
+  }
+</style>
+<body>
+  <p id="p">
+    This text should NOT be blue forced colors mode.
+  </p>
+</body>
+
+<script>
+  test(function() {
+    assert_not_equals(getComputedStyle(p).color, "rgb(0, 0, 255)");
+  }, "Checks that styles defined inside/outside forced-colors are overridden in forced colors mode.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-10.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-10.html
new file mode 100644
index 00000000000..765013d9134
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-10.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - forced-colors media query.
+  Tests that styles defined inside/outside forced-color media query
+  are preserved in forced colors mode if forced-color-adjust is none
+  and that the ordering of styles is preserved.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  p {
+    background-color: rgb(0, 128, 0);
+    color: rgb(0, 0, 255);
+    forced-color-adjust: none;
+  }
+  @media (forced-colors) {
+    p {
+      background-color: rgb(0, 0, 255);
+      color: rgb(0, 128, 0);
+    }
+  }
+</style>
+<body>
+  <p id="p">
+    This text should be green in forced colors mode.
+  </p>
+</body>
+
+<script>
+  test(function() {
+    assert_equals(getComputedStyle(p).backgroundColor, "rgb(0, 0, 255)");
+    assert_equals(getComputedStyle(p).color, "rgb(0, 128, 0)");
+  }, "Checks that styles defined inside/outside forced-colors are preserved in forced colors mode if forced-color-ajust is none.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-11.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-11.html
new file mode 100644
index 00000000000..5fa8ba4524a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-11.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - forced-colors media query.
+  Tests that styles defined inside forced-color media query
+  are preserved in forced colors mode if forced-color-adjust
+  is none.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  @media (forced-colors: none) {
+    p {
+      background-color: rgb(255, 0, 0);
+      color: rgb(255, 255, 255);
+    }
+  }
+  @media (forced-colors: active) {
+    p {
+      background-color: rgb(0, 0, 255);
+      color: rgb(0, 128, 0);
+      forced-color-adjust: none;
+    }
+  }
+</style>
+</head>
+<body>
+  <p id="p">
+    This text should be green in forced colors mode.
+  </p>
+</body>
+
+<script>
+  test(function() {
+    assert_equals(getComputedStyle(p).backgroundColor, "rgb(0, 0, 255)");
+    assert_equals(getComputedStyle(p).color, "rgb(0, 128, 0)");
+  }, "Checks that styles defined in forced-colors are preserved in forced colors mode.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14-ref.html
new file mode 100644
index 00000000000..910b19df036
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14-ref.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - active selection reference.
+</title>
+<style>
+  span {
+    background-color: Highlight;
+    color: HighlightText;
+    display: inline-block;
+    forced-color-adjust: none;
+  }
+  #adjust-none {
+    background-color: rgba(255, 0, 0, 0.99);
+    color: blue;
+  }
+</style>
+<body>
+  <span class="select">AAA</span>
+  <br>
+  <span class="select" id="adjust-none">AAA</span>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14.html
new file mode 100644
index 00000000000..c57193e99db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-14.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode - active selection.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-14-ref.html">
+<style>
+  br::selection {
+    background-color: transparent;
+    forced-color-adjust: none;
+  }
+  span {
+    /* inline-block to ensure the selection bounding rectangle matches that of the
+       span. This allows us to test selection using a reference test. */
+    display: inline-block;
+  }
+  .select::selection {
+    background-color: rgba(255, 0, 0, 0.99); /* alpha < 1 so that we don't blend the background color with white. */
+    color: blue;
+  }
+  #adjust-none::selection {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <span class="select">AAA</span>
+  <br>
+  <span class="select" id="adjust-none">AAA</span>
+</body>
+
+<script>
+  var node1 = document.getElementsByClassName('select')[0].firstChild;
+  var node2 = document.getElementsByClassName('select')[1].firstChild;
+  var range = document.createRange();
+  range.setStart(node1, 0);
+  range.setEnd(node2, node2.length);
+  window.getSelection().addRange(range);
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html
new file mode 100644
index 00000000000..ca9616c8a1f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - text decoration and emphasis color reference.</title>
+<style>
+  p {
+    forced-color-adjust: none;
+    text-decoration: underline;
+    text-decoration-color: WindowText;
+    -webkit-text-emphasis: '*' WindowText;
+  }
+</style>
+<body>
+  <p>
+    The text decoration and emphasis color for this text should have a
+    WindowText color in forced colors mode.
+  </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html
new file mode 100644
index 00000000000..2202e0a7f94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-17.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - text decoration and emphasis color.</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-17-ref.html">
+<style>
+  p {
+    text-decoration: underline;
+    text-decoration-color: red;
+    -webkit-text-emphasis: '*' blue;
+  }
+</style>
+<body>
+  <p>
+    The text decoration and emphasis color for this text should have a
+    WindowText color in forced colors mode.
+  </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
new file mode 100644
index 00000000000..34eba583caa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18-ref.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill and stroke reference.
+  Only text and foreignObject svg elements should have fill and stroke
+  overridden in forced colors mode.
+</title>
+<style>
+  svg, text, foreignObject {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <svg height="600" width="600">
+    <text x="0" y="15" fill="WindowText">
+      This text should have a WindowText fill and transparent stroke color in
+      forced colors mode.
+    </text>
+    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
+    <foreignObject x="20" y="100" width="160" height="160">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="color: WindowText;">
+        This text should be WindowText color in forced colors mode.
+      </div>
+      <svg height="20" width="20">
+        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
+      </svg>
+    </foreignObject>
+  </svg>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
new file mode 100644
index 00000000000..cc6ac8e4e09
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-18.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - fill and stroke.
+  Only text and foreignObject svg elements should have fill and stroke
+  overridden in forced colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-18-ref.html">
+<body>
+  <svg height="600" width="600">
+    <text x="0" y="15" fill="red" stroke="blue">
+      This text should have a WindowText fill and transparent stroke color in
+      forced colors mode.
+    </text>
+    <rect x="0" height="60" y="30" width="180" style="fill: red; stroke: blue;"/>
+    <foreignObject x="20" y="100" width="160" height="160">
+      <div xmlns="http://www.w3.org/1999/xhtml" style="color: blue;">
+        This text should be WindowText color in forced colors mode.
+      </div>
+      <svg height="20" width="20">
+        <rect x="0" height="20" y="0" width="20" style="fill: green; stroke: purple;"/>
+      </svg>
+    </foreignObject>
+  </svg>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19-ref.html
new file mode 100644
index 00000000000..8d25ec5009c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19-ref.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode reference.
+  Tests that inline images are ignored in forced colors mode when
+  forced-color-adjust is auto.
+</title>
+<style>
+  body {
+    forced-color-adjust: none;
+  }
+  div {
+    display: inline;
+  }
+  #adjustnone {
+    background-image:
+      url("resources/test-image.jpg");
+  }
+</style>
+<body>
+  <div>
+    The background image behind this text should be ignored in forced colors
+    mode.
+  </div>
+  <div id="adjustnone">
+    The background image behind this text should NOT be ignored in forced
+    colors mode.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19.html
new file mode 100644
index 00000000000..5c4a09e4226
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-19.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>
+  Forced colors mode.
+  Tests that inline images are ignored in forced colors mode when
+  forced-color-adjust is auto.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-19-ref.html">
+<style>
+  div {
+    background-image: url("resources/test-image.jpg");
+    display: inline;
+  }
+  #adjustnone {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div>
+    The background image behind this text should be ignored in forced colors
+    mode.
+  </div>
+  <div id="adjustnone">
+    The background image behind this text should NOT be ignored in forced
+    colors mode.
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-20.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-20.html
new file mode 100644
index 00000000000..6e9ef2f9c1c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-20.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - alpha channel.
+  Tests that the alpha channel for background colors are preserved in forced
+  colors mode.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  div {
+    background-color: rgba(114, 173, 218, .3);
+  }
+</style>
+<body id="body">
+  <div id="div">
+    Background colors should maintain their alpha channels in forced
+    colors mode.
+  </div>
+</body>
+
+<script>
+  var body_color = getComputedStyle(body).backgroundColor;
+  var expected_div_color = body_color.replace(')', ', 0.3)').replace('rgb(', 'rgba(');
+  test(function(){
+    assert_equals(getComputedStyle(div).backgroundColor, expected_div_color);
+  }, "Checks that background color alpha channels are preserved in forced colors mode.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-21.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-21.html
new file mode 100644
index 00000000000..4781ad2f7b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-21.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - alpha channel.
+  Tests that the alpha channel for background colors are preserved in forced
+  colors mode at the root node.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  body {
+    background-color: rgba(114, 173, 218, .3);
+  }
+  div {
+    background-color: Window;
+  }
+</style>
+<body id="body">
+  <div id="div">
+    Background colors should maintain their alpha channels in forced
+    colors mode.
+  </div>
+</body>
+
+<script>
+  var div_color = getComputedStyle(div).backgroundColor;
+  var expected_div_color = div_color.replace(')', ', 0.3)').replace('rgb(', 'rgba(');
+  test(function(){
+    assert_equals(getComputedStyle(body).backgroundColor, expected_div_color);
+  }, "Checks that background color alpha channels are preserved in forced colors mode at the root node.");
+</script>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23-ref.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23-ref.html
new file mode 100644
index 00000000000..a9501be3960
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - non-inherited cache reference.
+  Ensures that forced colors styles don't get overridden by non-inherited
+  cached values.
+</title>
+<style>
+  body {
+    forced-color-adjust: none;
+  }
+  #a {
+    color: WindowText;
+  }
+  #b {
+    background: rgb(0, 128, 0);
+    box-shadow: 5px 10px rgb(255, 255, 0);
+    color: rgb(0, 0, 255);
+  }
+</style>
+<body>
+  <div>
+    <span id="a">text</span>
+  </div>
+  <div>
+    <span id="b">text</span>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23.html b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23.html
new file mode 100644
index 00000000000..20519ea181e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/forced-colors-mode/forced-colors-mode-23.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Forced colors mode - non-inherited cache.
+  Ensures that forced colors styles don't get overridden by non-inherited
+  cached values.
+</title>
+<link rel="help" href="https://www.w3.org/TR/css-color-adjust-1/#forced-colors-properties">
+<link rel=match href="forced-colors-mode-23-ref.html">
+<style>
+  div span{
+    background: rgb(0, 128, 0);
+    box-shadow: 5px 10px rgb(255, 255, 0);
+    color: rgb(0, 0, 255);
+  }
+  #a {
+    forced-color-adjust: auto;
+  }
+  #b {
+    forced-color-adjust: none;
+  }
+</style>
+<body>
+  <div id="a">
+    <span>text</span>
+  </div>
+  <div id="b">
+    <span>text</span>
+  </div>
+</body>
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/resources/float-image.jpg b/tests/wpt/web-platform-tests/forced-colors-mode/resources/float-image.jpg
new file mode 100644
index 00000000000..ab06d5f94d1
Binary files /dev/null and b/tests/wpt/web-platform-tests/forced-colors-mode/resources/float-image.jpg differ
diff --git a/tests/wpt/web-platform-tests/forced-colors-mode/resources/test-image.jpg b/tests/wpt/web-platform-tests/forced-colors-mode/resources/test-image.jpg
new file mode 100644
index 00000000000..93f6e196e58
Binary files /dev/null and b/tests/wpt/web-platform-tests/forced-colors-mode/resources/test-image.jpg differ
diff --git a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-transition.html b/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-transition.html
index 1d50502ee3b..b494dc04e6d 100644
--- a/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-transition.html
+++ b/tests/wpt/web-platform-tests/fullscreen/rendering/fullscreen-css-transition.html
@@ -17,11 +17,11 @@
       assert_equals(document.fullscreenElement, trans);
       assert_equals(getComputedStyle(trans).color, "rgb(0, 128, 0)", "Transition is in progress - still green");
     });
-    trans.addEventListener('click', e => {
+    trans.addEventListener('click', t.step_func(() => {
       trans.style.color = "red";
       trans.offsetTop;
       trans.requestFullscreen();
-    }, {once: true});
+    }), {once: true});
     test_driver.click(trans);
   });
 </script>
diff --git a/tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_IDL.https.html b/tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_IDL.https.html
index 75426fc3b99..1688c862789 100644
--- a/tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_IDL.https.html
+++ b/tests/wpt/web-platform-tests/geolocation-API/getCurrentPosition_IDL.https.html
@@ -20,31 +20,29 @@ function successCallback(position)
   var ii, oldval;
 
   /*
-    [NoInterfaceObject]
-    interface Position {
-      readonly attribute Coordinates coords;
+    interface GeolocationPosition {
+      readonly attribute GeolocationCoordinates coords;
       readonly attribute DOMTimeStamp timestamp;
     };
   */
 
   test(function() {
-    assert_equals(position.toString(), "[object Position]",
-        "Position.toString should result in '[object Position]' was: " + position.toString());
-  }, "Position toString");
+    assert_equals(position.toString(), "[object GeolocationPosition]",
+        "position.toString should result in '[object GeolocationPosition]' was: " + position.toString());
+  }, "GeolocationPosition toString");
 
   test(function() {
-    assert_equals(position.coords.toString(), "[object Coordinates]",
-        "position.coords.toString should result in '[object Coordinates]' was: " + position.coords.toString());
-  }, "Position.coordinates toString");
+    assert_equals(position.coords.toString(), "[object GeolocationCoordinates]",
+        "position.coords.toString should result in '[object GeolocationCoordinates]' was: " + position.coords.toString());
+  }, "GeolocationCoordinates toString");
 
   test(function() {
     assert_equals(typeof(position.timestamp), "number",
-        "Position.timestamp should be of type 'number' was: " + typeof(position.timestamp));
-  }, "Position.timestamp is type number");
+        "position.timestamp should be of type 'number' was: " + typeof(position.timestamp));
+  }, "GeolocationPosition.timestamp is type number");
 
   /*
-    [NoInterfaceObject]
-    interface Coordinates {
+    interface GeolocationCoordinates {
       readonly attribute double latitude;
       readonly attribute double longitude;
       readonly attribute double? altitude;
@@ -103,10 +101,10 @@ function BadSuccessCallback(position)
 function errorCallback(error)
 {
   test(function() {
-    assert_equals(error.toString(), "[object PositionError]",
-        "PositionError.toString should result in '[object PositionError]' was: " +
+    assert_equals(error.toString(), "[object GeolocationPositionError]",
+        "error.toString should result in '[object GeolocationPositionError]' was: " +
         error.toString());
-  }, "PositionError toString");
+  }, "GeolocationPositionError toString");
 
   test(function() {
     assert_equals(error.PERMISSION_DENIED, 1,
diff --git a/tests/wpt/web-platform-tests/geolocation-API/idlharness.window.js b/tests/wpt/web-platform-tests/geolocation-API/idlharness.https.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/geolocation-API/idlharness.window.js
rename to tests/wpt/web-platform-tests/geolocation-API/idlharness.https.window.js
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html
index e50c7b525b4..e640fe46898 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-no-referrer.sub.html
@@ -21,6 +21,8 @@ import { referrer as referrerSameRemote } from "./resources/import-remote-origin
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 test(t => {
   assert_equals(
       referrerSame, "",
@@ -49,9 +51,9 @@ test(t => {
 
 test(t => {
   assert_equals(
-      referrerRemoteRemote, "",
-      "Referrer should not be sent for the remote-origin descendant script.");
-}, "Importing a remote-origin descendant script from a remote-origin " +
+      referrerRemoteSame, "",
+      "Referrer should not be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
    "top-level script with the no-referrer policy.");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html
index 3623ac2ccb2..1ca6b1dfda3 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin-when-cross-origin.sub.html
@@ -21,6 +21,8 @@ import { referrer as referrerSameRemote } from "./resources/import-remote-origin
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 const origin = (new URL(location.href)).origin + "/";
 const remoteOrigin = "http://{{domains[www1]}}:{{ports[http][0]}}/";
 
@@ -37,7 +39,6 @@ test(t => {
       "Referrer should be sent for the remote-origin top-level script.");
 }, "Importing a remote-origin top-level script with the " +
    "origin-when-cross-origin policy.");
-
 test(t => {
   const scriptURL =
       new URL("resources/import-referrer-checker.sub.js", location.href)
@@ -46,7 +47,6 @@ test(t => {
       "Referrer should be sent for the same-origin descendant script.");
 }, "Importing a same-origin descendant script from a same-origin top-level " +
    "script with the origin-when-cross-origin policy.");
-
 test(t => {
   assert_equals(
       referrerSameRemote, origin,
@@ -61,6 +61,16 @@ test(t => {
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the origin-when-cross-origin policy.");
 
+test(t => {
+  const scriptURL = new URL(
+    "html/semantics/scripting-1/the-script-element/module/resources/" +
+    "import-same-origin-referrer-checker-from-remote-origin.sub.js",
+    remoteOrigin);
+  assert_equals(referrerRemoteSame, scriptURL + "?name=remote_same",
+      "Referrer should be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the origin-when-cross-origin policy.");
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html
index f512982a451..a554fb4b0c4 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-origin.sub.html
@@ -21,6 +21,8 @@ import { referrer as referrerSameRemote } from "./resources/import-remote-origin
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 const origin = (new URL(location.href)).origin + "/";
 const remoteOrigin = "http://{{domains[www1]}}:{{ports[http][0]}}/";
 
@@ -57,6 +59,13 @@ test(t => {
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the origin policy.");
 
+test(t => {
+  assert_equals(
+      referrerRemoteSame, remoteOrigin,
+      "Referrer should be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the origin policy.");
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html
index 67b055c217d..1d470e66899 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-same-origin.sub.html
@@ -21,6 +21,10 @@ import { referrer as referrerSameRemote } from "./resources/import-remote-origin
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
+const remoteOrigin = "http://{{domains[www1]}}:{{ports[http][0]}}/";
+
 test(t => {
   assert_equals(
       referrerSame, location.href,
@@ -57,6 +61,18 @@ test(t => {
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the same-origin policy.");
 
+test(t => {
+  const scriptURL = new URL(
+    "html/semantics/scripting-1/the-script-element/module/resources/" +
+    "import-same-origin-referrer-checker-from-remote-origin.sub.js",
+    remoteOrigin);
+  assert_equals(
+      referrerRemoteSame, scriptURL + "?name=remote_same",
+      "Referrer should be sent for the same-origin descendant script " +
+      "even if it is imported from the script in the remote-origin.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the same-origin policy.");
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html
index 11f60c010f0..443731c1b81 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/referrer-unsafe-url.sub.html
@@ -21,6 +21,8 @@ import { referrer as referrerSameRemote } from "./resources/import-remote-origin
 
 import { referrer as referrerRemoteRemote } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-referrer-checker.sub.js?name=remote_remote";
 
+import { referrer as referrerRemoteSame } from "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js?name=remote_same";
+
 test(t => {
   assert_equals(
       referrerSame, location.href,
@@ -63,6 +65,17 @@ test(t => {
 }, "Importing a remote-origin descendant script from a remote-origin " +
    "top-level script with the unsafe-url policy.");
 
+test(t => {
+  const scriptURL =
+      "http://{{domains[www1]}}:{{ports[http][0]}}/html/semantics/" +
+      "scripting-1/the-script-element/module/resources/" +
+      "import-same-origin-referrer-checker-from-remote-origin.sub.js";
+  assert_equals(
+      referrerRemoteSame, scriptURL + "?name=remote_same",
+      "Referrer should be sent for the same-origin descendant script.");
+}, "Importing a same-origin descendant script from a remote-origin " +
+   "top-level script with the unsafe-url policy.");
+
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js
new file mode 100644
index 00000000000..5a53bcd4d5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js
@@ -0,0 +1,2 @@
+import { referrer as referrerImport } from 'http://{{host}}:{{ports[http][0]}}/html/semantics/scripting-1/the-script-element/module/resources/referrer-checker.py?name={{GET[name]}}';
+export const referrer = referrerImport;
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers
new file mode 100644
index 00000000000..cb762eff806
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/resources/import-same-origin-referrer-checker-from-remote-origin.sub.js.headers
@@ -0,0 +1 @@
+Access-Control-Allow-Origin: *
diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html b/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html
index 9f9c3395733..7e04da63ddb 100644
--- a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html
+++ b/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/tranferFromImageBitmap-TransferToImageBitmap-offscreen.html
@@ -36,7 +36,7 @@ promise_test(function() {
         var myCanvas2 = document.createElement('canvas');
         var myCtx2 = myCanvas2.getContext('bitmaprenderer');
         myCtx2.transferFromImageBitmap(bitmapCanvas.transferToImageBitmap());
-        testCanvas(myCanvas2, 0, 0, 0, 255);
+        testCanvas(myCanvas2, 0, 0, 0, 0);
     }
 
     var greenCanvas = document.createElement('canvas');
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini
new file mode 100644
index 00000000000..2bac0b50db7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/__dir__.ini
@@ -0,0 +1,2 @@
+disabled:
+  if product == "chrome" and os == "mac": https://bugs.chromium.org/p/chromedriver/issues/detail?id=3114
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini
index c34584ceec6..4fc91a1c2b0 100644
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/actionsWithKeyPressed.html.ini
@@ -4,4 +4,4 @@
 
   [TestDriver actions: actions with key pressed]
     expected:
-      if os == "mac" and (product == "chrome" or product=="firefox"): FAIL
+      if product == "firefox" and os == "mac": FAIL
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
index 49e4a40016e..9ae71a6e73e 100644
--- a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/testdriver/actions/elementPosition.html.ini
@@ -1,7 +1,4 @@
 [elementPosition.html]
-  expected:
-    if os == "mac" and product == "chrome": TIMEOUT
-
   [TestDriver actions: element position]
     expected:
       if product == "safari": FAIL
diff --git a/tests/wpt/web-platform-tests/interfaces/FileAPI.idl b/tests/wpt/web-platform-tests/interfaces/FileAPI.idl
index 0ae43bbe38c..a630226c3df 100644
--- a/tests/wpt/web-platform-tests/interfaces/FileAPI.idl
+++ b/tests/wpt/web-platform-tests/interfaces/FileAPI.idl
@@ -3,10 +3,10 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: File API (https://w3c.github.io/FileAPI/)
 
-[Constructor(optional sequence<BlobPart> blobParts,
-             optional BlobPropertyBag options = {}),
- Exposed=(Window,Worker), Serializable]
+[Exposed=(Window,Worker), Serializable]
 interface Blob {
+  constructor(optional sequence<BlobPart> blobParts,
+              optional BlobPropertyBag options = {});
 
   readonly attribute unsigned long long size;
   readonly attribute DOMString type;
@@ -31,11 +31,11 @@ dictionary BlobPropertyBag {
 
 typedef (BufferSource or Blob or USVString) BlobPart;
 
-[Constructor(sequence<BlobPart> fileBits,
-             USVString fileName,
-             optional FilePropertyBag options = {}),
- Exposed=(Window,Worker), Serializable]
+[Exposed=(Window,Worker), Serializable]
 interface File : Blob {
+  constructor(sequence<BlobPart> fileBits,
+              USVString fileName,
+              optional FilePropertyBag options = {});
   readonly attribute DOMString name;
   readonly attribute long long lastModified;
 };
@@ -50,9 +50,9 @@ interface FileList {
   readonly attribute unsigned long length;
 };
 
-[Constructor, Exposed=(Window,Worker)]
+[Exposed=(Window,Worker)]
 interface FileReader: EventTarget {
-
+  constructor();
   // async read methods
   void readAsArrayBuffer(Blob blob);
   void readAsBinaryString(Blob blob);
@@ -82,8 +82,9 @@ interface FileReader: EventTarget {
   attribute EventHandler onloadend;
 };
 
-[Constructor, Exposed=(DedicatedWorker,SharedWorker)]
+[Exposed=(DedicatedWorker,SharedWorker)]
 interface FileReaderSync {
+  constructor();
   // Synchronously return strings
 
   ArrayBuffer readAsArrayBuffer(Blob blob);
diff --git a/tests/wpt/web-platform-tests/interfaces/background-fetch.idl b/tests/wpt/web-platform-tests/interfaces/background-fetch.idl
index 0dbe3fbad3c..cf3d7512540 100644
--- a/tests/wpt/web-platform-tests/interfaces/background-fetch.idl
+++ b/tests/wpt/web-platform-tests/interfaces/background-fetch.idl
@@ -16,7 +16,7 @@ partial interface ServiceWorkerRegistration {
 
 [Exposed=(Window,Worker)]
 interface BackgroundFetchManager {
-  Promise<BackgroundFetchRegistration> fetch(DOMString id, (RequestInfo or sequence<RequestInfo>) requests, optional BackgroundFetchOptions options);
+  Promise<BackgroundFetchRegistration> fetch(DOMString id, (RequestInfo or sequence<RequestInfo>) requests, optional BackgroundFetchOptions options = {});
   Promise<BackgroundFetchRegistration?> get(DOMString id);
   Promise<sequence<DOMString>> getIds();
 };
@@ -44,8 +44,8 @@ interface BackgroundFetchRegistration : EventTarget {
   attribute EventHandler onprogress;
 
   Promise<boolean> abort();
-  Promise<BackgroundFetchRecord> match(RequestInfo request, optional CacheQueryOptions options);
-  Promise<sequence<BackgroundFetchRecord>> matchAll(optional RequestInfo request, optional CacheQueryOptions options);
+  Promise<BackgroundFetchRecord> match(RequestInfo request, optional CacheQueryOptions options = {});
+  Promise<sequence<BackgroundFetchRecord>> matchAll(optional RequestInfo request, optional CacheQueryOptions options = {});
 };
 
 enum BackgroundFetchResult { "", "success", "failure" };
@@ -72,8 +72,9 @@ interface BackgroundFetchRecord {
   readonly attribute Promise<Response> responseReady;
 };
 
-[Constructor(DOMString type, BackgroundFetchEventInit init), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface BackgroundFetchEvent : ExtendableEvent {
+  constructor(DOMString type, BackgroundFetchEventInit init);
   readonly attribute BackgroundFetchRegistration registration;
 };
 
@@ -81,7 +82,8 @@ dictionary BackgroundFetchEventInit : ExtendableEventInit {
   required BackgroundFetchRegistration registration;
 };
 
-[Constructor(DOMString type, BackgroundFetchEventInit init), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface BackgroundFetchUpdateUIEvent : BackgroundFetchEvent {
-  Promise<void> updateUI(optional BackgroundFetchUIOptions options);
+  constructor(DOMString type, BackgroundFetchEventInit init);
+  Promise<void> updateUI(optional BackgroundFetchUIOptions options = {});
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl b/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl
index 802e76ce85f..e8dd1526fd0 100644
--- a/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl
+++ b/tests/wpt/web-platform-tests/interfaces/geolocation-API.idl
@@ -1,28 +1,28 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into reffy-reports
 // (https://github.com/tidoust/reffy-reports)
-// Source: Geolocation API Specification 2nd Edition (https://www.w3.org/TR/geolocation-API/)
+// Source: Geolocation API Specification (https://w3c.github.io/geolocation-api/)
 
 partial interface Navigator {
-  readonly attribute Geolocation geolocation;
+  [SameObject] readonly attribute Geolocation geolocation;
 };
 
-[NoInterfaceObject]
+[Exposed=Window]
 interface Geolocation {
   void getCurrentPosition(PositionCallback successCallback,
                           optional PositionErrorCallback errorCallback,
-                          optional PositionOptions options);
+                          optional PositionOptions options = {});
 
   long watchPosition(PositionCallback successCallback,
                      optional PositionErrorCallback errorCallback,
-                     optional PositionOptions options);
+                     optional PositionOptions options = {});
 
   void clearWatch(long watchId);
 };
 
-callback PositionCallback = void (Position position);
+callback PositionCallback = void (GeolocationPosition position);
 
-callback PositionErrorCallback = void (PositionError positionError);
+callback PositionErrorCallback = void (GeolocationPositionError positionError);
 
 dictionary PositionOptions {
   boolean enableHighAccuracy = false;
@@ -30,14 +30,14 @@ dictionary PositionOptions {
   [Clamp] unsigned long maximumAge = 0;
 };
 
-[NoInterfaceObject]
-interface Position {
-  readonly attribute Coordinates coords;
+[Exposed=Window, SecureContext]
+interface GeolocationPosition {
+  readonly attribute GeolocationCoordinates coords;
   readonly attribute DOMTimeStamp timestamp;
 };
 
-[NoInterfaceObject]
-interface Coordinates {
+[Exposed=Window, SecureContext]
+interface GeolocationCoordinates {
   readonly attribute double latitude;
   readonly attribute double longitude;
   readonly attribute double? altitude;
@@ -47,8 +47,8 @@ interface Coordinates {
   readonly attribute double? speed;
 };
 
-[NoInterfaceObject]
-interface PositionError {
+[Exposed=Window]
+interface GeolocationPositionError {
   const unsigned short PERMISSION_DENIED = 1;
   const unsigned short POSITION_UNAVAILABLE = 2;
   const unsigned short TIMEOUT = 3;
diff --git a/tests/wpt/web-platform-tests/interfaces/orientation-event.idl b/tests/wpt/web-platform-tests/interfaces/orientation-event.idl
index bfeca7a2ebc..a8eef516f29 100644
--- a/tests/wpt/web-platform-tests/interfaces/orientation-event.idl
+++ b/tests/wpt/web-platform-tests/interfaces/orientation-event.idl
@@ -1,68 +1,85 @@
 // GENERATED CONTENT - DO NOT EDIT
 // Content was automatically extracted by Reffy into reffy-reports
 // (https://github.com/tidoust/reffy-reports)
-// Source: DeviceOrientation Event Specification (https://w3c.github.io/deviceorientation/spec-source-orientation.html)
+// Source: DeviceOrientation Event Specification (https://w3c.github.io/deviceorientation/)
 
 partial interface Window {
-      attribute EventHandler ondeviceorientation;
-    };
+    [SecureContext] attribute EventHandler ondeviceorientation;
+};
 
-    [Constructor(DOMString type, optional DeviceOrientationEventInit eventInitDict), Exposed=Window]
-    interface DeviceOrientationEvent : Event {
-      readonly attribute double? alpha;
-      readonly attribute double? beta;
-      readonly attribute double? gamma;
-      readonly attribute boolean absolute;
-    };
+[Constructor(DOMString type, optional DeviceOrientationEventInit eventInitDict = {}), Exposed=Window, SecureContext]
+interface DeviceOrientationEvent : Event {
+    readonly attribute double? alpha;
+    readonly attribute double? beta;
+    readonly attribute double? gamma;
+    readonly attribute boolean absolute;
 
-    dictionary DeviceOrientationEventInit : EventInit {
-      double? alpha = null;
-      double? beta = null;
-      double? gamma = null;
-      boolean absolute = false;
-    };
+    static Promise<PermissionState> requestPermission();
+};
+
+dictionary DeviceOrientationEventInit : EventInit {
+    double? alpha = null;
+    double? beta = null;
+    double? gamma = null;
+    boolean absolute = false;
+};
+
+enum PermissionState {
+    "granted",
+    "denied",
+};
 
 partial interface Window {
-      attribute EventHandler ondevicemotion;
-    };
+    [SecureContext] attribute EventHandler ondeviceorientationabsolute;
+};
 
-    [NoInterfaceObject]
-    interface DeviceAcceleration {
-      readonly attribute double? x;
-      readonly attribute double? y;
-      readonly attribute double? z;
-    };
+partial interface Window {
+    attribute EventHandler oncompassneedscalibration;
+};
 
-    [NoInterfaceObject]
-    interface DeviceRotationRate {
-      readonly attribute double? alpha;
-      readonly attribute double? beta;
-      readonly attribute double? gamma;
-    };
+partial interface Window {
+    [SecureContext] attribute EventHandler ondevicemotion;
+};
 
-    [Constructor(DOMString type, optional DeviceMotionEventInit eventInitDict), Exposed=Window]
-    interface DeviceMotionEvent : Event {
-      readonly attribute DeviceAcceleration? acceleration;
-      readonly attribute DeviceAcceleration? accelerationIncludingGravity;
-      readonly attribute DeviceRotationRate? rotationRate;
-      readonly attribute double interval;
-    };
+[SecureContext]
+interface DeviceMotionEventAcceleration {
+    readonly attribute double? x;
+    readonly attribute double? y;
+    readonly attribute double? z;
+};
 
-    dictionary DeviceAccelerationInit {
-      double? x = null;
-      double? y = null;
-      double? z = null;
-    };
+[SecureContext]
+interface DeviceMotionEventRotationRate {
+    readonly attribute double? alpha;
+    readonly attribute double? beta;
+    readonly attribute double? gamma;
+};
 
-    dictionary DeviceRotationRateInit {
-      double? alpha = null;
-      double? beta = null;
-      double? gamma = null;
-    };
+[Constructor(DOMString type, optional DeviceMotionEventInit eventInitDict = {}), Exposed=Window, SecureContext]
+interface DeviceMotionEvent : Event {
+    readonly attribute DeviceMotionEventAcceleration? acceleration;
+    readonly attribute DeviceMotionEventAcceleration? accelerationIncludingGravity;
+    readonly attribute DeviceMotionEventRotationRate? rotationRate;
+    readonly attribute double interval;
 
-    dictionary DeviceMotionEventInit : EventInit {
-      DeviceAccelerationInit? acceleration;
-      DeviceAccelerationInit? accelerationIncludingGravity;
-      DeviceRotationRateInit? rotationRate;
-      double interval = 0;
-    };
+    static Promise<PermissionState> requestPermission();
+};
+
+dictionary DeviceMotionEventAccelerationInit {
+    double? x = null;
+    double? y = null;
+    double? z = null;
+};
+
+dictionary DeviceMotionEventRotationRateInit {
+    double? alpha = null;
+    double? beta = null;
+    double? gamma = null;
+};
+
+dictionary DeviceMotionEventInit : EventInit {
+    DeviceMotionEventAccelerationInit acceleration;
+    DeviceMotionEventAccelerationInit accelerationIncludingGravity;
+    DeviceMotionEventRotationRateInit rotationRate;
+    double interval = 0;
+};
diff --git a/tests/wpt/web-platform-tests/interfaces/presentation-api.idl b/tests/wpt/web-platform-tests/interfaces/presentation-api.idl
index 6ce0f5623ff..c1e566538aa 100644
--- a/tests/wpt/web-platform-tests/interfaces/presentation-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/presentation-api.idl
@@ -19,10 +19,10 @@ partial interface Presentation {
   readonly attribute PresentationReceiver? receiver;
 };
 
-[Constructor(USVString url),
- Constructor(sequence<USVString> urls),
- SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PresentationRequest : EventTarget {
+  constructor(USVString url);
+  constructor(sequence<USVString> urls);
   Promise<PresentationConnection> start();
   Promise<PresentationConnection> reconnect(USVString presentationId);
   Promise<PresentationAvailability> getAvailability();
@@ -37,9 +37,9 @@ interface PresentationAvailability : EventTarget {
   attribute EventHandler onchange;
 };
 
-[Constructor(DOMString type, PresentationConnectionAvailableEventInit eventInitDict),
- SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PresentationConnectionAvailableEvent : Event {
+  constructor(DOMString type, PresentationConnectionAvailableEventInit eventInitDict);
   [SameObject] readonly attribute PresentationConnection connection;
 };
 
@@ -64,17 +64,17 @@ interface PresentationConnection : EventTarget {
   // Communication
   attribute BinaryType binaryType;
   attribute EventHandler onmessage;
-  void send(DOMString message);
-  void send(Blob data);
-  void send(ArrayBuffer data);
-  void send(ArrayBufferView data);
+  void send (DOMString message);
+  void send (Blob data);
+  void send (ArrayBuffer data);
+  void send (ArrayBufferView data);
 };
 
 enum PresentationConnectionCloseReason { "error", "closed", "wentaway" };
 
-[Constructor(DOMString type, PresentationConnectionCloseEventInit eventInitDict),
- SecureContext, Exposed=Window]
+[SecureContext, Exposed=Window]
 interface PresentationConnectionCloseEvent : Event {
+  constructor(DOMString type, PresentationConnectionCloseEventInit eventInitDict);
   readonly attribute PresentationConnectionCloseReason reason;
   readonly attribute DOMString message;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/push-api.idl b/tests/wpt/web-platform-tests/interfaces/push-api.idl
index 74725a30256..419fe25e08b 100644
--- a/tests/wpt/web-platform-tests/interfaces/push-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/push-api.idl
@@ -64,8 +64,9 @@ partial interface ServiceWorkerGlobalScope {
   attribute EventHandler onpushsubscriptionchange;
 };
 
-[Constructor(DOMString type, optional PushEventInit eventInitDict = {}), Exposed=ServiceWorker, SecureContext]
+[Exposed=ServiceWorker, SecureContext]
 interface PushEvent : ExtendableEvent {
+  constructor(DOMString type, optional PushEventInit eventInitDict = {});
   readonly attribute PushMessageData? data;
 };
 
@@ -75,8 +76,9 @@ dictionary PushEventInit : ExtendableEventInit {
   PushMessageDataInit data;
 };
 
-[Constructor(DOMString type, optional PushSubscriptionChangeEventInit eventInitDict = {}), Exposed=ServiceWorker, SecureContext]
+[Exposed=ServiceWorker, SecureContext]
 interface PushSubscriptionChangeEvent : ExtendableEvent {
+  constructor(DOMString type, optional PushSubscriptionChangeEventInit eventInitDict = {});
   readonly attribute PushSubscription? newSubscription;
   readonly attribute PushSubscription? oldSubscription;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/screen-capture.idl b/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
index b5b0067650d..4936ee9a519 100644
--- a/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
+++ b/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
@@ -4,43 +4,43 @@
 // Source: Screen Capture (https://w3c.github.io/mediacapture-screen-share/)
 
 partial interface MediaDevices {
-    Promise<MediaStream> getDisplayMedia (optional DisplayMediaStreamConstraints constraints = {});
+  Promise<MediaStream> getDisplayMedia(optional DisplayMediaStreamConstraints constraints = {});
 };
 
 dictionary DisplayMediaStreamConstraints {
-    (boolean or MediaTrackConstraints) video = true;
-    (boolean or MediaTrackConstraints) audio = false;
+  (boolean or MediaTrackConstraints) video = true;
+  (boolean or MediaTrackConstraints) audio = false;
 };
 
 partial dictionary MediaTrackSupportedConstraints {
-             boolean displaySurface = true;
-             boolean logicalSurface = true;
-             boolean cursor = true;
-             boolean restrictOwnAudio = true;
+  boolean displaySurface = true;
+  boolean logicalSurface = true;
+  boolean cursor = true;
+  boolean restrictOwnAudio = true;
 };
 
 partial dictionary MediaTrackConstraintSet {
-             ConstrainDOMString displaySurface;
-             ConstrainBoolean logicalSurface;
-             ConstrainDOMString cursor;
-             ConstrainBoolean restrictOwnAudio;
+  ConstrainDOMString displaySurface;
+  ConstrainBoolean logicalSurface;
+  ConstrainDOMString cursor;
+  ConstrainBoolean restrictOwnAudio;
 };
 
 partial dictionary MediaTrackSettings {
-             DOMString displaySurface;
-             boolean logicalSurface;
-             DOMString cursor;
+  DOMString displaySurface;
+  boolean logicalSurface;
+  DOMString cursor;
 };
 
 enum DisplayCaptureSurfaceType {
-    "monitor",
-    "window",
-    "application",
-    "browser"
+  "monitor",
+  "window",
+  "application",
+  "browser"
 };
 
 enum CursorCaptureConstraint {
-    "never",
-    "always",
-    "motion"
+  "never",
+  "always",
+  "motion"
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/service-workers.idl b/tests/wpt/web-platform-tests/interfaces/service-workers.idl
index 0feabd389cf..c01fcab7f2d 100644
--- a/tests/wpt/web-platform-tests/interfaces/service-workers.idl
+++ b/tests/wpt/web-platform-tests/interfaces/service-workers.idl
@@ -155,8 +155,9 @@ enum ClientType {
   "all"
 };
 
-[Constructor(DOMString type, optional ExtendableEventInit eventInitDict = {}), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface ExtendableEvent : Event {
+  constructor(DOMString type, optional ExtendableEventInit eventInitDict = {});
   void waitUntil(Promise<any> f);
 };
 
@@ -164,8 +165,9 @@ dictionary ExtendableEventInit : EventInit {
   // Defined for the forward compatibility across the derived events
 };
 
-[Constructor(DOMString type, FetchEventInit eventInitDict), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface FetchEvent : ExtendableEvent {
+  constructor(DOMString type, FetchEventInit eventInitDict);
   [SameObject] readonly attribute Request request;
   readonly attribute Promise<any> preloadResponse;
   readonly attribute DOMString clientId;
@@ -183,8 +185,9 @@ dictionary FetchEventInit : ExtendableEventInit {
   DOMString replacesClientId = "";
 };
 
-[Constructor(DOMString type, optional ExtendableMessageEventInit eventInitDict = {}), Exposed=ServiceWorker]
+[Exposed=ServiceWorker]
 interface ExtendableMessageEvent : ExtendableEvent {
+  constructor(DOMString type, optional ExtendableMessageEventInit eventInitDict = {});
   readonly attribute any data;
   readonly attribute USVString origin;
   readonly attribute DOMString lastEventId;
diff --git a/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl b/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl
index 62bc0b7a839..828729071e4 100644
--- a/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl
+++ b/tests/wpt/web-platform-tests/interfaces/wasm-js-api.idl
@@ -99,12 +99,3 @@ interface Global {
   any valueOf();
   attribute any value;
 };
-
-[LegacyNamespace=WebAssembly]
-interface CompileError { };
-
-[LegacyNamespace=WebAssembly]
-interface LinkError { };
-
-[LegacyNamespace=WebAssembly]
-interface RuntimeError { };
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html
index e381ffe77c3..9fc44123058 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-bar-001.html
@@ -25,10 +25,8 @@
     </style>
     <script src="/common/reftest-wait.js"></script>
     <script>
-      window.addEventListener("load", () => {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(adjustPositionOfFraction); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(adjustPositionOfFraction); });
+
       function adjustPositionOfFraction()
       {
         requestAnimationFrame(() => {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
index 85c7c587010..6cb1b8b4351 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-linethickness-002.html
@@ -28,10 +28,7 @@
       }
 
       setup({ explicit_done: true });
-      window.addEventListener("load", function() {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
       function runTests() {
         var defaultRuleThickness = 100;
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
index ba47897c111..b7efbc78ca0 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-1.html
@@ -62,10 +62,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
index 151265787ab..368fc0676d2 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-2.html
@@ -46,10 +46,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
 
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html
index 69be003195a..9c7db8a3cdc 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001-ref.html
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html
index e87b357dd2a..98fd807f91d 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-001.html
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html
index 9169bb999c3..b4e9a25f00b 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002-ref.html
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html
index 0b704dc801e..2bc848b415c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-002.html
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html
index 3fe86faf9f3..91b85450e3e 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003-ref.html
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html
index 9bd79836cc0..44c4cf63e35 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-003.html
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html
index 10d0415304e..9578254610b 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004-ref.html
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html
index 43410cba608..431b0af4fff 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-004.html
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html
index 9bfd7653d1d..270a8ac2d92 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005-ref.html
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html
index da77012b96d..3be77973404 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-005.html
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html
index 2abba28f0a3..02cd8477d5b 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006-ref.html
@@ -29,10 +29,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html
index 25bf644ec61..783696ace5f 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-parameters-gap-006.html
@@ -47,10 +47,7 @@
     div.style.height = `${refBox.height-4}px`;
     document.documentElement.classList.remove('reftest-wait');
   }
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 </script>
 </head>
 <body>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html
new file mode 100644
index 00000000000..1934bf4969a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow-ref.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>fraction rendering from in-flow children</title>
+  </head>
+  <body>
+    <math>
+      <mfrac>
+        <mspace width="64px" height="48px" style="background: lightblue"></mspace>
+        <mspace width="128px" height="96px" style="background: lightgreen"></mspace>
+      </mfrac>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html
new file mode 100644
index 00000000000..8c92d665c73
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/fractions/frac-rendering-from-in-flow.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>fraction rendering from in-flow children</title>
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#fractions-mfrac">
+    <meta name="assert" content="Verify rendering of fractions is only affected by in-flow children.">
+    <style>
+      .oof1 {
+          position: absolute;
+      }
+      .oof2 {
+          position: fixed;
+      }
+      .nobox {
+          display: none;
+      }
+    </style>
+    <link rel="match" href="frac-rendering-from-in-flow-ref.html">
+  </head>
+  <body>
+    <math>
+      <mfrac>
+        <mspace height="32px" width="24px" class="oof1"/>
+        <mspace height="16px" width="12px" class="oof2"/>
+        <mspace height="8px" width="4px" class="nobox"/>
+        <mspace width="64px" height="48px" style="background: lightblue"></mspace>
+        <mspace height="32px" width="24px" class="oof1"/>
+        <mspace height="16px" width="12px" class="oof2"/>
+        <mspace height="8px" width="4px" class="nobox"/>
+        <mspace width="128px" height="96px" style="background: lightgreen"></mspace>
+        <mspace height="32px" width="24px" class="oof1"/>
+        <mspace height="16px" width="12px" class="oof2"/>
+        <mspace height="8px" width="4px" class="nobox"/>
+      </mfrac>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html
index ee40561a634..b6a51762dfd 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/mrow/inferred-mrow-stretchy.html
@@ -28,10 +28,7 @@
 </style>
 <script type="text/javascript">
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
   function runTests()
   {
       ["Mrow", "Sqrt", "Style", "Error", "Phantom", "Math", "Menclose", "Mpadded"].forEach((tag) => {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001.html
index 78c5069b90c..31bdff2fd7c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-001.html
@@ -11,6 +11,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
 <style>
   /* Default spacing of operator 'X' is 0.2777777777777778em so quite different
      from the measured/specified 0em and 1em. */
@@ -27,11 +28,20 @@
       color: blue !important;
       background: blue !important;
   }
+  .oof1 {
+      position: absolute;
+  }
+  .oof2 {
+      position: fixed;
+  }
+  .nobox {
+      display: none;
+  }
 </style>
 <script>
   function spaceBeforeElement(id) {
       var element = document.getElementById(id);
-      var mnBefore = element.previousElementSibling;
+      var mnBefore = previousInFlowSibling(element);
       return element.getBoundingClientRect().left - mnBefore.getBoundingClientRect().right;
   }
 
@@ -51,15 +61,27 @@
       ["mrow", "mstyle", "mphantom", "mpadded"].forEach(tag => {
           test(function() {
               assert_true(MathMLFeatureDetection.has_operator_spacing());
-              assert_approx_equals(spaceBeforeElement(`${tag}-op`), 2 * emToPx, epsilon);
-              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-op`), 0, epsilon);
+              assert_approx_equals(spaceBeforeElement(`${tag}-op-1`), 2 * emToPx, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-op-1`), 0, epsilon);
           }, `${tag} (embellished operator)`);
 
           test(function() {
               assert_true(MathMLFeatureDetection.has_operator_spacing());
-              assert_approx_equals(spaceBeforeElement(`${tag}-nonop`), 0, epsilon);
-              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-nonop`), 2 * emToPx, epsilon);
+              assert_approx_equals(spaceBeforeElement(`${tag}-op-2`), 2 * emToPx, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-op-2`), 0, epsilon);
+          }, `${tag} (embellished operator, from in-flow children)`);
+
+          test(function() {
+              assert_true(MathMLFeatureDetection.has_operator_spacing());
+              assert_approx_equals(spaceBeforeElement(`${tag}-nonop-1`), 0, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-nonop-1`), 2 * emToPx, epsilon);
           }, `${tag} (not embellished operator)`);
+
+          test(function() {
+              assert_true(MathMLFeatureDetection.has_operator_spacing());
+              assert_approx_equals(spaceBeforeElement(`${tag}-nonop-2`), 0, epsilon);
+              assert_approx_equals(spaceBeforeCoreOperator(`${tag}-nonop-2`), 2 * emToPx, epsilon);
+          }, `${tag} (not embellished operator, from in-flow children)`);
       });
 
       done();
@@ -68,10 +90,12 @@
 </head>
 <body>
   <div id="log"></div>
+  <!-- mrow is an embellished operator if its in-flow children consist
+       of one embellished operator and zero or more space-like elements. -->
   <p>
     <math>
       <mn>X</mn>
-      <mrow id="mrow-op" class="testedElement">
+      <mrow id="mrow-op-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
         <mtext class="space-like">X</mtext>
       </mrow>
@@ -81,19 +105,53 @@
   <p>
     <math>
       <mn>X</mn>
-      <mrow id="mrow-nonop" class="testedElement">
+      <mrow id="mrow-nonop-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
         <mn>X</mn> <!-- "mn" is not space-like -->
       </mrow>
       <mn>X</mn>
     </math>
   </p>
-  <!-- mstyle is an embellished operator if its children consist
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow id="mrow-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mtext class="space-like">X</mtext>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow id="mrow-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <!-- mstyle is an embellished operator if its in-flow children consist
        of one embellished operator and zero or more space-like elements. -->
   <p>
     <math>
       <mn>X</mn>
-      <mstyle id="mstyle-op" class="testedElement">
+      <mstyle id="mstyle-op-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
       </mstyle>
       <mn>X</mn>
@@ -102,19 +160,51 @@
   <p>
     <math>
       <mn>X</mn>
-      <mstyle id="mstyle-nonop" class="testedElement">
+      <mstyle id="mstyle-nonop-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
         <mn>X</mn> <!-- "mn" is not space-like -->
       </mstyle>
       <mn>X</mn>
     </math>
   </p>
-  <!-- mphantom is an embellished operator if its children consist
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mstyle id="mstyle-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mstyle>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mstyle id="mstyle-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mstyle>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <!-- mphantom is an embellished operator if its in-flow children consist
        of one embellished operator and zero or more space-like elements. -->
   <p>
     <math>
       <mn>X</mn>
-      <mphantom id="mphantom-op" class="testedElement">
+      <mphantom id="mphantom-op-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
       </mphantom>
       <mn>X</mn>
@@ -123,19 +213,51 @@
   <p>
     <math>
       <mn>X</mn>
-      <mphantom id="mphantom-nonop" class="testedElement">
+      <mphantom id="mphantom-nonop-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
         <mn>X</mn> <!-- "mn" is not space-like -->
       </mphantom>
       <mn>X</mn>
     </math>
   </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mphantom id="mphantom-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mphantom>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mphantom id="mphantom-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mphantom>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
   <!-- mpadded is an embellished operator if its children consist
        of one embellished operator and zero or more space-like elements. -->
   <p>
     <math>
       <mn>X</mn>
-      <mpadded id="mpadded-op" class="testedElement">
+      <mpadded id="mpadded-op-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
       </mpadded>
       <mn>X</mn>
@@ -144,12 +266,44 @@
   <p>
     <math>
       <mn>X</mn>
-      <mpadded id="mpadded-nonop" class="testedElement">
+      <mpadded id="mpadded-nonop-1" class="testedElement">
         <mo lspace="2em" rspace="0em">X</mo>
         <mn>X</mn> <!-- "mn" is not space-like -->
       </mpadded>
       <mn>X</mn>
     </math>
   </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mpadded id="mpadded-op-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mpadded>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mpadded id="mpadded-nonop-2" class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn> <!-- "mn" is not space-like -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mpadded>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-002.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-002.html
index da343dd0bc3..1bbed4e229e 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-002.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/embellished-operator-002.html
@@ -11,6 +11,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
 <style>
   /* Default spacing of operator 'X' is 0.2777777777777778em so quite different
      from the measured/specified 0em and 1em. */
@@ -30,10 +31,19 @@
       color: blue !important;
       background: blue !important;
   }
+  .oof1 {
+      position: absolute;
+  }
+  .oof2 {
+      position: fixed;
+  }
+  .nobox {
+      display: none;
+  }
 </style>
 <script>
   function spaceBeforeElement(element) {
-      var mnBefore = element.previousElementSibling;
+      var mnBefore = previousInFlowSibling(element);
       return element.getBoundingClientRect().left - mnBefore.getBoundingClientRect().right;
   }
 
@@ -55,8 +65,20 @@
            test(function() {
                assert_true(MathMLFeatureDetection.has_operator_spacing());
                var element = document.getElementsByTagName(tag)[1];
+               assert_approx_equals(spaceBeforeElement(element), 2 * emToPx, epsilon);
+           }, `${tag} (embellished operator, from in-flow children)`);
+
+           test(function() {
+               assert_true(MathMLFeatureDetection.has_operator_spacing());
+               var element = document.getElementsByTagName(tag)[2];
                assert_approx_equals(spaceBeforeElement(element), 0, epsilon);
            }, `${tag} (not embellished operator)`);
+
+           test(function() {
+               assert_true(MathMLFeatureDetection.has_operator_spacing());
+               var element = document.getElementsByTagName(tag)[3];
+               assert_approx_equals(spaceBeforeElement(element), 0, epsilon);
+           }, `${tag} (not embellished operator, from in-flow children)`);
       });
       done();
   }
@@ -66,7 +88,8 @@
   <div id="log"></div>
   <!-- <msub>, <msup>, <msubsup>, <munder>, <mover>, <munderover>,
        <mmultiscripts>, <mfrac>, <semantics> or <maction> are embellished
-       operators if their first child exists and is an embellished operator -->
+       operators if their first in-flow
+       child exists and is an embellished operator -->
   <p>
     <math>
       <mn>X</mn>
@@ -172,9 +195,190 @@
       <mn>X</mn>
     </math>
   </p>
+
+  <!-- Only in-flow children affect determination of embellished operators. -->
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msub class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msub>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msubsup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msubsup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munder class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munder>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mmultiscripts>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mfrac class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mfrac>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <maction class="testedElement" actiontype="statusline">
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>STATUS MESSAGE</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </maction>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <semantics class="testedElement">
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <annotation>TEXT ANNOTATION</annotation>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </semantics>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+
   <!-- <msub>, <msup>, <msubsup>, <munder>, <mover>, <munderover>,
        <mmultiscripts>, <mfrac>, <semantics> or <maction> are not embellished
-       operators if their first child is not an embellished operator -->
+       operators if their first in-flow child is not an embellished operator -->
   <p>
     <math>
       <mn>X</mn>
@@ -282,5 +486,190 @@
       <mn>X</mn>
     </math>
   </p>
+
+  <!-- Only in-flow children affect determination of embellished operators. -->
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msub class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msub>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msubsup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msubsup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munder class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munder>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mmultiscripts class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mmultiscripts>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mfrac class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mfrac>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <maction class="testedElement" actiontype="statusline">
+        <mn>X</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="2em" rspace="0em">STATUS MESSAGE</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </maction>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <semantics class="testedElement">
+        <mrow>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mn>X</mn>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mo lspace="2em" rspace="0em">X</mo>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </mrow>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <annotation>TEXT ANNOTATION</annotation>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </semantics>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
index 63595b02784..3b28d976f0c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-axis-height-1.html
@@ -25,10 +25,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html
new file mode 100644
index 00000000000..3efeaa0dfe0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow-ref.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>&lt;mo&gt; movablelimits</title>
+    <style>
+      math, math * {
+          font: 25px/1 Ahem;
+      }
+    </style>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+  </head>
+  <body>
+    <math>
+      <msub>
+        <mo lspace="0px" rspace="0px">+</mo>
+        <mn>1</mn>
+      </msub>
+      <msup>
+        <mo lspace="0px" rspace="0px">+</mo>
+        <mn>1</mn>
+      </msup>
+      <msubsup>
+        <mo lspace="0px" rspace="0px">+</mo>
+        <mn>1</mn>
+        <mn>2</mn>
+      </msubsup>
+    </math>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html
new file mode 100644
index 00000000000..b36894e98f6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/operators/mo-movablelimits-from-in-flow.html
@@ -0,0 +1,51 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>&lt;mo&gt; movablelimits</title>
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#operator-fence-separator-or-accent-mo">
+    <meta name="assert" content="Verify movablelimits is read from the first in-flow child.">
+    <style>
+      math, math * {
+          font: 25px/1 Ahem;
+      }
+      .oof1 {
+          position: absolute;
+      }
+      .oof2 {
+          position: fixed;
+      }
+      .nobox {
+          display: none;
+      }
+    </style>
+    <link rel="stylesheet" type="text/css" href="/fonts/ahem.css" />
+    <link rel="match" href="mo-movablelimits-ref.html">
+  </head>
+  <body>
+    <math>
+      <munder>
+        <mo class="oof1" movablelimits="false"></mo>
+        <mo class="oof2" movablelimits="false"></mo>
+        <mo class="nobox" movablelimits="false"></mo>
+        <mo lspace="0px" rspace="0px" movablelimits="true">+</mo>
+        <mn>1</mn>
+      </munder>
+      <mover>
+        <mo class="oof1" movablelimits="false"></mo>
+        <mo class="oof2" movablelimits="false"></mo>
+        <mo class="nobox" movablelimits="false"></mo>
+        <mo lspace="0px" rspace="0px" movablelimits="true">+</mo>
+        <mn>1</mn>
+      </mover>
+      <munderover>
+        <mo class="oof1" movablelimits="false"></mo>
+        <mo class="oof2" movablelimits="false"></mo>
+        <mo class="nobox" movablelimits="false"></mo>
+        <mo lspace="0px" rspace="0px" movablelimits="true">+</mo>
+        <mn>1</mn>
+        <mn>2</mn>
+      </munderover>
+    </math>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html
new file mode 100644
index 00000000000..403a76f483e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow-ref.html
@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>radicals rendering from in-flow children</title>
+  </head>
+  <body>
+    <math>
+      <msqrt>
+        <mspace width="64px" height="8px" style="background: lightblue"></mspace>
+      </msqrt>
+      <mroot>
+        <mspace width="64px" height="12px" style="background: lightblue"></mspace>
+        <mspace width="128px" height="24px" style="background: lightgreen"></mspace>
+      </mroot>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html
new file mode 100644
index 00000000000..c49a899a0fa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/radical-rendering-from-in-flow.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>radicals rendering from in-flow children</title>
+    <link rel="help" href="https://mathml-refresh.github.io/mathml-core/#radicals-msqrt-mroot">
+    <meta name="assert" content="Verify rendering of radicals is only affected by in-flow children.">
+    <style>
+      .oof1 {
+          position: absolute;
+      }
+      .oof2 {
+          position: fixed;
+      }
+      .nobox {
+          display: none;
+      }
+    </style>
+    <link rel="match" href="radical-rendering-from-in-flow-ref.html">
+  </head>
+  <body>
+    <math>
+      <msqrt>
+        <mspace width="32px" class="oof1"/>
+        <mspace width="16px" class="oof2"/>
+        <mspace width="8px" class="nobox"/>
+        <mspace width="64px" height="8px" style="background: lightblue"></mspace>
+        <mspace width="32px" class="oof1"/>
+        <mspace width="16px" class="oof2"/>
+        <mspace width="8px" class="nobox"/>
+      </msqrt>
+      <mroot>
+        <mspace width="32px" class="oof1"/>
+        <mspace width="16px" class="oof2"/>
+        <mspace width="8px" class="nobox"/>
+        <mspace width="64px" height="12px" style="background: lightblue"></mspace>
+        <mspace width="32px" class="oof1"/>
+        <mspace width="16px" class="oof2"/>
+        <mspace width="8px" class="nobox"/>
+        <mspace width="128px" height="24px" style="background: lightgreen"></mspace>
+        <mspace width="32px" class="oof1"/>
+        <mspace width="16px" class="oof2"/>
+        <mspace width="8px" class="nobox"/>
+      </mroot>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
index d09d117b8ad..06433621680 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/radicals/root-parameters-1.html
@@ -50,10 +50,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html
new file mode 100644
index 00000000000..2be1c8ad2e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/cramped-001.html
@@ -0,0 +1,1094 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Cramped elements</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#cramped-elements">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#subscripts-and-superscripts-msub-msup-msubsup">
+<meta name="assert" content="Verify definition of cramped elements.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
+<style>
+  math {
+      font-family: superscriptshiftupcramped5000;
+  }
+  math, math * {
+      font-size: 10px;
+      background: lightyellow;
+  }
+  @font-face {
+    font-family: superscriptshiftupcramped5000;
+    src: url("/fonts/math/scripts-superscriptshiftupcramped5000.woff");
+  }
+  .testedElement *:first-child {
+      background: lightblue;
+  }
+  .testedElement *:last-child {
+      background: pink;
+  }
+  .oof1 {
+      position: absolute;
+  }
+  .oof2 {
+      position: fixed;
+  }
+  .nobox {
+      display: none;
+  }
+</style>
+<script>
+  function assert_cramped(id, expected, name) {
+      const emToPx = 10 / 1000; // font-size: 10px, font.em = 1000
+      const superscriptshiftupcramped = 5000 * emToPx;
+      var container = document.getElementById(id);
+      var msup = container.getElementsByClassName("testedElement")[0];
+      var base = firstInFlowChild(msup);
+      var script = nextInFlowSibling(base);
+      var shift = base.getBoundingClientRect().bottom - script.getBoundingClientRect().bottom;
+      if (expected)
+          assert_greater_than(shift, superscriptshiftupcramped / 2, `${name || id} should be cramped`);
+      else
+          assert_less_than(shift, superscriptshiftupcramped / 2, `${name || id} should not be cramped`);
+  }
+
+  setup({ explicit_done: true });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
+
+  function runTests() {
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("math-001", false);
+          assert_cramped("mrow-001", false, "mrow");
+      }, "child of non-cramped element");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mrow-002", true);
+      }, "child of cramped element");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msqrt-001", true);
+      }, "child of msqrt");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mroot-001", true);
+      }, "child of parent");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mfrac-001", false, "numerator");
+          assert_cramped("mfrac-002", true, "denominator");
+      }, "child of mfrac");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msub-001", false, "base");
+          assert_cramped("msub-002", true, "subscript");
+      }, "child of msub");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msup-001", false, "base");
+          assert_cramped("msup-002", false, "superscript");
+      }, "child of msup");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msubsup-001", false, "base");
+          assert_cramped("msubsup-002", true, "subscript");
+          assert_cramped("msubsup-003", false, "superscript");
+      }, "child of msubsup");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munder-001", false, "base");
+          assert_cramped("munder-002", true, "underscript");
+      }, "child of munder");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mover-001", false, "base");
+          assert_cramped("mover-002", false, "non-accent overscript");
+      }, "child of mover");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munderover-001", false, "base");
+          assert_cramped("munderover-002", false, "underscript");
+          assert_cramped("munderover-003", false, "non-accent overscript");
+      }, "child of munderover");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mover-003", true, "accent overscript");
+          assert_cramped("mover-004", false, "accent superscript");
+      }, "accent child of mover");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munderover-004", true, "accent overscript");
+          assert_cramped("munderover-005", false, "accent superscript");
+      }, "accent child of munderover");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("math-011", false);
+          assert_cramped("mrow-011", false, "mrow");
+      }, "child of non-cramped element, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mrow-012", true);
+      }, "child of cramped element, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msqrt-011", true);
+      }, "child of msqrt, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mroot-011", true);
+      }, "child of parent, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mfrac-011", false, "numerator");
+          assert_cramped("mfrac-012", true, "denominator");
+      }, "child of mfrac, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msub-011", false, "base");
+          assert_cramped("msub-012", true, "subscript");
+      }, "child of msub, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msup-011", false, "base");
+          assert_cramped("msup-012", false, "superscript");
+      }, "child of msup, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("msubsup-011", false, "base");
+          assert_cramped("msubsup-012", true, "subscript");
+          assert_cramped("msubsup-013", false, "superscript");
+      }, "child of msubsup, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munder-011", false, "base");
+          assert_cramped("munder-012", true, "underscript");
+      }, "child of munder, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mover-011", false, "base");
+          assert_cramped("mover-012", false, "non-accent overscript");
+      }, "child of mover, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munderover-011", false, "base");
+          assert_cramped("munderover-012", false, "underscript");
+          assert_cramped("munderover-013", false, "non-accent overscript");
+      }, "child of munderover, from in-flow children");
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("mover-013", true, "accent overscript");
+          assert_cramped("mover-014", false, "accent superscript");
+      }, "accent child of mover, from in-flow children");
+
+
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_mspace());
+          assert_cramped("munderover-014", true, "accent overscript");
+          assert_cramped("munderover-015", false, "accent superscript");
+      }, "accent child of munderover, from in-flow children");
+
+      done();
+  }
+</script>
+</head>
+<body>
+  <div id="log"></div>
+  <p>
+    <math id="math-001">
+      <msup class="testedElement">
+        <mspace height="2em" width="2em"/>
+        <mspace height="1em" width="1em"/>
+      </msup>
+    </math>
+    <math>
+      <mrow id="mrow-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mrow>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msqrt>
+        <!-- This is a child of a msqrt so it is cramped. As a consequence,
+             all its descendants are cramped too. -->
+        <munderover>
+          <mover>
+            <munder>
+              <msubsup>
+                <msup>
+                  <msub>
+                    <mfrac>
+                      <mrow id="mrow-002">
+                        <msup class="testedElement">
+                          <mspace height="2em" width="2em"/>
+                          <mspace height="1em" width="1em"/>
+                        </msup>
+                      </mrow>
+                      <mspace/>
+                    </mfrac>
+                    <mspace/>
+                  </msub>
+                  <mspace/>
+                </msup>
+                <mspace/>
+                <mspace/>
+              </msubsup>
+              <mspace/>
+            </munder>
+            <mspace/>
+          </mover>
+          <mspace/>
+          <mspace/>
+        </munderover>
+      </msqrt>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msqrt id="msqrt-001">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>3</mn>
+        <mn>4</mn>
+      </msqrt>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mroot id="mroot-001">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mroot>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mroot id="mroot-002">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </mroot>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mfrac id="mfrac-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </mfrac>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mfrac id="mfrac-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mfrac>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msub id="msub-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </msub>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msub id="msub-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </msub>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msup id="msup-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </msup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msup id="msup-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </msup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msubsup id="msubsup-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+        <mn>2</mn>
+      </msubsup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msubsup id="msubsup-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>2</mn>
+      </msubsup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <msubsup id="msubsup-003">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </msubsup>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munder id="munder-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </munder>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munder id="munder-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munder>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover id="mover-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover id="mover-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover accent="true" id="mover-003">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mover accent="true" id="mover-004">
+        <mo movablelimits="true">0</mo>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </mover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover id="munderover-001">
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>1</mn>
+        <mn>2</mn>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover id="munderover-002">
+        <mn>0</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+        <mn>2</mn>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover id="munderover-003">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover accent="true" id="munderover-004">
+        <mn>0</mn>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munderover>
+    </math>
+  </p>
+  <p>
+    <math>
+      <munderover accent="true" id="munderover-005">
+        <mo movablelimits="true">0</mo>
+        <mn>1</mn>
+        <msup class="testedElement">
+          <mspace height="2em" width="2em"/>
+          <mspace height="1em" width="1em"/>
+        </msup>
+      </munderover>
+    </math>
+  </p>
+
+  <p>
+    <math id="math-011">
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msup class="testedElement">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mspace height="2em" width="2em"/>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mspace height="1em" width="1em"/>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow id="mrow-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msqrt>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <!-- This is a child of a msqrt so it is cramped. As a consequence,
+             all its descendants are cramped too. -->
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <munderover>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mover>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <munder>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <msubsup>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <msup>
+                  <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                  <msub>
+                    <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                    <mfrac>
+                      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                      <mrow id="mrow-012">
+                        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                        <msup class="testedElement">
+                          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                          <mspace height="2em" width="2em"/>
+                          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                          <mspace height="1em" width="1em"/>
+                          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                        </msup>
+                        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                      </mrow>
+                      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                      <mspace/>
+                      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                    </mfrac>
+                    <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                    <mspace/>
+                    <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                  </msub>
+                  <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                  <mspace/>
+                  <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                </msup>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace/>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace/>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </msubsup>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace/>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </munder>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace/>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          </mover>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </munderover>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msqrt>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msqrt id="msqrt-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>3</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>4</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msqrt>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mroot id="mroot-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mroot>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mroot id="mroot-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mroot>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mfrac id="mfrac-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mfrac>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mfrac id="mfrac-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mfrac>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msub id="msub-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msub>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msub id="msub-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msub>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msup id="msup-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msup id="msup-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msubsup id="msubsup-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>2</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msubsup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msubsup id="msubsup-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>2</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msubsup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <msubsup id="msubsup-013">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </msubsup>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munder id="munder-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munder>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munder id="munder-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munder>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover id="mover-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover id="mover-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover accent="true" id="mover-013">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mover accent="true" id="mover-014">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo movablelimits="true">0</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover id="munderover-011">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>2</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover id="munderover-012">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>2</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover id="munderover-013">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover accent="true" id="munderover-014">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>0</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <munderover accent="true" id="munderover-015">
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo movablelimits="true">0</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mn>1</mn>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <msup class="testedElement">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="2em" width="2em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace height="1em" width="1em"/>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </msup>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </munderover>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
index a5f21ec5458..0c6610cc18f 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-1.html
@@ -62,10 +62,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
index 0abf01838c8..da7574ac4d0 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/subsup-parameters-2.html
@@ -27,10 +27,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   /*
     These two tests verify that:
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
index 26a1b3964cc..9217488a561 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-1.html
@@ -38,10 +38,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
index aed22235b8c..6f9aa4763a9 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-2.html
@@ -38,10 +38,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
index 6a1e51cdc45..a09e2cbca32 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-3.html
@@ -41,10 +41,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
index e569c15a699..8df0f4d8ef8 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/scripts/underover-parameters-4.html
@@ -41,10 +41,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => {   document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-004.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-004.html
index 091a3ea0a62..2ad6b0b772c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-004.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/spaces/space-like-004.html
@@ -11,6 +11,7 @@
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/mathml/support/feature-detection.js"></script>
+<script src="/mathml/support/box-navigation.js"></script>
 <style>
   /* Default spacing of operator 'X' is 0.2777777777777778em so quite different
      from the measured/specified 0em and 1em. */
@@ -27,17 +28,26 @@
       color: blue !important;
       background: blue !important;
   }
+  .oof1 {
+      position: absolute;
+  }
+  .oof2 {
+      position: fixed;
+  }
+  .nobox {
+      display: none;
+  }
 </style>
 <script>
   function spaceBefore(id) {
       var element = document.getElementById(id);
-      var mnBeforeParent = element.parentNode.previousElementSibling;
+      var mnBeforeParent = previousInFlowSibling(element.parentNode);
       return element.getBoundingClientRect().left - mnBeforeParent.getBoundingClientRect().right;
   }
 
   function spaceAfter(id) {
       var element = document.getElementById(id);
-      var mnAfterParent = element.parentNode.nextElementSibling;
+      var mnAfterParent = nextInFlowSibling(element.parentNode);
       return mnAfterParent.getBoundingClientRect().left - element.getBoundingClientRect().right;
   }
 
@@ -54,12 +64,24 @@
           assert_approx_equals(spaceAfter("complex1"), emToPx, epsilon);
       }, "complex space-like subtree");
 
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_operator_spacing());
+          assert_approx_equals(spaceBefore("complex1-bis"), emToPx, epsilon);
+          assert_approx_equals(spaceAfter("complex1-bis"), emToPx, epsilon);
+      }, "complex space-like subtree, from in-flow children");
+
       test(function() {
           assert_true(MathMLFeatureDetection.has_operator_spacing());
           assert_approx_equals(spaceBefore("complex2"), 0, epsilon);
           assert_approx_equals(spaceAfter("complex2"), 2 * emToPx, epsilon);
       }, "complex non-space-like subtree");
 
+      test(function() {
+          assert_true(MathMLFeatureDetection.has_operator_spacing());
+          assert_approx_equals(spaceBefore("complex2-bis"), 0, epsilon);
+          assert_approx_equals(spaceAfter("complex2-bis"), 2 * emToPx, epsilon);
+      }, "complex non-space-like subtree, from in-flow children");
+
       done();
   }
 </script>
@@ -127,6 +149,121 @@
       <mn>X</mn>
     </math>
   </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow>
+        <!-- This element is space-like because it is made of nested
+             mrow, mstyle, mpadded, mphantom, mtext, mspace
+          -->
+        <mrow class="testedElement" id="complex1-bis">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mtext>X</mtext>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mstyle>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow></mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          </mstyle>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace width="25px"></mspace>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </mrow>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="1em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
   <p>
     <math>
       <mn>X</mn>
@@ -189,5 +326,121 @@
       <mn>X</mn>
     </math>
   </p>
+  <p>
+    <math>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mrow>
+        <!-- This element is not space-like. It is made of nested
+             mrow, mstyle, mpadded, mphantom, mtext, mspace but contains
+             one non-space like descendant (an mn element).
+          -->
+        <mrow class="testedElement" id="complex2-bis">
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mtext>X</mtext>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mstyle>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mstyle>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow></mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mrow>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mrow>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mtext>X</mtext>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mspace width="25px"></mspace>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            <mpadded>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mn>X</mn> <!-- mn is not space-like -->
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mphantom>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mtext>X</mtext>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+                <mspace width="25px"></mspace>
+                <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              </mphantom>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mtext>X</mtext>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+              <mspace width="25px"></mspace>
+              <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+            </mpadded>
+            <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          </mstyle>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+          <mspace width="25px"></mspace>
+          <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        </mrow>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+        <mo lspace="1em" rspace="0em">X</mo>
+        <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      </mrow>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+      <mn>X</mn>
+      <mn class="oof1">0</mn><mn class="oof2">1</mn><mn class="nobox">2</mn>
+    </math>
+  </p>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html b/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
index 3eaf9c8fff4..f9354266a7c 100644
--- a/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
+++ b/tests/wpt/web-platform-tests/mathml/presentation-markup/tables/table-axis-height.html
@@ -26,10 +26,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013.html
index 60bc906452b..30be35c0247 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-013.html
@@ -21,10 +21,7 @@
         document.getElementById("m6").removeAttribute("displaystyle");
         document.documentElement.removeAttribute("class");
       }
-      window.addEventListener("load", function() {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(doTest); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(doTest); });
     </script>
     <link rel="stylesheet" href="/fonts/ahem.css">
     <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014.html
index 5f30f534e5e..d54a8043788 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-014.html
@@ -18,10 +18,7 @@
                  setAttribute('mathbackground', 'red');
         document.documentElement.removeAttribute("class");
       }
-      window.addEventListener("load", function() {
-        // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-        requestAnimationFrame(() => { document.fonts.ready.then(doTest); });
-      });
+      window.addEventListener("load", () => { document.fonts.ready.then(doTest); });
     </script>
     <link rel="stylesheet" href="/fonts/ahem.css">
     <style>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
index 73e5020e74c..19494a3e17a 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-1.html
@@ -31,10 +31,7 @@
       assert_approx_equals(elementSize, expectedSize, epsilon, description);
   }
 
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
       for (transform in AttributeValueTransforms) {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-2.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-2.html
index fc1bd7a432d..e544f4534dd 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/displaystyle-2.html
@@ -31,10 +31,7 @@
       assert_approx_equals(elementSize, expectedSize, epsilon, description);
   }
 
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
       for (transform in AttributeValueTransforms) {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html
index 22fc40156f1..90b0887d031 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/css-styling/lengths-2.html
@@ -29,10 +29,7 @@
   }
 
   setup({ explicit_done: true });
-  window.addEventListener("load", function() {
-    // Delay the check to workaround WebKit's bug https://webkit.org/b/174030.
-    requestAnimationFrame(() => { document.fonts.ready.then(runTests); });
-  });
+  window.addEventListener("load", () => { document.fonts.ready.then(runTests); });
 
   function runTests() {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html
index 00310046168..57ababb4a91 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/clipboard-event-handlers.tentative.html
@@ -14,9 +14,9 @@
 <script src="/resources/testharnessreport.js"></script>
 <div id="log"></div>
 <math
-  oncopy="document.copyHappened = true"
-  oncut="document.cutHappened = true"
-  onpaste="document.pasteHappened = true"
+  oncopy="window.copyHappened1 = true"
+  oncut="window.cutHappened1 = true"
+  onpaste="window.pasteHappened1 = true"
 >
   <mi>E</mi>
 </math>
@@ -56,10 +56,62 @@
       );
       compiledHandler();
       assert_true(
-        window[name + "Happened"],
+        window[`${name}Happened1`],
         "Calling the handler must run the code"
       );
     }, `${handlerName}: the content attribute must be compiled into a function as the corresponding property`);
+
+    test(() => {
+        const mathEl = document.createElementNS(
+            "http://www.w3.org/1998/Math/MathML",
+            "math"
+        );
+        assert_equals(mathEl[handlerName], null, `The ${handlerName} property must be null (no attribute)`);
+
+        mathEl.setAttribute(handlerName, `window.${handlerName}Happened2 = true;`);
+        const compiledHandler = mathEl[handlerName];
+        assert_equals(
+            typeof compiledHandler,
+            "function",
+            `The ${handlerName} property must be a function (set attribute)`
+        );
+        compiledHandler();
+        assert_true(
+            window[`${handlerName}Happened2`],
+            "Calling the handler must run the code (set attribute)"
+        );
+
+        window[`${handlerName}Happened2`] = false;
+        const clonedMathEl = mathEl.cloneNode(true);
+        const clonedCompiledHandler = clonedMathEl[handlerName];
+        assert_equals(
+            typeof clonedCompiledHandler,
+            "function",
+            `The ${handlerName} property must be a function (clone node)`
+        );
+        clonedCompiledHandler();
+        assert_true(
+            window[`${handlerName}Happened2`],
+            "Calling the handler must run the code (clone node)"
+        );
+
+        mathEl.setAttribute(handlerName, `window.${handlerName}Happened3 = true;`);
+        const newCompiledHandler = mathEl[handlerName];
+        assert_equals(
+            typeof newCompiledHandler,
+            "function",
+            `The ${handlerName} property must be a function (modify attribute)`
+        );
+        newCompiledHandler();
+        assert_true(
+            window[`${handlerName}Happened3`],
+            "Calling the handler must run the code (modify attribute)"
+        );
+
+        mathEl.removeAttribute(handlerName);
+        assert_equals(mathEl[handlerName], null, `The ${handlerName} property must be null (remove attribute)`);
+    }, `${handlerName}: dynamic changes on the attribute`);
+
   }
 
   EVENTS.forEach(name => {
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html
index 13f01392736..19f3e6c82aa 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/css-inline-style-dynamic.tentative-ref.html
@@ -3,11 +3,16 @@
 <head>
 <meta charset="utf-8"/>
 <title>MathML 'ElementCSSInlineStyle` Dynamic Tests</title>
+<style>
+mspace {
+  background-color: green;
+}
+</style>
 </head>
 <body>
   <span>This tests that `ElementCSSInlineStyle` interface changes update rendering.</span>
   <div>
-    <math style="background-color: green"><mspace width="50px" height="100px"/><mspace width="50px" height="100px"/></math>
+    <math><mspace width="50px" height="100px"/><mspace width="50px" height="100px"/></math>
   </div>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
index 807a29ee315..b5b9c75dac1 100644
--- a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/math-global-event-handlers.tentative.html
@@ -58,13 +58,9 @@
         }, `${name}: the default value must be null`);
 
         test(() => {
-          const el = document.createElementNS(
-            "http://www.w3.org/1998/Math/MathML",
-            "math"
-          );
-          el.setAttribute(name, `window.${name}Happened = true;`);
-          const compiledHandler = el[name];
-
+          const div = document.getElementById("container");
+          div.innerHTML = `<math ${name}="window.${name}Happened1 = true;"></math>`;
+          const compiledHandler = div.firstElementChild[name];
           assert_equals(
             typeof compiledHandler,
             "function",
@@ -72,11 +68,62 @@
           );
           compiledHandler();
           assert_true(
-            window[name + "Happened"],
+            window[`${name}Happened1`],
             "Calling the handler must run the code"
           );
         }, `${name}: the content attribute must be compiled into a function as the corresponding property`);
 
+        test(() => {
+          const el = document.createElementNS(
+            "http://www.w3.org/1998/Math/MathML",
+            "math"
+          );
+          assert_equals(el[name], null, `The ${name} property must be null (no attribute)`);
+
+          el.setAttribute(name, `window.${name}Happened2 = true;`);
+          const compiledHandler = el[name];
+          assert_equals(
+            typeof compiledHandler,
+            "function",
+            `The ${name} property must be a function (set attribute)`
+          );
+          compiledHandler();
+          assert_true(
+            window[`${name}Happened2`],
+            "Calling the handler must run the code (set attribute)"
+          );
+
+          window[`${name}Happened2`] = false;
+          const clonedEl = el.cloneNode(true);
+          const clonedCompiledHandler = clonedEl[name];
+          assert_equals(
+            typeof clonedCompiledHandler,
+            "function",
+            `The ${name} property must be a function (clone node)`
+          );
+          clonedCompiledHandler();
+          assert_true(
+            window[`${name}Happened2`],
+            "Calling the handler must run the code (clone node)"
+          );
+
+          el.setAttribute(name, `window.${name}Happened3 = true;`);
+          const newCompiledHandler = el[name];
+          assert_equals(
+            typeof newCompiledHandler,
+            "function",
+            `The ${name} property must be a function (modify attribute)`
+          );
+          newCompiledHandler();
+          assert_true(
+            window[`${name}Happened3`],
+            "Calling the handler must run the code (modify attribute)"
+          );
+
+          el.removeAttribute(name);
+          assert_equals(el[name], null, `The ${name} property must be null (remove attribute)`);
+        }, `${name}: dynamic changes on the attribute`);
+
         test(() => {
           const element = document.createElementNS(
             "http://www.w3.org/1998/Math/MathML",
@@ -97,3 +144,5 @@
       done();
     });
 </script>
+
+<div style="display: none" id="container"></div>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html
new file mode 100644
index 00000000000..aaf82f77caa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-001.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>MathML tabIndex attribute</title>
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#css-styling">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#the-top-level-math-element">
+<meta name="assert" content="Verify default values for the tabIndex attribute">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  window.addEventListener("load", function() {
+      test(() => {
+          const mrow = document.getElementById('mrow');
+          assert_equals(mrow.tabIndex, -1, "no attribute");
+          mrow.setAttribute("tabindex", "invalid");
+          assert_equals(mrow.tabIndex, -1, "invalid");
+          mrow.setAttribute("tabindex", "9999999999");
+          assert_equals(mrow.tabIndex, -1, "too large integer");
+      }, "default and invalid values on mrow");
+      test(() => {
+          const mrowLink = document.getElementById('mrow-link');
+          assert_equals(mrow.tabIndex, 0, "no attribute");
+          mrow.setAttribute("tabindex", "invalid");
+          assert_equals(mrow.tabIndex, 0, "invalid");
+          mrow.setAttribute("tabindex", "9999999999");
+          assert_equals(mrow.tabIndex, 0, "too large integer");
+      }, "default and invalid values on MathML link");
+  });
+</script>
+</head>
+<body>
+  <div id="log"></div>
+  <math>
+    <mrow id="mrow" onfocus="alert('fail')"></mrow>
+    <mrow id="mrow-link" href="javascript:alert('fail')" onfocus="alert('fail')"></mrow>
+  </math>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-002.html b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-002.html
new file mode 100644
index 00000000000..a1788d562e3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/relations/html5-tree/tabindex-002.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<title>MathML tabindex attribute</title>
+<meta name="timeout" content="long">
+<link rel="help" href="https://mathml-refresh.github.io/mathml-core/#attributes-common-to-html-and-mathml-elements">
+<meta assert="flag" content="interact">
+<meta assert="assert" content="Check the sequential focus navigation order for MathML">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/testdriver.js"></script>
+<script src="/resources/testdriver-vendor.js"></script>
+<div id="log"></div>
+<math>
+  <mtext id="text1">tabindex(omitted)</mtext>
+  <mtext id="text2" tabindex="">tabindex(empty)</mtext>
+  <mtext id="text3" tabindex="a">tabindex(a)</mtext>
+  <mtext id="text4" tabindex="-1">tabindex(-1)</mtext>
+  <mtext id="text5" tabindex="0">tabindex(0)</mtext>
+  <mtext id="text6" href="#link">tabindex(href)</mtext>
+  <mtext id="text7" tabindex="3">tabindex(3)</mtext>
+  <mtext id="text8" tabindex="2">tabindex(2)</mtext>
+  <mtext id="text9" tabindex="2">tabindex(2)</mtext>
+  <mtext id="text10" tabindex="2">tabindex(2)</mtext>
+  <mtext id="text11" tabindex="1">tabindex(1)</mtext>
+</math>
+<script>
+
+var i = 0,
+    expectation = ["text11", "text8", "text9", "text10", "text7", "text5", "text6"],
+    results = [],
+    t = async_test("Elements with different tabindex must be focused sequentially when pressing 'Tab' keys");
+
+setup(function () {
+  document.body.focus();
+});
+
+document.querySelector("math").addEventListener("focus", function (evt) {
+  results.push(evt.target.id);
+  i++;
+  if (i >= expectation.length) {
+    t.step(function () {
+      assert_array_equals(results, expectation);
+    });
+    t.done();
+  } else {
+    t.step(function () {
+      // TAB = '\ue004'
+      test_driver.send_keys(document.body, "\ue004");
+    });
+  }
+}, true);
+
+document.addEventListener("keydown", function (evt) {
+  t.step(function () {
+    assert_equals(evt.keyCode, 9, "Please press 'Tab' key.");
+  });
+}, true);
+
+t.step(function () {
+  // TAB = '\ue004'
+  test_driver.send_keys(document.body, "\ue004");
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/mathml/support/box-navigation.js b/tests/wpt/web-platform-tests/mathml/support/box-navigation.js
new file mode 100644
index 00000000000..f4897cfe999
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mathml/support/box-navigation.js
@@ -0,0 +1,29 @@
+function IsInFlow(element) {
+    var style = window.getComputedStyle(element);
+    return style.getPropertyValue("display") !== "none" &&
+        style.getPropertyValue("position") !== "absolute" &&
+        style.getPropertyValue("position") !== "fixed";
+}
+
+function firstInFlowChild(element) {
+    var child = element.firstElementChild;
+    if (!child || IsInFlow(child))
+        return child;
+    return nextInFlowSibling(child);
+}
+
+function nextInFlowSibling(element) {
+    var child = element;
+    do {
+        child = child.nextElementSibling;
+    } while (child && !IsInFlow(child));
+    return child;
+}
+
+function previousInFlowSibling(element) {
+    var child = element;
+    do {
+        child = child.previousElementSibling;
+    } while (child && !IsInFlow(child));
+    return child;
+}
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js b/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
deleted file mode 100644
index ee34c4973a9..00000000000
--- a/tests/wpt/web-platform-tests/mixed-content/generic/mixed-content-test-case.js
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * @fileoverview Test case for mixed-content in Web Platform Tests.
- * @author burnik@google.com (Kristijan Burnik)
- */
-
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
-/**
- * MixedContentTestCase exercises all the tests for checking browser behavior
- * when resources regarded as mixed-content are requested. A single run covers
- * only a single scenario.
- * @param {object} scenario A JSON describing the test arrangement and
- *     expectation(s). Refer to /mixed-content/spec.src.json for details.
- * @param {string} description The test scenario verbose description.
- * @param {SanityChecker} sanityChecker Instance of an object used to check the
- *     running scenario. Useful in debug mode. See ./sanity-checker.js.
- *     Run {@code ./tools/generate.py -h} for info on test generating modes.
- * @return {object} Object wrapping the start method used to run the test.
- */
-function MixedContentTestCase(scenario, description, sanityChecker) {
-  sanityChecker.checkScenario(scenario, subresourceMap);
-
-  let sourceContextList = [];
-  let subresourceType = scenario.subresource;
-  if (subresourceType === 'classic-data-worker-fetch') {
-    // Currently 'classic-data-worker-fetch' (fetch API from inside classic
-    // data: worker) is handled as a kind of subresource request
-    // on the genarator side, but should be processed using the combination of
-    // SourceContext list (classic data: worker) + Subresource (fetch API)
-    // on the JavaScript side.
-    // We bridge this inconsistency here, and will later pass these information
-    // directly from the generated tests and remove this conversion here.
-    subresourceType = 'fetch-request';
-    sourceContextList = [{sourceContextType: 'worker-classic-data'}];
-  }
-
-  const originTypeConversion = {
-    "same-host-https": "same-https",
-    "same-host-http": "same-http",
-    "cross-origin-https": "cross-https",
-    "cross-origin-http": "cross-http",
-    "same-host-wss": "same-wss",
-    "same-host-ws": "same-ws",
-    "cross-origin-wss": "cross-wss",
-    "cross-origin-ws": "cross-ws",
-  };
-
-  const urls = getRequestURLs(subresourceType,
-                              originTypeConversion[scenario.origin],
-                              scenario.redirection);
-  const checkResult = _ => {
-    // Send request to check if the key has been torn down.
-    return xhrRequest(urls.assertUrl)
-      .then(assertResult => {
-          // Now check if the value has been torn down. If it's still there,
-          // we have blocked the request to mixed-content.
-          assert_equals(assertResult.status, scenario.expectation,
-            "The resource request should be '" + scenario.expectation + "'.");
-        });
-  };
-
-  function runTest() {
-    /** @type {Subresource} */
-    const subresource = {
-      subresourceType: subresourceType,
-      url: urls.testUrl,
-      policyDeliveries: []
-    };
-
-    promise_test(() => {
-      return xhrRequest(urls.announceUrl)
-        // Send out the real resource request.
-        // This should tear down the key if it's not blocked.
-        .then(_ => invokeRequest(subresource, sourceContextList))
-        // We check the key state, regardless of whether the main request
-        // succeeded or failed.
-        .then(checkResult, checkResult);
-      }, description);
-  }  // runTest
-
-  return {start: runTest};
-}  // MixedContentTestCase
diff --git a/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js b/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js
index d25986e5c26..9e9e169f15f 100644
--- a/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js
+++ b/tests/wpt/web-platform-tests/mixed-content/generic/test-case.sub.js
@@ -3,50 +3,6 @@
  * @author burnik@google.com (Kristijan Burnik)
  */
 
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
 /**
  * MixedContentTestCase exercises all the tests for checking browser behavior
  * when resources regarded as mixed-content are requested. A single run covers
@@ -62,37 +18,9 @@ function getSubresourceOrigin(originType) {
 function TestCase(scenario, description, sanityChecker) {
   sanityChecker.checkScenario(scenario, subresourceMap);
 
-  const redirectionTypeConversion = {
-    "no-redirect": "no-redirect",
-    "keep-scheme": "keep-scheme-redirect",
-    "swap-scheme": "swap-scheme-redirect",
-    "keep-origin": "keep-origin-redirect",
-    "swap-origin": "swap-origin-redirect"
-  };
-  const subresourceTypeConversion = {
-    "beacon": "beacon-request",
-    "fetch": "fetch-request",
-    "xhr": "xhr-request",
-    "websocket": "websocket-request",
-    "worker-classic": "worker-request",
-    "worker-module": "module-worker",
-    "worker-import-data": "module-data-worker-import",
-    "sharedworker-classic": "shared-worker",
-    "worklet-animation": "worklet-animation-top-level",
-    "worklet-audio": "worklet-audio-top-level",
-    "worklet-layout": "worklet-layout-top-level",
-    "worklet-paint": "worklet-paint-top-level",
-    "worklet-animation-import-data": "worklet-animation-data-import",
-    "worklet-audio-import-data": "worklet-audio-data-import",
-    "worklet-layout-import-data": "worklet-layout-data-import",
-    "worklet-paint-import-data": "worklet-paint-data-import"
-  };
-  const subresourceType =
-      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
-
-  const urls = getRequestURLs(subresourceType,
+  const urls = getRequestURLs(scenario.subresource,
                               scenario.origin,
-                              redirectionTypeConversion[scenario.redirection]);
+                              scenario.redirection);
   const checkResult = _ => {
     // Send request to check if the key has been torn down.
     return xhrRequest(urls.assertUrl)
@@ -107,7 +35,7 @@ function TestCase(scenario, description, sanityChecker) {
   function runTest() {
     /** @type {Subresource} */
     const subresource = {
-      subresourceType: subresourceType,
+      subresourceType: scenario.subresource,
       url: urls.testUrl,
       policyDeliveries: scenario.subresource_policy_deliveries,
     };
diff --git a/tests/wpt/web-platform-tests/orientation-event/META.yml b/tests/wpt/web-platform-tests/orientation-event/META.yml
index ba1811f6742..88014849d06 100644
--- a/tests/wpt/web-platform-tests/orientation-event/META.yml
+++ b/tests/wpt/web-platform-tests/orientation-event/META.yml
@@ -1,4 +1,4 @@
-spec: https://w3c.github.io/deviceorientation/spec-source-orientation.html
+spec: https://w3c.github.io/deviceorientation/
 suggested_reviewers:
   - reillyeon
   - timvolodine
diff --git a/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html b/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html
new file mode 100644
index 00000000000..8da6b341840
--- /dev/null
+++ b/tests/wpt/web-platform-tests/portals/portals-set-src-after-activate.html
@@ -0,0 +1,36 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+function nextMessage(target) {
+  return new Promise((resolve, reject) => {
+    target.addEventListener('message', e => resolve(e), {once: true});
+  });
+}
+
+promise_test(async () => {
+  const w = window.open();
+  try {
+    const portal = w.document.createElement('portal');
+    portal.src = new URL('resources/simple-portal-adopts-predecessor.html', location.href);
+    w.document.body.appendChild(portal);
+    assert_equals((await nextMessage(portal)).data, 'ready');
+
+    // Intentionally don't await activation finishing; this should work
+    // even if activation is ongoing.
+    let activateDone = portal.activate();
+
+    // TODO(jbroman): It shouldn't be necessary to reinsert the element to
+    // navigate it again, either.
+    w.document.body.removeChild(portal);
+    portal.src = new URL('resources/simple-portal.html', location.href);
+    w.document.body.appendChild(portal);
+    assert_equals((await nextMessage(portal)).data, 'ready');
+
+    // But activation should still resolve, eventually.
+    await activateDone;
+  } finally {
+    w.close();
+  }
+}, "Tests that a portal element can be fully reused after activate has detached it");
+</script>
diff --git a/tests/wpt/web-platform-tests/portals/resources/simple-portal-adopts-predecessor.html b/tests/wpt/web-platform-tests/portals/resources/simple-portal-adopts-predecessor.html
new file mode 100644
index 00000000000..b199bdd93b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/portals/resources/simple-portal-adopts-predecessor.html
@@ -0,0 +1,7 @@
+<!DOCTYPE html>
+<body>
+  <script>
+    window.portalHost.postMessage("ready", "*");
+    onportalactivate = e => document.body.appendChild(e.adoptPredecessor());
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
index 01dfd86b564..a4bbddb5646 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/external-import-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
index 1c018e84ee8..32adf5adcad 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/internal-import-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
index 87b123bbad0..56db82c1d3c 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/child-css/processing-instruction.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
index f0782dff86c..ac26aa2828f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-import-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
index d242b08635f..fa21a1d53f7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/external-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
index f72ba3941fe..d2c8ae754fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-import-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
index 79c521b322d..43aa37151b4 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/internal-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
index c38bbbc15f8..6c864afd9ae 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/font-face/processing-instruction.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
index b6d667654e3..15aae6f8247 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-import-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
index 85ad8055c0a..eed146dac0f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/external-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
index aa7778aea0a..1e94b3df2cd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/inline-style.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
index 63a8ef94374..75ca554381e 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-import-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
index f7bc4b8ad1b..caef85329fe 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/internal-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
index 0d562712a07..df5593b218f 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/presentation-attribute.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
index 82a435a5212..5d88fcbb6db 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/image/processing-instruction.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="never">
   </head>
   <body>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
index b91bedee06b..12bc9eeba63 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/external-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="never">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
index a14ada69a50..2d4725e0bb1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/inline-style.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
index e81fea3605c..38f4cf8b569 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/internal-stylesheet.html
@@ -7,7 +7,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
index 393e8f67c58..e2104a6a6c1 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/presentation-attribute.html
@@ -8,7 +8,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
index e405d0bd6de..4ff9a518902 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/css-integration/svg/processing-instruction.html
@@ -8,7 +8,6 @@
     <script src="/common/utils.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <!-- Helper functions for referrer-policy css tests. -->
     <script src="/referrer-policy/css-integration/css-test-helper.js"></script>
     <meta name="referrer" content="origin">
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
index 060fabdb1c8..6639ebd9873 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/inheritance/iframe-inheritance-srcdoc.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
     <meta name="referrer" content="origin">
   </head>
   <body onload="runTest()">
@@ -23,7 +22,6 @@
         var iframe = document.createElement("iframe");
         iframe.srcdoc =
             `<script src = "/common/security-features/resources/common.sub.js"></` + `script>
-            <script src = "/referrer-policy/generic/referrer-policy-test-case.sub.js"></` + `script>
             <script>
               var urlPath = "/common/security-features/subresource/xhr.py";
               var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
index 8a94cd7c102..e6b7b07d517 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-and-values.html
@@ -6,7 +6,6 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header and header values are allowed</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
index 799bba8a32c..b5c27515dff 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-combined.html
@@ -6,7 +6,6 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy header values are allowed</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
index 7304df846c9..5561cd85009 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-invalid.html
@@ -6,7 +6,6 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
index 57ca2f4384a..f07500e546a 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers-one-unknown-token.html
@@ -6,7 +6,6 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers with one invalid</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
index 43f8bb72c18..d6c3a90ccb8 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/multiple-headers.html
@@ -6,7 +6,6 @@
     <script src="/resources/testharnessreport.js"></script>
 
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: multiple Referrer-Policy headers are allowed</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js b/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
deleted file mode 100644
index 4722b0b1b8b..00000000000
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/referrer-policy-test-case.sub.js
+++ /dev/null
@@ -1,260 +0,0 @@
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.sub.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
-// NOTE: This method only strips the fragment and is not in accordance to the
-// recommended draft specification:
-// https://w3c.github.io/webappsec/specs/referrer-policy/#null
-// TODO(kristijanburnik): Implement this helper as defined by spec once added
-// scenarios for URLs containing username/password/etc.
-function stripUrlForUseAsReferrer(url) {
-  return url.replace(/#.*$/, "");
-}
-
-function invokeScenario(scenario, sourceContextList) {
-  const originTypeConversion = {
-    "same-origin-http": "same-http",
-    "same-origin-https": "same-https",
-    "cross-origin-http": "cross-http",
-    "cross-origin-https": "cross-https"
-  };
-  const urls = getRequestURLs(
-    scenario.subresource,
-    originTypeConversion[scenario.origin + '-' + scenario.target_protocol],
-    scenario.redirection);
-
-  const deliveryTypeConversion = {
-    "attr-referrer": "attr",
-    "rel-noreferrer": "rel-noref",
-    // Other delivery methods such as "http-rp" are ignored here because
-    // they are already applied to the main document by generator.py.
-  };
-
-  /** @type {PolicyDelivery} */
-  const delivery = {
-      deliveryType: deliveryTypeConversion[scenario.delivery_method],
-      key: "referrerPolicy",
-      value: scenario.referrer_policy};
-
-  /** @type {Subresource} */
-  const subresource = {
-    subresourceType: scenario.subresource,
-    url: urls.testUrl,
-    policyDeliveries: [delivery]
-  };
-
-  return invokeRequest(subresource, sourceContextList || []);
-}
-
-function ReferrerPolicyTestCase(scenario, testDescription, sanityChecker) {
-  // Pass and skip rest of the test if browser does not support fetch.
-  if (scenario.subresource == "fetch-request" && !window.fetch) {
-    // TODO(kristijanburnik): This should be refactored.
-    return {
-      start: function() {
-        test(function() { assert_true(true); },
-             "[ReferrerPolicyTestCase] Skipping test: Fetch is not supported.");
-      }
-    };
-  }
-
-  // This check is A NOOP in release.
-  sanityChecker.checkScenario(scenario);
-
-  const referrerUrlResolver = {
-    "omitted": function(sourceUrl) {
-      return undefined;
-    },
-    "origin": function(sourceUrl) {
-      return new URL(sourceUrl).origin + "/";
-    },
-    "stripped-referrer": function(sourceUrl) {
-      return stripUrlForUseAsReferrer(sourceUrl);
-    }
-  };
-
-  const checkResult = (expectation, result) => {
-    let currentURL = location.toString();
-    const expectedReferrerUrl =
-      referrerUrlResolver[expectation](currentURL);
-
-    // Check the reported URL.
-    assert_equals(result.referrer,
-                  expectedReferrerUrl,
-                  "Reported Referrer URL is '" +
-                  expectation + "'.");
-    assert_equals(result.headers.referer,
-                  expectedReferrerUrl,
-                  "Reported Referrer URL from HTTP header is '" +
-                  expectedReferrerUrl + "'");
-  };
-
-  function runTest() {
-    function historyBackPromise(t, scenario) {
-      history.back();
-      return new Promise(resolve => {
-          // Wait for completion of `history.back()` by listening the
-          // popstate events that are fired near the end of
-          // `history.back()` processing.
-          window.addEventListener('popstate', resolve, {once: true});
-
-          // Workaround for Safari: Waiting for popstate events causes
-          // timeout in a-tag tests. To avoid timeout, we anyway resolve
-          // the promise.
-          if (scenario.subresource === 'a-tag') {
-            t.step_timeout(resolve, 1000);
-          }
-        });
-    }
-
-    // Request in the top-level document.
-    promise_test(_ => {
-      return invokeScenario(scenario)
-        .then(result => checkResult(scenario.referrer_url, result));
-    }, testDescription);
-
-    // `Referer` headers with length over 4k are culled down to an origin, so,
-    // let's test around that boundary for tests that would otherwise return
-    // the complete URL.
-    // Different subresource URLs are used because getRequestURLs() is called
-    // for each sub test which returns a unique URL.
-    if (scenario.referrer_url == "stripped-referrer") {
-      promise_test(t => {
-        history.pushState(null, null, "/");
-        history.replaceState(null, null, "A".repeat(4096 - location.href.length - 1));
-        return invokeScenario(scenario)
-          .then(result => checkResult(scenario.referrer_url, result))
-          .finally(_ => historyBackPromise(t, scenario));
-      }, "`Referer` header with length < 4k is not stripped to an origin.");
-
-      promise_test(t => {
-        history.pushState(null, null, "/");
-        history.replaceState(null, null, "A".repeat(4096 - location.href.length));
-        return invokeScenario(scenario)
-          .then(result => checkResult(scenario.referrer_url, result))
-          .finally(_ => historyBackPromise(t, scenario));
-      }, "`Referer` header with length == 4k is not stripped to an origin.");
-
-      promise_test(t => {
-        history.pushState(null, null, "/");
-        history.replaceState(null, null, "A".repeat(4096 - location.href.length + 1));
-        return invokeScenario(scenario)
-          .then(result => checkResult("origin", result))
-          .finally(_ => historyBackPromise(t, scenario));
-      }, "`Referer` header with length > 4k is stripped to an origin.");
-    }
-
-    // We test requests from inside iframes only for <img> tags.
-    // This is just to preserve the previous test coverage.
-    // TODO(hiroshige): Enable iframe tests for all subresource types.
-    if (scenario.subresource !== "img-tag") {
-      return;
-    }
-
-    // We skip <srcdoc> tests for attr-referrer, because delivering referrer
-    // policy via DOM attributes inside <srcdoc> is quite similar to doing
-    // so in the top-level Document.
-    if (scenario.delivery_method === "attr-referrer") {
-      return;
-    }
-
-    // Request in a `srcdoc` frame to ensure that it uses the referrer
-    // policy of its parent,
-    promise_test(_ => {
-        /** @type {Array<SourceContext>} */
-        const sourceContextList = [{sourceContextType: "srcdoc"}];
-
-        return invokeScenario(scenario, sourceContextList)
-          .then(result => checkResult(scenario.referrer_url, result));
-      }, testDescription + " (srcdoc iframe inherits parent)");
-
-    // We skip (top Document w/ referrer policy by HTTP headers)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests, because we
-    // already have similar (top Document w/ referrer policy by <meta>)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests.
-    if (scenario.delivery_method === "http-rp") {
-      return;
-    }
-
-    // We skip (top Document w/o referrer policy)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests, to simplify the
-    // generator. We already have (top Document w/ referrer policy)->
-    // (<iframe srcdoc> w/ overriding referrer policy) tests, which verify the
-    // <iframe srcdoc>'s referrer policy behavior.
-    if (scenario.referrer_policy === null) {
-      return;
-    }
-
-    // Request in a `srcdoc` frame with its own referrer policy to
-    // override its parent.
-    promise_test(_ => {
-        // Give a srcdoc iframe a referrer policy different from the
-        // top-level page's policy.
-        const overridingPolicy =
-            scenario.referrer_policy === "no-referrer" ? "unsafe-url"
-                                                       : "no-referrer";
-        const overrridingExpectation =
-            overridingPolicy === "no-referrer" ? "omitted"
-                                               : "stripped-referrer";
-
-        const scenarioWithoutDelivery = Object.assign({}, scenario);
-        // Omit policy deliveries applied to subresource requests.
-        // This is hacky method but will be removed soon.
-        scenarioWithoutDelivery.delivery_method = null;
-
-        // <iframe srcdoc> with overriding <meta> referrerPolicy.
-        /** @type {Array<SourceContext>} */
-        const sourceContextList = [{
-            sourceContextType: "srcdoc",
-            policyDeliveries: [{deliveryType: "meta",
-                                key: "referrerPolicy",
-                                value: overridingPolicy}]
-          }];
-
-        return invokeScenario(scenarioWithoutDelivery, sourceContextList)
-          .then(result => checkResult(overrridingExpectation, result));
-      }, testDescription + " (overridden by srcdoc iframe)");
-  }
-
-  return {start: runTest};
-}
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
index 65c48e242bf..f6ecd884df3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/sandboxed-iframe-with-opaque-origin.html
@@ -8,7 +8,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: A document with an opaque origin doesn't send referrers</h1>
@@ -27,7 +26,6 @@
           iframe.srcdoc = `
               <meta name = "referrer" content = "always">
               <script src = "/common/security-features/resources/common.sub.js"></` + `script>
-              <script src = "/referrer-policy/generic/referrer-policy-test-case.sub.js"></` + `script>
               <script>
                 var urlPath = "/common/security-features/subresource/xhr.py";
                 var url = "${location.protocol}//www1.${location.hostname}:${location.port}" + urlPath;
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
index 5de90e5b510..2a4f29654df 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/area-navigate.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Area Link messaging - cross-origin Area Link navigation</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
index a20f6a11ca9..2678af822ef 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/fetch-messaging.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Fetch messaging - same-origin Fetch request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
index 15b6ab8f088..b8bdb0e5e03 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/iframe-messaging.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Iframe messaging - cross-origin iframe request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
index f515ceb1fa3..76ce0e263a7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/image-decoding.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Image decoding - cross-origin image request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
index dbb9a897208..21783d3e31d 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/link-navigate.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Link messaging - cross-origin Link navigation</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
index 967c58a4a10..1bc0ba13ef7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/script-messaging.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Script messaging - cross-origin Script request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
index 294fa574b58..c2db8fe8452 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/worker-messaging.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Worker messaging - same-origin Worker request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
index f88e2e57595..c1f89919ca3 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/subresource-test/xhr-messaging.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>XHR messaging - cross-origin XHR request</h1>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js b/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js
index 356f8054f6e..c8a6b139f33 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/test-case.sub.js
@@ -1,47 +1,3 @@
-// TODO: This function is currently placed and duplicated at:
-// - mixed-content/generic/mixed-content-test-case.js
-// - referrer-policy/generic/referrer-policy-test-case.sub.js
-// but should be moved to /common/security-features/resources/common.js.
-function getSubresourceOrigin(originType) {
-  const httpProtocol = "http";
-  const httpsProtocol = "https";
-  const wsProtocol = "ws";
-  const wssProtocol = "wss";
-
-  const sameOriginHost = "{{host}}";
-  const crossOriginHost = "{{domains[www1]}}";
-
-  // These values can evaluate to either empty strings or a ":port" string.
-  const httpPort = getNormalizedPort(parseInt("{{ports[http][0]}}", 10));
-  const httpsPort = getNormalizedPort(parseInt("{{ports[https][0]}}", 10));
-  const wsPort = getNormalizedPort(parseInt("{{ports[ws][0]}}", 10));
-  const wssPort = getNormalizedPort(parseInt("{{ports[wss][0]}}", 10));
-
-  /**
-    @typedef OriginType
-    @type {string}
-
-    Represents the origin of the subresource request URL.
-    The keys of `originMap` below are the valid values.
-
-    Note that there can be redirects from the specified origin
-    (see RedirectionType), and thus the origin of the subresource
-    response URL might be different from what is specified by OriginType.
-  */
-  const originMap = {
-    "same-https": httpsProtocol + "://" + sameOriginHost + httpsPort,
-    "same-http": httpProtocol + "://" + sameOriginHost + httpPort,
-    "cross-https": httpsProtocol + "://" + crossOriginHost + httpsPort,
-    "cross-http": httpProtocol + "://" + crossOriginHost + httpPort,
-    "same-wss": wssProtocol + "://" + sameOriginHost + wssPort,
-    "same-ws": wsProtocol + "://" + sameOriginHost + wsPort,
-    "cross-wss": wssProtocol + "://" + crossOriginHost + wssPort,
-    "cross-ws": wsProtocol + "://" + crossOriginHost + wsPort,
-  };
-
-  return originMap[originType];
-}
-
 // NOTE: This method only strips the fragment and is not in accordance to the
 // recommended draft specification:
 // https://w3c.github.io/webappsec/specs/referrer-policy/#null
@@ -52,40 +8,13 @@ function stripUrlForUseAsReferrer(url) {
 }
 
 function invokeScenario(scenario) {
-  const redirectionTypeConversion = {
-    "no-redirect": "no-redirect",
-    "keep-scheme": "keep-scheme-redirect",
-    "swap-scheme": "swap-scheme-redirect",
-    "keep-origin": "keep-origin-redirect",
-    "swap-origin": "swap-origin-redirect"
-  };
-  const subresourceTypeConversion = {
-    "beacon": "beacon-request",
-    "fetch": "fetch-request",
-    "xhr": "xhr-request",
-    "websocket": "websocket-request",
-    "worker-classic": "worker-request",
-    "worker-module": "module-worker",
-    "worker-import-data": "module-data-worker-import",
-    "sharedworker-classic": "shared-worker",
-    "worklet-animation": "worklet-animation-top-level",
-    "worklet-audio": "worklet-audio-top-level",
-    "worklet-layout": "worklet-layout-top-level",
-    "worklet-paint": "worklet-paint-top-level",
-    "worklet-animation-import-data": "worklet-animation-data-import",
-    "worklet-audio-import-data": "worklet-audio-data-import",
-    "worklet-layout-import-data": "worklet-layout-data-import",
-    "worklet-paint-import-data": "worklet-paint-data-import"
-  };
-  const subresourceType =
-      subresourceTypeConversion[scenario.subresource] || scenario.subresource;
   const urls = getRequestURLs(
-    subresourceType,
+    scenario.subresource,
     scenario.origin,
-    redirectionTypeConversion[scenario.redirection]);
+    scenario.redirection);
   /** @type {Subresource} */
   const subresource = {
-    subresourceType: subresourceType,
+    subresourceType: scenario.subresource,
     url: urls.testUrl,
     policyDeliveries: scenario.subresource_policy_deliveries,
   };
diff --git a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
index 3c5cd740af9..a7f22210edd 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
+++ b/tests/wpt/web-platform-tests/referrer-policy/generic/unsupported-csp-referrer-directive.html
@@ -7,7 +7,6 @@
     <script src="/resources/testharnessreport.js"></script>
     <!-- Common global functions for referrer-policy tests. -->
     <script src="/common/security-features/resources/common.sub.js"></script>
-    <script src="/referrer-policy/generic/referrer-policy-test-case.sub.js"></script>
   </head>
   <body>
     <h1>Referrer Policy: CSP 'referrer' directive should not be supported</h1>
diff --git a/tests/wpt/web-platform-tests/resource-timing/resource_ignore_failures.html b/tests/wpt/web-platform-tests/resource-timing/resource_ignore_failures.html
deleted file mode 100644
index fa9e411ea98..00000000000
--- a/tests/wpt/web-platform-tests/resource-timing/resource_ignore_failures.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta charset="utf-8" />
-<title>Resource Timing ignores failed resources</title>
-<link rel="author" title="Google" href="http://www.google.com/" />
-<link rel="help" href="http://www.w3.org/TR/resource-timing/#dom-performanceresourcetiming-initiatortype"/>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="resources/webperftestharness.js"></script>
-<script src="resources/webperftestharnessextension.js"></script>
-<script>
-let iframe;
-function setup_iframe() {
-    const iframe_content = '<img src="resources/non-existing-file.png"></img>';
-    iframe = document.getElementById('frameContext');
-    iframe.contentWindow.document.write(iframe_content);
-}
-function onload_test() {
-    const context = new PerformanceContext(iframe.contentWindow.performance);
-    const entries = context.getEntriesByType('resource');
-    test_true(entries.length == 0, "entries.length == 0");
-}
-window.setup_iframe = setup_iframe;
-</script>
-</head>
-<body>
-<h1>Description</h1>
-<p>This test validates that failed resources aren't present in the Resource Timing buffer.</p>
-<div id="log"></div>
-<iframe id="frameContext" onload="onload_test();" src="resources/inject_resource_test.html"></iframe>
-</body>
-</html>
diff --git a/tests/wpt/web-platform-tests/resource-timing/resources/status-code.py b/tests/wpt/web-platform-tests/resource-timing/resources/status-code.py
new file mode 100644
index 00000000000..6ddad159524
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resource-timing/resources/status-code.py
@@ -0,0 +1,4 @@
+def main(request, response):
+    status = request.GET.first('status')
+    response.status = (status, "");
+
diff --git a/tests/wpt/web-platform-tests/resource-timing/status-codes-create-entry.html b/tests/wpt/web-platform-tests/resource-timing/status-codes-create-entry.html
new file mode 100644
index 00000000000..fb4236e6bbe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resource-timing/status-codes-create-entry.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<img src="resources/status-code.py?status=200">
+<img src="resources/status-code.py?status=307">
+<img src="resources/status-code.py?status=404">
+<img src="resources/status-code.py?status=502">
+<script>
+async_test(t => {
+  window.addEventListener("load", t.step_func(() => {
+    const images = document.getElementsByTagName("img");
+    for (let img of images) {
+      assert_equals(performance.getEntriesByName(img.src).length, 1, img.src);
+    }
+    t.done();
+  }));
+}, "Make sure all status codes are reported");
+</script>
diff --git a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
index 9722f8ee570..01a4e70d0c9 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/nfc-mock.js
@@ -1,20 +1,5 @@
 'use strict';
 
-function toMojoNDEFRecordType(type) {
-  switch (type) {
-  case 'text':
-    return device.mojom.NDEFRecordType.TEXT;
-  case 'url':
-    return device.mojom.NDEFRecordType.URL;
-  case 'json':
-    return device.mojom.NDEFRecordType.JSON;
-  case 'opaque':
-    return device.mojom.NDEFRecordType.OPAQUE_RECORD;
-  }
-
-  return device.mojom.NDEFRecordType.EMPTY;
-}
-
 function toMojoNFCPushTarget(target) {
   switch (target) {
   case 'peer':
@@ -48,7 +33,7 @@ function toMojoNDEFMessage(message) {
 
 function toMojoNDEFRecord(record) {
   let nfcRecord = new device.mojom.NDEFRecord();
-  nfcRecord.recordType = toMojoNDEFRecordType(record.recordType);
+  nfcRecord.recordType = record.recordType;
   nfcRecord.mediaType = record.mediaType;
   nfcRecord.data = toByteArray(record.data);
   return nfcRecord;
@@ -74,8 +59,7 @@ function toByteArray(data) {
 // TODO: Use different getters to get received record data,
 // see spec changes at https://github.com/w3c/web-nfc/pull/243
 function compareNDEFRecords(providedRecord, receivedRecord) {
-  assert_equals(toMojoNDEFRecordType(providedRecord.recordType),
-                receivedRecord.recordType);
+  assert_equals(providedRecord.recordType, receivedRecord.recordType);
 
   // Compare media types without charset.
   // Charset should be compared when watch method is implemented, in order
@@ -83,8 +67,7 @@ function compareNDEFRecords(providedRecord, receivedRecord) {
   assert_equals(providedRecord.mediaType,
       receivedRecord.mediaType.substring(0, providedRecord.mediaType.length));
 
-  assert_false(toMojoNDEFRecordType(providedRecord.recordType) ==
-              device.mojom.NDEFRecordType.EMPTY);
+  assert_not_equals(providedRecord.recordType, 'empty');
 
   assert_array_equals(toByteArray(providedRecord.data),
                       new Uint8Array(receivedRecord.data));
@@ -140,8 +123,7 @@ function assertNFCReaderOptionsEqual(provided, received) {
 
   if (provided.recordType !== undefined) {
     assert_equals(!+received.record_filter, true);
-    assert_equals(toMojoNDEFRecordType(provided.recordType),
-        received.recordFilter.recordType);
+    assert_equals(provided.recordType, received.recordFilter.recordType);
   }
 }
 
@@ -169,9 +151,8 @@ function matchesWatchOptions(message, compatibility, options) {
         && options.mediaType !== record.mediaType) {
       return false;
     }
-    if (options.recordFilter != null
-        && options.recordFilter.recordType
-            !== toMojoNDEFRecordType(record.recordType)) {
+    if (options.recordFilter != null &&
+        options.recordFilter.recordType !== record.recordType) {
       return false;
     }
   }
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
index 73dda0920f1..894e2a24f65 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webxr-test.js
@@ -45,12 +45,9 @@ function getMatrixFromTransform(transform) {
           m14, m24, m34, 1];
 }
 
-function getGFXTransformFromPosition(x, y, z) {
+function composeGFXTransform(fakeTransformInit) {
   let transform = new gfx.mojom.Transform();
-  transform.matrix = getMatrixFromTransform({
-    position: [x, y, z],
-    orientation: [0, 0, 0, 1]
-  });
+  transform.matrix = getMatrixFromTransform(fakeTransformInit);
   return transform;
 }
 
@@ -378,7 +375,10 @@ class MockRuntime {
           leftDegrees: 50.899,
           rightDegrees: 35.197
         },
-        headFromEye: getGFXTransformFromPosition(-0.032, 0, 0),
+        headFromEye: composeGFXTransform({
+          position: [-0.032, 0, 0],
+          orientation: [0, 0, 0, 1]
+        }),
         renderWidth: 20,
         renderHeight: 20
       },
@@ -389,7 +389,10 @@ class MockRuntime {
           leftDegrees: 50.899,
           rightDegrees: 35.197
         },
-        headFromEye: getGFXTransformFromPosition(0.032, 0, 0),
+        headFromEye: composeGFXTransform({
+          position: [0.032, 0, 0],
+          orientation: [0, 0, 0, 1]
+        }),
         renderWidth: 20,
         renderHeight: 20
       },
@@ -415,8 +418,6 @@ class MockRuntime {
     let upTan = (1 + m[9]) / m[5];
     let downTan = (1 - m[9]) / m[5];
 
-    let offset = fakeXRViewInit.viewOffset.position;
-
     return {
       fieldOfView: {
         upDegrees: toDegrees(upTan),
@@ -424,7 +425,7 @@ class MockRuntime {
         leftDegrees: toDegrees(leftTan),
         rightDegrees: toDegrees(rightTan)
       },
-      headFromEye: getGFXTransformFromPosition(offset[0], offset[1], offset[2]),
+      headFromEye: composeGFXTransform(fakeXRViewInit.viewOffset),
       renderWidth: fakeXRViewInit.resolution.width,
       renderHeight: fakeXRViewInit.resolution.height
     };
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html
index fa229dd032f..bc513126ae6 100644
--- a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment-target.html
@@ -1,9 +1,23 @@
 <!doctype html>
 <title>Navigating to a text fragment anchor</title>
 <script>
+function isInView(element) {
+  return (element.offsetTop >= window.scrollY) &&
+         (element.offsetTop <= (window.scrollY + window.innerHeight));
+}
+
 function checkScroll() {
   let bc = new BroadcastChannel('scroll-to-text-fragment');
-  bc.postMessage({ didScrollToTarget: window.scrollY > 0 });
+
+  var position = 'unknown';
+  if (window.scrollY == 0)
+    position = 'top';
+  else if (isInView(document.getElementById('element')))
+    position = 'element';
+  else if (isInView(document.getElementById('text')))
+    position = 'text';
+
+  bc.postMessage({ scrollPosition: position });
   bc.close();
   window.close();
 }
@@ -21,7 +35,7 @@ function checkScroll() {
     top: 2000px;
   }
 </style>
-<body onload="checkScroll()">
+<body onload="window.requestAnimationFrame(checkScroll)">
   <div id="element">Element</div>
   <p id="text">This is a test page</p>
 </body>
diff --git a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html
index db1b1ded306..3e3cfcbbb5b 100644
--- a/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html
+++ b/tests/wpt/web-platform-tests/scroll-to-text-fragment/scroll-to-text-fragment.html
@@ -7,33 +7,38 @@
 <script src="/resources/testdriver-vendor.js"></script>
 <script>
 let test_cases = [
-  { fragment: '#', expect_scroll: false },
-  { fragment: '##targetText=test', expect_scroll: true },
-  { fragment: '##targetText=this,page', expect_scroll: true },
-  { fragment: '##targetText=this-,is,test', expect_scroll: true },
-  { fragment: '##targetText=this-,is,test,-page', expect_scroll: true },
-  { fragment: '##targetText=this-,is,page,-none', expect_scroll: false },
-  { fragment: '##targetText=this,test,-page', expect_scroll: true },
-  { fragment: '##targetText=this%20is%20a%20test%20page', expect_scroll: true },
-  { fragment: '##targetText=this&targetText=test,page', expect_scroll: true },
-  { fragment: '#pagestate##targetText=test', expect_scroll: true },
-  { fragment: '#pagestate##targetText=nomatch', expect_scroll: false },
-  { fragment: '#element##targetText=nomatch', expect_scroll: true },
+  { fragment: '#', expect_position: 'top' },
+  { fragment: '##targetText=test', expect_position: 'text' },
+  { fragment: '##targetText=this,page', expect_position: 'text' },
+  { fragment: '##targetText=this-,is,test', expect_position: 'text' },
+  { fragment: '##targetText=this-,is,test,-page', expect_position: 'text' },
+  { fragment: '##targetText=this-,is,page,-none', expect_position: 'top' },
+  { fragment: '##targetText=this,test,-page', expect_position: 'text' },
+  { fragment: '##targetText=this%20is%20a%20test%20page', expect_position: 'text' },
+  { fragment: '##targetText=this&targetText=test,page', expect_position: 'text' },
+  { fragment: '#pagestate##targetText=test', expect_position: 'text' },
+  { fragment: '#pagestate##targetText=nomatch', expect_position: 'top' },
+  { fragment: '#element##targetText=nomatch', expect_position: 'element' },
+  { fragment: '#element##directive', expect_position: 'element' },
 ];
 
+test(t => {
+  assert_equals(typeof(window.location.selector), 'object', 'window.location.selector is defined');
+}, 'Scroll to text is feature detectable via window.location.selector');
+
 for (const test_case of test_cases) {
   promise_test(t => new Promise(resolve => {
     let channel = new BroadcastChannel('scroll-to-text-fragment');
     channel.addEventListener("message", e => {
-      resolve(e.data.didScrollToTarget);
+      resolve(e.data.scrollPosition);
     }, {once: true});
 
     test_driver.bless('Open a URL with a text fragment anchor', () => {
       window.open('scroll-to-text-fragment-target.html' + test_case.fragment, '_blank', 'noopener');
     });
-  }).then(scroll => {
-    assert_equals(scroll, test_case.expect_scroll,
-                  'Expected ' + test_case.fragment + (test_case.expect_scroll ? ' to scroll.' : ' to not scroll.'));
+  }).then(scrollPosition => {
+    assert_equals(scrollPosition, test_case.expect_position,
+                  'Expected ' + test_case.fragment + ' to scroll to ' + test_case.expect_position);
   }), 'Test navigation with text fragment anchor ' + test_case.fragment);
 }
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-frozen.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-frozen.https.html
index ef27ac3d372..479c28a60f2 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-frozen.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-frozen.https.html
@@ -48,19 +48,6 @@ promise_test(function(t) {
                   {port:channel.port2, includeLifecycleState: true}, [channel.port2]);
             });
         })
-      .then(function(e) {
-          assert_equals(e.data.length, 1);
-          assert_object_equals(e.data[0], expected_window_2);
-        })
-      .then(function() {
-          var channel = new MessageChannel();
-
-          return new Promise(function(resolve) {
-              channel.port1.onmessage = resolve;
-              windows[1].navigator.serviceWorker.controller.postMessage(
-                  {port:channel.port2, options: {lifecycleState: "all"}, includeLifecycleState: true}, [channel.port2]);
-            });
-        })
       .then(function(e) {
           assert_equals(e.data.length, 2);
           // No specific order is required, so support inversion.
@@ -71,32 +58,6 @@ promise_test(function(t) {
             assert_object_equals(e.data[0], expected_window_1);
             assert_object_equals(e.data[1], expected_window_2);
           }
-        })
-      .then(function() {
-          var channel = new MessageChannel();
-
-          return new Promise(function(resolve) {
-              channel.port1.onmessage = resolve;
-              windows[1].navigator.serviceWorker.controller.postMessage(
-                  {port:channel.port2, options: {lifecycleState: "frozen"}, includeLifecycleState: true}, [channel.port2]);
-            });
-        })
-      .then(function(e) {
-          assert_equals(e.data.length, 1);
-          assert_object_equals(e.data[0], expected_window_1);
-        })
-      .then(function() {
-          var channel = new MessageChannel();
-
-          return new Promise(function(resolve) {
-              channel.port1.onmessage = resolve;
-              windows[1].navigator.serviceWorker.controller.postMessage(
-                  {port:channel.port2, options: {lifecycleState: "active"}, includeLifecycleState: true}, [channel.port2]);
-            });
-        })
-      .then(function(e) {
-          assert_equals(e.data.length, 1);
-          assert_object_equals(e.data[0], expected_window_2);
       });
 }, 'Test Clients.matchAll()');
 
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html
index f0502cac727..2a366087cd3 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing.sub.https.html
@@ -98,14 +98,12 @@ promise_test(function(t) {
               resource: 'resources/missing.jpg',
               mode: 'same-origin',
               description: 'Network fallback load failure',
-              should_no_performance_entry: true,
           });
           verify({
               performance: performance,
               resource: 'resources/missing.jpg',
               mode: 'cross-origin',
               description: 'Network fallback cross-origin load failure',
-              should_no_performance_entry: true,
           });
           // Tests for respondWith(fetch()).
           verify({
diff --git a/tests/wpt/web-platform-tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html b/tests/wpt/web-platform-tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html
index 83cbc3d8185..6893ad394b4 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/DocumentOrShadowRoot-prototype-elementFromPoint.html
@@ -250,7 +250,30 @@ test(function () {
 
 container.innerHTML = '';
 
-    </script>
-  </body>
+test(function(t) {
+  const container = document.createElement("div");
+  const span = document.createElement("span");
+  span.innerText = "foo";
+  document.body.appendChild(container);
+  container.appendChild(span);
+
+  let elements = document.elementsFromPoint(...pointInElement(span));
+  assert_equals(elements.length, 4);
+  assert_equals(elements[0], span);
+  assert_equals(elements[1], container);
+  assert_equals(elements[2].nodeName, 'BODY');
+  assert_equals(elements[3].nodeName, 'HTML');
+
+  const host = document.createElement("div");
+  const shadowRoot = host.attachShadow({ mode: "open" });
+  elements = shadowRoot.elementsFromPoint(...pointInElement(span));
+  assert_equals(elements.length, 4);
+  assert_equals(elements[0], span);
+  assert_equals(elements[1], container);
+  assert_equals(elements[2].nodeName, 'BODY');
+  assert_equals(elements[3].nodeName, 'HTML');
+}, "elementsFromPoint should return all elements under a point, even when context object is not connected");
+</script>
+</body>
 </html>
 
diff --git a/tests/wpt/web-platform-tests/tools/ci/run_tc.py b/tests/wpt/web-platform-tests/tools/ci/run_tc.py
index e54f431955a..ea4a1ac1a6a 100755
--- a/tests/wpt/web-platform-tests/tools/ci/run_tc.py
+++ b/tests/wpt/web-platform-tests/tools/ci/run_tc.py
@@ -48,6 +48,9 @@ except ImportError:
     from urllib.request import urlopen
 
 
+QUEUE_BASE = "https://queue.taskcluster.net/v1/task"
+
+
 root = os.path.abspath(
     os.path.join(os.path.dirname(__file__),
                  os.pardir,
@@ -245,14 +248,29 @@ def setup_repository():
         run(["git", "fetch", "--quiet", "origin", "%s:%s" % (branch, branch)])
 
 
+def fetch_event_data():
+    try:
+        task_id = os.environ["TASK_ID"]
+    except KeyError:
+        print("WARNING: Missing TASK_ID environment variable")
+        # For example under local testing
+        return None
+
+    resp = urlopen("%s/%s" % (QUEUE_BASE, task_id))
+
+    task_data = json.load(resp)
+    event_data = task_data.get("extra", {}).get("github_event")
+    if event_data is not None:
+        return json.loads(event_data)
+
+
 def main():
     args = get_parser().parse_args()
-    try:
+
+    if "TASK_EVENT" in os.environ:
         event = json.loads(os.environ["TASK_EVENT"])
-    except KeyError:
-        print("WARNING: Missing TASK_EVENT environment variable")
-        # For example under local testing
-        event = {}
+    else:
+        event = fetch_event_data()
 
     if event:
         set_variables(event)
diff --git a/tests/wpt/web-platform-tests/tools/manifest/item.py b/tests/wpt/web-platform-tests/tools/manifest/item.py
index ea0c9b1742c..9619813fc9b 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/item.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/item.py
@@ -329,12 +329,6 @@ class VisualTest(URLManifestItem):
     item_type = "visual"
 
 
-class Stub(URLManifestItem):
-    __slots__ = ()
-
-    item_type = "stub"
-
-
 class WebDriverSpecTest(URLManifestItem):
     __slots__ = ()
 
diff --git a/tests/wpt/web-platform-tests/tools/manifest/manifest.py b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
index 616f95eb2c6..8aace771cba 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/manifest.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/manifest.py
@@ -5,7 +5,7 @@ from collections import MutableMapping, defaultdict
 from six import iteritems, iterkeys, itervalues, string_types, binary_type, text_type
 
 from . import vcs
-from .item import (ConformanceCheckerTest, ManifestItem, ManualTest, RefTest, RefTestNode, Stub,
+from .item import (ConformanceCheckerTest, ManifestItem, ManualTest, RefTest, RefTestNode,
                    SupportFile, TestharnessTest, VisualTest, WebDriverSpecTest)
 from .log import get_logger
 from .sourcefile import SourceFile
@@ -51,7 +51,6 @@ item_classes = {"testharness": TestharnessTest,
                 "reftest": RefTest,
                 "reftest_node": RefTestNode,
                 "manual": ManualTest,
-                "stub": Stub,
                 "wdspec": WebDriverSpecTest,
                 "conformancechecker": ConformanceCheckerTest,
                 "visual": VisualTest,
@@ -471,6 +470,14 @@ class Manifest(object):
         self._path_hash = {to_os_path(k): v for k, v in iteritems(obj["paths"])}
 
         for test_type, type_paths in iteritems(obj["items"]):
+            # Drop "stub" items, which are no longer supported but may be
+            # present when doing an incremental manifest update.
+            # See https://github.com/web-platform-tests/rfcs/pull/27 for background.
+            #
+            # TODO(MANIFESTv7): remove this condition
+            if test_type == "stub":
+                continue
+
             if test_type not in item_classes:
                 raise ManifestError
 
diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
index 54cd3b74488..4788fc9bdb6 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
@@ -33,7 +33,7 @@ except ImportError:
 import html5lib
 
 from . import XMLParser
-from .item import (ManifestItem, Stub, ManualTest, WebDriverSpecTest, RefTestNode, TestharnessTest,
+from .item import (ManifestItem, ManualTest, WebDriverSpecTest, RefTestNode, TestharnessTest,
                    SupportFile, ConformanceCheckerTest, VisualTest)
 from .utils import ContextManagerBytesIO, cached_property
 
@@ -352,13 +352,6 @@ class SourceFile(object):
         # type: () -> bool
         return self.in_conformance_checker_dir()
 
-    @property
-    def name_is_stub(self):
-        # type: () -> bool
-        """Check if the file name matches the conditions for the file to
-        be a stub file"""
-        return self.name_prefix("stub-")
-
     @property
     def name_is_manual(self):
         # type: () -> bool
@@ -793,15 +786,6 @@ class SourceFile(object):
                     self.rel_path
                 )]  # type: Tuple[Text, List[ManifestItem]]
 
-        elif self.name_is_stub:
-            rv = Stub.item_type, [
-                Stub(
-                    self.tests_root,
-                    self.rel_path,
-                    self.url_base,
-                    self.rel_url
-                )]
-
         elif self.name_is_manual:
             rv = ManualTest.item_type, [
                 ManualTest(
diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py b/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
index 5717173b3f2..8e008be0911 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/tests/test_manifest.py
@@ -50,7 +50,7 @@ def rel_dir_file_path(draw):
 @hs.composite
 def sourcefile_strategy(draw):
     item_classes = [item.TestharnessTest, item.RefTestNode,
-                    item.ManualTest, item.Stub, item.WebDriverSpecTest,
+                    item.ManualTest, item.WebDriverSpecTest,
                     item.ConformanceCheckerTest, item.SupportFile]
     cls = draw(hs.sampled_from(item_classes))
 
diff --git a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
index 54255720160..0bddd7b1373 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -114,17 +114,17 @@ class ActionSequence(object):
         """Perform all queued actions."""
         self.session.actions.perform([self.dict])
 
-    def _key_action(self, subtype, value, async_dispatch=False):
-        self._actions.append({"type": subtype, "value": value, "asyncDispatch": async_dispatch})
+    def _key_action(self, subtype, value):
+        self._actions.append({"type": subtype, "value": value})
 
-    def _pointer_action(self, subtype, button, async_dispatch=False):
-        self._actions.append({"type": subtype, "button": button, "asyncDispatch": async_dispatch})
+    def _pointer_action(self, subtype, button):
+        self._actions.append({"type": subtype, "button": button})
 
     def pause(self, duration):
         self._actions.append({"type": "pause", "duration": duration})
         return self
 
-    def pointer_move(self, x, y, duration=None, origin=None, async_dispatch=False):
+    def pointer_move(self, x, y, duration=None, origin=None):
         """Queue a pointerMove action.
 
         :param x: Destination x-axis coordinate of pointer in CSS pixels.
@@ -143,29 +143,28 @@ class ActionSequence(object):
             action["duration"] = duration
         if origin is not None:
             action["origin"] = origin
-        action["asyncDispatch"] = async_dispatch
         self._actions.append(action)
         return self
 
-    def pointer_up(self, button=0, async_dispatch=False):
+    def pointer_up(self, button=0):
         """Queue a pointerUp action for `button`.
 
         :param button: Pointer button to perform action with.
                        Default: 0, which represents main device button.
         """
-        self._pointer_action("pointerUp", button, async_dispatch)
+        self._pointer_action("pointerUp", button)
         return self
 
-    def pointer_down(self, button=0, async_dispatch=False):
+    def pointer_down(self, button=0):
         """Queue a pointerDown action for `button`.
 
         :param button: Pointer button to perform action with.
                        Default: 0, which represents main device button.
         """
-        self._pointer_action("pointerDown", button, async_dispatch)
+        self._pointer_action("pointerDown", button)
         return self
 
-    def click(self, element=None, button=0, async_dispatch=False):
+    def click(self, element=None, button=0):
         """Queue a click with the specified button.
 
         If an element is given, move the pointer to that element first,
@@ -176,33 +175,33 @@ class ActionSequence(object):
                        with. Default: 0, which represents main device button.
         """
         if element:
-            self.pointer_move(0, 0, origin=element, async_dispatch=async_dispatch)
-        return self.pointer_down(button, async_dispatch).pointer_up(button, async_dispatch)
+            self.pointer_move(0, 0, origin=element)
+        return self.pointer_down(button).pointer_up(button)
 
-    def key_up(self, value, async_dispatch=False):
+    def key_up(self, value):
         """Queue a keyUp action for `value`.
 
         :param value: Character to perform key action with.
         """
-        self._key_action("keyUp", value, async_dispatch)
+        self._key_action("keyUp", value)
         return self
 
-    def key_down(self, value, async_dispatch=False):
+    def key_down(self, value):
         """Queue a keyDown action for `value`.
 
         :param value: Character to perform key action with.
         """
-        self._key_action("keyDown", value, async_dispatch)
+        self._key_action("keyDown", value)
         return self
 
-    def send_keys(self, keys, async_dispatch=False):
+    def send_keys(self, keys):
         """Queue a keyDown and keyUp action for each character in `keys`.
 
         :param keys: String of keys to perform key actions with.
         """
         for c in keys:
-            self.key_down(c, async_dispatch)
-            self.key_up(c, async_dispatch)
+            self.key_down(c)
+            self.key_up(c)
         return self
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/android.py b/tests/wpt/web-platform-tests/tools/wpt/android.py
index 1dc057ff502..51deb71e316 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/android.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/android.py
@@ -58,7 +58,7 @@ def install_sdk(logger, dest=None):
 
     os_name = platform.system().lower()
     if os_name not in ["darwin", "linux", "windows"]:
-        logger.error("Unsupported platform %s" % os_name)
+        logger.critical("Unsupported platform %s" % os_name)
         raise NotImplementedError
 
     os_name = 'darwin' if os_name == 'macosx' else os_name
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 0bccc687b7c..b52137ec9fa 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -67,7 +67,7 @@ def create_parser():
 
 def exit(msg=None):
     if msg:
-        logger.error(msg)
+        logger.critical(msg)
         sys.exit(1)
     else:
         sys.exit(0)
diff --git a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
index b5a0e645739..cf12a59c8e6 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
@@ -53,8 +53,8 @@ def get_git_cmd(repo_path):
             logger.debug(" ".join(full_cmd))
             return subprocess.check_output(full_cmd, cwd=repo_path).decode("utf8").strip()
         except subprocess.CalledProcessError as e:
-            logger.error("Git command exited with status %i" % e.returncode)
-            logger.error(e.output)
+            logger.critical("Git command exited with status %i" % e.returncode)
+            logger.critical(e.output)
             sys.exit(1)
     return git
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
index ca6165f7ad0..c614cbaa888 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/metadata.py
@@ -454,7 +454,7 @@ def create_test_tree(metadata_path, test_manifest):
     """
     do_delayed_imports()
     id_test_map = {}
-    exclude_types = frozenset(["stub", "manual", "support", "conformancechecker"])
+    exclude_types = frozenset(["manual", "support", "conformancechecker"])
     all_types = set(manifestitem.item_types.keys())
     assert all_types > exclude_types
     include_types = all_types - exclude_types
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index c6dbd70f1bf..5c0c60a07a9 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -473,7 +473,7 @@ class TestRunnerManager(threading.Thread):
     def init(self):
         assert isinstance(self.state, RunnerManagerState.initializing)
         if self.state.failure_count > self.max_restarts:
-            self.logger.error("Max restarts exceeded")
+            self.logger.critical("Max restarts exceeded")
             return RunnerManagerState.error()
 
         self.browser.update_settings(self.state.test)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py
index 3860ba6f36d..b6a564216cc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_update.py
@@ -31,7 +31,6 @@ item_classes = {"testharness": manifest_item.TestharnessTest,
                 "reftest": manifest_item.RefTest,
                 "reftest_node": manifest_item.RefTestNode,
                 "manual": manifest_item.ManualTest,
-                "stub": manifest_item.Stub,
                 "wdspec": manifest_item.WebDriverSpecTest,
                 "conformancechecker": manifest_item.ConformanceCheckerTest,
                 "visual": manifest_item.VisualTest,
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/update.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/update.py
index c4f1e7e93ec..96302ee267e 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/update.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/update.py
@@ -164,7 +164,7 @@ class WPTUpdate(object):
             return exit_clean
 
         if not self.kwargs["continue"] and not self.state.is_empty():
-            self.logger.error("Found existing state. Run with --continue to resume or --abort to clear state")
+            self.logger.critical("Found existing state. Run with --continue to resume or --abort to clear state")
             return exit_unclean
 
         if self.kwargs["continue"]:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
index 6b4e70b3046..8dcdcdebe15 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -169,10 +169,10 @@ def run_tests(config, test_paths, product, **kwargs):
         unexpected_total = 0
 
         if len(test_loader.test_ids) == 0 and kwargs["test_list"]:
-            logger.error("Unable to find any tests at the path(s):")
+            logger.critical("Unable to find any tests at the path(s):")
             for path in kwargs["test_list"]:
-                logger.error("  %s" % path)
-            logger.error("Please check spelling and make sure there are tests in the specified path(s).")
+                logger.critical("  %s" % path)
+            logger.critical("Please check spelling and make sure there are tests in the specified path(s).")
             return False
         kwargs["pause_after_test"] = get_pause_after_test(test_loader, **kwargs)
 
@@ -302,7 +302,7 @@ def run_tests(config, test_paths, product, **kwargs):
                 logger.info("No tests ran")
                 return True
             else:
-                logger.error("No tests ran")
+                logger.critical("No tests ran")
                 return False
 
     if unexpected_total and not kwargs["fail_on_unexpected"]:
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
index e58b4acd719..c037732a6ba 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
@@ -676,7 +676,7 @@ class WebTestHttpd(object):
 
             _host, self.port = self.httpd.socket.getsockname()
         except Exception:
-            self.logger.error("Failed to start HTTP server. {}".format(EDIT_HOSTS_HELP))
+            self.logger.critical("Failed to start HTTP server. {}".format(EDIT_HOSTS_HELP))
             raise
 
     def start(self, block=False):
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html
index cd4f5827c53..f7d7132505f 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-eval.tentative.html
@@ -21,9 +21,7 @@
 
   test(t => {
     let a = 0;
-    assert_throws(new EvalError(), _ => {
-      eval(p.createScript('a="Hello transformed string"'));
-    });
+    eval(p.createScript('a="Hello transformed string"'));
     assert_equals(a, 0);
   }, "eval with TrustedScript throws (script-src blocks).");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html b/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html
index aa13e4252c4..1170655c5f5 100644
--- a/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/default-policy-report-only.tentative.html
@@ -7,26 +7,6 @@
 </head>
 <body>
 <script>
-
-// We expect to run this test in two instances, enforcing and report-only
-// Trusted Type policies. We'll infer from our URL which one we are.
-//
-// The expected file names/headers are:
-// - default-policy.tentative.html:
-//     Content-Security-Policy: trusted-types *
-// - default-policy-report-only.tentative.html:
-//    Content-Security-Policy-Report-Only: trusted-types *
-//
-// The behaviour of the tests should be _mostly_ identical, except that
-// Trusted Types relevant assignments should only throw in the enforced
-// case. We will use assert_throws for things that should always throw
-// (i.e., regular exceptions), and maybe_throws for tests that should only
-// throw in TT-enforcing mode.
-const is_report_only = document.location.pathname.includes("report-only");
-const maybe_throws = (is_report_only
-  ? (error, fn, message) => fn()
-  : assert_throws);
-
 // Ensure that only the right events trigger violation reports.
 // The Promise will resolve, when an event including the string "done" is
 // received. The last line of this test file will cause this trigger.
@@ -69,7 +49,8 @@ const testCases = [
 testCases.forEach(c => {
   test(t => {
     const element = document.createElement(c[0]);
-    maybe_throws(TypeError(), _ => element[c[1]] = "nodefault");
+    element[c[1]] = "nodefault";
+    assert_true(element[c[1]].includes("nodefault"));
   }, `${c[0]}.${c[1]} no default policy`);
 });
 
@@ -105,7 +86,8 @@ testCases.forEach(c => {
   }, name + "default");
   test(t => {
     const element = document.createElement(c[0]);
-    maybe_throws(TypeError(), _ => element[c[1]] = "null");
+    element[c[1]] = "null";
+    assert_true(element[c[1]].includes("null"));
   }, name + "null");
   test(t => {
     const element = document.createElement(c[0]);
@@ -113,7 +95,8 @@ testCases.forEach(c => {
   }, name + "throw");
   test(t => {
     const element = document.createElement(c[0]);
-    maybe_throws(TypeError(), _ => element[c[1]] = "undefined");
+    element[c[1]] = "undefined";
+    assert_true(element[c[1]].includes("undefined"));
   }, name + "undefined");
   test(t => {
     const element = document.createElement(c[0]);
diff --git a/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html b/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html
index aa13e4252c4..68e05c1305b 100644
--- a/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/default-policy.tentative.html
@@ -7,26 +7,6 @@
 </head>
 <body>
 <script>
-
-// We expect to run this test in two instances, enforcing and report-only
-// Trusted Type policies. We'll infer from our URL which one we are.
-//
-// The expected file names/headers are:
-// - default-policy.tentative.html:
-//     Content-Security-Policy: trusted-types *
-// - default-policy-report-only.tentative.html:
-//    Content-Security-Policy-Report-Only: trusted-types *
-//
-// The behaviour of the tests should be _mostly_ identical, except that
-// Trusted Types relevant assignments should only throw in the enforced
-// case. We will use assert_throws for things that should always throw
-// (i.e., regular exceptions), and maybe_throws for tests that should only
-// throw in TT-enforcing mode.
-const is_report_only = document.location.pathname.includes("report-only");
-const maybe_throws = (is_report_only
-  ? (error, fn, message) => fn()
-  : assert_throws);
-
 // Ensure that only the right events trigger violation reports.
 // The Promise will resolve, when an event including the string "done" is
 // received. The last line of this test file will cause this trigger.
@@ -69,7 +49,8 @@ const testCases = [
 testCases.forEach(c => {
   test(t => {
     const element = document.createElement(c[0]);
-    maybe_throws(TypeError(), _ => element[c[1]] = "nodefault");
+    assert_throws(TypeError(), _ => element[c[1]] = "nodefault");
+    assert_equals(element[c[1]], "");
   }, `${c[0]}.${c[1]} no default policy`);
 });
 
@@ -105,7 +86,8 @@ testCases.forEach(c => {
   }, name + "default");
   test(t => {
     const element = document.createElement(c[0]);
-    maybe_throws(TypeError(), _ => element[c[1]] = "null");
+    assert_throws(TypeError(), _ => element[c[1]] = "null");
+    assert_equals(element[c[1]], "");
   }, name + "null");
   test(t => {
     const element = document.createElement(c[0]);
@@ -113,7 +95,8 @@ testCases.forEach(c => {
   }, name + "throw");
   test(t => {
     const element = document.createElement(c[0]);
-    maybe_throws(TypeError(), _ => element[c[1]] = "undefined");
+    assert_throws(TypeError(), _ => element[c[1]] = "undefined");
+    assert_equals(element[c[1]], "");
   }, name + "undefined");
   test(t => {
     const element = document.createElement(c[0]);
diff --git a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html
index f60bb9fe514..dc865361750 100644
--- a/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html
+++ b/tests/wpt/web-platform-tests/trusted-types/trusted-types-eval-reporting-no-unsafe-eval.tentative.https.html
@@ -89,7 +89,6 @@
         .then(promise_violation("script-src"))
         .then(promise_flush());
     expect_throws(_ => eval('script_run_beacon="should not run"'));
-    // TODO(ssanfilippo) This should throw, but doesn't yet. See crbug.com/992424.
     eval(scriptyPolicy.createScript('script_run_beacon="i ran"'));
     flush();
     assert_not_equals(script_run_beacon, 'i ran'); // Code did not run.
diff --git a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/canceling-an-animation.html b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/canceling-an-animation.html
index b0ef0b1bf96..b2a7a33e6e6 100644
--- a/tests/wpt/web-platform-tests/web-animations/timing-model/animations/canceling-an-animation.html
+++ b/tests/wpt/web-platform-tests/web-animations/timing-model/animations/canceling-an-animation.html
@@ -66,6 +66,7 @@ test(t => {
   const promise = animation.ready;
   animation.cancel();
   assert_not_equals(animation.ready, promise);
+  promise_rejects(t, 'AbortError', promise, 'Cancel should abort ready promise');
 }, 'The ready promise should be replaced when the animation is canceled');
 
 promise_test(t => {
diff --git a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
index 9ce41a40321..aa3de01509c 100644
--- a/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/NDEFRecord_constructor.https.html
@@ -13,9 +13,25 @@
 
   test(() => {
     assert_throws(new TypeError, () => new NDEFRecord(null),
-        "The record has neither type nor data.");
+        'The record has neither type nor data.');
   }, 'NDEFRecord constructor with null init dict');
 
+  test(() => {
+    const record = new NDEFRecord(createTextRecord(test_text_data));
+    assert_equals(record.recordType, 'text', 'recordType');
+    assert_equals(record.mediaType, 'text/plain', 'mediaType');
+    assert_equals(record.toText(), test_text_data,
+        'toText() has the same content with the original dictionary');
+  }, 'NDEFRecord constructor with text record type');
+
+  test(() => {
+    const record = new NDEFRecord(createUrlRecord(test_url_data));
+    assert_equals(record.recordType, 'url', 'recordType');
+    assert_equals(record.mediaType, 'text/plain', 'mediaType');
+    assert_equals(record.toText(), test_url_data,
+        'toText() has the same content with the original dictionary');
+  }, 'NDEFRecord constructor with url record type');
+
   test(() => {
     let buffer = new ArrayBuffer(4);
     let buffer_view = new Uint8Array(buffer);
@@ -68,4 +84,19 @@
         'toJSON() has the same content with the original dictionary');
   }, 'NDEFRecord constructor with json data');
 
+  test(() => {
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('EMptY')),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('TeXt', '', test_text_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('uRL', '', test_url_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('jSoN', '', test_json_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('OpaQUE', '', test_buffer_data)),
+        'Unknown record type.');
+    assert_throws(new TypeError, () => new NDEFRecord(createRecord('sMart-PosTER', '', test_url_data)),
+        'Unknown record type.');
+  }, 'NDEFRecord constructor with record type string being treated as case sensitive');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js b/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js
index c19458aed83..869433d2ff5 100644
--- a/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js
+++ b/tests/wpt/web-platform-tests/web-nfc/idlharness.https.window.js
@@ -4,13 +4,17 @@
 'use strict';
 
 // https://w3c.github.io/web-nfc/
+
+const record = {
+  recordType: "text",
+  mediaType: "text/plain",
+  data: "Hello World",
+  id: "/custom/path"
+};
 const message = {
   url: "/custom/path",
-  records: [{
-    recordType: "text",
-    data: "Hello World"
-  }]
-}
+  records: [record]
+};
 
 idl_test(
   ['web-nfc'],
@@ -19,6 +23,8 @@ idl_test(
     idl_array.add_objects({
       NFCWriter: ['new NFCWriter();'],
       NFCReader: ['new NFCReader();'],
+      NDEFRecord: [`new NDEFRecord(${JSON.stringify(record)});`],
+      NDEFMessage: [`new NDEFMessage(${JSON.stringify(message)});`],
       NFCReadingEvent: [`new NFCReadingEvent("reading", { message: ${JSON.stringify(message)} })`],
       NFCErrorEvent: ['new NFCErrorEvent("error", { error: new DOMException() });'],
     });
diff --git a/tests/wpt/web-platform-tests/web-share/canShare-files.https.html b/tests/wpt/web-platform-tests/web-share/canShare-files.tentative.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/canShare-files.https.html
rename to tests/wpt/web-platform-tests/web-share/canShare-files.tentative.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/canShare-insecure.http.html b/tests/wpt/web-platform-tests/web-share/canShare-insecure.tentative.http.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/canShare-insecure.http.html
rename to tests/wpt/web-platform-tests/web-share/canShare-insecure.tentative.http.html
diff --git a/tests/wpt/web-platform-tests/web-share/canShare.https.html b/tests/wpt/web-platform-tests/web-share/canShare.tentative.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/canShare.https.html
rename to tests/wpt/web-platform-tests/web-share/canShare.tentative.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-cancel-manual.html b/tests/wpt/web-platform-tests/web-share/share-cancel-manual.https.html
similarity index 91%
rename from tests/wpt/web-platform-tests/web-share/share-cancel-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-cancel-manual.https.html
index b523fb5c221..b078a74251c 100644
--- a/tests/wpt/web-platform-tests/web-share/share-cancel-manual.html
+++ b/tests/wpt/web-platform-tests/web-share/share-cancel-manual.https.html
@@ -17,7 +17,7 @@
           return callWhenButtonClicked(() => promise_rejects(
               t, 'AbortError',
               navigator.share({title: 'the title', text: 'the message',
-                               url: 'data:the url'})));
+                               url: 'https://example.com'})));
         }, 'share with user cancellation');
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.html b/tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.https.html
similarity index 75%
rename from tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.https.html
index 29e7a564544..47ef7fa1158 100644
--- a/tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.html
+++ b/tests/wpt/web-platform-tests/web-share/share-extra-argument-manual.https.html
@@ -12,9 +12,9 @@
         setup({explicit_timeout: true});
 
         setupManualShareTest(
-            {title: 'the title', text: 'the message', url: 'data:the url'});
+            {title: 'the title', text: 'the message', url: 'https://example.com'});
         callWhenButtonClicked(() => navigator.share(
-              {title: 'the title', text: 'the message', url: 'data:the url'},
+              {title: 'the title', text: 'the message', url: 'https://example.com'},
               'more than required'));
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/web-share/share-extra-field-manual.html b/tests/wpt/web-platform-tests/web-share/share-extra-field-manual.https.html
similarity index 75%
rename from tests/wpt/web-platform-tests/web-share/share-extra-field-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-extra-field-manual.https.html
index d601c7df7ab..8b479bb02b9 100644
--- a/tests/wpt/web-platform-tests/web-share/share-extra-field-manual.html
+++ b/tests/wpt/web-platform-tests/web-share/share-extra-field-manual.https.html
@@ -12,9 +12,9 @@
         setup({explicit_timeout: true});
 
         setupManualShareTest(
-            {title: 'the title', text: 'the message', url: 'data:the url'});
+            {title: 'the title', text: 'the message', url: 'https://example.com'});
         callWhenButtonClicked(() => navigator.share(
-              {title: 'the title', text: 'the message', url: 'data:the url',
+              {title: 'the title', text: 'the message', url: 'https://example.com',
                unused: 'unexpected field'}));
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/web-share/share-files-manual.html b/tests/wpt/web-platform-tests/web-share/share-files-manual.tentative.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-files-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-files-manual.tentative.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-image-manual.html b/tests/wpt/web-platform-tests/web-share/share-image-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-image-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-image-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-non-string-manual.html b/tests/wpt/web-platform-tests/web-share/share-non-string-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-non-string-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-non-string-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-null-manual.html b/tests/wpt/web-platform-tests/web-share/share-null-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-null-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-null-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-sharePromise-internal-slot.https.html b/tests/wpt/web-platform-tests/web-share/share-sharePromise-internal-slot.https.html
new file mode 100644
index 00000000000..5a71eaa4abf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/web-share/share-sharePromise-internal-slot.https.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8" />
+    <link rel="help" href="https://github.com/w3c/web-share/pull/113" />
+    <title>WebShare Test: only one share at a time</title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/resources/testdriver.js"></script>
+    <script src="/resources/testdriver-vendor.js"></script>
+  </head>
+  <body>
+    <script>
+      promise_test(async t => {
+        const [, promise2, promise3] = await test_driver.bless(
+          "share needs user activation",
+          () => {
+            return [
+              navigator.share({ title: "should be pending" }),
+              navigator.share({ title: "should reject" }),
+              navigator.share({ title: "should also reject" }),
+            ];
+          }
+        );
+        await Promise.all([
+          promise_rejects(t, "InvalidStateError", promise2),
+          promise_rejects(t, "InvalidStateError", promise3),
+        ]);
+      }, "Only allow one share call at a time, which is controlled by the [[sharePromise]] internal slot.");
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/web-share/share-simple-manual.html b/tests/wpt/web-platform-tests/web-share/share-simple-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-simple-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-simple-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-unicode-strings-manual.html b/tests/wpt/web-platform-tests/web-share/share-unicode-strings-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-unicode-strings-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-unicode-strings-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-unicode-strings-nonutf8-manual.html b/tests/wpt/web-platform-tests/web-share/share-unicode-strings-nonutf8-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-unicode-strings-nonutf8-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-unicode-strings-nonutf8-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-data-manual.html b/tests/wpt/web-platform-tests/web-share/share-url-data-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-url-data-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-url-data-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-empty-manual.html b/tests/wpt/web-platform-tests/web-share/share-url-empty-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-url-empty-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-url-empty-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-encoding-manual.html b/tests/wpt/web-platform-tests/web-share/share-url-encoding-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-url-encoding-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-url-encoding-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-noscheme-manual.html b/tests/wpt/web-platform-tests/web-share/share-url-noscheme-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-url-noscheme-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-url-noscheme-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-pathonly-manual.html b/tests/wpt/web-platform-tests/web-share/share-url-pathonly-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-url-pathonly-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-url-pathonly-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-url-relative-manual.html b/tests/wpt/web-platform-tests/web-share/share-url-relative-manual.https.html
similarity index 100%
rename from tests/wpt/web-platform-tests/web-share/share-url-relative-manual.html
rename to tests/wpt/web-platform-tests/web-share/share-url-relative-manual.https.html
diff --git a/tests/wpt/web-platform-tests/web-share/share-without-user-gesture.https.html b/tests/wpt/web-platform-tests/web-share/share-without-user-gesture.https.html
index cf933b8bc7f..48e03b0fc3b 100644
--- a/tests/wpt/web-platform-tests/web-share/share-without-user-gesture.https.html
+++ b/tests/wpt/web-platform-tests/web-share/share-without-user-gesture.https.html
@@ -12,7 +12,7 @@
           return promise_rejects(
               t, 'NotAllowedError',
               navigator.share({title: 'the title', text: 'the message',
-                               url: 'data:the url'}));
+                               url: 'https://example.com'}));
         }, 'share without a user gesture');
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
index fd5fa68e1fc..e7fe576cb20 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffset.https.html
@@ -11,7 +11,7 @@ let testName = "Updating XRReferenceSpace origin offset updates view and input m
 
 const VIEW_OFFSET_WITH_ROTATION = {
   position: [4, 3, 2],
-  orientation: [0, -0.71, 0, 0.71 ]
+  orientation: [0, -0.7071, 0, 0.7071 ]
 };
 
 const VIEWS_WITH_OFFSET = [{
@@ -55,15 +55,15 @@ let testFunction =
 
     const RADIANS_90D = Math.PI / 2;
 
-    const EXPECTED_VIEW_MATRIX_1 = [0, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, -5, -4, -3, 1];
+    const EXPECTED_VIEW_MATRIX_1 = [1, 0, 0, 0, 0, 0, -1, 0, 0, 1, 0, 0, -3, -4, 5, 1];
     const EXPECTED_GRIP_MATRIX_1 = [0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 1, 2, 3, 1];
     const EXPECTED_RAY_MATRIX_1 = [0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, 2, 2, 1, 1];
 
-    const EXPECTED_VIEW_MATRIX_2 = [0, 0, 1, 0, 0, 1, 0, 0, -1, 0, 0, 0, -8, 1, 7, 1];
+    const EXPECTED_VIEW_MATRIX_2 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 7, 1, 8, 1];
     const EXPECTED_GRIP_MATRIX_2 = [0, -1, 0, 0, 0, 0, -1, 0, 1, 0, 0, 0, -9, -2, -5, 1];
     const EXPECTED_RAY_MATRIX_2 = [0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 0, -8, -4, -5, 1];
 
-    const EXPECTED_VIEW_MATRIX_3 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, -8, 3, 12, 1];
+    const EXPECTED_VIEW_MATRIX_3 = [0, 0, -1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 12, 3, 8, 1];
     const EXPECTED_GRIP_MATRIX_3 = [0, -1, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 5, -4, -14, 1];
     const EXPECTED_RAY_MATRIX_3 = [1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 1, 0, 5, -6, -13, 1];
 
diff --git a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
index 5e2bd39d2de..cfa3cc7ca2f 100644
--- a/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
+++ b/tests/wpt/web-platform-tests/webxr/xrReferenceSpace_originOffsetBounded.https.html
@@ -87,9 +87,9 @@ function testFunction(session, fakeDeviceController, t) {
             let grip_matrix = grip_pose.transform.matrix;
             let ray_matrix = input_pose.transform.matrix;
 
-            assert_matrix_approx_equals(expected_view_matrix, view_matrix);
-            assert_matrix_approx_equals(expected_grip_matrix, grip_matrix);
-            assert_matrix_approx_equals(expected_ray_matrix, ray_matrix);
+            assert_matrix_approx_equals(view_matrix, expected_view_matrix);
+            assert_matrix_approx_equals(grip_matrix, expected_grip_matrix);
+            assert_matrix_approx_equals(ray_matrix, expected_ray_matrix);
 
             assert_equals(reference_space.boundsGeometry.length, expected_bounds_geometry.length);
             for (var i = 0; i < reference_space.boundsGeometry.length; ++i) {