diff --git a/tests/wpt/metadata/FileAPI/idlharness.html.ini b/tests/wpt/metadata/FileAPI/idlharness.html.ini
index bcf886825d98..e0de309e99f6 100644
--- a/tests/wpt/metadata/FileAPI/idlharness.html.ini
+++ b/tests/wpt/metadata/FileAPI/idlharness.html.ini
@@ -15,3 +15,6 @@
   [FileReader interface: new FileReader() must inherit property "readAsBinaryString(Blob)" with the proper type]
     expected: FAIL
 
+  [File API automated IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/FileAPI/idlharness.worker.js.ini b/tests/wpt/metadata/FileAPI/idlharness.worker.js.ini
index 70812cb9f6f9..09efefe4dde2 100644
--- a/tests/wpt/metadata/FileAPI/idlharness.worker.js.ini
+++ b/tests/wpt/metadata/FileAPI/idlharness.worker.js.ini
@@ -78,3 +78,6 @@
   [FileReaderSync interface: new FileReaderSync() must inherit property "readAsDataURL(Blob)" with the proper type]
     expected: FAIL
 
+  [Untitled]
+    expected: FAIL
+
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 ed43d3717707..c8f51681ec5e 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
@@ -1,8 +1,11 @@
 [url-in-tags-revoke.window.html]
+  expected: TIMEOUT
   [Fetching a blob URL immediately before revoking it works in an iframe.]
     expected: FAIL
 
-
   [Fetching a blob URL immediately before revoking it works in an iframe navigation.]
+    expected: FAIL
+
+  [Fetching a blob URL immediately before revoking it works in <script> tags.]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/FileAPI/url/url-in-tags.window.js.ini b/tests/wpt/metadata/FileAPI/url/url-in-tags.window.js.ini
index e7cac1778c34..9eae19c4edee 100644
--- a/tests/wpt/metadata/FileAPI/url/url-in-tags.window.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-in-tags.window.js.ini
@@ -1,4 +1,5 @@
 [url-in-tags.window.html]
+  expected: TIMEOUT
   [Blob URL fragment is implemented.]
-    expected: FAIL
+    expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index ac605e3f8f07..1e38218000f2 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -151,12 +151,6 @@
      {}
     ]
    ],
-   "accname/description_from_content_of_describedby_element_which_is_hidden-manual.html": [
-    [
-     "/accname/description_from_content_of_describedby_element_which_is_hidden-manual.html",
-     {}
-    ]
-   ],
    "accname/description_link-with-label-manual.html": [
     [
      "/accname/description_link-with-label-manual.html",
@@ -817,12 +811,6 @@
      {}
     ]
    ],
-   "accname/name_test_case_663-manual.html": [
-    [
-     "/accname/name_test_case_663-manual.html",
-     {}
-    ]
-   ],
    "accname/name_test_case_663a-manual.html": [
     [
      "/accname/name_test_case_663a-manual.html",
@@ -1279,6 +1267,12 @@
      {}
     ]
    ],
+   "console/console-countReset-logging-manual.html": [
+    [
+     "/console/console-countReset-logging-manual.html",
+     {}
+    ]
+   ],
    "console/console-format-specifier-symbol-manual.html": [
     [
      "/console/console-format-specifier-symbol-manual.html",
@@ -12943,6 +12937,12 @@
      {}
     ]
    ],
+   "feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html": [
+    [
+     "/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html",
+     {}
+    ]
+   ],
    "fullscreen/api/document-exit-fullscreen-manual.html": [
     [
      "/fullscreen/api/document-exit-fullscreen-manual.html",
@@ -14539,6 +14539,12 @@
      {}
     ]
    ],
+   "html/user-activation/activation-thru-contextmenu-event-manual.html": [
+    [
+     "/html/user-activation/activation-thru-contextmenu-event-manual.html",
+     {}
+    ]
+   ],
    "html/webappapis/scripting/event-loops/task_microtask_ordering-manual.html": [
     [
      "/html/webappapis/scripting/event-loops/task_microtask_ordering-manual.html",
@@ -15013,6 +15019,12 @@
      {}
     ]
    ],
+   "pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers-manual.html": [
+    [
+     "/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers-manual.html",
+     {}
+    ]
+   ],
    "pointerevents/pointerevent_boundary_events_in_capturing-manual.html": [
     [
      "/pointerevents/pointerevent_boundary_events_in_capturing-manual.html",
@@ -15379,6 +15391,12 @@
      {}
     ]
    ],
+   "pointerevents/pointerlock/pointerevent_movementxy_when_locked-manual.html": [
+    [
+     "/pointerevents/pointerlock/pointerevent_movementxy_when_locked-manual.html",
+     {}
+    ]
+   ],
    "pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture-manual.html": [
     [
      "/pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture-manual.html",
@@ -21075,6 +21093,30 @@
      {}
     ]
    ],
+   "css/CSS2/abspos/table-caption-is-containing-block-001.html": [
+    [
+     "/css/CSS2/abspos/table-caption-is-containing-block-001.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/abspos/table-caption-passes-abspos-up-001.html": [
+    [
+     "/css/CSS2/abspos/table-caption-passes-abspos-up-001.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/backgrounds/background-001.xht": [
     [
      "/css/CSS2/backgrounds/background-001.xht",
@@ -46835,6 +46877,18 @@
      {}
     ]
    ],
+   "css/CSS2/floats-clear/adjoining-float-new-fc.html": [
+    [
+     "/css/CSS2/floats-clear/adjoining-float-new-fc.html",
+     [
+      [
+       "/css/CSS2/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats-clear/clear-001.xht": [
     [
      "/css/CSS2/floats-clear/clear-001.xht",
@@ -46895,6 +46949,18 @@
      {}
     ]
    ],
+   "css/CSS2/floats-clear/clear-after-top-margin.html": [
+    [
+     "/css/CSS2/floats-clear/clear-after-top-margin.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats-clear/clear-applies-to-000.xht": [
     [
      "/css/CSS2/floats-clear/clear-applies-to-000.xht",
@@ -49043,6 +49109,78 @@
      {}
     ]
    ],
+   "css/CSS2/floats-clear/nested-clearance-new-formatting-context.html": [
+    [
+     "/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html",
+     [
+      [
+       "/css/reference/ref-filled-green-200px-square.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html": [
+    [
+     "/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html",
+     [
+      [
+       "/css/reference/nothing.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html": [
+    [
+     "/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats-clear/no-clearance-due-to-large-margin.html": [
+    [
+     "/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html": [
+    [
+     "/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html": [
+    [
+     "/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats/floated-table-wider-than-specified.html": [
     [
      "/css/CSS2/floats/floated-table-wider-than-specified.html",
@@ -49055,6 +49193,18 @@
      {}
     ]
    ],
+   "css/CSS2/floats/floats-in-table-caption-001.html": [
+    [
+     "/css/CSS2/floats/floats-in-table-caption-001.html",
+     [
+      [
+       "/css/CSS2/floats/floats-in-table-caption-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats/floats-placement-vertical-001a.xht": [
     [
      "/css/CSS2/floats/floats-placement-vertical-001a.xht",
@@ -49587,6 +49737,18 @@
      {}
     ]
    ],
+   "css/CSS2/floats/new-fc-beside-adjoining-float-2.html": [
+    [
+     "/css/CSS2/floats/new-fc-beside-adjoining-float-2.html",
+     [
+      [
+       "/css/reference/ref-filled-green-200px-square.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats/new-fc-beside-adjoining-float.html": [
     [
      "/css/CSS2/floats/new-fc-beside-adjoining-float.html",
@@ -49599,6 +49761,18 @@
      {}
     ]
    ],
+   "css/CSS2/floats/new-fc-separates-from-float-2.html": [
+    [
+     "/css/CSS2/floats/new-fc-separates-from-float-2.html",
+     [
+      [
+       "/css/reference/ref-filled-green-200px-square.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/floats/new-fc-separates-from-float.html": [
     [
      "/css/CSS2/floats/new-fc-separates-from-float.html",
@@ -69387,6 +69561,30 @@
      {}
     ]
    ],
+   "css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html": [
+    [
+     "/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html": [
+    [
+     "/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square-only.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/normal-flow/max-height-001.xht": [
     [
      "/css/CSS2/normal-flow/max-height-001.xht",
@@ -98031,6 +98229,138 @@
      {}
     ]
    ],
+   "css/CSS2/visudet/inline-block-baseline-001.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-001.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-002.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-002.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-003.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-003.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-004.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-004.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-005.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-005.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-006.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-006.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-001-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-010.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-010.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-011.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-011.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-012.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-012.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-013.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-013.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-014.xht": [
+    [
+     "/css/CSS2/visudet/inline-block-baseline-014.xht",
+     [
+      [
+       "/css/CSS2/visudet/inline-block-baseline-010-ref.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/CSS2/visudet/line-height-201.html": [
     [
      "/css/CSS2/visudet/line-height-201.html",
@@ -100603,6 +100933,18 @@
      {}
     ]
    ],
+   "css/css-backgrounds/background-rounded-image-clip.html": [
+    [
+     "/css/css-backgrounds/background-rounded-image-clip.html",
+     [
+      [
+       "/css/css-backgrounds/reference/background-rounded-image-clip.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-backgrounds/background-size-002.html": [
     [
      "/css/css-backgrounds/background-size-002.html",
@@ -104832,7 +105174,7 @@
      "/css/css-color/lab-004.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-004-ref.html",
        "=="
       ]
      ],
@@ -104844,7 +105186,7 @@
      "/css/css-color/lab-005.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-005-ref.html",
        "=="
       ]
      ],
@@ -104856,7 +105198,7 @@
      "/css/css-color/lab-006.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-006-ref.html",
        "=="
       ]
      ],
@@ -104868,7 +105210,7 @@
      "/css/css-color/lab-007.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-007-ref.html",
        "=="
       ]
      ],
@@ -104916,7 +105258,7 @@
      "/css/css-color/lch-004.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-004-ref.html",
        "=="
       ]
      ],
@@ -104928,7 +105270,7 @@
      "/css/css-color/lch-005.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-005-ref.html",
        "=="
       ]
      ],
@@ -104940,7 +105282,7 @@
      "/css/css-color/lch-006.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-006-ref.html",
        "=="
       ]
      ],
@@ -104952,7 +105294,7 @@
      "/css/css-color/lch-007.html",
      [
       [
-       "/css/css-color/blacktext-ref.html",
+       "/css/css-color/lab-007-ref.html",
        "=="
       ]
      ],
@@ -106471,6 +106813,30 @@
      {}
     ]
    ],
+   "css/css-contain/contain-layout-006.html": [
+    [
+     "/css/css-contain/contain-layout-006.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-layout-007.html": [
+    [
+     "/css/css-contain/contain-layout-007.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-layout-breaks-001.html": [
     [
      "/css/css-contain/contain-layout-breaks-001.html",
@@ -106591,6 +106957,30 @@
      {}
     ]
    ],
+   "css/css-contain/contain-paint-009.html": [
+    [
+     "/css/css-contain/contain-paint-009.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-contain/contain-paint-010.html": [
+    [
+     "/css/css-contain/contain-paint-010.html",
+     [
+      [
+       "/css/reference/ref-filled-green-100px-square.xht",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-size-001.html": [
     [
      "/css/css-contain/contain-size-001.html",
@@ -109219,6 +109609,42 @@
      {}
     ]
    ],
+   "css/css-filter/filtered-block-is-container.html": [
+    [
+     "/css/css-filter/filtered-block-is-container.html",
+     [
+      [
+       "/css/css-filter/filtered-block-is-container-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-filter/filtered-html-is-not-container.html": [
+    [
+     "/css/css-filter/filtered-html-is-not-container.html",
+     [
+      [
+       "/css/css-filter/filtered-html-is-not-container-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-filter/filtered-inline-is-container.html": [
+    [
+     "/css/css-filter/filtered-inline-is-container.html",
+     [
+      [
+       "/css/css-filter/filtered-inline-is-container-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-flexbox/Flexible-order.html": [
     [
      "/css/css-flexbox/Flexible-order.html",
@@ -113871,6 +114297,30 @@
      {}
     ]
    ],
+   "css/css-fonts/font-face-unicode-range-2.html": [
+    [
+     "/css/css-fonts/font-face-unicode-range-2.html",
+     [
+      [
+       "/css/css-fonts/font-face-unicode-range-2-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-fonts/font-feature-settings-descriptor-01.html": [
+    [
+     "/css/css-fonts/font-feature-settings-descriptor-01.html",
+     [
+      [
+       "/css/css-fonts/font-feature-settings-descriptor-01-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-fonts/font-features-across-space-1.html": [
     [
      "/css/css-fonts/font-features-across-space-1.html",
@@ -113967,6 +114417,18 @@
      {}
     ]
    ],
+   "css/css-fonts/font-size-adjust-002.html": [
+    [
+     "/css/css-fonts/font-size-adjust-002.html",
+     [
+      [
+       "/css/css-fonts/font-size-adjust-002-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-fonts/font-size-adjust-005.xht": [
     [
      "/css/css-fonts/font-size-adjust-005.xht",
@@ -117603,6 +118065,18 @@
      {}
     ]
    ],
+   "css/css-grid/grid-items/percentage-size-replaced-subitems-001.html": [
+    [
+     "/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html",
+     [
+      [
+       "/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-grid/grid-items/percentage-size-subitems-001.html": [
     [
      "/css/css-grid/grid-items/percentage-size-subitems-001.html",
@@ -126679,6 +127153,18 @@
      {}
     ]
    ],
+   "css/css-scoping/stylesheet-title-001.html": [
+    [
+     "/css/css-scoping/stylesheet-title-001.html",
+     [
+      [
+       "/css/css-scoping/reference/green-box.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html": [
     [
      "/css/css-shapes/shape-outside/formatting-context/shape-outside-formatting-context.tentative.html",
@@ -126871,6 +127357,102 @@
      {}
     ]
    ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/gradients/reference/shape-outside-linear-gradient-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-shapes/shape-outside/shape-image/shape-image-000.html": [
     [
      "/css/css-shapes/shape-outside/shape-image/shape-image-000.html",
@@ -127183,6 +127765,18 @@
      {}
     ]
    ],
+   "css/css-shapes/shape-outside/shape-image/shape-image-026.html": [
+    [
+     "/css/css-shapes/shape-outside/shape-image/shape-image-026.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/shape-image/reference/shape-image-006-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html": [
     [
      "/css/css-shapes/shape-outside/supported-shapes/circle/shape-outside-circle-013.html",
@@ -127675,6 +128269,18 @@
      {}
     ]
    ],
+   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html": [
+    [
+     "/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html",
+     [
+      [
+       "/css/css-shapes/shape-outside/supported-shapes/inset/reference/shape-outside-inset-010-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html": [
     [
      "/css/css-shapes/shape-outside/supported-shapes/polygon/shape-outside-polygon-007.html",
@@ -127927,6 +128533,30 @@
      {}
     ]
    ],
+   "css/css-sizing/intrinsic-percent-non-replaced-004.html": [
+    [
+     "/css/css-sizing/intrinsic-percent-non-replaced-004.html",
+     [
+      [
+       "/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-sizing/intrinsic-percent-non-replaced-005.html": [
+    [
+     "/css/css-sizing/intrinsic-percent-non-replaced-005.html",
+     [
+      [
+       "/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-style-attr/style-attr-braces-001.xht": [
     [
      "/css/css-style-attr/style-attr-braces-001.xht",
@@ -172651,6 +173281,18 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001.html",
@@ -172939,6 +173581,18 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016.html",
@@ -173419,6 +174073,18 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html": [
+    [
+     "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html",
+     [
+      [
+       "/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01.html": [
     [
      "/css/vendor-imports/mozilla/mozilla-central-reftests/text-decor-3/ruby-text-decoration-01.html",
@@ -178812,7 +179478,7 @@
      "/fetch/corb/img-html-correctly-labeled.sub.html",
      [
       [
-       "/fetch/corb/img-png-mislabeled-as-html.sub-expected.html",
+       "/fetch/corb/img-png-mislabeled-as-html.sub-ref.html",
        "=="
       ]
      ],
@@ -178824,7 +179490,7 @@
      "/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html",
      [
       [
-       "/fetch/corb/img-png-mislabeled-as-html.sub-expected.html",
+       "/fetch/corb/img-png-mislabeled-as-html.sub-ref.html",
        "=="
       ]
      ],
@@ -178836,7 +179502,19 @@
      "/fetch/corb/img-png-mislabeled-as-html.sub.html",
      [
       [
-       "/fetch/corb/img-png-mislabeled-as-html.sub-expected.html",
+       "/fetch/corb/img-png-mislabeled-as-html.sub-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "fetch/http-cache/basic-auth-cache-test.html": [
+    [
+     "/fetch/http-cache/basic-auth-cache-test.html",
+     [
+      [
+       "/fetch/http-cache/basic-auth-cache-test-ref.html",
        "=="
       ]
      ],
@@ -181171,6 +181849,18 @@
      {}
     ]
    ],
+   "html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html": [
+    [
+     "/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html",
+     [
+      [
+       "/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "html/rendering/replaced-elements/images/space.html": [
     [
      "/html/rendering/replaced-elements/images/space.html",
@@ -182203,18 +182893,6 @@
      {}
     ]
    ],
-   "http/basic-auth-cache-test.html": [
-    [
-     "/http/basic-auth-cache-test.html",
-     [
-      [
-       "/http/basic-auth-cache-test-ref.html",
-       "=="
-      ]
-     ],
-     {}
-    ]
-   ],
    "infrastructure/assumptions/ahem.html": [
     [
      "/infrastructure/assumptions/ahem.html",
@@ -182963,24 +183641,48 @@
      {}
     ]
    ],
-   "svg/extensibility/foreignObject/stacking-context.html": [
+   "svg/extensibility/foreignObject/foreign-object-paints-before-rect.html": [
     [
-     "/svg/extensibility/foreignObject/stacking-context.html",
+     "/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html",
      [
       [
-       "/svg/extensibility/foreignObject/stacking-context-expected.html",
+       "/svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html",
        "=="
       ]
      ],
      {}
     ]
    ],
-   "svg/foreignobject/position-svg-root-in-foreign-object.html": [
+   "svg/extensibility/foreignObject/foreign-object-size.html": [
+    [
+     "/svg/extensibility/foreignObject/foreign-object-size.html",
+     [
+      [
+       "/svg/extensibility/foreignObject/foreign-object-size-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html": [
+    [
+     "/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html",
+     [
+      [
+       "/svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "svg/extensibility/foreignObject/stacking-context.html": [
     [
-     "/svg/foreignobject/position-svg-root-in-foreign-object.html",
+     "/svg/extensibility/foreignObject/stacking-context.html",
      [
       [
-       "/svg/foreignobject/position-svg-root-in-foreign-object-ref.html",
+       "/svg/extensibility/foreignObject/stacking-context-ref.html",
        "=="
       ]
      ],
@@ -187524,11 +188226,6 @@
      {}
     ]
    ],
-   "./config.default.json": [
-    [
-     {}
-    ]
-   ],
    "./lint.whitelist": [
     [
      {}
@@ -187564,6 +188261,11 @@
      {}
     ]
    ],
+   ".well-known/idp-proxy/OWNERS": [
+    [
+     {}
+    ]
+   ],
    ".well-known/idp-proxy/README.md": [
     [
      {}
@@ -187589,6 +188291,11 @@
      {}
     ]
    ],
+   "2dcontext/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "2dcontext/best-practices/.gitkeep": [
     [
      {}
@@ -188659,6 +189366,11 @@
      {}
     ]
    ],
+   "BackgroundSync/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "FileAPI/BlobURL/support/file_test2.txt": [
     [
      {}
@@ -192114,11 +192826,21 @@
      {}
     ]
    ],
+   "apng/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "apng/animated-png-timeout-ref.html": [
     [
      {}
     ]
    ],
+   "audio-output/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "background-fetch/OWNERS": [
     [
      {}
@@ -192354,6 +193076,16 @@
      {}
     ]
    ],
+   "budget-api/OWNERS": [
+    [
+     {}
+    ]
+   ],
+   "clear-site-data/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "clear-site-data/support/echo-clear-site-data.py": [
     [
      {}
@@ -192379,6 +193111,11 @@
      {}
     ]
    ],
+   "client-hints/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "client-hints/accept_ch.http.html.headers": [
     [
      {}
@@ -192604,6 +193341,11 @@
      {}
     ]
    ],
+   "common/subset-tests.js": [
+    [
+     {}
+    ]
+   ],
    "common/test-setting-immutable-prototype.js": [
     [
      {}
@@ -214874,7 +215616,7 @@
      {}
     ]
    ],
-   "content-security-policy/navigate-to/child-navigates-parent-blocked.html.headers": [
+   "content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers": [
     [
      {}
     ]
@@ -214884,7 +215626,7 @@
      {}
     ]
    ],
-   "content-security-policy/navigate-to/parent-navigates-child-blocked.html.headers": [
+   "content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers": [
     [
      {}
     ]
@@ -215684,6 +216426,16 @@
      {}
     ]
    ],
+   "cookie-store/serviceworker_cookieStore_subscriptions.js": [
+    [
+     {}
+    ]
+   ],
+   "cookie-store/serviceworker_cookieStore_subscriptions_basic.js": [
+    [
+     {}
+    ]
+   ],
    "cookies/OWNERS": [
     [
      {}
@@ -216259,6 +217011,26 @@
      {}
     ]
    ],
+   "cookies/resources/cookie-helper.sub.js": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/drop.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/dropSameSite.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/dropSecure.py": [
+    [
+     {}
+    ]
+   ],
    "cookies/resources/echo-cookie.html": [
     [
      {}
@@ -216269,11 +217041,51 @@
      {}
     ]
    ],
+   "cookies/resources/helpers.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/imgIfMatch.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/list.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/postToParent.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/redirectWithCORSHeaders.py": [
+    [
+     {}
+    ]
+   ],
    "cookies/resources/set-cookie.py": [
     [
      {}
     ]
    ],
+   "cookies/resources/set.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/setSameSite.py": [
+    [
+     {}
+    ]
+   ],
+   "cookies/resources/setSecure.py": [
+    [
+     {}
+    ]
+   ],
    "cookies/resources/testharness-helpers.js": [
     [
      {}
@@ -216374,6 +217186,11 @@
      {}
     ]
    ],
+   "credential-management/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "credential-management/support/echoing-nester.html": [
     [
      {}
@@ -223369,6 +224186,11 @@
      {}
     ]
    ],
+   "css/CSS2/floats/floats-in-table-caption-001-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/CSS2/floats/floats-placement-vertical-001-ref.xht": [
     [
      {}
@@ -234519,6 +235341,16 @@
      {}
     ]
    ],
+   "css/CSS2/visudet/inline-block-baseline-001-ref.xht": [
+    [
+     {}
+    ]
+   ],
+   "css/CSS2/visudet/inline-block-baseline-010-ref.xht": [
+    [
+     {}
+    ]
+   ],
    "css/CSS2/visudet/reference/content-height-001-ref.html": [
     [
      {}
@@ -238964,6 +239796,11 @@
      {}
     ]
    ],
+   "css/css-backgrounds/reference/background-rounded-image-clip.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-backgrounds/reference/background-size-002-ref.html": [
     [
      {}
@@ -239184,11 +240021,6 @@
      {}
     ]
    ],
-   "css/css-backgrounds/resources/parsing-testcommon.js": [
-    [
-     {}
-    ]
-   ],
    "css/css-backgrounds/support/100x100-blue-and-orange.png": [
     [
      {}
@@ -239619,6 +240451,26 @@
      {}
     ]
    ],
+   "css/css-color/lab-004-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-color/lab-005-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-color/lab-006-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-color/lab-007-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-color/rebeccapurple-ref.html": [
     [
      {}
@@ -240004,6 +240856,11 @@
      {}
     ]
    ],
+   "css/css-content/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-content/attr-case-insensitive-ref.html": [
     [
      {}
@@ -240284,11 +241141,31 @@
      {}
     ]
    ],
+   "css/css-fill-stroke/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-fill-stroke/reference/paint-order-001-ref.tentative.html": [
     [
      {}
     ]
    ],
+   "css/css-filter/filtered-block-is-container-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-filter/filtered-html-is-not-container-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-filter/filtered-inline-is-container-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-flexbox/OWNERS": [
     [
      {}
@@ -241624,6 +242501,11 @@
      {}
     ]
    ],
+   "css/css-font-loading/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts/OWNERS": [
     [
      {}
@@ -241704,6 +242586,11 @@
      {}
     ]
    ],
+   "css/css-fonts/font-face-unicode-range-2-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts/font-family-name-016-ref.xht": [
     [
      {}
@@ -241734,6 +242621,11 @@
      {}
     ]
    ],
+   "css/css-fonts/font-feature-settings-descriptor-01-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts/font-features-across-space-1-ref.html": [
     [
      {}
@@ -241764,6 +242656,16 @@
      {}
     ]
    ],
+   "css/css-fonts/font-size-adjust-001-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-fonts/font-size-adjust-002-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-fonts/font-stretch-pass-ref.html": [
     [
      {}
@@ -242379,7 +243281,7 @@
      {}
     ]
    ],
-   "css/css-fonts/support/fonts/font-feature-settings-rendering-2-expected.html": [
+   "css/css-fonts/support/fonts/font-feature-settings-rendering-2-ref.html": [
     [
      {}
     ]
@@ -250234,6 +251136,11 @@
      {}
     ]
    ],
+   "css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-grid/grid-items/percentage-size-subitems-001-ref.html": [
     [
      {}
@@ -252304,6 +253211,11 @@
      {}
     ]
    ],
+   "css/css-properties-values-api/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-pseudo/OWNERS": [
     [
      {}
@@ -253489,11 +254401,26 @@
      {}
     ]
    ],
+   "css/css-scroll-anchoring/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-scroll-anchoring/README.md": [
     [
      {}
     ]
    ],
+   "css/css-scroll-snap/OWNERS": [
+    [
+     {}
+    ]
+   ],
+   "css/css-shadow-parts/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "css/css-shadow-parts/support/shadow-helper.js": [
     [
      {}
@@ -254009,6 +254936,16 @@
      {}
     ]
    ],
+   "css/css-sizing/intrinsic-percent-non-replaced-004-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "css/css-sizing/intrinsic-percent-non-replaced-005-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-speech/OWNERS": [
     [
      {}
@@ -259614,6 +260551,11 @@
      {}
     ]
    ],
+   "css/css-ui/parsing/resources/parsing-testcommon.js": [
+    [
+     {}
+    ]
+   ],
    "css/css-ui/reference/box-sizing-001-ref.html": [
     [
      {}
@@ -270184,6 +271126,11 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html": [
     [
      {}
@@ -270294,6 +271241,11 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html": [
     [
      {}
@@ -270484,6 +271436,11 @@
      {}
     ]
    ],
+   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter": [
     [
      {}
@@ -271539,6 +272496,11 @@
      {}
     ]
    ],
+   "device-memory/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "docs/.gitignore": [
     [
      {}
@@ -271729,6 +272691,11 @@
      {}
     ]
    ],
+   "docs/_writing-tests/testdriver-tutorial.md": [
+    [
+     {}
+    ]
+   ],
    "docs/_writing-tests/testdriver.md": [
     [
      {}
@@ -274009,6 +274976,11 @@
      {}
     ]
    ],
+   "feature-policy/experimental-features/resources/vertical-scroll-touch-action.html": [
+    [
+     {}
+    ]
+   ],
    "feature-policy/experimental-features/resources/vertical-scroll.js": [
     [
      {}
@@ -274174,21 +275146,6 @@
      {}
     ]
    ],
-   "fetch/api/cors/cors-expose-star.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/cors/cors-filtering.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/cors/cors-multiple-origins.js": [
-    [
-     {}
-    ]
-   ],
    "fetch/api/policies/csp-blocked.html.headers": [
     [
      {}
@@ -274274,46 +275231,6 @@
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-count.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-empty-location.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-location.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-method.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-mode.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-origin.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-referrer.js": [
-    [
-     {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-to-dataurl.js": [
-    [
-     {}
-    ]
-   ],
    "fetch/api/request/destination/resources/dummy": [
     [
      {}
@@ -274569,22 +275486,27 @@
      {}
     ]
    ],
+   "fetch/content-length/content-length.html.headers": [
+    [
+     {}
+    ]
+   ],
    "fetch/corb/README.md": [
     [
      {}
     ]
    ],
-   "fetch/corb/img-html-correctly-labeled.sub-expected.html": [
+   "fetch/corb/img-html-correctly-labeled.sub-ref.html": [
     [
      {}
     ]
    ],
-   "fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-expected.html": [
+   "fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html": [
     [
      {}
     ]
    ],
-   "fetch/corb/img-png-mislabeled-as-html.sub-expected.html": [
+   "fetch/corb/img-png-mislabeled-as-html.sub-ref.html": [
     [
      {}
     ]
@@ -274634,6 +275556,26 @@
      {}
     ]
    ],
+   "fetch/corb/resources/html-js-polyglot.js": [
+    [
+     {}
+    ]
+   ],
+   "fetch/corb/resources/html-js-polyglot.js.headers": [
+    [
+     {}
+    ]
+   ],
+   "fetch/corb/resources/html-js-polyglot2.js": [
+    [
+     {}
+    ]
+   ],
+   "fetch/corb/resources/html-js-polyglot2.js.headers": [
+    [
+     {}
+    ]
+   ],
    "fetch/corb/resources/js-mislabeled-as-html-nosniff.js": [
     [
      {}
@@ -274709,6 +275651,11 @@
      {}
     ]
    ],
+   "fetch/http-cache/basic-auth-cache-test-ref.html": [
+    [
+     {}
+    ]
+   ],
    "fetch/http-cache/http-cache.js": [
     [
      {}
@@ -274719,6 +275666,11 @@
      {}
     ]
    ],
+   "fetch/http-cache/resources/securedimage.py": [
+    [
+     {}
+    ]
+   ],
    "fetch/nosniff/importscripts.js": [
     [
      {}
@@ -275599,6 +276551,11 @@
      {}
     ]
    ],
+   "generic-sensor/README.md": [
+    [
+     {}
+    ]
+   ],
    "generic-sensor/generic-sensor-feature-policy-test.sub.js": [
     [
      {}
@@ -276059,6 +277016,26 @@
      {}
     ]
    ],
+   "html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md": [
+    [
+     {}
+    ]
+   ],
+   "html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis": [
+    [
+     {}
+    ]
+   ],
+   "html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py": [
+    [
+     {}
+    ]
+   ],
+   "html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt": [
+    [
+     {}
+    ]
+   ],
    "html/browsers/browsing-the-web/navigating-across-documents/source/support/dummy.html": [
     [
      {}
@@ -276909,11 +277886,6 @@
      {}
     ]
    ],
-   "html/browsers/origin/.gitkeep": [
-    [
-     {}
-    ]
-   ],
    "html/browsers/origin/cross-origin-objects/frame-with-then.html": [
     [
      {}
@@ -276929,17 +277901,12 @@
      {}
     ]
    ],
-   "html/browsers/origin/relaxing-the-same-origin-restriction/.gitkeep": [
-    [
-     {}
-    ]
-   ],
-   "html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_iframe.html": [
+   "html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.html": [
     [
      {}
     ]
    ],
-   "html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_frame.html": [
+   "html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html": [
     [
      {}
     ]
@@ -277619,6 +278586,11 @@
      {}
     ]
    ],
+   "html/dom/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html": [
+    [
+     {}
+    ]
+   ],
    "html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext-subframe.txt": [
     [
      {}
@@ -283719,6 +284691,11 @@
      {}
     ]
    ],
+   "html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html": [
+    [
+     {}
+    ]
+   ],
    "html/rendering/replaced-elements/image-maps-0/.gitkeep": [
     [
      {}
@@ -287624,97 +288601,77 @@
      {}
     ]
    ],
-   "html/webappapis/system-state-and-capabilities/.gitkeep": [
+   "html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js": [
     [
      {}
     ]
    ],
-   "html/webappapis/system-state-and-capabilities/the-external-interface/.gitkeep": [
-    [
-     {}
-    ]
-   ],
-   "html/webappapis/system-state-and-capabilities/the-navigator-object/.gitkeep": [
-    [
-     {}
-    ]
-   ],
-   "html/webappapis/system-state-and-capabilities/the-navigator-object/contains.json": [
+   "html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js": [
     [
      {}
     ]
    ],
-   "html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginSharedWorker.js": [
+   "html/webappapis/structured-clone/structured-clone-battery-of-tests.js": [
     [
      {}
     ]
    ],
-   "html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginWorker.js": [
-    [
-     {}
-    ]
-   ],
-   "html/webappapis/timers/.gitkeep": [
-    [
-     {}
-    ]
-   ],
-   "html/webappapis/user-prompts/.gitkeep": [
+   "html/webappapis/system-state-and-capabilities/.gitkeep": [
     [
      {}
     ]
    ],
-   "html/webappapis/user-prompts/dialogs-implemented-using-separate-documents/.gitkeep": [
+   "html/webappapis/system-state-and-capabilities/the-external-interface/.gitkeep": [
     [
      {}
     ]
    ],
-   "html/webappapis/user-prompts/printing/.gitkeep": [
+   "html/webappapis/system-state-and-capabilities/the-navigator-object/.gitkeep": [
     [
      {}
     ]
    ],
-   "html/webappapis/user-prompts/simple-dialogs/.gitkeep": [
+   "html/webappapis/system-state-and-capabilities/the-navigator-object/contains.json": [
     [
      {}
     ]
    ],
-   "http/OWNERS": [
+   "html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginSharedWorker.js": [
     [
      {}
     ]
    ],
-   "http/basic-auth-cache-test-ref.html": [
+   "html/webappapis/the-windoworworkerglobalscope-mixin/support/WorkerSelfOriginWorker.js": [
     [
      {}
     ]
    ],
-   "http/content_length.html.headers": [
+   "html/webappapis/timers/.gitkeep": [
     [
      {}
     ]
    ],
-   "http/refresh/README.md": [
+   "html/webappapis/user-prompts/.gitkeep": [
     [
      {}
     ]
    ],
-   "http/refresh/resources/multiple.asis": [
+   "html/webappapis/user-prompts/dialogs-implemented-using-separate-documents/.gitkeep": [
     [
      {}
     ]
    ],
-   "http/refresh/resources/refresh.py": [
+   "html/webappapis/user-prompts/printing/.gitkeep": [
     [
      {}
     ]
    ],
-   "http/refresh/resources/refreshed.txt": [
+   "html/webappapis/user-prompts/simple-dialogs/.gitkeep": [
     [
      {}
     ]
    ],
-   "http/resources/securedimage.py": [
+   "imagebitmap-renderingcontext/OWNERS": [
     [
      {}
     ]
@@ -288044,6 +289001,11 @@
      {}
     ]
    ],
+   "infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini": [
+    [
+     {}
+    ]
+   ],
    "infrastructure/metadata/infrastructure/reftest/reftest_and_fail.html.ini": [
     [
      {}
@@ -288274,6 +289236,11 @@
      {}
     ]
    ],
+   "interfaces/keyboard-map.idl": [
+    [
+     {}
+    ]
+   ],
    "interfaces/magnetometer.idl": [
     [
      {}
@@ -288459,6 +289426,16 @@
      {}
     ]
    ],
+   "keyboard-lock/OWNERS": [
+    [
+     {}
+    ]
+   ],
+   "keyboard-lock/resources/iframe-lock-helper.html": [
+    [
+     {}
+    ]
+   ],
    "longtask-timing/OWNERS": [
     [
      {}
@@ -288779,6 +289756,11 @@
      {}
     ]
    ],
+   "media-capabilities/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "media-capabilities/README.md": [
     [
      {}
@@ -289159,6 +290141,16 @@
      {}
     ]
    ],
+   "mediacapture-fromelement/OWNERS": [
+    [
+     {}
+    ]
+   ],
+   "mediacapture-image/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "mediacapture-record/OWNERS": [
     [
      {}
@@ -289169,6 +290161,11 @@
      {}
     ]
    ],
+   "mediasession/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "mediasession/README.md": [
     [
      {}
@@ -289879,6 +290876,11 @@
      {}
     ]
    ],
+   "netinfo/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "notifications/OWNERS": [
     [
      {}
@@ -289899,6 +290901,11 @@
      {}
     ]
    ],
+   "offscreen-canvas/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "offscreen-canvas/filter/offscreencanvas.filter.js": [
     [
      {}
@@ -289934,6 +290941,11 @@
      {}
     ]
    ],
+   "old-tests/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html": [
     [
      {}
@@ -290009,6 +291021,11 @@
      {}
     ]
    ],
+   "orientation-event/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html.headers": [
     [
      {}
@@ -290044,6 +291061,11 @@
      {}
     ]
    ],
+   "orientation-sensor/orientation-sensor-tests.js": [
+    [
+     {}
+    ]
+   ],
    "page-visibility/OWNERS": [
     [
      {}
@@ -290214,6 +291236,11 @@
      {}
     ]
    ],
+   "picture-in-picture/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "picture-in-picture/resources/picture-in-picture-helpers.js": [
     [
      {}
@@ -293154,6 +294181,11 @@
      {}
     ]
    ],
+   "remote-playback/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "remote-playback/README.md": [
     [
      {}
@@ -293394,6 +294426,11 @@
      {}
     ]
    ],
+   "secure-contexts/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "secure-contexts/basic-popup-and-iframe-tests.https.js": [
     [
      {}
@@ -293479,6 +294516,11 @@
      {}
     ]
    ],
+   "server-timing/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "server-timing/resources/blue.png": [
     [
      {}
@@ -293489,6 +294531,16 @@
      {}
     ]
    ],
+   "server-timing/resources/blue_tao.png": [
+    [
+     {}
+    ]
+   ],
+   "server-timing/resources/blue_tao.png.sub.headers": [
+    [
+     {}
+    ]
+   ],
    "server-timing/resources/green.png": [
     [
      {}
@@ -294339,11 +295391,21 @@
      {}
     ]
    ],
+   "server-timing/sw.js": [
+    [
+     {}
+    ]
+   ],
    "server-timing/test_server_timing.html.sub.headers": [
     [
      {}
     ]
    ],
+   "server-timing/test_server_timing.https.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
    "service-workers/OWNERS": [
     [
      {}
@@ -295264,6 +296326,11 @@
      {}
     ]
    ],
+   "service-workers/service-worker/resources/iframe-with-image.html": [
+    [
+     {}
+    ]
+   ],
    "service-workers/service-worker/resources/immutable-prototype-serviceworker.js": [
     [
      {}
@@ -295819,6 +296886,11 @@
      {}
     ]
    ],
+   "service-workers/service-worker/resources/square.png.sub.headers": [
+    [
+     {}
+    ]
+   ],
    "service-workers/service-worker/resources/success.py": [
     [
      {}
@@ -295919,6 +296991,11 @@
      {}
     ]
    ],
+   "service-workers/service-worker/resources/worker-fetching-cross-origin.js": [
+    [
+     {}
+    ]
+   ],
    "service-workers/service-worker/resources/worker-interception-iframe.https.html": [
     [
      {}
@@ -296634,12 +297711,22 @@
      {}
     ]
    ],
-   "svg/extensibility/foreignObject/stacking-context-expected.html": [
+   "svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html": [
+    [
+     {}
+    ]
+   ],
+   "svg/extensibility/foreignObject/foreign-object-size-ref.html": [
+    [
+     {}
+    ]
+   ],
+   "svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html": [
     [
      {}
     ]
    ],
-   "svg/foreignobject/position-svg-root-in-foreign-object-ref.html": [
+   "svg/extensibility/foreignObject/stacking-context-ref.html": [
     [
      {}
     ]
@@ -296949,6 +298036,11 @@
      {}
     ]
    ],
+   "trusted-types/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "trusted-types/support/helper.js": [
     [
      {}
@@ -297319,6 +298411,11 @@
      {}
     ]
    ],
+   "upgrade-insecure-requests/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "upgrade-insecure-requests/link-upgrade/basic-link-no-upgrade.sub.html": [
     [
      {}
@@ -297549,6 +298646,11 @@
      {}
     ]
    ],
+   "wasm/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "wasm/compile_worker.js": [
     [
      {}
@@ -297714,6 +298816,11 @@
      {}
     ]
    ],
+   "webaudio/resources/audio-param.js": [
+    [
+     {}
+    ]
+   ],
    "webaudio/resources/audionodeoptions.js": [
     [
      {}
@@ -297764,6 +298871,11 @@
      {}
     ]
    ],
+   "webaudio/resources/mix-testing.js": [
+    [
+     {}
+    ]
+   ],
    "webaudio/resources/mixing-rules.js": [
     [
      {}
@@ -298004,6 +299116,11 @@
      {}
     ]
    ],
+   "webdriver/tests/accept_alert/__init__.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/tests/actions/__init__.py": [
     [
      {}
@@ -298039,17 +299156,37 @@
      {}
     ]
    ],
+   "webdriver/tests/add_cookie/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/close_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
    "webdriver/tests/conftest.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/element_click/__init__.py": [
+   "webdriver/tests/delete_cookie/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/dismiss_alert/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/__init__.py": [
+   "webdriver/tests/element_clear/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/element_click/__init__.py": [
     [
      {}
     ]
@@ -298069,27 +299206,132 @@
      {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/conftest.py": [
+   "webdriver/tests/find_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/find_element_from_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/find_elements_from_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/fullscreen_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_active_element/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_alert_text/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_current_url/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_property/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_tag_name/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_element_text/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_named_cookie/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_timeouts/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_title/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/get_window_rect/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/is_element_selected/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/maximize_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/minimize_window/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/conftest.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/support/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webdriver/tests/new_session/support/create.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/support/__init__.py": [
+   "webdriver/tests/page_source/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/support/create.py": [
+   "webdriver/tests/send_alert_text/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/state/__init__.py": [
+   "webdriver/tests/set_window_rect/__init__.py": [
     [
      {}
     ]
    ],
-   "webdriver/tests/state/text/__init__.py": [
+   "webdriver/tests/status/__init__.py": [
     [
      {}
     ]
@@ -298129,6 +299371,16 @@
      {}
     ]
    ],
+   "webdriver/tests/switch_to_parent_frame/__init__.py": [
+    [
+     {}
+    ]
+   ],
+   "webgl/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "webgl/common.js": [
     [
      {}
@@ -298259,6 +299511,11 @@
      {}
     ]
    ],
+   "webrtc/protocol/README.txt": [
+    [
+     {}
+    ]
+   ],
    "webrtc/tools/.eslintrc.js": [
     [
      {}
@@ -298584,6 +299841,16 @@
      {}
     ]
    ],
+   "webusb/resources/usb.dedicatedworker.sharedworker.js": [
+    [
+     {}
+    ]
+   ],
+   "webusb/resources/usb.serviceworker.js": [
+    [
+     {}
+    ]
+   ],
    "webusb/usb-allowed-by-feature-policy.https.sub.html.headers": [
     [
      {}
@@ -300874,6 +302141,16 @@
      {}
     ]
    ],
+   "workers/modules/dedicated-worker-options-credentials.html.headers": [
+    [
+     {}
+    ]
+   ],
+   "workers/modules/resources/credentials.py": [
+    [
+     {}
+    ]
+   ],
    "workers/modules/resources/dynamic-import-and-then-static-import-worker.js": [
     [
      {}
@@ -300889,11 +302166,21 @@
      {}
     ]
    ],
+   "workers/modules/resources/empty-worker.js": [
+    [
+     {}
+    ]
+   ],
    "workers/modules/resources/import-meta-url-worker.js": [
     [
      {}
     ]
    ],
+   "workers/modules/resources/import-scripts-worker.js": [
+    [
+     {}
+    ]
+   ],
    "workers/modules/resources/nested-dynamic-import-worker.js": [
     [
      {}
@@ -300914,6 +302201,11 @@
      {}
     ]
    ],
+   "workers/modules/resources/static-import-non-existent-script-worker.js": [
+    [
+     {}
+    ]
+   ],
    "workers/modules/resources/static-import-worker.js": [
     [
      {}
@@ -301019,26 +302311,6 @@
      {}
     ]
    ],
-   "workers/semantics/structured-clone/common.js": [
-    [
-     {}
-    ]
-   ],
-   "workers/semantics/structured-clone/dedicated.js": [
-    [
-     {}
-    ]
-   ],
-   "workers/semantics/structured-clone/shared.js": [
-    [
-     {}
-    ]
-   ],
-   "workers/semantics/structured-clone/worker-common.js": [
-    [
-     {}
-    ]
-   ],
    "workers/semantics/xhr/001-1.xml": [
     [
      {}
@@ -301169,6 +302441,11 @@
      {}
     ]
    ],
+   "worklets/OWNERS": [
+    [
+     {}
+    ]
+   ],
    "worklets/README.md": [
     [
      {}
@@ -301324,6 +302601,11 @@
      {}
     ]
    ],
+   "x-frame-options/README.md": [
+    [
+     {}
+    ]
+   ],
    "x-frame-options/support/helper.js": [
     [
      {}
@@ -309182,337 +310464,533 @@
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/failures_ECDH.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/failures_ECDH.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/failures_HMAC.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_AES-KW.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/failures_HMAC.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-KW.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_AES-KW.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_ECDH.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_ECDH.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_ECDH.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_ECDSA.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_ECDSA.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_ECDSA.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_HMAC.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_HMAC.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_HMAC.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/successes_ECDH.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/successes_ECDH.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/successes_HMAC.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/successes_HMAC.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js": [
+   "WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.html",
+     "/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_aes-cbc.https.html": [
+   "WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_aes-cbc.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_aes-ctr.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_aes-ctr.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html": [
+   "WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html": [
+   "WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_failures_AES-KW.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_failures_AES-KW.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_failures_ECDH.https.html": [
+   "WebCryptoAPI/generateKey/successes_AES-KW.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_failures_ECDH.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-KW.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_failures_ECDSA.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_failures_ECDSA.https.html",
+     "/WebCryptoAPI/generateKey/successes_AES-KW.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_failures_HMAC.https.html": [
+   "WebCryptoAPI/generateKey/successes_ECDH.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_failures_HMAC.https.html",
+     "/WebCryptoAPI/generateKey/successes_ECDH.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html",
+     "/WebCryptoAPI/generateKey/successes_ECDH.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html": [
+   "WebCryptoAPI/generateKey/successes_ECDSA.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html",
+     "/WebCryptoAPI/generateKey/successes_ECDSA.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html",
+     "/WebCryptoAPI/generateKey/successes_ECDSA.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html": [
+   "WebCryptoAPI/generateKey/successes_HMAC.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html",
+     "/WebCryptoAPI/generateKey/successes_HMAC.https.any.html",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html",
+     "/WebCryptoAPI/generateKey/successes_HMAC.https.any.worker.html",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html": [
+   "WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js": [
     [
-     "/WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?1-10",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_successes_AES-KW.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_AES-KW.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?101-110",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_successes_ECDH.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_ECDH.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?11-20",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_successes_ECDSA.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_ECDSA.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?111-120",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_successes_HMAC.https.html": [
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_HMAC.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?121-130",
      {
       "timeout": "long"
      }
-    ]
-   ],
-   "WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html": [
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?131-140",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?141-150",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?151-last",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?21-30",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?31-40",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?41-50",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?51-60",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?61-70",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?71-80",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?81-90",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.html?91-100",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?1-10",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?101-110",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?11-20",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?111-120",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?121-130",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?131-140",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?141-150",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?151-last",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?21-30",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?31-40",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?41-50",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?51-60",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?61-70",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?71-80",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?81-90",
+     {
+      "timeout": "long"
+     }
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.worker.html?91-100",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html": [
+   "WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js": [
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.html?1-10",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.html?11-20",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.html?21-30",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.html?31-last",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.worker.html?1-10",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.worker.html?11-20",
+     {
+      "timeout": "long"
+     }
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.worker.html?21-30",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.worker.html?31-last",
      {
       "timeout": "long"
      }
     ]
    ],
-   "WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html": [
+   "WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js": [
+    [
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.html?1-10",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.html?11-20",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.html?21-30",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.html?31-last",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.worker.html?1-10",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.worker.html?11-20",
+     {
+      "timeout": "long"
+     }
+    ],
+    [
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.worker.html?21-30",
+     {
+      "timeout": "long"
+     }
+    ],
     [
-     "/WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html",
+     "/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.worker.html?31-last",
      {
       "timeout": "long"
      }
@@ -309892,6 +311370,12 @@
      {}
     ]
    ],
+   "async-local-storage/storage-smoke-test.https.tentative.html": [
+    [
+     "/async-local-storage/storage-smoke-test.https.tentative.html",
+     {}
+    ]
+   ],
    "audio-output/HTMLMediaElement-sinkId-idl.html": [
     [
      "/audio-output/HTMLMediaElement-sinkId-idl.html",
@@ -311438,6 +312922,12 @@
      {}
     ]
    ],
+   "compat/css-style-declaration-alias-enumeration.html": [
+    [
+     "/compat/css-style-declaration-alias-enumeration.html",
+     {}
+    ]
+   ],
    "compat/historical.html": [
     [
      "/compat/historical.html",
@@ -311466,13 +312956,13 @@
      {}
     ]
    ],
-   "console/console-count-label-conversion.any.js": [
+   "console/console-counting-label-conversion.any.js": [
     [
-     "/console/console-count-label-conversion.any.html",
+     "/console/console-counting-label-conversion.any.html",
      {}
     ],
     [
-     "/console/console-count-label-conversion.any.worker.html",
+     "/console/console-counting-label-conversion.any.worker.html",
      {}
     ]
    ],
@@ -312420,12 +313910,10 @@
      }
     ]
    ],
-   "content-security-policy/navigate-to/child-navigates-parent-blocked.html": [
+   "content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html": [
     [
-     "/content-security-policy/navigate-to/child-navigates-parent-blocked.html",
-     {
-      "timeout": "long"
-     }
+     "/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html",
+     {}
     ]
    ],
    "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.html": [
@@ -312458,9 +313946,9 @@
      {}
     ]
    ],
-   "content-security-policy/navigate-to/form-blocked.html": [
+   "content-security-policy/navigate-to/form-blocked.sub.html": [
     [
-     "/content-security-policy/navigate-to/form-blocked.html",
+     "/content-security-policy/navigate-to/form-blocked.sub.html",
      {}
     ]
    ],
@@ -312494,9 +313982,9 @@
      {}
     ]
    ],
-   "content-security-policy/navigate-to/href-location-blocked.html": [
+   "content-security-policy/navigate-to/href-location-blocked.sub.html": [
     [
-     "/content-security-policy/navigate-to/href-location-blocked.html",
+     "/content-security-policy/navigate-to/href-location-blocked.sub.html",
      {}
     ]
    ],
@@ -312532,12 +314020,10 @@
      }
     ]
    ],
-   "content-security-policy/navigate-to/link-click-blocked.html": [
+   "content-security-policy/navigate-to/link-click-blocked.sub.html": [
     [
-     "/content-security-policy/navigate-to/link-click-blocked.html",
-     {
-      "timeout": "long"
-     }
+     "/content-security-policy/navigate-to/link-click-blocked.sub.html",
+     {}
     ]
    ],
    "content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html": [
@@ -312578,9 +314064,9 @@
      {}
     ]
    ],
-   "content-security-policy/navigate-to/meta-refresh-blocked.html": [
+   "content-security-policy/navigate-to/meta-refresh-blocked.sub.html": [
     [
-     "/content-security-policy/navigate-to/meta-refresh-blocked.html",
+     "/content-security-policy/navigate-to/meta-refresh-blocked.sub.html",
      {}
     ]
    ],
@@ -314072,6 +315558,18 @@
      {}
     ]
    ],
+   "cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html": [
+    [
+     "/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html",
+     {}
+    ]
+   ],
+   "cookie-store/serviceworker_cookieStore_subscriptions_basic.tentative.https.html": [
+    [
+     "/cookie-store/serviceworker_cookieStore_subscriptions_basic.tentative.https.html",
+     {}
+    ]
+   ],
    "cookies/http-state/attribute-tests.html": [
     [
      "/cookies/http-state/attribute-tests.html",
@@ -314096,6 +315594,114 @@
      {}
     ]
    ],
+   "cookies/prefix/__host.document-cookie.non-secure.html": [
+    [
+     "/cookies/prefix/__host.document-cookie.non-secure.html",
+     {}
+    ]
+   ],
+   "cookies/prefix/__host.http.non-secure.html": [
+    [
+     "/cookies/prefix/__host.http.non-secure.html",
+     {}
+    ]
+   ],
+   "cookies/prefix/__secure.document-cookie.non-secure.html": [
+    [
+     "/cookies/prefix/__secure.document-cookie.non-secure.html",
+     {}
+    ]
+   ],
+   "cookies/prefix/__secure.http.non-secure.html": [
+    [
+     "/cookies/prefix/__secure.http.non-secure.html",
+     {}
+    ]
+   ],
+   "cookies/prefix/__secure.http.secure.html": [
+    [
+     "/cookies/prefix/__secure.http.secure.html",
+     {}
+    ]
+   ],
+   "cookies/prefix/document-cookie.non-secure.html": [
+    [
+     "/cookies/prefix/document-cookie.non-secure.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/fetch.html": [
+    [
+     "/cookies/samesite/fetch.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/form-get-blank-reload.html": [
+    [
+     "/cookies/samesite/form-get-blank-reload.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/form-get-blank.html": [
+    [
+     "/cookies/samesite/form-get-blank.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/form-post-blank-reload.html": [
+    [
+     "/cookies/samesite/form-post-blank-reload.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/form-post-blank.html": [
+    [
+     "/cookies/samesite/form-post-blank.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/iframe-reload.html": [
+    [
+     "/cookies/samesite/iframe-reload.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/iframe.html": [
+    [
+     "/cookies/samesite/iframe.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/img.html": [
+    [
+     "/cookies/samesite/img.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/window-open-reload.html": [
+    [
+     "/cookies/samesite/window-open-reload.html",
+     {}
+    ]
+   ],
+   "cookies/samesite/window-open.html": [
+    [
+     "/cookies/samesite/window-open.html",
+     {}
+    ]
+   ],
+   "cookies/secure/cookie-forcing.html": [
+    [
+     "/cookies/secure/cookie-forcing.html",
+     {}
+    ]
+   ],
+   "cookies/secure/create-cookie-http.html": [
+    [
+     "/cookies/secure/create-cookie-http.html",
+     {}
+    ]
+   ],
    "cookies/secure/set-from-dom.https.sub.html": [
     [
      "/cookies/secure/set-from-dom.https.sub.html",
@@ -314156,6 +315762,12 @@
      {}
     ]
    ],
+   "cors/client-hint-request-headers.htm": [
+    [
+     "/cors/client-hint-request-headers.htm",
+     {}
+    ]
+   ],
    "cors/credentials-flag.htm": [
     [
      "/cors/credentials-flag.htm",
@@ -314758,6 +316370,12 @@
      {}
     ]
    ],
+   "css/css-animations/animationevent-pseudoelement.html": [
+    [
+     "/css/css-animations/animationevent-pseudoelement.html",
+     {}
+    ]
+   ],
    "css/css-animations/animationevent-types.html": [
     [
      "/css/css-animations/animationevent-types.html",
@@ -315158,6 +316776,12 @@
      {}
     ]
    ],
+   "css/css-display/display-list-item-height-after-dom-change.html": [
+    [
+     "/css/css-display/display-list-item-height-after-dom-change.html",
+     {}
+    ]
+   ],
    "css/css-exclusions/wrap-flow-001.html": [
     [
      "/css/css-exclusions/wrap-flow-001.html",
@@ -315212,6 +316836,12 @@
      {}
     ]
    ],
+   "css/css-flexbox/flexbox_first-letter.html": [
+    [
+     "/css/css-flexbox/flexbox_first-letter.html",
+     {}
+    ]
+   ],
    "css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-center.html": [
     [
      "/css/css-flexbox/getcomputedstyle/flexbox_computedstyle_align-content-center.html",
@@ -317210,6 +318840,12 @@
      {}
     ]
    ],
+   "css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html": [
+    [
+     "/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html",
+     {}
+    ]
+   ],
    "css/css-images/parsing/gradient-position-invalid.html": [
     [
      "/css/css-images/parsing/gradient-position-invalid.html",
@@ -317654,6 +319290,18 @@
      {}
     ]
    ],
+   "css/css-scoping/keyframes-001.html": [
+    [
+     "/css/css-scoping/keyframes-001.html",
+     {}
+    ]
+   ],
+   "css/css-scoping/keyframes-002.html": [
+    [
+     "/css/css-scoping/keyframes-002.html",
+     {}
+    ]
+   ],
    "css/css-scoping/shadow-cascade-order-001.html": [
     [
      "/css/css-scoping/shadow-cascade-order-001.html",
@@ -317684,6 +319332,12 @@
      {}
     ]
    ],
+   "css/css-scoping/stylesheet-title-002.html": [
+    [
+     "/css/css-scoping/stylesheet-title-002.html",
+     {}
+    ]
+   ],
    "css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html": [
     [
      "/css/css-scroll-anchoring/abspos-containing-block-outside-scroller.html",
@@ -318590,6 +320244,12 @@
      {}
     ]
    ],
+   "css/css-syntax/unicode-range-selector.html": [
+    [
+     "/css/css-syntax/unicode-range-selector.html",
+     {}
+    ]
+   ],
    "css/css-tables/bounding-box-computation-1.html": [
     [
      "/css/css-tables/bounding-box-computation-1.html",
@@ -322172,6 +323832,138 @@
      {}
     ]
    ],
+   "css/css-ui/parsing/box-sizing-invalid.html": [
+    [
+     "/css/css-ui/parsing/box-sizing-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/box-sizing-valid.html": [
+    [
+     "/css/css-ui/parsing/box-sizing-valid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/caret-color-invalid.html": [
+    [
+     "/css/css-ui/parsing/caret-color-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/caret-color-valid.html": [
+    [
+     "/css/css-ui/parsing/caret-color-valid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/cursor-invalid.html": [
+    [
+     "/css/css-ui/parsing/cursor-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/cursor-valid.html": [
+    [
+     "/css/css-ui/parsing/cursor-valid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-color-invalid.html": [
+    [
+     "/css/css-ui/parsing/outline-color-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-color-valid-mandatory.html": [
+    [
+     "/css/css-ui/parsing/outline-color-valid-mandatory.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-color-valid-optional.html": [
+    [
+     "/css/css-ui/parsing/outline-color-valid-optional.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-invalid.html": [
+    [
+     "/css/css-ui/parsing/outline-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-offset-invalid.html": [
+    [
+     "/css/css-ui/parsing/outline-offset-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-offset-valid.html": [
+    [
+     "/css/css-ui/parsing/outline-offset-valid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-style-invalid.html": [
+    [
+     "/css/css-ui/parsing/outline-style-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-style-valid.html": [
+    [
+     "/css/css-ui/parsing/outline-style-valid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-valid-mandatory.html": [
+    [
+     "/css/css-ui/parsing/outline-valid-mandatory.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-valid-optional.html": [
+    [
+     "/css/css-ui/parsing/outline-valid-optional.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-width-invalid.html": [
+    [
+     "/css/css-ui/parsing/outline-width-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/outline-width-valid.html": [
+    [
+     "/css/css-ui/parsing/outline-width-valid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/resize-invalid.html": [
+    [
+     "/css/css-ui/parsing/resize-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/resize-valid.html": [
+    [
+     "/css/css-ui/parsing/resize-valid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/text-overflow-invalid.html": [
+    [
+     "/css/css-ui/parsing/text-overflow-invalid.html",
+     {}
+    ]
+   ],
+   "css/css-ui/parsing/text-overflow-valid.html": [
+    [
+     "/css/css-ui/parsing/text-overflow-valid.html",
+     {}
+    ]
+   ],
    "css/css-ui/text-overflow-023.html": [
     [
      "/css/css-ui/text-overflow-023.html",
@@ -322976,6 +324768,12 @@
      {}
     ]
    ],
+   "css/cssom-view/elementScroll-002.html": [
+    [
+     "/css/cssom-view/elementScroll-002.html",
+     {}
+    ]
+   ],
    "css/cssom-view/elementScroll.html": [
     [
      "/css/cssom-view/elementScroll.html",
@@ -323516,6 +325314,18 @@
      {}
     ]
    ],
+   "css/cssom/preferred-stylesheet-order.html": [
+    [
+     "/css/cssom/preferred-stylesheet-order.html",
+     {}
+    ]
+   ],
+   "css/cssom/preferred-stylesheet-reversed-order.html": [
+    [
+     "/css/cssom/preferred-stylesheet-reversed-order.html",
+     {}
+    ]
+   ],
    "css/cssom/selectorSerialize.html": [
     [
      "/css/cssom/selectorSerialize.html",
@@ -323588,6 +325398,12 @@
      {}
     ]
    ],
+   "css/cssom/stylesheet-title.html": [
+    [
+     "/css/cssom/stylesheet-title.html",
+     {}
+    ]
+   ],
    "css/cssom/ttwf-cssom-doc-ext-load-count.html": [
     [
      "/css/cssom/ttwf-cssom-doc-ext-load-count.html",
@@ -329426,39 +331242,33 @@
      {}
     ]
    ],
-   "fetch/api/cors/cors-expose-star-worker.html": [
+   "fetch/api/cors/cors-expose-star.sub.any.js": [
     [
-     "/fetch/api/cors/cors-expose-star-worker.html",
+     "/fetch/api/cors/cors-expose-star.sub.any.html",
      {}
-    ]
-   ],
-   "fetch/api/cors/cors-expose-star.html": [
+    ],
     [
-     "/fetch/api/cors/cors-expose-star.html",
+     "/fetch/api/cors/cors-expose-star.sub.any.worker.html",
      {}
     ]
    ],
-   "fetch/api/cors/cors-filtering-worker.html": [
+   "fetch/api/cors/cors-filtering.sub.any.js": [
     [
-     "/fetch/api/cors/cors-filtering-worker.html",
+     "/fetch/api/cors/cors-filtering.sub.any.html",
      {}
-    ]
-   ],
-   "fetch/api/cors/cors-filtering.html": [
+    ],
     [
-     "/fetch/api/cors/cors-filtering.html",
+     "/fetch/api/cors/cors-filtering.sub.any.worker.html",
      {}
     ]
    ],
-   "fetch/api/cors/cors-multiple-origins-worker.html": [
+   "fetch/api/cors/cors-multiple-origins.sub.any.js": [
     [
-     "/fetch/api/cors/cors-multiple-origins-worker.html",
+     "/fetch/api/cors/cors-multiple-origins.sub.any.html",
      {}
-    ]
-   ],
-   "fetch/api/cors/cors-multiple-origins.html": [
+    ],
     [
-     "/fetch/api/cors/cors-multiple-origins.html",
+     "/fetch/api/cors/cors-multiple-origins.sub.any.worker.html",
      {}
     ]
    ],
@@ -329762,91 +331572,73 @@
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-count-worker.html": [
+   "fetch/api/redirect/redirect-count.any.js": [
     [
-     "/fetch/api/redirect/redirect-count-worker.html",
-     {
-      "timeout": "long"
-     }
-    ]
-   ],
-   "fetch/api/redirect/redirect-count.html": [
+     "/fetch/api/redirect/redirect-count.any.html",
+     {}
+    ],
     [
-     "/fetch/api/redirect/redirect-count.html",
-     {
-      "timeout": "long"
-     }
+     "/fetch/api/redirect/redirect-count.any.worker.html",
+     {}
     ]
    ],
-   "fetch/api/redirect/redirect-empty-location-worker.html": [
+   "fetch/api/redirect/redirect-empty-location.any.js": [
     [
-     "/fetch/api/redirect/redirect-empty-location-worker.html",
+     "/fetch/api/redirect/redirect-empty-location.any.html",
      {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-empty-location.html": [
+    ],
     [
-     "/fetch/api/redirect/redirect-empty-location.html",
+     "/fetch/api/redirect/redirect-empty-location.any.worker.html",
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-location-worker.html": [
+   "fetch/api/redirect/redirect-location.any.js": [
     [
-     "/fetch/api/redirect/redirect-location-worker.html",
+     "/fetch/api/redirect/redirect-location.any.html",
      {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-location.html": [
+    ],
     [
-     "/fetch/api/redirect/redirect-location.html",
+     "/fetch/api/redirect/redirect-location.any.worker.html",
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-method-worker.html": [
+   "fetch/api/redirect/redirect-method.any.js": [
     [
-     "/fetch/api/redirect/redirect-method-worker.html",
+     "/fetch/api/redirect/redirect-method.any.html",
      {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-method.html": [
+    ],
     [
-     "/fetch/api/redirect/redirect-method.html",
+     "/fetch/api/redirect/redirect-method.any.worker.html",
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-mode-worker.html": [
+   "fetch/api/redirect/redirect-mode.any.js": [
     [
-     "/fetch/api/redirect/redirect-mode-worker.html",
+     "/fetch/api/redirect/redirect-mode.any.html",
      {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-mode.html": [
+    ],
     [
-     "/fetch/api/redirect/redirect-mode.html",
+     "/fetch/api/redirect/redirect-mode.any.worker.html",
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-origin-worker.html": [
+   "fetch/api/redirect/redirect-origin.any.js": [
     [
-     "/fetch/api/redirect/redirect-origin-worker.html",
+     "/fetch/api/redirect/redirect-origin.any.html",
      {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-origin.html": [
+    ],
     [
-     "/fetch/api/redirect/redirect-origin.html",
+     "/fetch/api/redirect/redirect-origin.any.worker.html",
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-referrer-worker.html": [
+   "fetch/api/redirect/redirect-referrer.any.js": [
     [
-     "/fetch/api/redirect/redirect-referrer-worker.html",
+     "/fetch/api/redirect/redirect-referrer.any.html",
      {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-referrer.html": [
+    ],
     [
-     "/fetch/api/redirect/redirect-referrer.html",
+     "/fetch/api/redirect/redirect-referrer.any.worker.html",
      {}
     ]
    ],
@@ -329856,15 +331648,13 @@
      {}
     ]
    ],
-   "fetch/api/redirect/redirect-to-dataurl-worker.html": [
+   "fetch/api/redirect/redirect-to-dataurl.any.js": [
     [
-     "/fetch/api/redirect/redirect-to-dataurl-worker.html",
+     "/fetch/api/redirect/redirect-to-dataurl.any.html",
      {}
-    ]
-   ],
-   "fetch/api/redirect/redirect-to-dataurl.html": [
+    ],
     [
-     "/fetch/api/redirect/redirect-to-dataurl.html",
+     "/fetch/api/redirect/redirect-to-dataurl.any.worker.html",
      {}
     ]
    ],
@@ -330146,6 +331936,16 @@
      {}
     ]
    ],
+   "fetch/api/response/response-stream-with-broken-then.any.js": [
+    [
+     "/fetch/api/response/response-stream-with-broken-then.any.html",
+     {}
+    ],
+    [
+     "/fetch/api/response/response-stream-with-broken-then.any.worker.html",
+     {}
+    ]
+   ],
    "fetch/api/response/response-trailer.html": [
     [
      "/fetch/api/response/response-trailer.html",
@@ -330162,6 +331962,12 @@
      {}
     ]
    ],
+   "fetch/content-length/content-length.html": [
+    [
+     "/fetch/content-length/content-length.html",
+     {}
+    ]
+   ],
    "fetch/corb/img-mime-types-coverage.tentative.sub.html": [
     [
      "/fetch/corb/img-mime-types-coverage.tentative.sub.html",
@@ -330180,6 +331986,12 @@
      {}
     ]
    ],
+   "fetch/corb/script-html-js-polyglot.sub.html": [
+    [
+     "/fetch/corb/script-html-js-polyglot.sub.html",
+     {}
+    ]
+   ],
    "fetch/corb/script-html-via-cross-origin-blob-url.sub.html": [
     [
      "/fetch/corb/script-html-via-cross-origin-blob-url.sub.html",
@@ -330982,6 +332794,22 @@
      {}
     ]
    ],
+   "html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js": [
+    [
+     "/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.html",
+     {}
+    ]
+   ],
+   "html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js": [
+    [
+     "/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.html",
+     {}
+    ],
+    [
+     "/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.worker.html",
+     {}
+    ]
+   ],
    "html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html": [
     [
      "/html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html",
@@ -331450,6 +333278,12 @@
      {}
     ]
    ],
+   "html/browsers/history/the-history-interface/history_pushstate_url.html": [
+    [
+     "/html/browsers/history/the-history-interface/history_pushstate_url.html",
+     {}
+    ]
+   ],
    "html/browsers/history/the-history-interface/history_replacestate.html": [
     [
      "/html/browsers/history/the-history-interface/history_replacestate.html",
@@ -333098,6 +334932,12 @@
      {}
     ]
    ],
+   "html/dom/dynamic-markup-insertion/document-write/contentType.window.js": [
+    [
+     "/html/dom/dynamic-markup-insertion/document-write/contentType.window.html",
+     {}
+    ]
+   ],
    "html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml": [
     [
      "/html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml",
@@ -333380,6 +335220,18 @@
      {}
     ]
    ],
+   "html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js": [
+    [
+     "/html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.html",
+     {}
+    ]
+   ],
+   "html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js": [
+    [
+     "/html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.html",
+     {}
+    ]
+   ],
    "html/dom/dynamic-markup-insertion/opening-the-input-stream/mutation-events.window.js": [
     [
      "/html/dom/dynamic-markup-insertion/opening-the-input-stream/mutation-events.window.html",
@@ -334096,6 +335948,16 @@
      {}
     ]
    ],
+   "html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html": [
+    [
+     "/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html?encoding=utf8",
+     {}
+    ],
+    [
+     "/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html?encoding=x-cp1251",
+     {}
+    ]
+   ],
    "html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html": [
     [
      "/html/infrastructure/urls/resolving-urls/query-encoding/utf-16be.html",
@@ -337818,6 +339680,12 @@
      {}
     ]
    ],
+   "html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js": [
+    [
+     "/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.html",
+     {}
+    ]
+   ],
    "html/semantics/forms/form-submission-0/form-data-set-usv.html": [
     [
      "/html/semantics/forms/form-submission-0/form-data-set-usv.html",
@@ -343046,6 +344914,16 @@
      {}
     ]
    ],
+   "html/webappapis/timers/missing-timeout-setinterval.any.js": [
+    [
+     "/html/webappapis/timers/missing-timeout-setinterval.any.html",
+     {}
+    ],
+    [
+     "/html/webappapis/timers/missing-timeout-setinterval.any.worker.html",
+     {}
+    ]
+   ],
    "html/webappapis/timers/negative-setinterval.html": [
     [
      "/html/webappapis/timers/negative-setinterval.html",
@@ -343070,28 +344948,6 @@
      {}
     ]
    ],
-   "http/content_length.html": [
-    [
-     "/http/content_length.html",
-     {}
-    ]
-   ],
-   "http/refresh/navigate.window.js": [
-    [
-     "/http/refresh/navigate.window.html",
-     {}
-    ]
-   ],
-   "http/refresh/subresource.any.js": [
-    [
-     "/http/refresh/subresource.any.html",
-     {}
-    ],
-    [
-     "/http/refresh/subresource.any.worker.html",
-     {}
-    ]
-   ],
    "imagebitmap-renderingcontext/bitmaprenderer-as-imagesource.html": [
     [
      "/imagebitmap-renderingcontext/bitmaprenderer-as-imagesource.html",
@@ -343156,6 +345012,12 @@
      {}
     ]
    ],
+   "infrastructure/expected-fail/timeout.html": [
+    [
+     "/infrastructure/expected-fail/timeout.html",
+     {}
+    ]
+   ],
    "infrastructure/server/secure-context.https.any.js": [
     [
      "/infrastructure/server/secure-context.https.any.html",
@@ -343254,6 +345116,12 @@
      {}
     ]
    ],
+   "intersection-observer/isIntersecting-change-events.html": [
+    [
+     "/intersection-observer/isIntersecting-change-events.html",
+     {}
+    ]
+   ],
    "intersection-observer/multiple-targets.html": [
     [
      "/intersection-observer/multiple-targets.html",
@@ -343434,6 +345302,18 @@
      {}
     ]
    ],
+   "keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html": [
+    [
+     "/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html",
+     {}
+    ]
+   ],
+   "keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html": [
+    [
+     "/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html",
+     {}
+    ]
+   ],
    "keyboard-lock/navigator-keyboard-lock-two-parallel-requests.https.html": [
     [
      "/keyboard-lock/navigator-keyboard-lock-two-parallel-requests.https.html",
@@ -343458,6 +345338,18 @@
      {}
     ]
    ],
+   "keyboard-map/idlharness.https.html": [
+    [
+     "/keyboard-map/idlharness.https.html",
+     {}
+    ]
+   ],
+   "keyboard-map/keyboard-map-https.html": [
+    [
+     "/keyboard-map/keyboard-map-https.html",
+     {}
+    ]
+   ],
    "longtask-timing/longtask-attributes.html": [
     [
      "/longtask-timing/longtask-attributes.html",
@@ -344262,6 +346154,12 @@
      {}
     ]
    ],
+   "mediacapture-streams/MediaStreamTrack-applyConstraints.https.html": [
+    [
+     "/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html",
+     {}
+    ]
+   ],
    "mediacapture-streams/MediaStreamTrack-getCapabilities.https.html": [
     [
      "/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html",
@@ -354998,9 +356896,9 @@
      {}
     ]
    ],
-   "orientation-sensor/OrientationSensor.https.html": [
+   "orientation-sensor/AbsoluteOrientationSensor.https.html": [
     [
-     "/orientation-sensor/OrientationSensor.https.html",
+     "/orientation-sensor/AbsoluteOrientationSensor.https.html",
      {}
     ]
    ],
@@ -355040,6 +356938,12 @@
      {}
     ]
    ],
+   "orientation-sensor/RelativeOrientationSensor.https.html": [
+    [
+     "/orientation-sensor/RelativeOrientationSensor.https.html",
+     {}
+    ]
+   ],
    "orientation-sensor/idlharness.https.html": [
     [
      "/orientation-sensor/idlharness.https.html",
@@ -356078,6 +357982,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -356114,6 +358036,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
@@ -356150,6 +358090,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -356186,6 +358144,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html",
@@ -356942,6 +358918,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -356978,6 +358972,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -357014,6 +359026,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -357050,6 +359080,24 @@
      {}
     ]
    ],
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html",
@@ -357806,6 +359854,24 @@
      {}
     ]
    ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
@@ -357842,6 +359908,24 @@
      {}
     ]
    ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
@@ -357878,6 +359962,24 @@
      {}
     ]
    ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html",
@@ -357962,6 +360064,48 @@
      {}
     ]
    ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html",
@@ -358958,6 +361102,24 @@
      {}
     ]
    ],
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -358994,6 +361156,24 @@
      {}
     ]
    ],
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -359030,6 +361210,24 @@
      {}
     ]
    ],
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -359066,6 +361264,24 @@
      {}
     ]
    ],
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html",
@@ -359822,6 +362038,24 @@
      {}
     ]
    ],
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html",
@@ -359858,6 +362092,24 @@
      {}
     ]
    ],
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html",
@@ -359894,6 +362146,24 @@
      {}
     ]
    ],
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
     [
      "/referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html",
@@ -359906,6 +362176,12 @@
      {}
     ]
    ],
+   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html",
@@ -360542,6 +362818,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -360578,6 +362872,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html",
@@ -360614,6 +362926,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -360650,6 +362980,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html",
@@ -361406,6 +363754,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -361442,6 +363808,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
@@ -361478,6 +363862,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -361514,6 +363916,24 @@
      {}
     ]
    ],
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html",
@@ -362270,6 +364690,24 @@
      {}
     ]
    ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -362306,6 +364744,24 @@
      {}
     ]
    ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -362342,6 +364798,24 @@
      {}
     ]
    ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html",
@@ -362378,6 +364852,24 @@
      {}
     ]
    ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html",
@@ -363134,6 +365626,24 @@
      {}
     ]
    ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -363170,6 +365680,24 @@
      {}
     ]
    ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html",
@@ -363206,6 +365734,24 @@
      {}
     ]
    ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html",
@@ -363242,6 +365788,24 @@
      {}
     ]
    ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html",
+     {}
+    ]
+   ],
+   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+    [
+     "/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html",
+     {}
+    ]
+   ],
    "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html": [
     [
      "/referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html",
@@ -364682,24 +367246,54 @@
      {}
     ]
    ],
+   "server-timing/navigation_timing_idl.https.html": [
+    [
+     "/server-timing/navigation_timing_idl.https.html",
+     {}
+    ]
+   ],
    "server-timing/resource_timing_idl.html": [
     [
      "/server-timing/resource_timing_idl.html",
      {}
     ]
    ],
+   "server-timing/resource_timing_idl.https.html": [
+    [
+     "/server-timing/resource_timing_idl.https.html",
+     {}
+    ]
+   ],
    "server-timing/server_timing_header-parsing.html": [
     [
      "/server-timing/server_timing_header-parsing.html",
      {}
     ]
    ],
+   "server-timing/server_timing_header-parsing.https.html": [
+    [
+     "/server-timing/server_timing_header-parsing.https.html",
+     {}
+    ]
+   ],
+   "server-timing/service_worker_idl.html": [
+    [
+     "/server-timing/service_worker_idl.html",
+     {}
+    ]
+   ],
    "server-timing/test_server_timing.html": [
     [
      "/server-timing/test_server_timing.html",
      {}
     ]
    ],
+   "server-timing/test_server_timing.https.html": [
+    [
+     "/server-timing/test_server_timing.https.html",
+     {}
+    ]
+   ],
    "service-workers/cache-storage/common.https.html": [
     [
      "/service-workers/cache-storage/common.https.html",
@@ -365858,6 +368452,12 @@
      {}
     ]
    ],
+   "service-workers/service-worker/resource-timing-cross-origin.https.html": [
+    [
+     "/service-workers/service-worker/resource-timing-cross-origin.https.html",
+     {}
+    ]
+   ],
    "service-workers/service-worker/resource-timing.https.html": [
     [
      "/service-workers/service-worker/resource-timing.https.html",
@@ -368120,21 +370720,21 @@
      {}
     ]
    ],
-   "svg/extensibility/foreignObject/properties.svg": [
+   "svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html": [
     [
-     "/svg/extensibility/foreignObject/properties.svg",
+     "/svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html",
      {}
     ]
    ],
-   "svg/extensibility/interfaces/foreignObject-graphics.svg": [
+   "svg/extensibility/foreignObject/properties.svg": [
     [
-     "/svg/extensibility/interfaces/foreignObject-graphics.svg",
+     "/svg/extensibility/foreignObject/properties.svg",
      {}
     ]
    ],
-   "svg/foreignobject/foreign-object-circular-filter-reference-crash.html": [
+   "svg/extensibility/interfaces/foreignObject-graphics.svg": [
     [
-     "/svg/foreignobject/foreign-object-circular-filter-reference-crash.html",
+     "/svg/extensibility/interfaces/foreignObject-graphics.svg",
      {}
     ]
    ],
@@ -369030,6 +371630,12 @@
      {}
     ]
    ],
+   "user-timing/user-timing-tojson.html": [
+    [
+     "/user-timing/user-timing-tojson.html",
+     {}
+    ]
+   ],
    "user-timing/user_timing_exists.any.js": [
     [
      "/user-timing/user_timing_exists.any.html",
@@ -369724,6 +372330,24 @@
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html": [
+    [
+     "/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html": [
+    [
+     "/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html": [
+    [
+     "/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html",
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-analysernode-interface/test-analyser-gain.html": [
     [
      "/webaudio/the-audio-api/the-analysernode-interface/test-analyser-gain.html",
@@ -369754,6 +372378,24 @@
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html": [
+    [
+     "/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html": [
+    [
+     "/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html": [
+    [
+     "/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html",
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html": [
     [
      "/webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html",
@@ -369772,6 +372414,24 @@
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html": [
+    [
+     "/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html": [
+    [
+     "/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html": [
+    [
+     "/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html",
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-audiodestinationnode-interface/idl-test.html": [
     [
      "/webaudio/the-audio-api/the-audiodestinationnode-interface/idl-test.html",
@@ -369826,12 +372486,84 @@
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html",
+     {}
+    ]
+   ],
+   "webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html",
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-audioparam-interface/automation-rate.html": [
     [
      "/webaudio/the-audio-api/the-audioparam-interface/automation-rate.html",
      {}
     ]
    ],
+   "webaudio/the-audio-api/the-audioparam-interface/event-insertion.html": [
+    [
+     "/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html",
+     {}
+    ]
+   ],
    "webaudio/the-audio-api/the-audioparam-interface/idl-test.html": [
     [
      "/webaudio/the-audio-api/the-audioparam-interface/idl-test.html",
@@ -371344,6 +374076,12 @@
      {}
     ]
    ],
+   "webrtc/RTCPeerConnection-add-track-no-deadlock.https.html": [
+    [
+     "/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html",
+     {}
+    ]
+   ],
    "webrtc/RTCPeerConnection-addIceCandidate.html": [
     [
      "/webrtc/RTCPeerConnection-addIceCandidate.html",
@@ -371722,6 +374460,12 @@
      {}
     ]
    ],
+   "webrtc/protocol/video-codecs.html": [
+    [
+     "/webrtc/protocol/video-codecs.html",
+     {}
+    ]
+   ],
    "webrtc/simplecall.https.html": [
     [
      "/webrtc/simplecall.https.html",
@@ -374138,6 +376882,24 @@
      {}
     ]
    ],
+   "webusb/worker/usb.dedicatedworker.https.html": [
+    [
+     "/webusb/worker/usb.dedicatedworker.https.html",
+     {}
+    ]
+   ],
+   "webusb/worker/usb.serviceworker.https.html": [
+    [
+     "/webusb/worker/usb.serviceworker.https.html",
+     {}
+    ]
+   ],
+   "webusb/worker/usb.sharedworker.https.html": [
+    [
+     "/webusb/worker/usb.sharedworker.https.html",
+     {}
+    ]
+   ],
    "webvr/idlharness.https.html": [
     [
      "/webvr/idlharness.https.html",
@@ -375452,6 +378214,12 @@
      {}
     ]
    ],
+   "workers/modules/dedicated-worker-options-credentials.html": [
+    [
+     "/workers/modules/dedicated-worker-options-credentials.html",
+     {}
+    ]
+   ],
    "workers/modules/dedicated-worker-options-type.html": [
     [
      "/workers/modules/dedicated-worker-options-type.html",
@@ -377386,6 +380154,16 @@
      {}
     ]
    ],
+   "xhr/sync-no-progress.any.js": [
+    [
+     "/xhr/sync-no-progress.any.html",
+     {}
+    ],
+    [
+     "/xhr/sync-no-progress.any.worker.html",
+     {}
+    ]
+   ],
    "xhr/template-element.html": [
     [
      "/xhr/template-element.html",
@@ -395704,12 +398482,6 @@
      {}
     ]
    ],
-   "css/css-fonts/font-face-unicode-range-2.html": [
-    [
-     "/css/css-fonts/font-face-unicode-range-2.html",
-     {}
-    ]
-   ],
    "css/css-fonts/font-face-unicode-range.html": [
     [
      "/css/css-fonts/font-face-unicode-range.html",
@@ -395722,12 +398494,6 @@
      {}
     ]
    ],
-   "css/css-fonts/font-size-adjust-002.html": [
-    [
-     "/css/css-fonts/font-size-adjust-002.html",
-     {}
-    ]
-   ],
    "css/css-fonts/font-variant-position-02.html": [
     [
      "/css/css-fonts/font-variant-position-02.html",
@@ -396630,6 +399396,12 @@
      {}
     ]
    ],
+   "webdriver/tests/accept_alert/accept.py": [
+    [
+     "/webdriver/tests/accept_alert/accept.py",
+     {}
+    ]
+   ],
    "webdriver/tests/actions/key.py": [
     [
      "/webdriver/tests/actions/key.py",
@@ -396688,327 +399460,381 @@
      }
     ]
    ],
-   "webdriver/tests/contexts/json_serialize_windowproxy.py": [
+   "webdriver/tests/add_cookie/add.py": [
+    [
+     "/webdriver/tests/add_cookie/add.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/close_window/close.py": [
+    [
+     "/webdriver/tests/close_window/close.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/close_window/user_prompts.py": [
     [
-     "/webdriver/tests/contexts/json_serialize_windowproxy.py",
+     "/webdriver/tests/close_window/user_prompts.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/contexts/maximize_window.py": [
+   "webdriver/tests/delete_cookie/delete.py": [
+    [
+     "/webdriver/tests/delete_cookie/delete.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/delete_cookie/user_prompts.py": [
+    [
+     "/webdriver/tests/delete_cookie/user_prompts.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/dismiss_alert/dismiss.py": [
     [
-     "/webdriver/tests/contexts/maximize_window.py",
+     "/webdriver/tests/dismiss_alert/dismiss.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/element_clear/clear.py": [
+    [
+     "/webdriver/tests/element_clear/clear.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/contexts/resizing_and_positioning.py": [
+   "webdriver/tests/element_click/bubbling.py": [
     [
-     "/webdriver/tests/contexts/resizing_and_positioning.py",
+     "/webdriver/tests/element_click/bubbling.py",
      {}
     ]
    ],
-   "webdriver/tests/cookies/add_cookie.py": [
+   "webdriver/tests/element_click/select.py": [
     [
-     "/webdriver/tests/cookies/add_cookie.py",
+     "/webdriver/tests/element_click/select.py",
      {}
     ]
    ],
-   "webdriver/tests/cookies/delete_cookie.py": [
+   "webdriver/tests/element_click/stale.py": [
     [
-     "/webdriver/tests/cookies/delete_cookie.py",
+     "/webdriver/tests/element_click/stale.py",
      {}
     ]
    ],
-   "webdriver/tests/cookies/get_named_cookie.py": [
+   "webdriver/tests/element_send_keys/content_editable.py": [
     [
-     "/webdriver/tests/cookies/get_named_cookie.py",
+     "/webdriver/tests/element_send_keys/content_editable.py",
      {}
     ]
    ],
-   "webdriver/tests/document_handling/page_source.py": [
+   "webdriver/tests/element_send_keys/form_controls.py": [
     [
-     "/webdriver/tests/document_handling/page_source.py",
+     "/webdriver/tests/element_send_keys/form_controls.py",
      {}
     ]
    ],
-   "webdriver/tests/element_click/bubbling.py": [
+   "webdriver/tests/element_send_keys/interactability.py": [
     [
-     "/webdriver/tests/element_click/bubbling.py",
+     "/webdriver/tests/element_send_keys/interactability.py",
      {}
     ]
    ],
-   "webdriver/tests/element_click/select.py": [
+   "webdriver/tests/element_send_keys/scroll_into_view.py": [
     [
-     "/webdriver/tests/element_click/select.py",
+     "/webdriver/tests/element_send_keys/scroll_into_view.py",
      {}
     ]
    ],
-   "webdriver/tests/element_click/stale.py": [
+   "webdriver/tests/execute_async_script/collections.py": [
     [
-     "/webdriver/tests/element_click/stale.py",
+     "/webdriver/tests/execute_async_script/collections.py",
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/find_element.py": [
+   "webdriver/tests/execute_async_script/user_prompts.py": [
     [
-     "/webdriver/tests/element_retrieval/find_element.py",
+     "/webdriver/tests/execute_async_script/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/find_element_from_element.py": [
+   "webdriver/tests/execute_script/collections.py": [
     [
-     "/webdriver/tests/element_retrieval/find_element_from_element.py",
+     "/webdriver/tests/execute_script/collections.py",
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/find_elements.py": [
+   "webdriver/tests/execute_script/cyclic.py": [
     [
-     "/webdriver/tests/element_retrieval/find_elements.py",
+     "/webdriver/tests/execute_script/cyclic.py",
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/find_elements_from_element.py": [
+   "webdriver/tests/execute_script/json_serialize_windowproxy.py": [
     [
-     "/webdriver/tests/element_retrieval/find_elements_from_element.py",
+     "/webdriver/tests/execute_script/json_serialize_windowproxy.py",
      {}
     ]
    ],
-   "webdriver/tests/element_retrieval/get_active_element.py": [
+   "webdriver/tests/execute_script/user_prompts.py": [
     [
-     "/webdriver/tests/element_retrieval/get_active_element.py",
+     "/webdriver/tests/execute_script/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/element_send_keys/form_controls.py": [
+   "webdriver/tests/find_element/find.py": [
     [
-     "/webdriver/tests/element_send_keys/form_controls.py",
+     "/webdriver/tests/find_element/find.py",
      {}
     ]
    ],
-   "webdriver/tests/element_send_keys/interactability.py": [
+   "webdriver/tests/find_element_from_element/find.py": [
     [
-     "/webdriver/tests/element_send_keys/interactability.py",
+     "/webdriver/tests/find_element_from_element/find.py",
      {}
     ]
    ],
-   "webdriver/tests/element_send_keys/scroll_into_view.py": [
+   "webdriver/tests/find_elements/find.py": [
     [
-     "/webdriver/tests/element_send_keys/scroll_into_view.py",
+     "/webdriver/tests/find_elements/find.py",
      {}
     ]
    ],
-   "webdriver/tests/execute_async_script/collections.py": [
+   "webdriver/tests/find_elements_from_element/find.py": [
     [
-     "/webdriver/tests/execute_async_script/collections.py",
+     "/webdriver/tests/find_elements_from_element/find.py",
      {}
     ]
    ],
-   "webdriver/tests/execute_async_script/user_prompts.py": [
+   "webdriver/tests/fullscreen_window/fullscreen.py": [
     [
-     "/webdriver/tests/execute_async_script/user_prompts.py",
+     "/webdriver/tests/fullscreen_window/fullscreen.py",
      {}
     ]
    ],
-   "webdriver/tests/execute_script/collections.py": [
+   "webdriver/tests/fullscreen_window/user_prompts.py": [
     [
-     "/webdriver/tests/execute_script/collections.py",
+     "/webdriver/tests/fullscreen_window/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/execute_script/cyclic.py": [
+   "webdriver/tests/get_active_element/get.py": [
     [
-     "/webdriver/tests/execute_script/cyclic.py",
+     "/webdriver/tests/get_active_element/get.py",
      {}
     ]
    ],
-   "webdriver/tests/execute_script/user_prompts.py": [
+   "webdriver/tests/get_alert_text/get.py": [
     [
-     "/webdriver/tests/execute_script/user_prompts.py",
+     "/webdriver/tests/get_alert_text/get.py",
      {}
     ]
    ],
-   "webdriver/tests/fullscreen_window.py": [
+   "webdriver/tests/get_current_url/get.py": [
     [
-     "/webdriver/tests/fullscreen_window.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_current_url/get.py",
+     {}
     ]
    ],
-   "webdriver/tests/get_window_rect.py": [
+   "webdriver/tests/get_current_url/user_prompts.py": [
     [
-     "/webdriver/tests/get_window_rect.py",
+     "/webdriver/tests/get_current_url/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/interaction/element_clear.py": [
+   "webdriver/tests/get_element_attribute/get.py": [
     [
-     "/webdriver/tests/interaction/element_clear.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_element_attribute/get.py",
+     {}
     ]
    ],
-   "webdriver/tests/interaction/send_keys_content_editable.py": [
+   "webdriver/tests/get_element_property/get.py": [
     [
-     "/webdriver/tests/interaction/send_keys_content_editable.py",
+     "/webdriver/tests/get_element_property/get.py",
      {}
     ]
    ],
-   "webdriver/tests/minimize_window.py": [
+   "webdriver/tests/get_element_property/user_prompts.py": [
     [
-     "/webdriver/tests/minimize_window.py",
+     "/webdriver/tests/get_element_property/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/navigation/current_url.py": [
+   "webdriver/tests/get_element_tag_name/get.py": [
     [
-     "/webdriver/tests/navigation/current_url.py",
+     "/webdriver/tests/get_element_tag_name/get.py",
      {}
     ]
    ],
-   "webdriver/tests/navigation/get_title.py": [
+   "webdriver/tests/get_element_tag_name/user_prompts.py": [
     [
-     "/webdriver/tests/navigation/get_title.py",
+     "/webdriver/tests/get_element_tag_name/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/sessions/get_timeouts.py": [
+   "webdriver/tests/get_element_text/get.py": [
     [
-     "/webdriver/tests/sessions/get_timeouts.py",
+     "/webdriver/tests/get_element_text/get.py",
      {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
+   "webdriver/tests/get_named_cookie/get.py": [
     [
-     "/webdriver/tests/sessions/new_session/create_alwaysMatch.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_named_cookie/get.py",
+     {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/create_firstMatch.py": [
+   "webdriver/tests/get_timeouts/get.py": [
     [
-     "/webdriver/tests/sessions/new_session/create_firstMatch.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_timeouts/get.py",
+     {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/default_values.py": [
+   "webdriver/tests/get_title/get.py": [
     [
-     "/webdriver/tests/sessions/new_session/default_values.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_title/get.py",
+     {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/invalid_capabilities.py": [
+   "webdriver/tests/get_title/user_prompts.py": [
     [
-     "/webdriver/tests/sessions/new_session/invalid_capabilities.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_title/user_prompts.py",
+     {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/merge.py": [
+   "webdriver/tests/get_window_rect/get.py": [
     [
-     "/webdriver/tests/sessions/new_session/merge.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_window_rect/get.py",
+     {}
     ]
    ],
-   "webdriver/tests/sessions/new_session/response.py": [
+   "webdriver/tests/get_window_rect/user_prompts.py": [
     [
-     "/webdriver/tests/sessions/new_session/response.py",
-     {
-      "timeout": "long"
-     }
+     "/webdriver/tests/get_window_rect/user_prompts.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/is_element_selected/selected.py": [
+    [
+     "/webdriver/tests/is_element_selected/selected.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/is_element_selected/user_prompts.py": [
+    [
+     "/webdriver/tests/is_element_selected/user_prompts.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/maximize_window/maximize.py": [
+    [
+     "/webdriver/tests/maximize_window/maximize.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/maximize_window/user_prompts.py": [
+    [
+     "/webdriver/tests/maximize_window/user_prompts.py",
+     {}
+    ]
+   ],
+   "webdriver/tests/minimize_window/minimize.py": [
+    [
+     "/webdriver/tests/minimize_window/minimize.py",
+     {}
     ]
    ],
-   "webdriver/tests/sessions/status.py": [
+   "webdriver/tests/minimize_window/user_prompts.py": [
     [
-     "/webdriver/tests/sessions/status.py",
+     "/webdriver/tests/minimize_window/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/set_window_rect.py": [
+   "webdriver/tests/new_session/create_alwaysMatch.py": [
     [
-     "/webdriver/tests/set_window_rect.py",
+     "/webdriver/tests/new_session/create_alwaysMatch.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/state/get_element_attribute.py": [
+   "webdriver/tests/new_session/create_firstMatch.py": [
     [
-     "/webdriver/tests/state/get_element_attribute.py",
+     "/webdriver/tests/new_session/create_firstMatch.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/state/get_element_property.py": [
+   "webdriver/tests/new_session/default_values.py": [
     [
-     "/webdriver/tests/state/get_element_property.py",
+     "/webdriver/tests/new_session/default_values.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/state/get_element_tag_name.py": [
+   "webdriver/tests/new_session/invalid_capabilities.py": [
     [
-     "/webdriver/tests/state/get_element_tag_name.py",
+     "/webdriver/tests/new_session/invalid_capabilities.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/state/is_element_selected.py": [
+   "webdriver/tests/new_session/merge.py": [
     [
-     "/webdriver/tests/state/is_element_selected.py",
+     "/webdriver/tests/new_session/merge.py",
      {
       "timeout": "long"
      }
     ]
    ],
-   "webdriver/tests/state/text/get_text.py": [
+   "webdriver/tests/new_session/response.py": [
     [
-     "/webdriver/tests/state/text/get_text.py",
-     {}
+     "/webdriver/tests/new_session/response.py",
+     {
+      "timeout": "long"
+     }
     ]
    ],
-   "webdriver/tests/switch_to_parent_frame.py": [
+   "webdriver/tests/page_source/source.py": [
     [
-     "/webdriver/tests/switch_to_parent_frame.py",
+     "/webdriver/tests/page_source/source.py",
      {}
     ]
    ],
-   "webdriver/tests/user_prompts/accept_alert.py": [
+   "webdriver/tests/send_alert_text/send.py": [
     [
-     "/webdriver/tests/user_prompts/accept_alert.py",
+     "/webdriver/tests/send_alert_text/send.py",
      {}
     ]
    ],
-   "webdriver/tests/user_prompts/dismiss_alert.py": [
+   "webdriver/tests/set_window_rect/set.py": [
+    [
+     "/webdriver/tests/set_window_rect/set.py",
+     {
+      "timeout": "long"
+     }
+    ]
+   ],
+   "webdriver/tests/set_window_rect/user_prompts.py": [
     [
-     "/webdriver/tests/user_prompts/dismiss_alert.py",
+     "/webdriver/tests/set_window_rect/user_prompts.py",
      {}
     ]
    ],
-   "webdriver/tests/user_prompts/get_alert_text.py": [
+   "webdriver/tests/status/status.py": [
     [
-     "/webdriver/tests/user_prompts/get_alert_text.py",
+     "/webdriver/tests/status/status.py",
      {}
     ]
    ],
-   "webdriver/tests/user_prompts/send_alert_text.py": [
+   "webdriver/tests/switch_to_parent_frame/switch.py": [
     [
-     "/webdriver/tests/user_prompts/send_alert_text.py",
+     "/webdriver/tests/switch_to_parent_frame/switch.py",
      {}
     ]
    ]
@@ -397032,15 +399858,15 @@
    "support"
   ],
   "./.taskcluster.yml": [
-   "55bc5218ac0aeecadb401ec84f037ad62aa48399",
+   "ad5de789abd81f88b66074c035b1533346f3a8e5",
    "support"
   ],
   "./.travis.yml": [
-   "951cf036d724f429965f091fdfa5a0ea0028f3bf",
+   "db79dd9531259cfaf670e7b780a9a205ec712369",
    "support"
   ],
   "./CONTRIBUTING.md": [
-   "cc9b0261662898aef7f4eed81741361c3f7c6467",
+   "d29b019e9828ee3b23b428c684412aa402ec9fff",
    "support"
   ],
   "./LICENSE": [
@@ -397052,19 +399878,15 @@
    "support"
   ],
   "./README.md": [
-   "ab5642d1f91579c4a86fbc56a10de5dbe6623cf3",
+   "99961df1909cc6fe0a4a7aa50ae9f34bd271d54f",
    "support"
   ],
   "./check_stability.ini": [
-   "f8af4287f3b0f6925a2a6c5c75b3788e24de1680",
-   "support"
-  ],
-  "./config.default.json": [
-   "54422ca469a8d54fa4b8252803bb0e2c91459858",
+   "5addd67f09e895336644c5a9f5049c03e1ffe615",
    "support"
   ],
   "./lint.whitelist": [
-   "64e7ead5a7fa09f59be4dac4ccb5a1e7bf3cb4fc",
+   "b740ea6ee933d028f6b2bef92cc473778b76002f",
    "support"
   ],
   "./serve.py": [
@@ -397091,6 +399913,10 @@
    "04a3fdbfc71c56c334f20d931dc7b427af2cce30",
    "support"
   ],
+  ".well-known/idp-proxy/OWNERS": [
+   "78cafbdf659a6b4f94a1c79b68739dce97771e6e",
+   "support"
+  ],
   ".well-known/idp-proxy/README.md": [
    "ff5a09cfac1bf14fee4c6c057bac351e3229706a",
    "support"
@@ -397111,6 +399937,10 @@
    "16f72935aaf97175593bcf27794506f0884f091b",
    "support"
   ],
+  "2dcontext/OWNERS": [
+   "07a7da62ef2c26f061cfc076d268f06a0cdcf72b",
+   "support"
+  ],
   "2dcontext/best-practices/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -401187,8 +404017,12 @@
    "73f0071c06f429c3d47eac8d0863e11f1d6e8c25",
    "support"
   ],
+  "BackgroundSync/OWNERS": [
+   "ed48014d817ef034062db60403704ed2c0cf9aeb",
+   "support"
+  ],
   "BackgroundSync/interfaces.any.js": [
-   "2a158ca33b93b78a581341d885150d252a0e4555",
+   "4b754f0550409475495768483f2075e8f54782d0",
    "testharness"
   ],
   "FileAPI/BlobURL/support/file_test2.txt": [
@@ -401308,7 +404142,7 @@
    "support"
   ],
   "FileAPI/historical.https.html": [
-   "e1cf63d05a0e401cc38a11d2b42efb9e8d315610",
+   "8a0e866521c4cbfb010260c29777f1c93101a576",
    "testharness"
   ],
   "FileAPI/idlharness-manual.html": [
@@ -401460,7 +404294,7 @@
    "testharness"
   ],
   "FileAPI/url/url-in-tags.window.js": [
-   "bf67cd8a24215953b0e68e1d046491c7863b05b6",
+   "cdbb802a1a1b85cba8e5119235d11590d7e2581f",
    "testharness"
   ],
   "FileAPI/url/url-lifetime.html": [
@@ -401476,7 +404310,7 @@
    "testharness"
   ],
   "FileAPI/url/url_createobjecturl_file-manual.html": [
-   "c2a3b3968e1349ae1c4c9bc98b5eb1aa251ea32c",
+   "5967de4f80dff9640ffb90c632db8185df95fcd0",
    "manual"
   ],
   "FileAPI/url/url_createobjecturl_file_img-manual.html": [
@@ -402756,11 +405590,11 @@
    "testharness"
   ],
   "IndexedDB/keypath-special-identifiers.htm": [
-   "588026e7e95192b98b594e77fafe67495d5cd481",
+   "0392d5dc6be8c17d435f2e0382e378521551c4fb",
    "testharness"
   ],
   "IndexedDB/keypath.htm": [
-   "a21b6eecc56a924bdf017d9053be2f0eecd25eeb",
+   "169a6f8e0f70ecf9089e2a6aa9232f632fe24e9a",
    "testharness"
   ],
   "IndexedDB/keypath_invalid.htm": [
@@ -403083,176 +405917,88 @@
    "61db89f7b21982628428d274dd238ad0f56a3c6d",
    "support"
   ],
-  "WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js": [
-   "d462df4da1958c1a7a923f4f6f8d74fc7e20f2bb",
+  "WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js": [
+   "43e43b7fbf6441d1fcd6ddf46c30f0621b1edba7",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js": [
-   "b745bb807622e053d8e5b2ad8f77ebdd1a5caa05",
+  "WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js": [
+   "2c884e027696683642ea9a554fbb458c80d7c250",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js": [
-   "c65c0c81ea710e071df9bbb36796c65c09023b2f",
+  "WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js": [
+   "a04245d270369f78f8043d0e18e78813d023143c",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js": [
-   "aba136c70512155f57879d90e8387f468cd08eb0",
+  "WebCryptoAPI/generateKey/failures_AES-KW.https.any.js": [
+   "926c029def9b80da51ebff1185692f24d403cecf",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_ECDH.https.worker.js": [
-   "24ad2f00216f7dfbf0488e7fe0096877b7126093",
+  "WebCryptoAPI/generateKey/failures_ECDH.https.any.js": [
+   "89fe37aa9252d976f76823cdf285630ddadfbfce",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js": [
-   "1fcde344bd6f05a1aec5ba568f5d6d7ede8c1b8c",
+  "WebCryptoAPI/generateKey/failures_ECDSA.https.any.js": [
+   "ab6acf474fb27f7a630847ce07d6fb6a9167ad92",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_HMAC.https.worker.js": [
-   "0c8d20aff7988acd571156f83be3825c6078686a",
+  "WebCryptoAPI/generateKey/failures_HMAC.https.any.js": [
+   "6f00681d254f24abf00f073806a162738bcbe8e7",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js": [
-   "06527a268ef2e009517230aae7e0c027ab94377b",
+  "WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js": [
+   "c6d7efb5ed58bb1ea96e141763e249b1ad99a6be",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js": [
-   "76553f02e30a990b521d51b3a13447459b5360ab",
+  "WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js": [
+   "dc18838f5c4f84436c892051a728de7ad83fe854",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js": [
-   "f1b875ecbe690db60e4e0706ed35f25cbd996d85",
+  "WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js": [
+   "170964b911cd3d1aacaa261de01b013ee3fd745a",
    "testharness"
   ],
   "WebCryptoAPI/generateKey/successes.js": [
-   "9623250b44a270bd23f6d892e8a8296351fac708",
+   "f0f112ddcf43a46cfccc0e7cf29b46208f87bb5f",
    "support"
   ],
-  "WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js": [
-   "c7f1d0c5e7ecf28cfc052c56739aaa3bc949ffca",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js": [
-   "4b388cfe97d99300e7f9c4514140e3b030ba4553",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js": [
-   "5502fcb3da8257d28e3c49d1d391e3f6dfd3c022",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js": [
-   "19c0af9024a49ce6e1b2c884c0806960686509e0",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_ECDH.https.worker.js": [
-   "751da81c9530a7dc5c31b02ed7c6e3dab8d997b4",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js": [
-   "900abdfba6c8a142d0cea1af9c1f6417bf05eb25",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_HMAC.https.worker.js": [
-   "90bdffb8858c79694521cb9a831bc658b2c72834",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js": [
-   "e74fcd1eaa98078c3f1bb6c16fbf82a754397d4b",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js": [
-   "bccff0d804b1d06ae9b183ebc38c72b3031c7f8a",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js": [
-   "b9e9790245742b8eeb4af7679cc0144710380c07",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_aes-cbc.https.html": [
-   "9c92564d0b64784bded21d3c337da125da1c0225",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_aes-ctr.https.html": [
-   "3804433a5bd2c382c8bd9afbd1b41792d9f927c1",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html": [
-   "bf4b12efa09c2602bed73b4ae2b94ebdf5bf9749",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html": [
-   "2d33a87c30f30d76e547cb6e4b9637292c2e7b6e",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html": [
-   "aaeb0182a48f680fd7f421a8ba7efa29561ad7fb",
+  "WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js": [
+   "49ce28516303c7525f74d29fbbe36b578e9e0d08",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_failures_AES-KW.https.html": [
-   "4dc9d4cff709a8a84569f6fc6eb2225a59fe8db4",
+  "WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js": [
+   "377e8f0ec969f36949c9dc08ae935063d25c08d8",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_failures_ECDH.https.html": [
-   "6eca49b0a06e1c468c28dffab3435cf14972095c",
+  "WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js": [
+   "a65a71f8f83b017fe9eb8fccbd8da3489ed1f9f0",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_failures_ECDSA.https.html": [
-   "decb88cd07b2ef2f2c07d1a1fd8e7dfc46e22350",
+  "WebCryptoAPI/generateKey/successes_AES-KW.https.any.js": [
+   "165159903403f67cc27d29f78d46369eb598811c",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_failures_HMAC.https.html": [
-   "ffd768d80a38ae9e9ae029c3372a227681b020dd",
+  "WebCryptoAPI/generateKey/successes_ECDH.https.any.js": [
+   "525b874eff610c6db8cca7f50ba0c074b8975001",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html": [
-   "ea5fab99e5fdc1b4232aa4c9eed96657f64b1e67",
+  "WebCryptoAPI/generateKey/successes_ECDSA.https.any.js": [
+   "2a63f8d0d12987ca2e4c41e5eb28a53741a091f5",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html": [
-   "1e03b7b789b75bb25e3491fe8bcfc198dd53b46d",
+  "WebCryptoAPI/generateKey/successes_HMAC.https.any.js": [
+   "af064fd9cc422c35718d1dcf2f6c861aab7385cc",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html": [
-   "749e526a3f67c246a328a99abd4c1da728571413",
+  "WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js": [
+   "f82ce4307fea94a097ccdf470b766f110d876b87",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html": [
-   "e8ee3bdfb8aef171d6db35cc69a482f1a992d089",
+  "WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js": [
+   "8ff33e42d855b7482455ebb3caab5ac311e7cbf5",
    "testharness"
   ],
-  "WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html": [
-   "07f55a63a2327ee8804548ba5e802fcdba09010e",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html": [
-   "ebec06754972d621026a4284c316c882be362dc3",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_AES-KW.https.html": [
-   "e76258a60418fb1467d16a17b4e01da1d99bd036",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_ECDH.https.html": [
-   "b2b7d0a233473a51e67a760638abf1f532d1232b",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_ECDSA.https.html": [
-   "c21190c7c74eb856a9fce3a4913723b46fa1887a",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_HMAC.https.html": [
-   "ccfe6cefe42764a46dd817046b026034be033e97",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html": [
-   "7ebe1df33a5df5f5a2cead014af5502246b6b833",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html": [
-   "623370ae56918c14ac14f40fb057327b0844be04",
-   "testharness"
-  ],
-  "WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html": [
-   "ad5db5278bef55d9ae2336961c226199a4c94446",
+  "WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js": [
+   "fbbbef333461a7845ea1b3cba2169435c7f82761",
    "testharness"
   ],
   "WebCryptoAPI/getRandomValues.any.js": [
@@ -403900,7 +406646,7 @@
    "support"
   ],
   "accelerometer/Accelerometer-disabled-by-feature-policy.https.html": [
-   "96e5a86bf78239f3aa4a79b32bb4308de0d5f60e",
+   "efa020e5d2384a3b753d41d32fd9e62337b5fd9e",
    "testharness"
   ],
   "accelerometer/Accelerometer-disabled-by-feature-policy.https.html.headers": [
@@ -403908,15 +406654,15 @@
    "support"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "f20f89a31daf399a7946b928e8deca9651d38487",
+   "0e27e5bad61367dcc348aef1ac813e70a2e2aa36",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html": [
-   "7ce8c39f0af6c932d1e6b6f75843c090f7274b80",
+   "5e072aa513efc16946b2f93ecb815d45dd6cadd2",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy.https.html": [
-   "dbda7cfa838c1f2d4296b545034d42f0064f331a",
+   "59207b5dbc249addf4a9c0c5886e1486a2d6eb94",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-by-feature-policy.https.html.headers": [
@@ -403924,7 +406670,7 @@
    "support"
   ],
   "accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html": [
-   "b8fb07cdd23dce9690de719387b9d505382772f5",
+   "fe9960de7b6ac203a36096f90ede31131e38cb1b",
    "testharness"
   ],
   "accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html.headers": [
@@ -403932,7 +406678,7 @@
    "support"
   ],
   "accelerometer/Accelerometer.https.html": [
-   "3ff5f61b25c52142e9796f3903d7f2bcaa30314c",
+   "bef928057d49b59c2ede3916e49abdd730dc9582",
    "testharness"
   ],
   "accelerometer/Accelerometer_insecure_context.html": [
@@ -403940,7 +406686,7 @@
    "testharness"
   ],
   "accelerometer/Accelerometer_onerror-manual.https.html": [
-   "c82f9595dc2582b2da40549a358da1c3fc2ff820",
+   "f6a624b70b401c0802c5f189c89e85d63fe58795",
    "manual"
   ],
   "accelerometer/LinearAccelerationSensor-shake-threshold-manual.https.html": [
@@ -403960,63 +406706,59 @@
    "support"
   ],
   "accname/description_1.0_combobox-focusable-manual.html": [
-   "4d68bb9b9a50d4db1bcbcd9d273ef1406a940061",
+   "942ce0107f0a19b99abb5caf186a7e89838daabf",
    "manual"
   ],
   "accname/description_from_content_of_describedby_element-manual.html": [
-   "8e96e4d80581fadd56434a85745b9411cc0af841",
-   "manual"
-  ],
-  "accname/description_from_content_of_describedby_element_which_is_hidden-manual.html": [
-   "4d253f206ccefa7f3db9bc96a4f710a2bc62971d",
+   "8ade27315759845e4282f7ea59fa5e0d61321fa1",
    "manual"
   ],
   "accname/description_link-with-label-manual.html": [
-   "a262ba63f6f6561824d987441be320bca0237587",
+   "1dacd728bc35fd4f9b55cac14198f87aee9f0bf6",
    "manual"
   ],
   "accname/description_test_case_557-manual.html": [
-   "ea490dbba2148260441dfb4530fbdd90085fab11",
+   "ba392069a9f5e6a565ac3810cf833f704113b722",
    "manual"
   ],
   "accname/description_test_case_664-manual.html": [
-   "2961cd60ab5c6ee71945873687c4e8934e8598eb",
+   "152eacbf6d23de6da7c5b792b6b74ecdbca60889",
    "manual"
   ],
   "accname/description_test_case_665-manual.html": [
-   "5319a9ac36d5097d39b927c5a8fa46c84bef1cd5",
+   "277439be8d7830f33ca3a79aee614b65e19440e1",
    "manual"
   ],
   "accname/description_test_case_666-manual.html": [
-   "b2d38d676b02ecb5b8358b61fa9dad15ab7fe1fa",
+   "b0f3239c44208d87f8ccc2d929ec07f76add1ba7",
    "manual"
   ],
   "accname/description_test_case_772-manual.html": [
-   "8ee85838b0405587c46eac2fb5623582cf896df6",
+   "df6010e0752080e4cef5b85e8c78beedc6b24406",
    "manual"
   ],
   "accname/description_test_case_773-manual.html": [
-   "c556bb181e7ee1c5e5e0d77044b9eefe11e5dfca",
+   "97eaff6b7d7c0dfedf52cd8529eec05a86744df7",
    "manual"
   ],
   "accname/description_test_case_774-manual.html": [
-   "ac6e58ffb556fdccfc6e6644fe56c9f2169103df",
+   "9e8001c1a8b88f8e20993d28949898a9519a9655",
    "manual"
   ],
   "accname/description_test_case_838-manual.html": [
-   "63684496c08de785e49f5f469ee425748fa695fe",
+   "33c6eb5104ac7a9e43f90767adf9dd205673a565",
    "manual"
   ],
   "accname/description_test_case_broken_reference-manual.html": [
-   "6cf8e7f477c20d3a54edcbf9a2a41acd06e67183",
+   "beac621cb76a398590d6557dad15c3d51469844b",
    "manual"
   ],
   "accname/description_test_case_one_valid_reference-manual.html": [
-   "022fa292ec892a652ed11764b567185e8672d6fa",
+   "6abb3feda0140638c43efa9d05bb53f2dcef026b",
    "manual"
   ],
   "accname/description_title-same-element-manual.html": [
-   "4654334cd9727d714b5be6995f2ff02b96f320fb",
+   "eb92d8b0c3fb184c9dd036988a277e9f8bfebc27",
    "manual"
   ],
   "accname/foo.jpg": [
@@ -404024,587 +406766,583 @@
    "support"
   ],
   "accname/name_1.0_combobox-focusable-alternative-manual.html": [
-   "1f0203dacbfe8ec1a6d70fad41deed86befe97cd",
+   "dea3142e6356ace455c3b588bda9a3eb50ece5b9",
    "manual"
   ],
   "accname/name_1.0_combobox-focusable-manual.html": [
-   "100366728ba5032fadb632ca855795d114c7d87b",
+   "e7ae6d317765060256d40468a3383ccc04021a40",
    "manual"
   ],
   "accname/name_checkbox-label-embedded-combobox-manual.html": [
-   "cccc7a6d8f9b7557036962bb718e42dba9ac96c9",
+   "cee096e59d96de8f98341727c157f38acfefc239",
    "manual"
   ],
   "accname/name_checkbox-label-embedded-listbox-manual.html": [
-   "8f7be07f2b61175f1ae66ba1dbdc2099fc5641f6",
+   "de5cf180fe4ef5b87b87f5c501ea239a3d4467f6",
    "manual"
   ],
   "accname/name_checkbox-label-embedded-menu-manual.html": [
-   "0335ffe94d7e02abbb972c2d313efb58d13e81b2",
+   "d182194f1c6103a91a219f3b5736f92f3e38c369",
    "manual"
   ],
   "accname/name_checkbox-label-embedded-select-manual.html": [
-   "ef66e7dc2e23bdc2a11df4788f0a5652b634614c",
+   "10892b1216652f4ebec19c653bf095b6572eef1e",
    "manual"
   ],
   "accname/name_checkbox-label-embedded-slider-manual.html": [
-   "6500d5fe8dd26eeab950d03f9be7f1f9c7c319a7",
+   "144459c37fd13b59e8c35b3aaf74282a97e1ade4",
    "manual"
   ],
   "accname/name_checkbox-label-embedded-spinbutton-manual.html": [
-   "c3e7459eba79382148fa313f299843884fe8ef47",
+   "cc43ba404aa5e749c8de15e7eaf6d7c633670b68",
    "manual"
   ],
   "accname/name_checkbox-label-embedded-textbox-manual.html": [
-   "c34539f6c23cbc849776cb95eeef38698a3e2a84",
+   "dd8c9d83b612b5cc2e7e08d73f32cacb82dfae44",
    "manual"
   ],
   "accname/name_checkbox-label-multiple-label-alternative-manual.html": [
-   "efe7a0506abeac9e54aee8fcd9b11d5e9a9dbae2",
+   "5dd974360a1e1a454371f2817d24046fe51fda80",
    "manual"
   ],
   "accname/name_checkbox-label-multiple-label-manual.html": [
-   "31fd1209d82562b2ae0966af448df85357d69d1c",
+   "6f2934bd7b87d4711cf466131253ed09407244a0",
    "manual"
   ],
   "accname/name_checkbox-title-manual.html": [
-   "637e389beedecf101f59eae1ef9a863c71fff3a8",
+   "212efbf3bfb856e09c051fe78fb51735fcab93f7",
    "manual"
   ],
   "accname/name_file-label-embedded-combobox-manual.html": [
-   "ad015f066db67a0b02dabb35d1ec9c0fbcea4c39",
+   "9cbc11bf6f193fae2ce7da6eabb29779a6efa849",
    "manual"
   ],
   "accname/name_file-label-embedded-menu-manual.html": [
-   "2af047cc3a867c77e39ca9e597bfc133cdd95005",
+   "535f4c532726f7c1ca617dd482a12c64547bc64f",
    "manual"
   ],
   "accname/name_file-label-embedded-select-manual.html": [
-   "b09f49619585bf400408c78ae97ea800af3cee72",
+   "bc107431570cf22bf0f88841421342792cca7bda",
    "manual"
   ],
   "accname/name_file-label-embedded-slider-manual.html": [
-   "e9fdf8cb3b59dd438b76fbe20ea3647d5776735a",
+   "bf03b87afe92fb183f4457c5b03e075e7492b801",
    "manual"
   ],
   "accname/name_file-label-embedded-spinbutton-manual.html": [
-   "e8b0cd393d01efe72035ef552a0bb1133851263a",
+   "2f5164b4653e4aadf86697db3deae536eb61699e",
    "manual"
   ],
   "accname/name_file-label-inline-block-elements-manual.html": [
-   "460663447f34018b11dc6167a4499e5db82e928e",
+   "e2ef7c2916984c787c3d696688cd9ec402a6e6ec",
    "manual"
   ],
   "accname/name_file-label-inline-block-styles-manual.html": [
-   "8e01c0a6da3ed4ad1690a93f64ed1ec06f5b7bd8",
+   "4a2f6970e3e82c8a6ceee0397e4b1c23d02f95ca",
    "manual"
   ],
   "accname/name_file-label-inline-hidden-elements-manual.html": [
-   "7b7c1f54e98c21aff89427fee9dc963a68df84f7",
+   "f49dba26b0f89a098c76616d8450993b0dc648ef",
    "manual"
   ],
   "accname/name_file-label-owned-combobox-manual.html": [
-   "daaba21bbbc9b082aebdb571f3846369b422395a",
+   "2f9e4b73cd465080954bee6745e2c8467401d3c7",
    "manual"
   ],
   "accname/name_file-label-owned-combobox-owned-listbox-manual.html": [
-   "a4da117bad61590598ab12317be8ebe6477d7549",
+   "c03da2d7b078cacfa397b51396fae86a8c2e3901",
    "manual"
   ],
   "accname/name_file-title-manual.html": [
-   "b3d5042308ea5b5fee0832a2ea9089539b7f9597",
+   "4f56a8fc50b12014a605b091aa65d0a832e87f76",
    "manual"
   ],
   "accname/name_from_content-manual.html": [
-   "a210d33ca9e562fae37f60de8e6212e279da375c",
+   "a533786f60bfe0a48645f0f26d70404cb49f4af5",
    "manual"
   ],
   "accname/name_from_content_of_label-manual.html": [
-   "958c2fa1501dfb3a7152e63cd56f47a481b95020",
+   "1d3307d1e1780f0896b2e59fcb2d60a77d76446a",
    "manual"
   ],
   "accname/name_from_content_of_labelledby_element-manual.html": [
-   "e18596656eebf15f2e02974f1be00500dbb6a87f",
+   "7f9c3a1907cac2a09945846fc5afc11d49a8cd21",
    "manual"
   ],
   "accname/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html": [
-   "006376e2c39418d0205601ef58d65287a8c8794b",
+   "fa0330d8ff7d3aebff1f71b90a781d748dd95ef9",
    "manual"
   ],
   "accname/name_heading-combobox-focusable-alternative-manual.html": [
-   "9b5b181518ce0d3d1400243d01a7182055db6c18",
+   "9b76031e493eeac070fb76db973dfadca9309336",
    "manual"
   ],
   "accname/name_image-title-manual.html": [
-   "9def9482d97f96d0c3b5c5a2101ddfa8d0313072",
+   "74fd80cee4320ffad1748b649a3992fe10e2a273",
    "manual"
   ],
   "accname/name_link-mixed-content-manual.html": [
-   "950f238d319e7da811ba3a8923e43e76b612d38c",
+   "8803ba524fbba7a5a2beb7e4608e8ecb0423b55a",
    "manual"
   ],
   "accname/name_link-with-label-manual.html": [
-   "293091b437d2b70dc1f984010ad0ccdc319384ba",
+   "a9cf0c7b747f43db63248a65ab0c96cd00d42775",
    "manual"
   ],
   "accname/name_password-label-embedded-combobox-manual.html": [
-   "178bf7cf557d22a1a57d5f0563a57efe0d55be7a",
+   "8328979575136ba6429e9feb945535643bb7b35d",
    "manual"
   ],
   "accname/name_password-label-embedded-menu-manual.html": [
-   "99cb16c39963218d7be6a0d5351cff00911851ba",
+   "7ae5b0acadcf16cb7c6c156f733bcca6ca6036a9",
    "manual"
   ],
   "accname/name_password-label-embedded-select-manual.html": [
-   "9698b2959880b2eb4ae024556c745579506e4772",
+   "e672aea9e2cd7338cc063b392b5c60309ee44914",
    "manual"
   ],
   "accname/name_password-label-embedded-slider-manual.html": [
-   "4da98f4489d466accd6e03099f65afbbf06a5672",
+   "7f73cac3d94d94dd945929ab8d0c01d917e484ff",
    "manual"
   ],
   "accname/name_password-label-embedded-spinbutton-manual.html": [
-   "28c2ff5472d78bd4a1e1d55a866af3d99186b972",
+   "98d0ebc6d88de20bed6969ec3dc1ab5a12c2ef6c",
    "manual"
   ],
   "accname/name_password-title-manual.html": [
-   "64c321f5eef4126a4ea6a1740074ee6fbfe14bac",
+   "e3fe2839407aab07c70b36f398e612b5421b3167",
    "manual"
   ],
   "accname/name_radio-label-embedded-combobox-manual.html": [
-   "3e341ee031aa1456dbd42794e1a4f0ce82ccda74",
+   "09d0b64d2cc8c7286a0f70dc478cb09de0e17531",
    "manual"
   ],
   "accname/name_radio-label-embedded-menu-manual.html": [
-   "97e63b918afe95030676b454335f1f2f4a93e040",
+   "abc7791f207c6fe8e9ba554a79a3a85d5e1c7fe4",
    "manual"
   ],
   "accname/name_radio-label-embedded-select-manual.html": [
-   "8f46103e042501221901732653935bfcbdc424a3",
+   "038cc7e80d3abcce57367cdfa99cc0f398e063bd",
    "manual"
   ],
   "accname/name_radio-label-embedded-slider-manual.html": [
-   "d4e4b7e25cb88efbd71c2b1c7985b1b04d699e7d",
+   "4cdc8afa77ef6389097c3760aae7c66a38327c3c",
    "manual"
   ],
   "accname/name_radio-label-embedded-spinbutton-manual.html": [
-   "921070eeccfd96d2163b1f22d04e1f53789cb627",
+   "7110f2cb3009b9b0149496081e1e94b8cda59da5",
    "manual"
   ],
   "accname/name_radio-title-manual.html": [
-   "437b6d2748eadac0fb879dd0a002ad5886657b7e",
+   "ea0d8b2be9e9c0d187bd659c46ba0d35977acf81",
    "manual"
   ],
   "accname/name_test_case_539-manual.html": [
-   "52283b3e50d6510796a37cce40ce7ae48c8363bc",
+   "d3b50dbbe4f33ee9c2e795f0602f41bbd5ed7fd8",
    "manual"
   ],
   "accname/name_test_case_540-manual.html": [
-   "6abedb87911a568570c22e6e2e587c10b7709f39",
+   "8db110c80d6340ebf60db94495251dcf7d8b6b07",
    "manual"
   ],
   "accname/name_test_case_541-manual.html": [
-   "7f58d024e6d71031c5f24570f20749e7ac237fc3",
+   "200b6f14f319e9f1b49288f0c838381cca8b3945",
    "manual"
   ],
   "accname/name_test_case_543-manual.html": [
-   "4f2b9608d32e8d0d8a72a989814dc2d4daf0f1c3",
+   "8cc54f2cddaebf3bcede82befcb4258d75b75008",
    "manual"
   ],
   "accname/name_test_case_544-manual.html": [
-   "48d880cfe47a081416a4a89a744410db553b664c",
+   "173a8ecf08421416a971d8e5638c155f17f7f84c",
    "manual"
   ],
   "accname/name_test_case_545-manual.html": [
-   "6b4cb49d4d07a5532d73050ce4130a683bdb933f",
+   "4cb90a73913cbb1460b854d251b2286382f876f9",
    "manual"
   ],
   "accname/name_test_case_546-manual.html": [
-   "43fb0bd46634a505f9c5d51f7a0b961cf18c0b96",
+   "df24b458ea5c8dbb98f0eb17ba93bbfc5d546049",
    "manual"
   ],
   "accname/name_test_case_547-manual.html": [
-   "baad5a48235f8a131bb7fd0559297a2800cec2bf",
+   "daa4913540b6cf35ec43ad395ab27d180ce99a57",
    "manual"
   ],
   "accname/name_test_case_548-manual.html": [
-   "26232c6bdad6ff0cdcaa67bf587d050c2a68b3ea",
+   "03bdd41b47142aef922986e69ddb67bf9706d626",
    "manual"
   ],
   "accname/name_test_case_549-manual.html": [
-   "832c197f7e97965e608c1e437f3bc3f6e7d9dc81",
+   "5f202eabc12f51f6b77f5dbad33424a8426a905a",
    "manual"
   ],
   "accname/name_test_case_550-manual.html": [
-   "d3e5f8e21c6881bd455c52021983c4f20c7ce659",
+   "6ffb7342f7f31d2f4562dc7fc552a84dbf00fb68",
    "manual"
   ],
   "accname/name_test_case_551-manual.html": [
-   "a319e99cd6c180f8bdfc07af2bfdfc0962656330",
+   "b9542a0575f106925a0b535c401a00c46e9ee98c",
    "manual"
   ],
   "accname/name_test_case_552-manual.html": [
-   "9f3f5e2fb077dac6b7e1f94bef42bea57bc85547",
+   "2242eb08972078c75149670be081086813b3b384",
    "manual"
   ],
   "accname/name_test_case_553-manual.html": [
-   "e11a2890ba6ae9e2737fec9470ed857a0ad567ad",
+   "14075c6fda804a70a042837ebe5928638cc62f79",
    "manual"
   ],
   "accname/name_test_case_556-manual.html": [
-   "281b70b1739ef2375e0def462bebd2079719d98a",
+   "858bc98661dcee47309e427c3128801c0b728405",
    "manual"
   ],
   "accname/name_test_case_557-manual.html": [
-   "ffefead34a778c5cd41a57912583d3b8e7b999e4",
+   "f43b62dae05f89fbea2cfa3abccc15af1d6b1668",
    "manual"
   ],
   "accname/name_test_case_558-manual.html": [
-   "1d1ebf12d2ef73a01d581017d0feb20a4828413d",
+   "7aca28d95d9376f12d9f3a718fdf564fa3c42615",
    "manual"
   ],
   "accname/name_test_case_559-manual.html": [
-   "9962a15676ec2c3e1b1d6ae54bf7939d004f01da",
+   "54a3a071380d99b3031d1546380d6923efb44a34",
    "manual"
   ],
   "accname/name_test_case_560-manual.html": [
-   "9f66ecbc9617ed12248a3037c508036d6c6eeddd",
+   "f946a49aa9b818037edd50dc24a11229d5843663",
    "manual"
   ],
   "accname/name_test_case_561-manual.html": [
-   "9dc3e8af2810f6d2ba615b40a2971580fc8ff33f",
+   "5a5ab94c795afcdc9458f8767ddcdb1b2f8a504e",
    "manual"
   ],
   "accname/name_test_case_562-manual.html": [
-   "fc84e88dada119cd9bd06d1aab5021db87f86cd5",
+   "2304d70d9ed5803dd414d4a7d75d9e5ad9430c03",
    "manual"
   ],
   "accname/name_test_case_563-manual.html": [
-   "1e185ba23a383cf051d6e0d815f973cfd9bd44eb",
+   "7c063e154a9b6d6d7f613174de4d9a9b92964572",
    "manual"
   ],
   "accname/name_test_case_564-manual.html": [
-   "f62252e5c8c68ee29f630d5827a9ff2bb06fa315",
+   "47482f3aed38d8c76b99d55061b1afcb35191f65",
    "manual"
   ],
   "accname/name_test_case_565-manual.html": [
-   "d9fcb897b444f026d936ea335e73baf5c092641b",
+   "e91c14d179efd0a5b93b5bdb5781bd26f050b676",
    "manual"
   ],
   "accname/name_test_case_566-manual.html": [
-   "93e82d0a5b6c2eb86b4dd32bf365d1a8d3a4386d",
+   "50ad8f63a9f774a14a2ca727d8b6fcbb7403cb2d",
    "manual"
   ],
   "accname/name_test_case_596-manual.html": [
-   "e33d4c97450492f5340a00c2c7e0dc84be6bb91f",
+   "9365c98fe9dc8d964ffa40908436425dcf271686",
    "manual"
   ],
   "accname/name_test_case_597-manual.html": [
-   "2c241887bdc4eed850514dbf58d7b281dddca323",
+   "69f9169bf42252787ead55a8d2d9678a02082b4a",
    "manual"
   ],
   "accname/name_test_case_598-manual.html": [
-   "3d1548107f86be97b7311dd1ad6721136b95b76c",
+   "2664528f836545ecaef5948133fc79cb8b9adf98",
    "manual"
   ],
   "accname/name_test_case_599-manual.html": [
-   "e8bf23feb35f9f864e8ce60d2e03d71787c1d4f7",
+   "5c6952ec95f632609382c1ef7f267d58d17aee17",
    "manual"
   ],
   "accname/name_test_case_600-manual.html": [
-   "b08c44e3c77abcea5f5f35a5339a2f285479dd84",
+   "3318ba200efa20800c61d4e3888de0c20efd216f",
    "manual"
   ],
   "accname/name_test_case_601-manual.html": [
-   "76d1adefd5cbd9a7fd7d3a20e030ab47990eb925",
+   "296c4b0d3a736f9756aa9eeb0fa2764929677724",
    "manual"
   ],
   "accname/name_test_case_602-manual.html": [
-   "580896a142d1b9cbc1a8ec8fb42c562146e50a9e",
+   "21ad7840fe98925e1f36373e2fec0100750c28bd",
    "manual"
   ],
   "accname/name_test_case_603-manual.html": [
-   "efaa4d546902022bc707007172395adc35750a8c",
+   "31bceeb89bf9745ee6057b1a9b22f562fdfd11df",
    "manual"
   ],
   "accname/name_test_case_604-manual.html": [
-   "2cd59bda65db6cfe0017eb08e84849d8ba99bca6",
+   "c3e0d9572a4a4d75f98054c69b92314c1229c91b",
    "manual"
   ],
   "accname/name_test_case_605-manual.html": [
-   "92dee09996257f0a370e4f8a6a7761a7beb89637",
+   "b0c38eb06802ed9cbe21c1f57656d77d6c79af16",
    "manual"
   ],
   "accname/name_test_case_606-manual.html": [
-   "1e1d038b456ab23570baeecc0c3700b80ff53597",
+   "4bf3db31cdc754db983b6e831503da158f72e70f",
    "manual"
   ],
   "accname/name_test_case_607-manual.html": [
-   "67505192d3aad59708eee221f228c73d26b98ed4",
+   "ec7bd4f25f37f2b2ef48f7e797031441b6f91645",
    "manual"
   ],
   "accname/name_test_case_608-manual.html": [
-   "49c6fe71c3a8b6d6ea3eeb7dd540bb2b0ebaf45e",
+   "48b2d664c09ee25b79af31a3adfe4bd4435a39a5",
    "manual"
   ],
   "accname/name_test_case_609-manual.html": [
-   "bf445b1416e83e298a73c078f56e1171fadccd55",
+   "7ee07c8b0db3609dcb26df3215d936c932ec5625",
    "manual"
   ],
   "accname/name_test_case_610-manual.html": [
-   "800244d9d67c9b0dc25aa222cd4fa221be23b1b6",
+   "9102c4c46d272513ec4cd71dfa40dfe8c0d36408",
    "manual"
   ],
   "accname/name_test_case_611-manual.html": [
-   "69c6c0f3aeb5252b6050a13dd88eae2d08259df7",
+   "107106dc1a4e6003482d1b06c2e92b58fa9e79c6",
    "manual"
   ],
   "accname/name_test_case_612-manual.html": [
-   "024b7f63a574fa5b1fb05381d0306a61bb5653d8",
+   "80a221a9f910494aa3af928e51458352b1db694c",
    "manual"
   ],
   "accname/name_test_case_613-manual.html": [
-   "f818d435c5edfe6adaec5004a9bcbca044b53862",
+   "1f0892c7e00117003bc53cae3d890ae3ba22f3bc",
    "manual"
   ],
   "accname/name_test_case_614-manual.html": [
-   "c00ca712608c7ec97c07ac23def64d4f773e652f",
+   "dfd9b43b3de3c435171bde3cda90a57b1e9ff8f8",
    "manual"
   ],
   "accname/name_test_case_615-manual.html": [
-   "26ce5881a2b4a1e5f09ebd4fc775ce900882d516",
+   "851e5eff8604cdcba4580c32fb13f9da3b8bb889",
    "manual"
   ],
   "accname/name_test_case_616-manual.html": [
-   "a193e5c8a61d55c5fb6e944256406cb6538c4354",
+   "7cdab2617bfa99f4a62267e39113ec7f1b50d9f5",
    "manual"
   ],
   "accname/name_test_case_617-manual.html": [
-   "72d11f68a6a92811be12fa9ebb35fe34b1615865",
+   "f45e186e42c25b8766990e2f9b049fe55d373818",
    "manual"
   ],
   "accname/name_test_case_618-manual.html": [
-   "1d10ddf08905211b41f014c9eda4c58f80306b65",
+   "5beff42a4af9a9e72f916fcc375c36af81dfab48",
    "manual"
   ],
   "accname/name_test_case_619-manual.html": [
-   "c0a0ba3bafe1d64b436f6ce1696326fe905faca0",
+   "5bc0b596df5839361b97688e0ae6dcfa670476ac",
    "manual"
   ],
   "accname/name_test_case_620-manual.html": [
-   "5019c6af576f3cb84f43847275f6429898fe8e28",
+   "8cede62e9324fed215e653aa562532297bf49393",
    "manual"
   ],
   "accname/name_test_case_621-manual.html": [
-   "d1a73465c5d8565bc52555f4a91f862375c44c04",
+   "cb9d9380651dbd65eb0ab4901f2882bd24dc1492",
    "manual"
   ],
   "accname/name_test_case_659-manual.html": [
-   "241ee4b9649de09cf8000a46d2080d35834154e0",
+   "1b4a2603d768a693e657f5f5030dce3547278f99",
    "manual"
   ],
   "accname/name_test_case_660-manual.html": [
-   "ac36e0a034118f61bada290a7a511b9e2ee7874c",
+   "cfe32a99404436a0eb503259e84653af8c74924d",
    "manual"
   ],
   "accname/name_test_case_661-manual.html": [
-   "a4117f09f6777fba316fc3c49cafe9572cd3fd43",
+   "e1d8ad454086fd8bbc6f85007e6ea2218e68f9da",
    "manual"
   ],
   "accname/name_test_case_662-manual.html": [
-   "6d5c1501c6b4f8cf5b2dddf924e453d8a9d24f80",
-   "manual"
-  ],
-  "accname/name_test_case_663-manual.html": [
-   "4eaadf4289477daf729267beedc919c3212a9b09",
+   "35556d5e6ddff50122d38b400e0f1b56ae857147",
    "manual"
   ],
   "accname/name_test_case_663a-manual.html": [
-   "597df91b7e46634853198e67f156cf5063fccd8b",
+   "c37ab8c1798646b7935f2a49a82bf84bd05faa00",
    "manual"
   ],
   "accname/name_test_case_721-manual.html": [
-   "c14e18a84e4eda3b45297a4ee716e19b9d1d7d3b",
+   "e960ad180dc23647f71b59c5bdcfa10da3bf4f82",
    "manual"
   ],
   "accname/name_test_case_723-manual.html": [
-   "75f5ceb299eec26270f0c35a7569a7f092312600",
+   "a8fb8e4605ba86bfb27f601e95181f3b5cc4bd4b",
    "manual"
   ],
   "accname/name_test_case_724-manual.html": [
-   "b4e2268c2babda95248c1080a881a47a9a0acf4f",
+   "324be2471af8b5565a6622bcf026286e77c660f5",
    "manual"
   ],
   "accname/name_test_case_725-manual.html": [
-   "ee3fc3d50f774a648b72b83001968f794fafebe7",
+   "f992ebe06509cf3d6e720878db8d0efa561152e0",
    "manual"
   ],
   "accname/name_test_case_726-manual.html": [
-   "6ed641f4d77e03c661b0e0a3b94154af08257faf",
+   "b08ac37a8778133f19a75887233f496a03b7b4f0",
    "manual"
   ],
   "accname/name_test_case_727-manual.html": [
-   "57ed68282c10cce56dd572cba54e272f29c0e7fd",
+   "3e01f5df2880ff5b988215a3d0304f2a08c0d0e5",
    "manual"
   ],
   "accname/name_test_case_728-manual.html": [
-   "a4ed4a27e35d2b2d3b3bc1ebc5fa11a8fecdb315",
+   "4b163c6e96fec551ea3c5de462ec3a283b81e3ea",
    "manual"
   ],
   "accname/name_test_case_729-manual.html": [
-   "7d63e9e5fa6239340e470fcd9390ddea3db508aa",
+   "7e4a132fd5b880aa0cde2a906c1c976fc5b61afc",
    "manual"
   ],
   "accname/name_test_case_730-manual.html": [
-   "007bbc808281d543e8606064b7e5c18cac9eab30",
+   "1bae3be008e60569a551a7490ef15594cc377fba",
    "manual"
   ],
   "accname/name_test_case_731-manual.html": [
-   "e893821b92253e191fed42b78f0ec3077c19dbc3",
+   "b13fc22121f9b67a0f6033905ae213d720a72cb6",
    "manual"
   ],
   "accname/name_test_case_733-manual.html": [
-   "bd7e1d6b944646ad378873075991b5a16d56d3bf",
+   "c4ea02518b330a503e70ebefeb85d7b42c9f5a2b",
    "manual"
   ],
   "accname/name_test_case_734-manual.html": [
-   "1fcb7f9ee490e63df4050eb2cae97c03a7a2021a",
+   "0ffbec5087284b9db1eda93e406b087d60d986af",
    "manual"
   ],
   "accname/name_test_case_735-manual.html": [
-   "027854b92e9d8fddaac391e68f1f482ed0f32559",
+   "a76405153db05538c77b9d929787a775a5b879c4",
    "manual"
   ],
   "accname/name_test_case_736-manual.html": [
-   "455089b41e48c2b4ee4a2d7c983f20ddb398fc02",
+   "43e1ef9c3fda2016280d0d8ac47991e79f7db4f7",
    "manual"
   ],
   "accname/name_test_case_737-manual.html": [
-   "44fc37258df0cf8c343c37949778844c4b6e9367",
+   "4d6212a9ac2c752b50f5b6b30750816996788758",
    "manual"
   ],
   "accname/name_test_case_738-manual.html": [
-   "019bcb1742292293ca33959ba77ed37b5ddc14ed",
+   "369cf25d235de2ef68a80024d3a868a6e3293039",
    "manual"
   ],
   "accname/name_test_case_739-manual.html": [
-   "80b51db55b569b5feaad08ec8d3d6b741c59f238",
+   "68c7ce266a6cf81eb6d9e43eb3eb5d22dfd57a48",
    "manual"
   ],
   "accname/name_test_case_740-manual.html": [
-   "5a23a00c05138818c49a4a92b62572abd0f90f22",
+   "68140b76d6d8089327a9b24b372782e7b3b8797f",
    "manual"
   ],
   "accname/name_test_case_741-manual.html": [
-   "1054c6f683226c327ba51ef5a741b9f71f78234c",
+   "e1215d82349e17777093c69da3d0c8dd380459ac",
    "manual"
   ],
   "accname/name_test_case_742-manual.html": [
-   "241363c65f067bba8839f71ead7ca1681832c81b",
+   "49ecfbc01c365d0690244efc7af402938d0ccfe8",
    "manual"
   ],
   "accname/name_test_case_743-manual.html": [
-   "ba809011cce26a6d45e1f0d36edf2df0373ccb21",
+   "67ff9d4067fc81dce307f360437d5e108a033474",
    "manual"
   ],
   "accname/name_test_case_744-manual.html": [
-   "148e638515effbe4373ec5209ccee400876dd248",
+   "62fcc22446884bb0cf3822af269674dc5bd77fd9",
    "manual"
   ],
   "accname/name_test_case_745-manual.html": [
-   "8dccd0ae45fa0da395a2fef06bcbd087d2caa44d",
+   "f42712d516c5e181c067e7acff8a84e0fccdf1be",
    "manual"
   ],
   "accname/name_test_case_746-manual.html": [
-   "48aec956695d5c06aa0ab21c682d58c986d5943d",
+   "3679c7e45bd2ffbaa3442eeadb57b684b93b0fc7",
    "manual"
   ],
   "accname/name_test_case_747-manual.html": [
-   "1881961d6ad0ff89ab4bfe536fd841317cf74357",
+   "7efb91c7bb2eb71cad1b44f5f80e4fc5cfa32150",
    "manual"
   ],
   "accname/name_test_case_748-manual.html": [
-   "1c774cdc38bfee4775608bdab49583ba95548951",
+   "c74b73d2883540e7af109a935d8b35d5dc132338",
    "manual"
   ],
   "accname/name_test_case_749-manual.html": [
-   "59a9089095a492ebb53697a6c886f0f9950c0e81",
+   "350e852dbc76b4d8936308784536a0dbfb9b94be",
    "manual"
   ],
   "accname/name_test_case_750-manual.html": [
-   "702d5db63ef1d7f8eac049803d7ce962bcb3f112",
+   "dc27894cf395289de4021bf2bc69717be27b8a8e",
    "manual"
   ],
   "accname/name_test_case_751-manual.html": [
-   "c1620650815ce39ab9bef833a517b992b45ea94a",
+   "318d2ef65aa78cf871eb22787df93ed37cd7ca9b",
    "manual"
   ],
   "accname/name_test_case_752-manual.html": [
-   "65c14f6c29990605a66791aee3d675e0df55fa2e",
+   "6f55a3324566dca7edf5fcbec535cff42cf63e01",
    "manual"
   ],
   "accname/name_test_case_753-manual.html": [
-   "0cb78d94b6a56f6785ba4940ae837cb994a0dacb",
+   "806f2bf3e5dc1e1d403a6c69e69296d585078cd8",
    "manual"
   ],
   "accname/name_test_case_754-manual.html": [
-   "0c51dd71ab7ac9cc27a3eb8e9e0f5244208d8aff",
+   "11180e58ba00a7d382e13f18558c502c433e8bfb",
    "manual"
   ],
   "accname/name_test_case_755-manual.html": [
-   "31b2216a84a5b59cfcf890fe59f5839ea1208c1e",
+   "b3a38a3edf3c31961f5db1985ab0f7e41b8ca2e9",
    "manual"
   ],
   "accname/name_test_case_756-manual.html": [
-   "62710efdfa73fccec1eb991993ccc6b51bf1f1ff",
+   "8c62ae078da81acfb5734c56bcce02bd414b5fcd",
    "manual"
   ],
   "accname/name_test_case_757-manual.html": [
-   "839480cbfc537cf1860e48bee4e597394573da3b",
+   "43361e19ca752856d0107ab5334d93429fcafbac",
    "manual"
   ],
   "accname/name_test_case_758-manual.html": [
-   "da6bcba2045179b1a9b4df5ea3b1f4c24a71ea9a",
+   "47883ac39bc784536f4e2013d5ef0cd9f3c2f587",
    "manual"
   ],
   "accname/name_test_case_759-manual.html": [
-   "7dddad8bc516dd14c710cd75c6c7d44db8def672",
+   "fd4d049d577ae3d3bab5c968a252aaf4e7bdd425",
    "manual"
   ],
   "accname/name_test_case_760-manual.html": [
-   "0ce401d8c9a85d245e965fed3f506d8d88f4650b",
+   "a3c98ac02f787347eb4d82148c7083e814b98b89",
    "manual"
   ],
   "accname/name_test_case_761-manual.html": [
-   "2226a89c8a511dfbe8e93037acf4f2b53dfd220e",
+   "71e1f27a11db58cebd25392e70ded3e2656baddd",
    "manual"
   ],
   "accname/name_test_case_762-manual.html": [
-   "2c5436081d45b1ab470ed93050eb956a85ccc779",
+   "347ae81975335b5f4111cc4e9a07073ea579dd95",
    "manual"
   ],
   "accname/name_text-label-embedded-combobox-manual.html": [
-   "406281ebff00851377335a6db85cdf85482df11a",
+   "d1c14c3091c820547729c8e8c36381dade5ffa57",
    "manual"
   ],
   "accname/name_text-label-embedded-menu-manual.html": [
-   "5d943988bde8cc64b69f9e0d27314eefafe516ca",
+   "05488e336012f77378900b26dbe2153577a2dc41",
    "manual"
   ],
   "accname/name_text-label-embedded-select-manual.html": [
-   "ee9cf471b60ebe327be4d877bd8a391ac0158d4d",
+   "1cd1a3a3eb1dd7e3c83744f8599064ba7f6fdf73",
    "manual"
   ],
   "accname/name_text-label-embedded-slider-manual.html": [
-   "df70f3aa99db3cada4a1f7bcd4e9d60a44333ef9",
+   "89e70b3afdca38b2b6aae581e9b388d7ccdc9989",
    "manual"
   ],
   "accname/name_text-label-embedded-spinbutton-manual.html": [
-   "214c4f8004f7d4e6dc29e0a4302e68170909a0ef",
+   "90693755b6c76521c1a0d26b338f4e90b6ef5d5d",
    "manual"
   ],
   "accname/name_text-title-manual.html": [
-   "2051faf3aa82d1b71dda2bd17c492329ec4c87af",
+   "9296bce9e3ee6465e351d79e61210b1a11a7f358",
    "manual"
   ],
   "accname/test.png": [
@@ -404684,7 +407422,7 @@
    "support"
   ],
   "acid/acid3/reference.sub.html": [
-   "764c07c1072c831cb69719372aca734fa49d827a",
+   "43768481bea5dc6c30343d60f218d895cf624a61",
    "support"
   ],
   "acid/acid3/support-a.png": [
@@ -404996,7 +407734,7 @@
    "support"
   ],
   "annotation-model/annotations/annotationMusts-manual.html": [
-   "ea19ebb2852265a4f96794132e4b6336f0a9c43f",
+   "3128798896573dd45913a4b35a0ba23b5d8e425c",
    "manual"
   ],
   "annotation-model/annotations/annotationMusts.test": [
@@ -405004,7 +407742,7 @@
    "support"
   ],
   "annotation-model/annotations/annotationOptionals-manual.html": [
-   "5685dcdfadb7189a285824cecb1191b01660b501",
+   "fdf156bdce4549584cd4829c88f25e51c6fdb5ae",
    "manual"
   ],
   "annotation-model/annotations/annotationOptionals.test": [
@@ -405012,7 +407750,7 @@
    "support"
   ],
   "annotation-model/annotations/annotationsAgentOptionals-manual.html": [
-   "3e0a094494729a6cc14ad8b769e88200a297e699",
+   "a295ae46be877c8ffaf40df1c6de9d5bc49b8bd2",
    "manual"
   ],
   "annotation-model/annotations/annotationsAgentOptionals.test": [
@@ -405628,7 +408366,7 @@
    "support"
   ],
   "annotation-model/collections/collectionMusts-manual.html": [
-   "2a0c6a441d36c9cf27613c401d6570d5449e6772",
+   "fccd3e8310ae99379f643e08e8e3915405f0d8af",
    "manual"
   ],
   "annotation-model/collections/collectionMusts.test": [
@@ -405636,7 +408374,7 @@
    "support"
   ],
   "annotation-model/collections/collectionOptionals-manual.html": [
-   "26ef7804d566c5d483a472f021f62d3d4de84a5c",
+   "6f1d9a4bc887b7fa5a6d1e8e19050771c0ae4278",
    "manual"
   ],
   "annotation-model/collections/collectionOptionals.test": [
@@ -405780,7 +408518,7 @@
    "support"
   ],
   "annotation-model/collections/pages/pageMusts-manual.html": [
-   "1312e1e724c26835241dfa26783d46f0f6d37e0e",
+   "5038313089639752e5ee22ffcd7fa252adeed6c1",
    "manual"
   ],
   "annotation-model/collections/pages/pageMusts.test": [
@@ -405788,7 +408526,7 @@
    "support"
   ],
   "annotation-model/collections/pages/pageOptionals-manual.html": [
-   "822091377f6a4e45ce1a4685077e6be705de0226",
+   "af2e2289980711ec4f4fa93e512387f635ff7dfe",
    "manual"
   ],
   "annotation-model/collections/pages/pageOptionals.test": [
@@ -405952,11 +408690,11 @@
    "support"
   ],
   "annotation-model/tools/template_js": [
-   "687806ee410f76b51d3053dcb1ca03d66c9f75b1",
+   "46f0748a93aa42ac3a27975e7b819ef29da13757",
    "support"
   ],
   "annotation-model/tools/template_manual": [
-   "0298eb6f0fea42ff20480061c7afc083f0179747",
+   "044bd2529d57c4eccf8110c212b371bab3277c84",
    "support"
   ],
   "annotation-model/tools/tests/README.md": [
@@ -406204,27 +408942,27 @@
    "support"
   ],
   "annotation-vocab/01-validJSON-LD-manual.html": [
-   "2c1e23b7b433576e5cb6182edfed69d1ff65d24c",
+   "6bb0c30d2ffc40fbf453d86c66911b3b159a0273",
    "manual"
   ],
   "annotation-vocab/02-context-to-triples-manual.html": [
-   "99198224af3300e80df2272b5f32bd6b4331d0e5",
+   "67b5550ffdfbae4e0a20e3d0d2187df99b7c358a",
    "manual"
   ],
   "annotation-vocab/03-graphs-are-isomorphic-manual.html": [
-   "e470fdbddd2df40fe62c6ab9d81023d99c22352b",
+   "b53b78517c84d0911a81a03c714925f4c92206b3",
    "manual"
   ],
   "annotation-vocab/04-graphs-convert-lossless-manual.html": [
-   "17b7ae6fa4d7f7fe271cfedd1876623425ed29d4",
+   "43199ce45c83963a81b85be1b13d3e3d5b98bf43",
    "manual"
   ],
   "annotation-vocab/05-ontology-parsed-as-valid-manual.html": [
-   "afd1de59f3e89ac689f23b64ba8c5c523ca8ca17",
+   "c05e61352edd95689aa56e9ea7ba6cb60953ee61",
    "manual"
   ],
   "annotation-vocab/06-ontology-internally-consistent-manual.html": [
-   "154a8eebf6b60e79aad3f53e1f59249370486da0",
+   "047e514331a90ba6b7700ca50d0cfa0cf620a127",
    "manual"
   ],
   "annotation-vocab/OWNERS": [
@@ -406787,6 +409525,10 @@
    "789767132e47fb6cad1ea60584a04b4f2e2c9551",
    "support"
   ],
+  "apng/OWNERS": [
+   "5fa81c84bf276ac842e54c02c4889aac62806f86",
+   "support"
+  ],
   "apng/animated-png-timeout-ref.html": [
    "dcd3c58b9200109868f2b98bda346bf26f823e07",
    "support"
@@ -406799,10 +409541,18 @@
    "32cf112fb1dcb4e7ec3c91bdf5bd6b976a1e4eac",
    "testharness"
   ],
+  "async-local-storage/storage-smoke-test.https.tentative.html": [
+   "1e00cf5aff9d85ca66d8b831ee4c2c3cb8259071",
+   "testharness"
+  ],
   "audio-output/HTMLMediaElement-sinkId-idl.html": [
    "8f37d8d2fc1cb9b5ad0d85234f733f534f4f0db8",
    "testharness"
   ],
+  "audio-output/OWNERS": [
+   "8d5030068c8ea67ad77f7dabb274470685b734a6",
+   "support"
+  ],
   "audio-output/setSinkId-manual.https.html": [
    "6743b9f6843a1c6134ac9cc627375b0368986e55",
    "manual"
@@ -406944,7 +409694,7 @@
    "testharness"
   ],
   "beacon/beacon-common.sub.js": [
-   "67226dd8db05540bd79bf5d4983c51fc985ff906",
+   "2ec5e7b47c8aec077352599fd033c3d64e9afc38",
    "support"
   ],
   "beacon/beacon-cors.sub.window.js": [
@@ -406964,7 +409714,7 @@
    "testharness"
   ],
   "beacon/headers/header-content-type.html": [
-   "aee7b4c817f064e871d10cc80da8d25759c16158",
+   "d533981c936455cb8a065988d4828e25264e406c",
    "testharness"
   ],
   "beacon/headers/header-referrer-no-referrer-when-downgrade.https.html": [
@@ -407779,10 +410529,18 @@
    "417d39a317f55a95180c806d28047c85dd959d65",
    "testharness"
   ],
+  "budget-api/OWNERS": [
+   "ed48014d817ef034062db60403704ed2c0cf9aeb",
+   "support"
+  ],
   "budget-api/interfaces.any.js": [
    "7532e03a56725728052d4b5a973630e2b86686da",
    "testharness"
   ],
+  "clear-site-data/OWNERS": [
+   "58a011d159fc7581c33fee75b7837c689e704289",
+   "support"
+  ],
   "clear-site-data/navigation-insecure.html": [
    "97c069cf7c938e1ebdba3f243ad48369a7fb5542",
    "testharness"
@@ -407819,24 +410577,28 @@
    "10f5f9d409ef513edb129e0e8522aa5f74d51ce8",
    "support"
   ],
+  "client-hints/OWNERS": [
+   "e096c94435cc7364a4959597cf51a86b3fee81a6",
+   "support"
+  ],
   "client-hints/accept_ch.http.html": [
-   "e2181077e6d378a288d4944aee8c76939aa896fe",
+   "ec820e569029ef412f776d35c4bc79a2a7ecf107",
    "testharness"
   ],
   "client-hints/accept_ch.http.html.headers": [
-   "25cd8622db940411b0e8eb39921e6086916e4f36",
+   "23aaa612f1b6ee417d31faec8399248c9bc7cffc",
    "support"
   ],
   "client-hints/accept_ch.sub.https.html": [
-   "7d5a8d7d6ffb78f99d17fc0c41abf26718c6b6b0",
+   "8cfb7a9f11cbd19f2e3965c27af394fca31e1654",
    "testharness"
   ],
   "client-hints/accept_ch.sub.https.html.headers": [
-   "25cd8622db940411b0e8eb39921e6086916e4f36",
+   "23aaa612f1b6ee417d31faec8399248c9bc7cffc",
    "support"
   ],
   "client-hints/accept_ch_malformed_header.https.html": [
-   "d0c116ce2a1f8d775bb8d9b800eae05f0bee12f9",
+   "fb5fa5837d4e3379384b6f409cd42c748dfa145f",
    "testharness"
   ],
   "client-hints/accept_ch_malformed_header.https.html.headers": [
@@ -407844,7 +410606,7 @@
    "support"
   ],
   "client-hints/echo_client_hints_received.py": [
-   "a6cf24dc7d02b044a27813f50737bb3aff4af8bf",
+   "a69e980bffe7bd97aaaffde6bbec85df36b164c4",
    "support"
   ],
   "clipboard-apis/OWNERS": [
@@ -408051,6 +410813,10 @@
    "e3593850f8098d3f3ff82c042deab15f51c66a52",
    "support"
   ],
+  "common/subset-tests.js": [
+   "ee72de5b5f2302d111a0f131eddf5081ad02b789",
+   "support"
+  ],
   "common/test-setting-immutable-prototype.js": [
    "2cafc5c2b867e0fd6f738b1fbeaa503761c400b7",
    "support"
@@ -408079,6 +410845,10 @@
    "e714708a95e56bc556b64d991cb72f0ccace4f92",
    "support"
   ],
+  "compat/css-style-declaration-alias-enumeration.html": [
+   "4c006ee875e49d297459e90248fa20f6a33a816e",
+   "testharness"
+  ],
   "compat/green-ref.html": [
    "4b23ea52d785a6dd19785bd4278bf700eb5547f8",
    "support"
@@ -425727,14 +428497,18 @@
    "6a6d341b506ea97be1082bc36f59b0eebf3df104",
    "support"
   ],
-  "console/console-count-label-conversion.any.js": [
-   "913cb6bf539803de5e4fc7f06f4af197579919c3",
-   "testharness"
-  ],
   "console/console-count-logging-manual.html": [
    "1ffcacf40728c1cd9f0eadbd68dad59e7c2c35d3",
    "manual"
   ],
+  "console/console-countReset-logging-manual.html": [
+   "587de5bb8dcb002025244e8058b52d4ba0b1bdd3",
+   "manual"
+  ],
+  "console/console-counting-label-conversion.any.js": [
+   "a48d28ca0a1d6c5c50dc5d29521563a44beb6590",
+   "testharness"
+  ],
   "console/console-format-specifier-symbol-manual.html": [
    "d3301d5fa86c5acad2dd4daec1d42ee7a7ef8732",
    "manual"
@@ -425776,7 +428550,7 @@
    "testharness"
   ],
   "content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html": [
-   "7dd8bccbd166c7ac938699c406bc2209a7f5677f",
+   "a8c074a65a874df3f2a0f7f994c2094f4c8647b9",
    "testharness"
   ],
   "content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html.sub.headers": [
@@ -426568,14 +429342,14 @@
    "testharness"
   ],
   "content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers": [
-   "89a55ff370ebf5af63e25642013073bddc823030",
+   "43989ae0395e33a5d7ef2ea6679b22b347d31190",
    "support"
   ],
-  "content-security-policy/navigate-to/child-navigates-parent-blocked.html": [
-   "1e35f9b195940f9134d53849de6fafef370f0744",
+  "content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html": [
+   "a4b643f75a3d0a30d01d0998296ed98efd622b4b",
    "testharness"
   ],
-  "content-security-policy/navigate-to/child-navigates-parent-blocked.html.headers": [
+  "content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers": [
    "b4d3209bd03a060ea90f85f7444717359c77d4d2",
    "support"
   ],
@@ -426596,83 +429370,83 @@
    "testharness"
   ],
   "content-security-policy/navigate-to/form-allowed.html": [
-   "704012813d3fd1c6bbba1ccbdb462d21ba77a077",
+   "db6aafa8a07c1e26409a0e5677cf63d675aba256",
    "testharness"
   ],
-  "content-security-policy/navigate-to/form-blocked.html": [
-   "c0029c0a4912758fdfa7ed1c53072f170793a074",
+  "content-security-policy/navigate-to/form-blocked.sub.html": [
+   "b5053c1ef094b840b08adb08c6044f2b7256966f",
    "testharness"
   ],
   "content-security-policy/navigate-to/form-cross-origin-allowed.sub.html": [
-   "2d9ae0fd58f4e061af9879c30374ea47c2249a1c",
+   "4e09c55679c5a5b1b56d42be8b8dd68e5a62186f",
    "testharness"
   ],
   "content-security-policy/navigate-to/form-cross-origin-blocked.sub.html": [
-   "049cf83b4b496b58aeacb01282ac44613954222f",
+   "903602bc5a2c337db89e606a81771bc031728106",
    "testharness"
   ],
   "content-security-policy/navigate-to/form-redirected-allowed.html": [
-   "1e4949c41732687d694eb9e6a9d3319bf3be706c",
+   "d100da21524178f59dd75e0e052addf3c139a7a1",
    "testharness"
   ],
   "content-security-policy/navigate-to/form-redirected-blocked.sub.html": [
-   "13620e71df04ee9af10401e5b6accb24b0c33335",
+   "9ecfce4fa9c6aa8703dbffeb33d217675330b853",
    "testharness"
   ],
   "content-security-policy/navigate-to/href-location-allowed.html": [
-   "bbde25e8270429fde22989c4667a1fb58d6c4eb4",
+   "38f1abdd52c0a8077890f07bcde344683392a184",
    "testharness"
   ],
-  "content-security-policy/navigate-to/href-location-blocked.html": [
-   "3fb68398ef412922a8816096b9441f785fc437c5",
+  "content-security-policy/navigate-to/href-location-blocked.sub.html": [
+   "53729c0a235bf10b3fdc5b7e9cd718436b7e7c8c",
    "testharness"
   ],
   "content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html": [
-   "31db79be8399ebf8ab2408693085b3a711d7abbe",
+   "e0f881238a177ea7b33fec77a2e054896ec1b8c2",
    "testharness"
   ],
   "content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html": [
-   "1f0c4fa5c25c36be8a44346fc209ca990703859b",
+   "90a57224551b630d5f19be550340c61012498d3b",
    "testharness"
   ],
   "content-security-policy/navigate-to/href-location-redirected-allowed.html": [
-   "fe5480cb306d83951a68b25ab0ea56f0468f0fca",
+   "fcae614d99f7dd6246f872311a39937cd6c074bf",
    "testharness"
   ],
   "content-security-policy/navigate-to/href-location-redirected-blocked.sub.html": [
-   "7447d77621e9c18ce829ddfbfde008fa80719d7e",
+   "110975cd19320a86aa50475103d875c184877c93",
    "testharness"
   ],
   "content-security-policy/navigate-to/link-click-allowed.html": [
-   "133c29674edc3a53e5bc65f5f2e8b72a8ccc7bdf",
+   "59fde62940abf3319711d71376b92ac65514bc60",
    "testharness"
   ],
-  "content-security-policy/navigate-to/link-click-blocked.html": [
-   "14861dffd89d889059d30f54a698ecff60a6c950",
+  "content-security-policy/navigate-to/link-click-blocked.sub.html": [
+   "d68edf245640db96612719c7f556deacd47098f0",
    "testharness"
   ],
   "content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html": [
-   "55f36a1c3965f6acdc93fa23dba543608d9912d2",
+   "5b6844dc98cee01d4ed287b96764a93bd9925315",
    "testharness"
   ],
   "content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html": [
-   "7247d779fa3729a9118859dd41e94aae7505afbd",
+   "1879a35f7fffcbb85222e615dd95d72fb713fad8",
    "testharness"
   ],
   "content-security-policy/navigate-to/link-click-redirected-allowed.html": [
-   "f8a0f0646b5493be62ffeb541edbb039c1321d06",
+   "3d4cc8a9359b09cb97f2ab17a6e466125cdd6642",
    "testharness"
   ],
   "content-security-policy/navigate-to/link-click-redirected-blocked.sub.html": [
-   "46ac39a0a5eb10fbb18ac6b19a087c81b66427f6",
+   "0a1bd34e914b59bafc7c41104f78b7f5fcaf9597",
    "testharness"
   ],
   "content-security-policy/navigate-to/meta-refresh-allowed.html": [
    "bf0f7db58c085f117034f9c5287373ad0db49f8a",
    "testharness"
   ],
-  "content-security-policy/navigate-to/meta-refresh-blocked.html": [
-   "6ea6e7109d76e351fd81a6985cdde22fdef5910b",
+  "content-security-policy/navigate-to/meta-refresh-blocked.sub.html": [
+   "d5488bd4fd78a7408f421b3d8d4576e4b0e7c75a",
    "testharness"
   ],
   "content-security-policy/navigate-to/meta-refresh-cross-origin-allowed.sub.html": [
@@ -426680,7 +429454,7 @@
    "testharness"
   ],
   "content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html": [
-   "3d80f42ab97508f4f61f6596f0f2b9025f512195",
+   "907ea54bef1a5c8771960b6856472401cf302e87",
    "testharness"
   ],
   "content-security-policy/navigate-to/meta-refresh-redirected-allowed.html": [
@@ -426688,7 +429462,7 @@
    "testharness"
   ],
   "content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html": [
-   "e6bb5c882ecb846c365ecd42b299198fcaf7b474",
+   "9552963f6eb3e1516fa615f2768e832548d775ca",
    "testharness"
   ],
   "content-security-policy/navigate-to/parent-navigates-child-allowed.html": [
@@ -426700,43 +429474,43 @@
    "support"
   ],
   "content-security-policy/navigate-to/parent-navigates-child-blocked.html": [
-   "10ff181365149bf04de2da16e2d1d24c509996e2",
+   "d46275518c16a2a8a56a6e65a1c69ec4dfa0849c",
    "testharness"
   ],
-  "content-security-policy/navigate-to/parent-navigates-child-blocked.html.headers": [
-   "5b6cf971a05b8e5dd54bd1540362e0123373f9d6",
+  "content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers": [
+   "c1d1158a04483cd625675bd87c2e130d84f19a8e",
    "support"
   ],
   "content-security-policy/navigate-to/support/form_action_navigation.sub.html": [
-   "ec7830a73ab5fe1cba901398cce869aa840c7752",
+   "7b205b7c4ec21ba902e893220883c513cec96898",
    "support"
   ],
   "content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers": [
-   "de63281b6e44caaebe995d4dd44b138244287957",
+   "3965eaac8d519bf5f5f8665ffb8c97e3d84f89e8",
    "support"
   ],
   "content-security-policy/navigate-to/support/href_location_navigation.sub.html": [
-   "7f295972d48ba585e1321f73a84a25650b1359f2",
+   "271b6072513bce8db8834da11e033afa604bf8ee",
    "support"
   ],
   "content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers": [
-   "de63281b6e44caaebe995d4dd44b138244287957",
+   "600ac899aba19c622d703cc526e5d11827848a41",
    "support"
   ],
   "content-security-policy/navigate-to/support/link_click_navigation.sub.html": [
-   "d5ff18750d8a3e35c06bff47a9c51c674688d7b5",
+   "e818f8b43d619d9c8faa44ebd74f15a013cb4fe0",
    "support"
   ],
   "content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers": [
-   "de63281b6e44caaebe995d4dd44b138244287957",
+   "600ac899aba19c622d703cc526e5d11827848a41",
    "support"
   ],
   "content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html": [
-   "6ae25bd646042543174c73a967ed62090c787c56",
+   "8050e3569e7cb8d25fc6c96ac1f9f103da8067d6",
    "support"
   ],
   "content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers": [
-   "de63281b6e44caaebe995d4dd44b138244287957",
+   "600ac899aba19c622d703cc526e5d11827848a41",
    "support"
   ],
   "content-security-policy/navigate-to/support/navigate_parent.sub.html": [
@@ -426744,7 +429518,7 @@
    "support"
   ],
   "content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers": [
-   "de63281b6e44caaebe995d4dd44b138244287957",
+   "600ac899aba19c622d703cc526e5d11827848a41",
    "support"
   ],
   "content-security-policy/navigate-to/support/post_message_to_frame_owner.html": [
@@ -426752,7 +429526,7 @@
    "support"
   ],
   "content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py": [
-   "cd705d78669aa77eca191a86d74c2eecdf1513fc",
+   "28d82d534aa827e329c62472640eec2cd8e0ea71",
    "support"
   ],
   "content-security-policy/navigate-to/support/wait_for_navigation.html": [
@@ -427784,7 +430558,7 @@
    "support"
   ],
   "content-security-policy/support/checkReport.sub.js": [
-   "06b0c4f4a36a7bd4d323d1920a1a3e2caa9b52dc",
+   "5a67d7d16562a8925a916214bb1d0ab27f52ddf3",
    "support"
   ],
   "content-security-policy/support/dedicated-worker-helper.js": [
@@ -428220,11 +430994,11 @@
    "testharness"
   ],
   "cookie-store/idlharness.tentative.html": [
-   "2a588a0b80a3cee80af52b9109770fe8ec17becd",
+   "42be9e73d8e6ad3760a4c9871f6f633962f2ab85",
    "testharness"
   ],
   "cookie-store/idlharness_serviceworker.js": [
-   "aceb00f593b0447853fa70c8c971902cf02a164b",
+   "516a0596c03b9db2446ca77d70d3eb95f060e895",
    "support"
   ],
   "cookie-store/idlharness_serviceworker.tentative.https.html": [
@@ -428307,6 +431081,22 @@
    "0700dc72bc1e00832546d4a6826a5474600af06c",
    "testharness"
   ],
+  "cookie-store/serviceworker_cookieStore_subscriptions.js": [
+   "932a140052fdd95c256bb8a7dfa24522774b569e",
+   "support"
+  ],
+  "cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html": [
+   "4389e108fcbad909506ce6ea0d30e32f5973bfce",
+   "testharness"
+  ],
+  "cookie-store/serviceworker_cookieStore_subscriptions_basic.js": [
+   "90300c01688cfecd10140078bf36d3801566c2ea",
+   "support"
+  ],
+  "cookie-store/serviceworker_cookieStore_subscriptions_basic.tentative.https.html": [
+   "3836f1d36746ae11b76ee420ba34d902d48bc0af",
+   "testharness"
+  ],
   "cookies/OWNERS": [
    "15417c1a9e90762ae826b0258fe3619cc6a78b0e",
    "support"
@@ -428783,6 +431573,46 @@
    "a54ac9afd9c176da2c8844389feb3cb0150fcf5c",
    "testharness"
   ],
+  "cookies/prefix/__host.document-cookie.non-secure.html": [
+   "a072be8d6f7759b238229a7da84f303a71972427",
+   "testharness"
+  ],
+  "cookies/prefix/__host.http.non-secure.html": [
+   "9eaab5c903e5d43cdc5e370dd27de5a718185df9",
+   "testharness"
+  ],
+  "cookies/prefix/__secure.document-cookie.non-secure.html": [
+   "279ff6ce295ec02371c5cfc48b316cfc8536c375",
+   "testharness"
+  ],
+  "cookies/prefix/__secure.http.non-secure.html": [
+   "4e17d8f6a8bdf7f1cc9c2b4b37853a36a13fb19f",
+   "testharness"
+  ],
+  "cookies/prefix/__secure.http.secure.html": [
+   "5406914f2316c92381dc696f56d20880cd1c85c8",
+   "testharness"
+  ],
+  "cookies/prefix/document-cookie.non-secure.html": [
+   "24d3cd4ad985061202e51a2a78f0ad242c98f54a",
+   "testharness"
+  ],
+  "cookies/resources/cookie-helper.sub.js": [
+   "a5cfe0b65ee4c71ea97731624974ab1b6077b60c",
+   "support"
+  ],
+  "cookies/resources/drop.py": [
+   "aa45e485a184b8dd198961e44115d1d99055dc8e",
+   "support"
+  ],
+  "cookies/resources/dropSameSite.py": [
+   "4307153c427b3e8f5f7648f2c8bb792e7993b87c",
+   "support"
+  ],
+  "cookies/resources/dropSecure.py": [
+   "1a98ab7a248905451bca88cfd3aa0520bccb632a",
+   "support"
+  ],
   "cookies/resources/echo-cookie.html": [
    "ac15291ad85804f61bf690525bad958bb2672ca0",
    "support"
@@ -428791,14 +431621,94 @@
    "c5b3d11bdfc3a4092d0ed53648d58e0e3bbd2d91",
    "support"
   ],
+  "cookies/resources/helpers.py": [
+   "0556713af62d78b7bfcda814c798397346290e31",
+   "support"
+  ],
+  "cookies/resources/imgIfMatch.py": [
+   "7a716e43648f8f9adcc4d04fdc10e278edd976fa",
+   "support"
+  ],
+  "cookies/resources/list.py": [
+   "e979b357defcf76e9783d394943b8d31a64d7470",
+   "support"
+  ],
+  "cookies/resources/postToParent.py": [
+   "01ee8dfd0c1c1261f46df1eb4198b8222a2e8507",
+   "support"
+  ],
+  "cookies/resources/redirectWithCORSHeaders.py": [
+   "a49a81930eeb58c75a1a3eda7fdd813dbe151f55",
+   "support"
+  ],
   "cookies/resources/set-cookie.py": [
    "6588680f5635aa742b8f0cb6956fe0a0521d6b09",
    "support"
   ],
+  "cookies/resources/set.py": [
+   "a4140b21cd6e33dd862b9e0222b50726c85308f0",
+   "support"
+  ],
+  "cookies/resources/setSameSite.py": [
+   "30bc88a6cea9468d3f09a41614d75798f62ed1e9",
+   "support"
+  ],
+  "cookies/resources/setSecure.py": [
+   "bfa50db57417501b8594a22d1c9b957b35701842",
+   "support"
+  ],
   "cookies/resources/testharness-helpers.js": [
    "f379feb76ff0d44c5ec32d4d5b3b0b443c85805f",
    "support"
   ],
+  "cookies/samesite/fetch.html": [
+   "c0e779b35da6d159808e20e9bb33bdbf49710480",
+   "testharness"
+  ],
+  "cookies/samesite/form-get-blank-reload.html": [
+   "b99dcb698dcd9680dabf2d794cb64de35aded40c",
+   "testharness"
+  ],
+  "cookies/samesite/form-get-blank.html": [
+   "28193985017094bb89ff73987f16a5b7493e21a4",
+   "testharness"
+  ],
+  "cookies/samesite/form-post-blank-reload.html": [
+   "c33495a3010b7a872592e0afb3c6aec1e072db30",
+   "testharness"
+  ],
+  "cookies/samesite/form-post-blank.html": [
+   "040e6533a608448f6c184eb4aaea99594b2ff99c",
+   "testharness"
+  ],
+  "cookies/samesite/iframe-reload.html": [
+   "9004c0afa1c0938810fa6b127b5c74a668d252d8",
+   "testharness"
+  ],
+  "cookies/samesite/iframe.html": [
+   "0b0de2fe93ae013f0339fc18ecc02b74139e7085",
+   "testharness"
+  ],
+  "cookies/samesite/img.html": [
+   "0de8d54b2d3b19378de9b62273cd92e326f0eff4",
+   "testharness"
+  ],
+  "cookies/samesite/window-open-reload.html": [
+   "8effc29255860c066e7bb6e8355721fc14708674",
+   "testharness"
+  ],
+  "cookies/samesite/window-open.html": [
+   "97bb86fc8d992f8d639c9cc0af8ec77d0f810843",
+   "testharness"
+  ],
+  "cookies/secure/cookie-forcing.html": [
+   "2c556af03603bc1022780620336e9de42526d187",
+   "testharness"
+  ],
+  "cookies/secure/create-cookie-http.html": [
+   "db6b86d508c4e3db703f190af579865b3a010fe9",
+   "testharness"
+  ],
   "cookies/secure/set-from-dom.https.sub.html": [
    "6532cda9322290949bedc06cdc45ce80521068aa",
    "testharness"
@@ -428840,883 +431750,883 @@
    "support"
   ],
   "core-aam/alert-manual.html": [
-   "c859aafe43f6e9123de0a080356bf28ab69cdef1",
+   "20aca73f405b5d5e6e9f86069217b0544a4348a6",
    "manual"
   ],
   "core-aam/alertdialog-manual.html": [
-   "718e0c7c4ac148fde7d58115dced3c77c1d262ef",
+   "472ffcf1c62590206998a9326ce3e7f9783f2297",
    "manual"
   ],
   "core-aam/application-manual.html": [
-   "003e33f14415d88ef226f8a654c12a6f7072ab4d",
+   "24cf8c7463e5288a62c874f673aefbeb5696976a",
    "manual"
   ],
   "core-aam/aria-atomic_false-manual.html": [
-   "c31104df1f2d21b3280d215a16f3c2cda45aa87c",
+   "e942ae3818204476dd7eb7e082c1704b4aa55d1b",
    "manual"
   ],
   "core-aam/aria-atomic_true-manual.html": [
-   "1c4378409a9a19e6039f1bf677ee389992641076",
+   "578aae22b3a11d70225a15441b97ab7f585b2d12",
    "manual"
   ],
   "core-aam/aria-autocomplete_both-manual.html": [
-   "4334983a8cc2d70bc141393b693b9f739764adcf",
+   "8d8f0ebf06d51feceebe67fc26811cfb61d876ba",
    "manual"
   ],
   "core-aam/aria-autocomplete_inline-manual.html": [
-   "a59669dd7daff22770ab0b224330da40eda091f5",
+   "f6b02277b4dd8fa356281a2594bef274f8d6c31b",
    "manual"
   ],
   "core-aam/aria-autocomplete_list-manual.html": [
-   "b1ef9ebea38ad1e565b593027199a1b25174ecf1",
+   "df2283350fd65410056d3249e14ea8f668d35ee5",
    "manual"
   ],
   "core-aam/aria-busy_false-manual.html": [
-   "5a864465eeabb2616c9de41c155dab1de2a41470",
+   "e88558c5464ccde5a31f44a318f090a67063656d",
    "manual"
   ],
   "core-aam/aria-busy_true-manual.html": [
-   "1e1732ed47bb0ed692b5ee6fdfb0e13407d9508a",
+   "0c4ae5e14037e3402f23fe40e5399c0ca054db4e",
    "manual"
   ],
   "core-aam/aria-busy_value_changes-manual.html": [
-   "37072fdc4353a6edc509eb82fbcf041123e1bdd7",
+   "52d88e227f18a943fcd38b37065a8713d44392ed",
    "manual"
   ],
   "core-aam/aria-checked_false_on_checkbox-manual.html": [
-   "a876e8cd2f5909c9244266e74bcb2c43d4644a0d",
+   "e56b9e1f852c9dbd2b901b28c34028cc0989df04",
    "manual"
   ],
   "core-aam/aria-checked_false_on_menuitemradio-manual.html": [
-   "33d1fafc0b1dead3b87bf63f2da16a7d700e2304",
+   "9302b829f9b0469941398942bdb1d00deb3b583e",
    "manual"
   ],
   "core-aam/aria-checked_mixed-manual.html": [
-   "3a0d20457b5adaa0a1557f5c9311831ab2ad4d78",
+   "0352c70c6c04f8f7511684eddb78e01b2f2e9c12",
    "manual"
   ],
   "core-aam/aria-checked_true_on_checkbox-manual.html": [
-   "203a4c3c635bcb21ec99a15595a64173a5ebed70",
+   "29fb6a5cb1006dbde26f4428fcf71d215c3ad61b",
    "manual"
   ],
   "core-aam/aria-checked_true_on_menuitemradio-manual.html": [
-   "7a2aa3896861003e90b4c3e8e73adfaca8dcaf7e",
+   "dbd0baf43b7efadf859039ac01befe4e7600d15a",
    "manual"
   ],
   "core-aam/aria-checked_value_changes-manual.html": [
-   "ab6b990cc593eb6f135b78af886b41e4a69fb752",
+   "c3d841e881e154f306f8cbe0f163a2e002cb0f65",
    "manual"
   ],
   "core-aam/aria-colcount_new-manual.html": [
-   "04fd57706e621226bd4ba173e56a61ea59f2bba6",
+   "8bc97cb0b279c88a121ea7f26b8d2027350f30cb",
    "manual"
   ],
   "core-aam/aria-colindex_new-manual.html": [
-   "8365f1b54c90e5c2cbc451512ec74b36bc83b925",
+   "4586e48e88c5f45cc2dcbb0b5c3f6a8a3fc94960",
    "manual"
   ],
   "core-aam/aria-colspan_new-manual.html": [
-   "916205a9d0595a3cc0f35763a5c43ddf6a1b578e",
+   "5f7dff1e6f34f5b89b81b911053af3ece1575bfd",
    "manual"
   ],
   "core-aam/aria-controls-manual.html": [
-   "f61aca68b1ae4709cb883d1281aadb418203d67a",
+   "e5bbfd3a09cebfa1b539c8bc1444f312bd74520c",
    "manual"
   ],
   "core-aam/aria-current_value_changes-manual.html": [
-   "3422e86f65c3bd3886ae2d6c820670bcb6e9d681",
+   "3f4fabe4311f5d5203b85c60e5d86042193189e9",
    "manual"
   ],
   "core-aam/aria-current_with_non-false_allowed_value_new-manual.html": [
-   "2eefb0c82d0b79eb0d248c29891b18df10eecd6c",
+   "af161ba43aa9b760eb8fd16ec8158ed38868720d",
    "manual"
   ],
   "core-aam/aria-current_with_unrecognized_value_new-manual.html": [
-   "3a74e4a0dc60d5bb7a4611c9953b2bc8a358766a",
+   "2228052edd1f57d56e8e08d89058709ccaa4d863",
    "manual"
   ],
   "core-aam/aria-describedby-manual.html": [
-   "042028f26f5cd2a268fc04c5055d4778e5570da3",
+   "ead1d100c265fe4f5964a273fe5a7b46ca5e4525",
    "manual"
   ],
   "core-aam/aria-details_new-manual.html": [
-   "35b69bdb2c33a8a6366dade9c177c49e8794f411",
+   "0cad2e0cd9dd2e6f3229a949d8ed2fa426d6943c",
    "manual"
   ],
   "core-aam/aria-disabled_false-manual.html": [
-   "a86ac2e0b8f9df36bb9b13a0db2a7d4017c17cc8",
+   "bffee09b7d021260313a43c17f0ad479609837fa",
    "manual"
   ],
   "core-aam/aria-disabled_true-manual.html": [
-   "ab71f5a8b037aea3acbeaf7595873396e0683c4b",
+   "97188d6cb7f793d7f33301ac2b39e99b63cc5797",
    "manual"
   ],
   "core-aam/aria-disabled_value_changes-manual.html": [
-   "b39c020d186b3098c55e6f51288ef7d00a302216",
+   "f38a2358777c01e09069ed5b29ecd90d792c0ed8",
    "manual"
   ],
   "core-aam/aria-dropeffect_copy-manual.html": [
-   "904734aa17a6281fcb7fa3f129ff240869153236",
+   "52aa27b3f31cd329ec7d7d6dbe5a80b2f5f6dff7",
    "manual"
   ],
   "core-aam/aria-dropeffect_execute-manual.html": [
-   "af47742a879ef4b4dc75a5a8d77a3b546c3cc31f",
+   "492d3dbdd10ceb6818ea4a60dfdb72ec360eb174",
    "manual"
   ],
   "core-aam/aria-dropeffect_link-manual.html": [
-   "ad688f3230161fa22457d7c71bfab32232b541b0",
+   "e1b9c6f36bc668ce18b246979dd58d171b0509b9",
    "manual"
   ],
   "core-aam/aria-dropeffect_move-manual.html": [
-   "ae5d81fb4cc1f5b3053d51a9db612364743f0ee4",
+   "767f98514f92288bd4cdfcfe6feba5f8f38ff008",
    "manual"
   ],
   "core-aam/aria-dropeffect_none-manual.html": [
-   "e10b72943abf5950f09e4f2fcaca5c256c60c4bf",
+   "47efc7fc462e50e6686276e8f293fedf9cf12f8d",
    "manual"
   ],
   "core-aam/aria-dropeffect_popup-manual.html": [
-   "3f28bb13ccc039cd183367749a69d4bd953d8b58",
+   "156b3b6b8b35c23dfd47e7952f9ad228d0bc7544",
    "manual"
   ],
   "core-aam/aria-dropeffect_value_changes-manual.html": [
-   "448a3821b05732ca142b545c419dba13f39e3333",
+   "61b2236e66849d5b8fc41a19feef3739376e6005",
    "manual"
   ],
   "core-aam/aria-errormessage-manual.html": [
-   "b2cc894907f3fff1092f102adc58bdd878f434b9",
+   "9cff566788e2ccff8aeeec8a6b4182b94d7f2071",
    "manual"
   ],
   "core-aam/aria-expanded_false-manual.html": [
-   "249d36e19d4ca26b281a1eb9f623c107fdc11567",
+   "cd2d74d80b008f12b9effeb164fb2612c42e5cec",
    "manual"
   ],
   "core-aam/aria-expanded_true-manual.html": [
-   "6374a29b6a2bc008f12884d361149139070ea1a4",
+   "9ea559e282e1dc3afd91ec5addf931f2c1b82b73",
    "manual"
   ],
   "core-aam/aria-expanded_value_changes-manual.html": [
-   "b1e42b76a3088ce00494366f53a5d696d4ee914e",
+   "e3c2dce7eaafe43304808c6936c59463557e416b",
    "manual"
   ],
   "core-aam/aria-flowto-manual.html": [
-   "aa2b63438ffe1ce2dad9073cd0065f70b4002630",
+   "451c6ceec5f956d4377aaacdd1042a7176097ae3",
    "manual"
   ],
   "core-aam/aria-grabbed_false-manual.html": [
-   "9fc589158670650b9016af89c5d0dbf8e2f99f4e",
+   "de684ca7d3cbcfa40f75d6ed5139db5f34334d7e",
    "manual"
   ],
   "core-aam/aria-grabbed_true-manual.html": [
-   "d55d6a540ca0200aa63b15ab3cc50e914c4e15bd",
+   "0000f96fefe8ceab38ce26199d5206bbed445eeb",
    "manual"
   ],
   "core-aam/aria-grabbed_value_changes-manual.html": [
-   "9c89d94f4f91efe0e23cb068ecb455d8a2a60d36",
+   "2cef56417e420a692600c842f1f8772459671fc7",
    "manual"
   ],
   "core-aam/aria-haspopup_dialog_new-manual.html": [
-   "fce55e4f6982abee6f158b36c1df06a6f775d2c8",
+   "ca82e7932c5709ed8d3d3931c208fbe17d570d78",
    "manual"
   ],
   "core-aam/aria-haspopup_false-manual.html": [
-   "4fbd1d6a7e229c5d92efb34e77a1ec552e4e2bac",
+   "535bff6e6c229961a059fd3792733e87ca8fec9b",
    "manual"
   ],
   "core-aam/aria-haspopup_listbox_new-manual.html": [
-   "c8e6ce5f5b52b55136c22742d9168264cb126e4d",
+   "a3d0213870f290f78186832444ee5cb9a6572955",
    "manual"
   ],
   "core-aam/aria-haspopup_menu_new-manual.html": [
-   "ad0ed72f17a76c05dd0aa873418084167d837b00",
+   "9cd27b913c567008b5537573c00c0cd103cd6ca3",
    "manual"
   ],
   "core-aam/aria-haspopup_tree_new-manual.html": [
-   "99a729c76d38e1d500f99c940d895b634dab7055",
+   "fd9a9a56c597159b71424ddde9932b73860d73c3",
    "manual"
   ],
   "core-aam/aria-haspopup_true-manual.html": [
-   "0610a9c974ed3b1f7ff2c3ca0a76c20db57606c5",
+   "9575eca5fdb3d673e690089588fd87381a90fa99",
    "manual"
   ],
   "core-aam/aria-hidden_true-manual.html": [
-   "4ad0f934d67800e562343f2f0409da87035655e8",
+   "3230b19099c81d4f0494f39c11f38bb04d700ab6",
    "manual"
   ],
   "core-aam/aria-hidden_true_when_element_is_focused_or_fires_event_new-manual.html": [
-   "cff04a903a339c608d25e76bdae6ee4c9dc983f5",
+   "21a0f880bf3ebd0918aa305cb736bdeb7cde1422",
    "manual"
   ],
   "core-aam/aria-hidden_value_changes-manual.html": [
-   "ab82bdb93aee0de057c47d69ea5afecf4c723d73",
+   "afb750478843afb652196071fb2c571d18b7954c",
    "manual"
   ],
   "core-aam/aria-invalid_false-manual.html": [
-   "9afee59c1274f99de33bbcc4c2730e40671f3361",
+   "1bb7827f3fde33ed6533526de1379f6446758dc6",
    "manual"
   ],
   "core-aam/aria-invalid_grammar-manual.html": [
-   "4a4d889c8166fe089dc93abf6d8b4f40186b0160",
+   "d149fa5d74d8b1c337dd07d7f44ae7183ec453e7",
    "manual"
   ],
   "core-aam/aria-invalid_spelling-manual.html": [
-   "421e1a55d691b997777c13fd8713d1e3018dc46a",
+   "81cc024a85c9f53a09a2511efb497e26bf5a8b7f",
    "manual"
   ],
   "core-aam/aria-invalid_true-manual.html": [
-   "09a266562226255012792c41190d95b397b46eae",
+   "20e3807bc563ac73dec1eb661c38f3004af41df9",
    "manual"
   ],
   "core-aam/aria-invalid_value_changes-manual.html": [
-   "48f5ebaf55dfe24c78b30502e5af874b25c34172",
+   "1291ce533a5dc61c74ed3ad7b98ddb817ae62855",
    "manual"
   ],
   "core-aam/aria-invalid_with_unrecognized_value_new-manual.html": [
-   "4cccc23d5ac0b71183dff5cd7fdf768125f46499",
+   "8ec189f8bdc591f526de43b7b2f58d107f868bc8",
    "manual"
   ],
   "core-aam/aria-keyshortcuts_new-manual.html": [
-   "ddaabd128729156e8d58fdd83e587c8c5f956745",
+   "fde0c02d5369662b6d28aca254ec94369c01167e",
    "manual"
   ],
   "core-aam/aria-label-manual.html": [
-   "6daff0af3825fa736448495529ff082eefad93ae",
+   "49575a0aeaf0c5a55f368df8b81f38b3470d3a10",
    "manual"
   ],
   "core-aam/aria-labelledby-manual.html": [
-   "10ae53e2bddb00e1cc54c91cb19b67008c033e3b",
+   "2f47ea07687200ccb9d436f79893920cb2b09220",
    "manual"
   ],
   "core-aam/aria-level_on_heading-manual.html": [
-   "386f2b127c43c50313343a5b118aa1624c00e087",
+   "3f1654b6922e963846f240835dff1d363aa0718f",
    "manual"
   ],
   "core-aam/aria-level_on_non-heading-manual.html": [
-   "4ff3e8af345db1aecb23d60e9b5cfa3d02202c9b",
+   "d900cab9436a7f5fc94b1eee279fcc4a0ea3063d",
    "manual"
   ],
   "core-aam/aria-live_assertive-manual.html": [
-   "66127854ece079613fbde5d2709089ac6083a8d3",
+   "a9b730440367570933f9d4ed01d47b2316b2be15",
    "manual"
   ],
   "core-aam/aria-live_off-manual.html": [
-   "7d3656ea6928dbf381e412a4de1da94bb7f5f87a",
+   "65da53423899dd0b96b998a30a1388491e2376d8",
    "manual"
   ],
   "core-aam/aria-live_polite-manual.html": [
-   "7554361de5acc223cfb890e65c77018584c434fb",
+   "cfda520a67fd630aaa123c0ed015a27db8bdfe05",
    "manual"
   ],
   "core-aam/aria-modal_false_new-manual.html": [
-   "381e83c5dc0e97f40ea23296ab4c0987abac6c0f",
+   "1183d3ce06bd13dd0eb350cdc464e9aedd73b03e",
    "manual"
   ],
   "core-aam/aria-modal_true_new-manual.html": [
-   "2c493da988e55c14e6ae22b6062c88db2924ec83",
+   "b34200829e97d8a6eeaa9c1208f83c839848f2c7",
    "manual"
   ],
   "core-aam/aria-multiline_false-manual.html": [
-   "1a487ac0061ef450a4c6bd6c7664fb827a8f085f",
+   "9854c078c1c8838f9f3bb4418a88a630bc5ff4de",
    "manual"
   ],
   "core-aam/aria-multiline_true-manual.html": [
-   "6ebc05326d73e45f91420caa390c084b95a7bd93",
+   "30df23755bdb9dd0873c2809151a2873fe6ba670",
    "manual"
   ],
   "core-aam/aria-multiselectable_false-manual.html": [
-   "18c6164e4416acfc961895731a0fe3d6f0fe3162",
+   "d99f9ef051cfef34574718b661ea1c7d00b18c73",
    "manual"
   ],
   "core-aam/aria-multiselectable_true-manual.html": [
-   "44375b1e1312639cf517834b844644e710f553a8",
+   "6ea059ea56a419b97ab60539388526efa9367e59",
    "manual"
   ],
   "core-aam/aria-orientation_horizontal-manual.html": [
-   "8862d7f7a5ab93f777e8ef032226be3444c86c76",
+   "3a9b2e0e862a3be3d2035faf879d2950479e83a6",
    "manual"
   ],
   "core-aam/aria-orientation_undefined_new-manual.html": [
-   "0fd3f611373b8622b8bff386f1d1690e01bd8bed",
+   "24012ea875315c7a432552a8102703028ec02eeb",
    "manual"
   ],
   "core-aam/aria-orientation_vertical-manual.html": [
-   "ee9edbd3a36b03753c94e7c26cca9e9b0268e0a1",
+   "b005965a618587cc6f6be8fc742d8820ec53bd55",
    "manual"
   ],
   "core-aam/aria-owns_may_need_manual_verification-manual.html": [
-   "4c6e3d6fedc2ed371b957e99c286c78983d19898",
+   "81b33bb96ec22e121c899b21409e3b708117e0ff",
    "manual"
   ],
   "core-aam/aria-placeholder_new-manual.html": [
-   "519b1a991584a92c5a660e04e5ade0066ae464fc",
+   "4c42d8837d8c6a4f82a1e9ebbbcba85c3d1e4484",
    "manual"
   ],
   "core-aam/aria-posinset-manual.html": [
-   "18d811d72fed48e70adda7f44f42980a57afe616",
+   "220b935f5e73f0176cf59ba93c31deeea7e77085",
    "manual"
   ],
   "core-aam/aria-pressed_false-manual.html": [
-   "9f2e5c3401fd293d7d1dcda7b46bf6a59d43b42a",
+   "00e67a1ba89d24bf0dc18e87afdf2c88b473b09b",
    "manual"
   ],
   "core-aam/aria-pressed_mixed-manual.html": [
-   "4e92ee5529060f55bacb63369d3f62fb15acf9c4",
+   "050217c5f0ad2a51d0e8754d2175f744bb92a1c1",
    "manual"
   ],
   "core-aam/aria-pressed_true-manual.html": [
-   "e29b0515a226bd3eb461080357623ddd47a67c38",
+   "639631a82baa352e1b0f6debc5ae96e28319ec31",
    "manual"
   ],
   "core-aam/aria-pressed_value_changes-manual.html": [
-   "ef7b7c37eadc4e0595b1ad0f663514f59ff45dfb",
+   "010fcd0709d498e14e11c96b01c598e9e23d6c68",
    "manual"
   ],
   "core-aam/aria-readonly_false-manual.html": [
-   "8009becf00f1cf96c98841c736522583c7a3c79f",
+   "e223650192f40df5d034fca891dea58f661bd34e",
    "manual"
   ],
   "core-aam/aria-readonly_is_unspecified_on_gridcell_new-manual.html": [
-   "771e05c31ff56c7e533578fc76f353fee975451d",
+   "7eef5d47602e9706651e21339b92ad7a876af6af",
    "manual"
   ],
   "core-aam/aria-readonly_true_on_checkbox-manual.html": [
-   "c34fe5d9936fd305beb1d382a74c738b494da453",
+   "3d6e57f57dff65e2ff9615946263f4748f8334c3",
    "manual"
   ],
   "core-aam/aria-readonly_true_on_radiogroup-manual.html": [
-   "d1b5578370ce7ccc19f4db951a773c15bb115224",
+   "227b459866626a8bc3181a9c0615ef26006cc4fc",
    "manual"
   ],
   "core-aam/aria-readonly_true_on_textbox-manual.html": [
-   "2a618d52bede8ed766951fe9481c238281e07481",
+   "8fe7f4290f1019106567a3d50365e626f11c4b6f",
    "manual"
   ],
   "core-aam/aria-readonly_value_changes-manual.html": [
-   "eaff04abf14ea32fc932eaa71af332c81605902d",
+   "9f52c218350a299c58a13594390ecfec15f9f6a3",
    "manual"
   ],
   "core-aam/aria-relevant-manual.html": [
-   "f1e14260d46573039f44d98fdc918dac3a911e76",
+   "f6e6d1776ba2b2cd3d4badf1e07601f136b5bf4e",
    "manual"
   ],
   "core-aam/aria-required_true-manual.html": [
-   "b3e7baa15286aa75cff1086c6497a81173582e7c",
+   "24c226199f5d1d962cac08d9e5487170cd48bd0d",
    "manual"
   ],
   "core-aam/aria-required_value_changes-manual.html": [
-   "579334e6278b6edf04ebcbbeb5b9bbf77073bc33",
+   "3f4a1087e9bc11b263f8f81df6282a47acc45ceb",
    "manual"
   ],
   "core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html": [
-   "00496d1c81b91a2431606f4452a6084e312b0a81",
+   "4e33f5b07307aa3809376fa32863cc4acb9f433a",
    "manual"
   ],
   "core-aam/aria-roledescription_new-manual.html": [
-   "32fa5268e48f61f9b914090c6689b9fb359c2ccb",
+   "88a70e97fab58dbc340ca33ed13a26b9454db34b",
    "manual"
   ],
   "core-aam/aria-rowcount_new-manual.html": [
-   "7d78485d802b486e7b78e7a1189407ff315a1ad8",
+   "0a90243c3cec5545d9985e9bde48a58ec3f64a95",
    "manual"
   ],
   "core-aam/aria-rowindex_new-manual.html": [
-   "6a08fbbc607bf60c97fa3bdfb6188e0d7cfd0236",
+   "58378d7e0db6948cfa0bd96e1d40b76085d3af3d",
    "manual"
   ],
   "core-aam/aria-rowspan_new-manual.html": [
-   "fc4817b38147574abaa3570ed3dfe7321f81ec36",
+   "b55123805bdb941a4bb4be980ca6b1be009172ef",
    "manual"
   ],
   "core-aam/aria-selected_false-manual.html": [
-   "fcfba1d3ea92579fc24dc95274d8674a4dd9689f",
+   "d630207ebf8c8fae3f7f0b1ee2e2d7eb2266e191",
    "manual"
   ],
   "core-aam/aria-selected_true-manual.html": [
-   "c57ee5987a5805eba611eb4996429d464c1b578e",
+   "4bac203b19e279f168e4f2a5bfab0713e7ac1b21",
    "manual"
   ],
   "core-aam/aria-setsize_-1_new-manual.html": [
-   "1aa760fbcf69fe8cf6f51347e1b61e8273b064d7",
+   "39de3f63c55a8d425571c5c6194611b70b44a74b",
    "manual"
   ],
   "core-aam/aria-setsize_3-manual.html": [
-   "627b548cfd62f35afe9956a9924557014032757a",
+   "098aa998f14d2e57d063c7473563dc10888cc36b",
    "manual"
   ],
   "core-aam/aria-sort_ascending-manual.html": [
-   "a80a64a238c6cf9ab14e06e911a15f06a84d2974",
+   "1e94e48d50038a20180c2f217da35aab9846f02a",
    "manual"
   ],
   "core-aam/aria-sort_descending-manual.html": [
-   "0e020930ba439aad0216ed84e6499c3caf10f8a7",
+   "2068a2bf2553fee0e71350dc87c9f9aed951d14b",
    "manual"
   ],
   "core-aam/aria-sort_none-manual.html": [
-   "a1b290ff9b2d013a948c2c3acfd26f9220073fc6",
+   "c6ba0dcce03a7b30d0e51695c64bf2678641fe38",
    "manual"
   ],
   "core-aam/aria-sort_other-manual.html": [
-   "8336aff3f8e16bfdb596dddb1bb12b4eba5559ab",
+   "a57a592f53e91071f18b04da49b3ac319684d906",
    "manual"
   ],
   "core-aam/aria-valuemax-manual.html": [
-   "f852b9de68752a73a14a22059b8201a7211f25e5",
+   "a331b468709f4fe3491ac54b88ff603cd4e986e0",
    "manual"
   ],
   "core-aam/aria-valuemin-manual.html": [
-   "0ed24aa015fd799ff755057fc55d6a7da1178ed9",
+   "4d4e47363bd85bfe2535368bd870594f56fd0702",
    "manual"
   ],
   "core-aam/aria-valuenow-manual.html": [
-   "cb7d42a3a1ef6745510d457c861b3c91f024922d",
+   "5d7c877285b32e33f3984b34b7dbd5aa75ac1963",
    "manual"
   ],
   "core-aam/aria-valuenow_value_changes-manual.html": [
-   "313c1fa7c20afbc3047ab251ed32b860b5d5e15f",
+   "bd2e506476597cdc5ee086629f72ac923513c0ab",
    "manual"
   ],
   "core-aam/aria-valuetext-manual.html": [
-   "f00cb422daf4280c9022054d21cec986be87ca72",
+   "9c11a534b978c27fde294a04848679d0636e0496",
    "manual"
   ],
   "core-aam/aria-valuetext_value_changes-manual.html": [
-   "6a0cbb8c1a185f944488a9d0b8ec3870bace35a4",
+   "6605ee0eba5be4b04cea7e5d413ed64bfbc6b206",
    "manual"
   ],
   "core-aam/article-manual.html": [
-   "140251a0eee810b28cfff5f8f788429c290dc56f",
+   "c932c0fe74e994309e3014dd4178ab849fc55a27",
    "manual"
   ],
   "core-aam/banner-manual.html": [
-   "6c629ff372f0ba73bbc31c52e3452e0ec7e56b22",
+   "757e623ea8eca557c01c58b1eacca0d1cf8ecc1e",
    "manual"
   ],
   "core-aam/button_with_aria-haspopup_dialog_new-manual.html": [
-   "0f9ec5572b8eb69fce716603c2ffbb35f6546310",
+   "ba8a30592b803c35199204e290e199689b6cb7b7",
    "manual"
   ],
   "core-aam/button_with_aria-haspopup_true-manual.html": [
-   "d3a5c0b2d7a4f8d3b5fde379a85020ffa5b9c8bb",
+   "0fbd2ffbcb0f8f9f78a19464b5a35897a30f38d2",
    "manual"
   ],
   "core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html": [
-   "3a2b80b8ee6317d240d9971c565946a01735062d",
+   "1f29e904333240fd957838d47a2f5e2d98755e78",
    "manual"
   ],
   "core-aam/button_with_defined_value_for_aria-pressed-manual.html": [
-   "f8c140ccaccdb7f66ebebb538381cc825cb13aa3",
+   "a4991486e4f991e61ee1e3f52dc73fecbdc5d084",
    "manual"
   ],
   "core-aam/cell_new-manual.html": [
-   "ae4cf75a82e8482f4b0e5c023cc228abef66a157",
+   "53942ae488f7bd89d301dd985e7bc654f09e5449",
    "manual"
   ],
   "core-aam/checkbox-manual.html": [
-   "c928767c1b6355411e0f94f9b8e7df7d8fd9c909",
+   "2bf180f4fa58f738a47d8eefc2c5df239cc3bdae",
    "manual"
   ],
   "core-aam/columnheader-manual.html": [
-   "22cbd39e5da6e18e62547aa7d47754084dd27ded",
+   "90ee2c1371de05f14a1ce81639b5ba96da5acdeb",
    "manual"
   ],
   "core-aam/combobox-manual.html": [
-   "c30d849b24521b7dfe1364a22d340d96c9adbe43",
+   "4dd2b1a3b73a26527c7d1c7dab14748a04d66027",
    "manual"
   ],
   "core-aam/complementary-manual.html": [
-   "68c8b3bac4f10411651ccdf035f95b6982e332a9",
+   "e939205a937b526dfbb3c3d6a7bac0493d64df48",
    "manual"
   ],
   "core-aam/contentinfo-manual.html": [
-   "8aea3dd1b09e8d4899c44b2500907a9a9980ac74",
+   "8fe4f1377fc8dc522522b7f02fe9a12828ba3d6b",
    "manual"
   ],
   "core-aam/definition-manual.html": [
-   "32ec8c37210e61ecabeb718605cd3cc18c32b0bc",
+   "f357724a4d214ed070d90da5d4ada4929753f3be",
    "manual"
   ],
   "core-aam/dialog-manual.html": [
-   "185229736630b12324939dcad6ca661aea912b3e",
+   "b32eaefc51f9477de1f192a039d121ab5673d6fb",
    "manual"
   ],
   "core-aam/directory-manual.html": [
-   "65e83d8de84ecfe560ad694ee2bb19ba89b83c37",
+   "415a7ab4e3bd8c4ab9f23f72eae2d62fa6115ca8",
    "manual"
   ],
   "core-aam/document-manual.html": [
-   "5d3e81bda52e8dcbde9f08c68d57cfdc3a5618c2",
+   "c904bad3af261f1c816d841f0e9d45a48c43acd8",
    "manual"
   ],
   "core-aam/exclude_element_hidden_with_css_display_none-manual.html": [
-   "8d90d5975d23c29380b8a9c4c3ddce755c46c40e",
+   "0799d1818fc2284d3c87c3f526a09f562d2410a1",
    "manual"
   ],
   "core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html": [
-   "ca68655fce7a3ac4c39474c22d131acef27fda66",
+   "e0035c0ef408f6a0d4057c073d44d089fcc6d885",
    "manual"
   ],
   "core-aam/exclude_element_hidden_with_html5_hidden-manual.html": [
-   "9852875a50efe39674c674d51b27c95b8a24c8cd",
+   "1e621f91d90a65b90a11b4b42234bd726ae5ca73",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_button-manual.html": [
-   "4319a2775114feb0598402ac4afeb4a2f223e119",
+   "2840eca33bfc6c199db8a337642dbe8558ee75f5",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_checkbox_new-manual.html": [
-   "19b61c5ae7986e13aa330a8f7138b794d0bff88c",
+   "d8efc2c69c4936556cf4ab278a77c0c866a47caa",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_img-manual.html": [
-   "f6fd8172fb4cebb646a3f802a843e442fd4595da",
+   "2b9594ac072726fc2b35bde31716c4c35c2f94ab",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_math-manual.html": [
-   "89cdfe74dbaf497af4c6a61e77e08f3ddfa40a50",
+   "207075a1303577f7c78d0b51d569afdb93309bdd",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_menuitemcheckbox_new-manual.html": [
-   "353a319aadd237dbf59fb649793357445ac2d225",
+   "186ea94985d2960b57e7dc63df2b2c4004af3b19",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_menuitemradio_new-manual.html": [
-   "86042a801723c341ddfefbfec0753d0b2782ada2",
+   "3986cd80ba331fca4fc580ec6cbae65641d5dfbe",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_option_new-manual.html": [
-   "3559e7422ac1da20ec979c8778f73d5f5d5f0263",
+   "966e5577873ff5fc759bbedd3362d07732b8dc9f",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_progressbar-manual.html": [
-   "1f42a525dfad95e6f4563b1c7cafe9f149f6f2ca",
+   "1ee0ce40836a58e4644eaef0e547fca881808086",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_radio_new-manual.html": [
-   "f7fcef7b737489ebae6bbb04d1491274f20fef20",
+   "837e9522242e617dadeb8cbf2e3c9c62de6c42b5",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_scrollbar-manual.html": [
-   "c8ca1ae6a80876c4270d9ab4c158ce864875ad9b",
+   "1756483bf313efa817bfa12f5ab4cee5d22efdb3",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_separator-manual.html": [
-   "9d17f744c06ef63e7a35c990a78c6490951664f6",
+   "199147675f7f48f4f26f1e3788827f96506f55e8",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_slider-manual.html": [
-   "28a68c465bd9e1ff55732ef28e94e8c7e4aecf0f",
+   "1cf181e6f08e083e6e6e44d4eab7f5dcbf61c759",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_switch_new-manual.html": [
-   "19a63482251f6c2ec182bfa42728f664d014d3e1",
+   "3429b95aaab9aea745d910ca3ee0cb4dea66a4b7",
    "manual"
   ],
   "core-aam/exclude_presentational_children_of_tab_new-manual.html": [
-   "6d1843fe8b1d58100f5802bad629f48e372fc9fc",
+   "bd47d8f2308a86903e1555716963ca51e4f63054",
    "manual"
   ],
   "core-aam/feed_new-manual.html": [
-   "e659bdcd01aebd53bc527ed476cb7e67227b4c60",
+   "fc34902741e2d31fbb6209b60faed49875000bd4",
    "manual"
   ],
   "core-aam/figure_new-manual.html": [
-   "175904be565488c2fa57f8da6f031fb4929bd5eb",
+   "2bb30ee7d86e572138d0a943623713f700345dd5",
    "manual"
   ],
   "core-aam/form-manual.html": [
-   "3f9b8144aaa5945f384789e6ab84e96f72d53ae2",
+   "c8693d470731299a1b48db7bf19850e79a4f45ee",
    "manual"
   ],
   "core-aam/grid-manual.html": [
-   "45aa9dce7ec6f37f5b9457824cd8aef4384c6ace",
+   "635bc78128e884741ae3731732604293d1a300bb",
    "manual"
   ],
   "core-aam/gridcell-manual.html": [
-   "c72cf8632ce6dc9c9e256ea4ef152bc667d9af80",
+   "3b093adfa46bc6816401a805d54ab9d211d068ee",
    "manual"
   ],
   "core-aam/group-manual.html": [
-   "0d61a26299bda921e326821e4882d03d6196afc1",
+   "1b4a40176efe6ccfcb02f8257458ebe5738c7302",
    "manual"
   ],
   "core-aam/heading-manual.html": [
-   "8da1a2e8f544abc7734301a2db773d4597ccd49b",
+   "07a76dcb4b366f6770da5f8d0d06908c76f47e78",
    "manual"
   ],
   "core-aam/img-manual.html": [
-   "4b7a6ec157300dcffadaefa243c7c89eebc158ef",
+   "0f851316d6dd1b5af960d9ab9346e828862376ae",
    "manual"
   ],
   "core-aam/include_element_referenced_by_global_aria-controls-manual.html": [
-   "b9d9fd53ef5625443dd84e6a43ff3dd3e66c61c7",
+   "090390606f870167a666a6294a7cc286602178ce",
    "manual"
   ],
   "core-aam/include_element_referenced_by_global_aria-describedby-manual.html": [
-   "800eb7e59730a182baa757654875406e6a33c31b",
+   "9dac4c336875f8863e1cf4eea549bba143b99276",
    "manual"
   ],
   "core-aam/include_element_referenced_by_global_aria-details_new-manual.html": [
-   "57f69a68a6911e5e580a0d3ff307ef4346e59b76",
+   "670b597365fef2c4e3fd83491190b68c2fd0d189",
    "manual"
   ],
   "core-aam/include_element_referenced_by_global_aria-errormessage_new-manual.html": [
-   "2cefe94d13199d8c3c4a1850b1cf5dcc9e6a61ff",
+   "c530c51e9feb96e6ace7cd51770d82078de17358",
    "manual"
   ],
   "core-aam/include_element_referenced_by_global_aria-flowto-manual.html": [
-   "2e0bac9bf235765e0069aa59de2e20cd47177993",
+   "1a49be004a2087eeda3117c9a241a211d33f6880",
    "manual"
   ],
   "core-aam/include_element_referenced_by_global_aria-labelledby-manual.html": [
-   "b57e67396e0255d57e4e55ffb50d9571b7a5d91f",
+   "eaa77ef9a58049ece00883ef3175f1ca64ab020f",
    "manual"
   ],
   "core-aam/include_element_referenced_by_global_aria-owns-manual.html": [
-   "c83c6b8f6a8011dcce1e3bc3a3e33ab684a10e9f",
+   "5fcada41b267438d8bf7dc0ae7ef28496cbbda1d",
    "manual"
   ],
   "core-aam/include_element_that_is_focusable-manual.html": [
-   "7c2202d531272fe4bcd5767d34cbbd4231e72451",
+   "0a0d396ffd393ef79266be55b28c4f5d4a019ffd",
    "manual"
   ],
   "core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html": [
-   "aa67c2ffd1f38cc578984c044319017a720cae9e",
+   "36566c5051a0f7abe9cc2a9b483d6eba0b259c51",
    "manual"
   ],
   "core-aam/link-manual.html": [
-   "08a9850a68d397c0c94a5b8273c86333e3c445fd",
+   "b29c6bf7a43214958c85ab3e070d25cea9ac5dbd",
    "manual"
   ],
   "core-aam/list-manual.html": [
-   "3bca83e6f292af793140669e5d1a477b13824dd4",
+   "51654c7f8df848e5ebef097a0c91c1858a4f8946",
    "manual"
   ],
   "core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html": [
-   "08134c2a597049966243bb43e7794395a1796fc1",
+   "dfa6479bc6622cc4e4b06781bed2fe264ba3feb9",
    "manual"
   ],
   "core-aam/listbox_owned_by_or_child_of_combobox-manual.html": [
-   "70c893bc1617777f8f4bf199e7751b3e0236907a",
+   "71ae566d5dbb35ff02a7e4ab0e3c745d077db322",
    "manual"
   ],
   "core-aam/listitem-manual.html": [
-   "fe47c78b32125a3608478ce2e329e8e6e73b02c3",
+   "bb55e89ce125030296062054d15944dffee6d0ce",
    "manual"
   ],
   "core-aam/log-manual.html": [
-   "b0cfb23b15694c7b27ab81236ce2cd9523da2f04",
+   "4e5e2b9dea7fad68d9193cdcbe07ea56f9d96540",
    "manual"
   ],
   "core-aam/main-manual.html": [
-   "8e6e5db5991f1665ee358c86e611ae6d63327ab3",
+   "3d6521e96ec1340d3a7752e46adcb7565b32e2a8",
    "manual"
   ],
   "core-aam/marquee-manual.html": [
-   "d37d31030ef5bd924a51c299e3eda67171abdb92",
+   "9aceb89e7944350a537c9f61c7b3348896c97fdf",
    "manual"
   ],
   "core-aam/math-manual.html": [
-   "45a130f52eaf4324df8eabeb162544e8048b2ecd",
+   "18fb1d763ec9e68dbcecfce47ee0b9a6bd01787b",
    "manual"
   ],
   "core-aam/menu-manual.html": [
-   "55f6cbab2fb9466fcb7f0adad6532b0eb1ab0dbd",
+   "8bd0a1bc001c7f6235a631c51a583708cf111390",
    "manual"
   ],
   "core-aam/menu_child_of_menu_item-manual.html": [
-   "65836d38e9842a8bbf341e05da8a0590a4a8ae95",
+   "a0b402df75639ce11c9bc92b22857b11927874ad",
    "manual"
   ],
   "core-aam/menubar-manual.html": [
-   "51b75485984cc0f4d77f32049c47d39bec0d74eb",
+   "17aa79da53bc4bee7b7b24bf9dd8b191c67e4081",
    "manual"
   ],
   "core-aam/menuitem_not_owned_by_or_child_of_group-manual.html": [
-   "c2a94ee210c24c2dd03c20781b98d84e6aa489d1",
+   "c2660dcf6b98027ef37fb9ed4ef792f24ba7ac7b",
    "manual"
   ],
   "core-aam/menuitem_owned_by_or_child_of_group-manual.html": [
-   "0885a232296e242e633e7929d90b292a90505d0e",
+   "bd9721ab09402f7fa9ec0221d3367c469e485ea7",
    "manual"
   ],
   "core-aam/menuitemcheckbox-manual.html": [
-   "3c9bafc81c06ed2dc45788c412c0013c103aad35",
+   "6517fb3607761929337b7d07056c4c322f1b4cd1",
    "manual"
   ],
   "core-aam/menuitemradio-manual.html": [
-   "696306c6d495f47723df3240323e7e896c2e0447",
+   "c4263ee059a0b499fff5c95a681e5f5d125c5f36",
    "manual"
   ],
   "core-aam/navigation-manual.html": [
-   "d3b80c33c4738b8ba1b3b6aa719b2403b05a2e01",
+   "ee5be4deb328f9773433b9ea4980c04f218945cf",
    "manual"
   ],
   "core-aam/none_new-manual.html": [
-   "cbef2eed17c93f0c43b81968c79e172198c3f87d",
+   "91f9d1b00a118d7f4a461398dba1c8d63a98e53e",
    "manual"
   ],
   "core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html": [
-   "37804ca22720578b4513f71f08b297e65f2f59ed",
+   "f0fda850ca33b0c2d22947876b96ee53a495a330",
    "manual"
   ],
   "core-aam/none_used_on_table_element_with_td_children_new-manual.html": [
-   "9abf93a3e9de4117abcb56cc533007ea96680010",
+   "b5857641f220c8a0ec0e43b1ca83e24b2f7c820c",
    "manual"
   ],
   "core-aam/none_used_on_ul_element_with_li_children_new-manual.html": [
-   "b8e90f929bab2ca1fc30e04f841fc49a931531e3",
+   "0e27d1041496d4a50702eca3a6d3a06f6f0c96de",
    "manual"
   ],
   "core-aam/note-manual.html": [
-   "ae0d55036db32cf4646d2f6dd8ce13c374f71712",
+   "b743803a2db863c91be7ca254335aa3bcc5d510f",
    "manual"
   ],
   "core-aam/option_inside_combobox-manual.html": [
-   "8e13f4e37088d43288d73b65cadedd884ccd3e32",
+   "6037f1df34a52686e3e0dad3ed7538b0fbf8ac82",
    "manual"
   ],
   "core-aam/option_not_inside_combobox-manual.html": [
-   "fb5244e2337d0b0589fa111cd11474bbddefb8ce",
+   "80abb7e7ae6f1738b76375893fb1102ba77b732c",
    "manual"
   ],
   "core-aam/presentation-manual.html": [
-   "6d164fca767b1dc0002f958f04a7484ada67ebc9",
+   "c791791766851f6c9530bd0736d0a2f47dd52192",
    "manual"
   ],
   "core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html": [
-   "d671a5e21682870819586eecc6a9f3d74182eac9",
+   "fc48af04128ef4cafb6aca0f4a9f28e741f7603e",
    "manual"
   ],
   "core-aam/presentation_used_on_table_element_with_td_children_new-manual.html": [
-   "4494e50029966771e05f4261a4204e451c1088ba",
+   "6ef13a82aa83a0206a48c3b193a47c4af4223efd",
    "manual"
   ],
   "core-aam/presentation_used_on_ul_element_with_li_children_new-manual.html": [
-   "9c4256fbab54a0651372c010df4b4b54645d48c3",
+   "b64a4a57b7c80041aea95ab40a761c4b520a5d4b",
    "manual"
   ],
   "core-aam/progressbar-manual.html": [
-   "0d0e4c44b9e953a00898a4c57a507bd976fa4aeb",
+   "c316ca21323700e85eb304353a31f75d587f6ec0",
    "manual"
   ],
   "core-aam/radio-manual.html": [
-   "cecdb8fde332fb31e61324ada239079ab925e7b2",
+   "caf680c72e61985d5bec7a8b566a54c74b834297",
    "manual"
   ],
   "core-aam/radiogroup-manual.html": [
-   "9c9d0db1ace6d092d64fda9db7e5c6ce7755c84b",
+   "9bc36918464078e2727a57026aa8c38fafa43038",
    "manual"
   ],
   "core-aam/region_with_an_accessible_name_new-manual.html": [
-   "2fa731fdafc525eb1ca9c5958d6815c6eadd83b4",
+   "6680d5d81c1b5ea1c3ee737496b88309c282e9f2",
    "manual"
   ],
   "core-aam/region_without_an_accessible_name_new-manual.html": [
-   "2e89a57d2f7edd723224cc80695d57af2543b5b1",
+   "0d00faea4689f4470af49487f68aefa197d81680",
    "manual"
   ],
   "core-aam/row_inside_treegrid-manual.html": [
-   "41b5f2cb912d1fe031dca42b6591f6d080522f28",
+   "0a1016de8e06d4972c3ae5987c3c85b72d884ab0",
    "manual"
   ],
   "core-aam/row_not_inside_treegrid-manual.html": [
-   "cefd7631e03b4c182ed16d46cf3ece9a7eeb49d9",
+   "bea71a6ddfe99739530af85328beff54c36780c6",
    "manual"
   ],
   "core-aam/rowgroup-manual.html": [
-   "9a11d3a6fbd7866736a930ff522c1fa6622fc878",
+   "5e64687cbb26f09543c2ee33356425cb0edfafad",
    "manual"
   ],
   "core-aam/rowheader-manual.html": [
-   "dcd21b93f6230837f587bc616e259578ac8118aa",
+   "a91ef3fffa4122f5fc80bd374d2cdcb692b9f4c5",
    "manual"
   ],
   "core-aam/scrollbar-manual.html": [
-   "a62bdc1ae12a5683d033925934287e44e4a3b94c",
+   "15e2b890d6889c9f48f8059a7f80bf04b497136f",
    "manual"
   ],
   "core-aam/search-manual.html": [
-   "5ef988d9e86bcc57d5cba3050af31cf455225029",
+   "46ac0fb77de876e2e7c3b9f7a3977268194162e9",
    "manual"
   ],
   "core-aam/searchbox_new-manual.html": [
-   "b376ede0ebd4b86f9bd70e73c14043abe33b69e0",
+   "7e8e4762bb086160e3ac79d23b2e7c9df09654d5",
    "manual"
   ],
   "core-aam/separator_focusable_new-manual.html": [
-   "0ef8d2f270a3bb97ef1d1cc96758cafcefe56dc5",
+   "bda08c6535f7fbb55578eb7b44a9f35c3e34c98a",
    "manual"
   ],
   "core-aam/separator_non-focusable-manual.html": [
-   "2bb493f07c66109f4f616c88456f7d6ea0af4fdb",
+   "3777336fadeef6bf57fb06a6b19aea78e32d1418",
    "manual"
   ],
   "core-aam/slider-manual.html": [
-   "b30c6f0835349083b3d8e5b4f45433cea928b26b",
+   "f2c61896223ebaa70af20dfe99c5c57b83020db0",
    "manual"
   ],
   "core-aam/spinbutton-manual.html": [
-   "d206a25f2379cd22b2394f92b4a52ac388e4667e",
+   "5d221b2a71c78a884b8d7b66b1d3f8986d63854e",
    "manual"
   ],
   "core-aam/status-manual.html": [
-   "ae21b30623663495df042c975a22ef820f46d5f5",
+   "696249331ae6a914ee214a9312be542b78fd249c",
    "manual"
   ],
   "core-aam/switch_new-manual.html": [
-   "1ad6e017f138891c62a4671bc957a47efd51019b",
+   "e99427f33513485c80d0cd13f9cdda1efd23a094",
    "manual"
   ],
   "core-aam/tab-manual.html": [
-   "f1e10ec87a29ee5ea7e535f69da392dfcbdd6533",
+   "297f79c5c674859d8256269ca66d5b0c069bd59e",
    "manual"
   ],
   "core-aam/table_new-manual.html": [
-   "41ddee4a58eaffaf6c0236ab0299ed7df4c3a7be",
+   "17256eaa155a24ce5e5db40c6ac04623f84b9fd8",
    "manual"
   ],
   "core-aam/tablist-manual.html": [
-   "dcc005bbf334f34f87e997dc2f514c19400b921d",
+   "2cd52a7fc39d6c457e958b5d576ce836c9cdb477",
    "manual"
   ],
   "core-aam/tabpanel-manual.html": [
-   "cce118b7d1002c1dc895f08a31d8dba2fc34f92b",
+   "b574f3302ef991b2f1e0e16af17f6239c8e45ef4",
    "manual"
   ],
   "core-aam/term_new-manual.html": [
-   "c551a46778d6f983ad890efcad40fbf19efafa47",
+   "9d554da4e34515081398a1ea3ae8db302d6de733",
    "manual"
   ],
   "core-aam/textbox_when_aria-multiline_is_false-manual.html": [
-   "b6798573553d05d1633e99292af9a21b99421d36",
+   "4935c9c4d448439496d846dfd08f1a450cbbed15",
    "manual"
   ],
   "core-aam/textbox_when_aria-multiline_is_true-manual.html": [
-   "01569747831aa6cc672c054664030767215cf8a4",
+   "5de00a37517368424d4d984123a2d1c55f520e2f",
    "manual"
   ],
   "core-aam/timer-manual.html": [
-   "45e10de6a4de88047e63713c9d1cb1a13ede9269",
+   "df0a5556edba275741bcf8f621e4b2076f5816b6",
    "manual"
   ],
   "core-aam/toolbar-manual.html": [
-   "e8dd02cba761318997d69fc44bc2fb0fd6c42c2d",
+   "d70ac4573f45dfcc1f9329cd81889c97fcbfbc1d",
    "manual"
   ],
   "core-aam/tooltip-manual.html": [
-   "d0ce96d1ce2d918f41ac2c595ab22ba0bd647d82",
+   "9763027f57e499d7c1f53ba7e2870c5d57cef1fa",
    "manual"
   ],
   "core-aam/tree-manual.html": [
-   "51dc4b4b499fea248051556f48bec20b8b8dbae2",
+   "f27f5accc74e3cf700e3a969ca2bad98a03c0836",
    "manual"
   ],
   "core-aam/treegrid-manual.html": [
-   "6d8e0f4056481bd18a894fc9a2666ce998e14e53",
+   "a10b8432b1c99a5de4a36bdc4f699f5ad5b4e24b",
    "manual"
   ],
   "core-aam/treeitem-manual.html": [
-   "adb1499f09e7b3d86f359ce526260b312d51e207",
+   "7a62eaee7b29868499a2152c64015557e7d48b90",
    "manual"
   ],
   "cors/304.htm": [
@@ -429743,6 +432653,10 @@
    "a3589dffef076a17cc33610ad49fae71485886c4",
    "testharness"
   ],
+  "cors/client-hint-request-headers.htm": [
+   "8376a7a4d8e3d5fd33f6ce0b41dd0cb3ebd72e89",
+   "testharness"
+  ],
   "cors/credentials-flag.htm": [
    "0c2e70a707db7426e86726fc8e9cf86159606227",
    "testharness"
@@ -429844,7 +432758,7 @@
    "testharness"
   ],
   "cors/simple-requests.htm": [
-   "73671cf4dd3474c70b065a7f34e706677c6abb62",
+   "608ea76c3209d7e803b4d4c1b02035e8493d52d5",
    "testharness"
   ],
   "cors/status-async.htm": [
@@ -429863,6 +432777,10 @@
    "8307ed240a531033c96da89197dcfb5ea25cde87",
    "support"
   ],
+  "credential-management/OWNERS": [
+   "c7e6702e4472c55bb6e9c543bed62de2d2a7331d",
+   "support"
+  ],
   "credential-management/credentialscontainer-create-basics.https.html": [
    "4889217f5e821965907d4d60a9ffdd19d4bc79af",
    "testharness"
@@ -430027,6 +432945,14 @@
    "f060b356887b9ceb49be019634657b847bfffe81",
    "reftest"
   ],
+  "css/CSS2/abspos/table-caption-is-containing-block-001.html": [
+   "d416e3d830bf172326723ed469d6a5f02de7e9e1",
+   "reftest"
+  ],
+  "css/CSS2/abspos/table-caption-passes-abspos-up-001.html": [
+   "e052f94ee697a68bb31cc30231197655251bdc04",
+   "reftest"
+  ],
   "css/CSS2/backgrounds/background-001-ref.xht": [
    "9ae9d57c3db2a6bbb7e56e592b2808a7ba921848",
    "support"
@@ -446503,6 +449429,10 @@
    "a1b16dd5548c5b358564fa723ee30dd0b872aa46",
    "reftest"
   ],
+  "css/CSS2/floats-clear/adjoining-float-new-fc.html": [
+   "c9b1c2a88838d119a7a472f99e44e3e245eb16ee",
+   "reftest"
+  ],
   "css/CSS2/floats-clear/clear-001-ref.xht": [
    "6c2495de89220792494f6e57450135d2b9be050b",
    "support"
@@ -446535,6 +449465,10 @@
    "4bb55db3c05ae1f52b6320491577cc40f99a59a0",
    "reftest"
   ],
+  "css/CSS2/floats-clear/clear-after-top-margin.html": [
+   "6787ba8e0510d9867d9585e6b2cde68b7f40b447",
+   "reftest"
+  ],
   "css/CSS2/floats-clear/clear-applies-to-000-ref.xht": [
    "5691b2e615b308024ea804cf5fcc7aba5de29313",
    "support"
@@ -447528,11 +450462,11 @@
    "reftest"
   ],
   "css/CSS2/floats-clear/floats-143-ref.xht": [
-   "7713f31704c7bec118a066048eeb0163730f2bbe",
+   "e0b18220ad5d855dc081da2cc1e2bc36b9a0e982",
    "support"
   ],
   "css/CSS2/floats-clear/floats-143.xht": [
-   "8cae4019514dc9018bd744670e0fc856a55d874a",
+   "0229a8a9b443508801a17d980ecdb12362578516",
    "reftest"
   ],
   "css/CSS2/floats-clear/floats-144-ref.xht": [
@@ -447819,6 +450753,30 @@
    "b4347b446723cc1bfd3476c457858a780064e001",
    "reftest"
   ],
+  "css/CSS2/floats-clear/nested-clearance-new-formatting-context.html": [
+   "4e6792f21e342e655c066de8091c904994ec0e5d",
+   "reftest"
+  ],
+  "css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html": [
+   "a38b48546f1f170839e6d7e17d75771b693c3427",
+   "reftest"
+  ],
+  "css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html": [
+   "4047422ac3c5e044a0ab8a7b07f357f889fcad20",
+   "reftest"
+  ],
+  "css/CSS2/floats-clear/no-clearance-due-to-large-margin.html": [
+   "bb349bd932fc54db66320e284f0e9270050f56c2",
+   "reftest"
+  ],
+  "css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html": [
+   "39a8c1d7aa1a424912840a819b785a0ae41ec311",
+   "reftest"
+  ],
+  "css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html": [
+   "cd06d798d180baa9d6c3d33b39975e43ff0be1d4",
+   "reftest"
+  ],
   "css/CSS2/floats-clear/support/1x1-green.png": [
    "51e7b6974a09eda6cb31337717c5eaeb9c44b443",
    "support"
@@ -448007,6 +450965,14 @@
    "4081cd8860323434f2461673c39c872f7e9c55e2",
    "reftest"
   ],
+  "css/CSS2/floats/floats-in-table-caption-001-ref.html": [
+   "546c22da7607f4c26a951e7c614b29dc6a7c9331",
+   "support"
+  ],
+  "css/CSS2/floats/floats-in-table-caption-001.html": [
+   "f9b30873ba1da1309d17f2ae6f0777656521e5b2",
+   "reftest"
+  ],
   "css/CSS2/floats/floats-placement-vertical-001-ref.xht": [
    "219c3d13a6859b58907f35df0a5602ba215a0335",
    "support"
@@ -448315,10 +451281,18 @@
    "7287e2ce42cab8fda1f63e97c98b664f0b49e9fb",
    "reftest"
   ],
+  "css/CSS2/floats/new-fc-beside-adjoining-float-2.html": [
+   "3f5a648154f288d3a78038daacb3810662aa8977",
+   "reftest"
+  ],
   "css/CSS2/floats/new-fc-beside-adjoining-float.html": [
    "f378062671d9de538e54c7dba552c2deab57baa4",
    "reftest"
   ],
+  "css/CSS2/floats/new-fc-separates-from-float-2.html": [
+   "91a4405707130a19100db1ccbaebb41b885531dd",
+   "reftest"
+  ],
   "css/CSS2/floats/new-fc-separates-from-float.html": [
    "357427f1d71d7137c1ba4c386ae25acc7712928e",
    "reftest"
@@ -460815,6 +463789,14 @@
    "33e6e180ed6e9896b7aeb3fcd9060bedb162291c",
    "reftest"
   ],
+  "css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html": [
+   "97c8c6cd37568dfa52dea1538ac851e7357797fe",
+   "reftest"
+  ],
+  "css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html": [
+   "920cfd35cdf213169ec6c4d0078abb812815bec8",
+   "reftest"
+  ],
   "css/CSS2/normal-flow/max-height-001.xht": [
    "34a501cb70b591b6998234f3366361c33a064a18",
    "reftest"
@@ -472016,11 +474998,11 @@
    "visual"
   ],
   "css/CSS2/syntax/characters-0080-009F-001-ref.xht": [
-   "0c4ed8b5ac633decd29f9c53292d08d57875318a",
+   "39e86240ba85ad84038749605b6d28158a718e59",
    "support"
   ],
   "css/CSS2/syntax/characters-0080-009F-001.xht": [
-   "a5b33839189dbed251db006e22962aa9f681cf64",
+   "4388d4bf4c6b2e820e64148e08f41de850254835",
    "reftest"
   ],
   "css/CSS2/syntax/charset-attr-001.xht": [
@@ -472328,11 +475310,11 @@
    "reftest"
   ],
   "css/CSS2/syntax/escaped-url-001-ref.xht": [
-   "df891c3ea662fdb4fadd8e432e938b37ae5d0d5a",
+   "6559ce0dced033696989b923cf96d8d74afa0fd5",
    "support"
   ],
   "css/CSS2/syntax/escaped-url-001.xht": [
-   "f3c1230ece92478f507bf2dc8f0e043cfcf27d04",
+   "b033a1237056d29b61baadddea2588d52d7f8d6e",
    "reftest"
   ],
   "css/CSS2/syntax/escapes-000-ref.xht": [
@@ -483135,6 +486117,58 @@
    "7de15523c5a70277df00ce5c36cf0495796e8834",
    "reftest"
   ],
+  "css/CSS2/visudet/inline-block-baseline-001-ref.xht": [
+   "9332dece9b7144eedb6bbd1434b39e32faba0753",
+   "support"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-001.xht": [
+   "b87d60726dd92a47df85f0c1decff084026198e2",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-002.xht": [
+   "1b589ca728ddc33d0601cbacbb0a453b54e30d02",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-003.xht": [
+   "ce0fa4694fbbd2f4dc27301df540d192199b4664",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-004.xht": [
+   "689f0954014b30e156a34490841e23d384b4bea0",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-005.xht": [
+   "a09d2427ab4e7bc1ab8bd22dd830a90f33642f2b",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-006.xht": [
+   "803746d0a716ce6b848d3ad8adf5c7f8cbe72560",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-010-ref.xht": [
+   "0b0a3d08162276df379a25ac4cb0850d0eaa733a",
+   "support"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-010.xht": [
+   "6d0974ec84414e31217d47aa07e9cb4f66ae3c05",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-011.xht": [
+   "c3d3f9d8ca28e38fbea9ed47a9bc42755462b0dd",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-012.xht": [
+   "2e5738dccd6943cedb10a2e6c9f0f528d23c9e32",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-013.xht": [
+   "bd746c546151fa0f3c0a5077dd9058c471cdef0e",
+   "reftest"
+  ],
+  "css/CSS2/visudet/inline-block-baseline-014.xht": [
+   "53997273e986a9a44c81910a2f3b4df57fe17330",
+   "reftest"
+  ],
   "css/CSS2/visudet/line-height-201.html": [
    "e6bb33894cc5bcc27d2288496ba2c379f8528f3c",
    "reftest"
@@ -483500,7 +486534,7 @@
    "manual"
   ],
   "css/CSS2/visufx/overflow-applies-to-001-ref.xht": [
-   "34faa112c98e7420ef620e72449843194c8810ad",
+   "73f5a590cb67d148487b7e0c23250af1252de762",
    "support"
   ],
   "css/CSS2/visufx/overflow-applies-to-001.xht": [
@@ -483772,11 +486806,11 @@
    "reftest"
   ],
   "css/CSS2/visuren/inline-formatting-context-001-ref.xht": [
-   "9b6407feb1ad5526b869991c6604d7f6c52a177b",
+   "a91a440baf7d555f70681ee72d238b18a7017b35",
    "support"
   ],
   "css/CSS2/visuren/inline-formatting-context-001.xht": [
-   "0e997f564daa14cec4aba7a359d7db7b6cb306a0",
+   "abbfb786df6032c046b0cc0118216a09ee1e2da8",
    "reftest"
   ],
   "css/CSS2/visuren/left-offset-position-fixed-001-ref.xht": [
@@ -484216,7 +487250,7 @@
    "reftest"
   ],
   "css/README.md": [
-   "ab97108074d4c07c5333ff1148fe9a5e425484ca",
+   "4cd0a3eee196e6ca0eb72e84a8bd4bf45f5bb02e",
    "support"
   ],
   "css/WOFF2/OWNERS": [
@@ -488920,11 +491954,15 @@
    "testharness"
   ],
   "css/css-animations/animationevent-interface.js": [
-   "91d95ca5ee8f917ec3961e1cf29dc2a78b7acee8",
+   "d756058c7e5d9e2e1302d96b2b148c034bde8981",
    "support"
   ],
+  "css/css-animations/animationevent-pseudoelement.html": [
+   "827d8eab74c277830749364b3497fad36613be05",
+   "testharness"
+  ],
   "css/css-animations/animationevent-types.html": [
-   "168107b4c1e2aeb7c3329911bb0e5e68b61002ac",
+   "15d495003fa9616fc54a4f6072e531341d51185f",
    "testharness"
   ],
   "css/css-animations/animationstart-and-animationend-events.html": [
@@ -489160,7 +492198,7 @@
    "reftest"
   ],
   "css/css-backgrounds/background-clip-content-box-001.html": [
-   "0274ddcafae18210539741524c8d142adfabfed6",
+   "edfac77c12fb04febf258794980b4e11645c7d9b",
    "reftest"
   ],
   "css/css-backgrounds/background-clip-content-box.html": [
@@ -489475,6 +492513,10 @@
    "36050bffda9382cfd978dc82a2f0244a535a6a46",
    "support"
   ],
+  "css/css-backgrounds/background-rounded-image-clip.html": [
+   "1f3a33ee141f0bf0186875d376bc95414db8dd18",
+   "reftest"
+  ],
   "css/css-backgrounds/background-size-001.html": [
    "7cf677bf25a1fcac569bd0accd28dd66e6060a1b",
    "testharness"
@@ -491524,7 +494566,7 @@
    "reftest"
   ],
   "css/css-backgrounds/box-shadow-syntax-001.html": [
-   "90c15e29e3675b2dada46ea9d9d940fcb37c5b79",
+   "fcf77540a8d60885c814fedad81ce86e8b5255c9",
    "testharness"
   ],
   "css/css-backgrounds/box-shadow/box-shadow-blur-definition-001.xht": [
@@ -491800,7 +494842,7 @@
    "testharness"
   ],
   "css/css-backgrounds/parsing/resources/parsing-testcommon.js": [
-   "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
    "support"
   ],
   "css/css-backgrounds/reference/60x60-green-background.html": [
@@ -491824,7 +494866,7 @@
    "support"
   ],
   "css/css-backgrounds/reference/background-clip-content-box-ref.html": [
-   "8d6167560bb724cd2cabb59984821bb2569945c8",
+   "a818d18fc2089057ae818e20e4263ee2b0d88ad8",
    "support"
   ],
   "css/css-backgrounds/reference/background-color-clip.html": [
@@ -491863,6 +494905,10 @@
    "1141a4c270ace715755b9b8352dab9baffca27c4",
    "support"
   ],
+  "css/css-backgrounds/reference/background-rounded-image-clip.html": [
+   "0f98f9c82627977b11cde5f7c8ba536104cccdd2",
+   "support"
+  ],
   "css/css-backgrounds/reference/background-size-002-ref.html": [
    "33d8850f315bedabb7024031b091a14177034c1d",
    "support"
@@ -492039,10 +495085,6 @@
    "121d1dcc21d4fb64b984bf54456bbe40d10f5dd9",
    "support"
   ],
-  "css/css-backgrounds/resources/parsing-testcommon.js": [
-   "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
-   "support"
-  ],
   "css/css-backgrounds/scroll-positioned-multiple-background-images.html": [
    "2fafa8d282711ae7b4a996ca5fe0fd9079c350c6",
    "reftest"
@@ -492619,24 +495661,40 @@
    "0723ed9d6c7414565e3dfed19b133f8450d6c092",
    "reftest"
   ],
+  "css/css-color/lab-004-ref.html": [
+   "673330aa247dd4335b409f363d981bce2c98eafe",
+   "support"
+  ],
   "css/css-color/lab-004.html": [
-   "51f4804db8a2f9e0e388c81cb1fee589e1bbdd28",
+   "5c2ba8f9a9e2210ba71cfab41ca8a7ca5c6df45c",
    "reftest"
   ],
+  "css/css-color/lab-005-ref.html": [
+   "0e33a3d9f01ce838cceefb300ce285e3fa8b2614",
+   "support"
+  ],
   "css/css-color/lab-005.html": [
-   "db07745d8a25a48ea3bcf1b8d3ea56c58cdbc9af",
+   "c36f72b1e4eb01643e215a4ce1fb13d771f78fd8",
    "reftest"
   ],
+  "css/css-color/lab-006-ref.html": [
+   "3c8201581df26de61485477f74abc00d1012ba67",
+   "support"
+  ],
   "css/css-color/lab-006.html": [
-   "eea09960176bb28aba7a05bde9acacb1960db649",
+   "8bfc2f23db0e166283116007f3e0e2c8bc4f515b",
    "reftest"
   ],
+  "css/css-color/lab-007-ref.html": [
+   "e94b776e6fc00524cf2895cc50e3af2906ebc778",
+   "support"
+  ],
   "css/css-color/lab-007.html": [
-   "c65ede9c328ddf85fc607a5ac78fd4897d25c926",
+   "ef6727c026766145a40ae1ddddc462771a7b19e0",
    "reftest"
   ],
   "css/css-color/lch-001.html": [
-   "5b18f33c3947d8d9be59b886442f6e51248c5db6",
+   "56db2e10683be4fa459c657dc709f96903bef6aa",
    "reftest"
   ],
   "css/css-color/lch-002.html": [
@@ -492648,19 +495706,19 @@
    "reftest"
   ],
   "css/css-color/lch-004.html": [
-   "5e3588caa84df218f959bcf3fa98908e7a97c5a2",
+   "ecbee5e5b0394dc3bc8c4d09e6741c2a3fcf0aeb",
    "reftest"
   ],
   "css/css-color/lch-005.html": [
-   "9ed500d2841d09b3db270f4c4c6624e231fa5915",
+   "d91d0e536685e4bb57a3e8a9b2795f0c4d3b75b8",
    "reftest"
   ],
   "css/css-color/lch-006.html": [
-   "7eb1d1e686a1bc99621e2ecaa3b691eb7b81915b",
+   "50cfea9e95c16a2bd220c067b6ad9b78545fdb5f",
    "reftest"
   ],
   "css/css-color/lch-007.html": [
-   "597f775935650c4259de1cdc85afdacb496aa3bb",
+   "217195f6a5931c9008d10da1cb16756a59ecda8c",
    "reftest"
   ],
   "css/css-color/named-001.html": [
@@ -493412,107 +496470,123 @@
    "support"
   ],
   "css/css-contain/contain-layout-001.html": [
-   "e40223fa77c569be5465ce55532eca46d9893cad",
+   "937507caf01330e9beafc7a5ba850284d35c4369",
    "reftest"
   ],
   "css/css-contain/contain-layout-002.html": [
-   "30d5b2c379a9af602b9c882067ebe922c25038bb",
+   "f37c06237a09aea4eaa09bdc08d9969f7763f0b7",
    "reftest"
   ],
   "css/css-contain/contain-layout-003.html": [
-   "5e19e8c0f7a9a9f73238ef6e6b28462883740c6e",
+   "b031fdb81e39d3044e133e6e332aff31b2844d8a",
    "reftest"
   ],
   "css/css-contain/contain-layout-004.html": [
-   "391769dc944021336fdf3f3409be7e2be494a685",
+   "dea2a6b1dada9e57f36d2245ac67c05fd9c4ad0b",
    "reftest"
   ],
   "css/css-contain/contain-layout-005.html": [
-   "c64e0379993570d68ebb96c7b6df3f5f0f60674a",
+   "60b834ef7b5becf76f5cacd55b2b9c4774562637",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-006.html": [
+   "89c68e7ce325295d6a36da91b6d4dd39580f7165",
+   "reftest"
+  ],
+  "css/css-contain/contain-layout-007.html": [
+   "799965dfb9989fc3a8226e80fa3c67cafb24374b",
    "reftest"
   ],
   "css/css-contain/contain-layout-breaks-001.html": [
-   "2904f490dbe202ed821d6d74652ec177ad8eacab",
+   "09fcfd311126800c7ce63f27c3154ef31fc647bd",
    "reftest"
   ],
   "css/css-contain/contain-layout-breaks-002.html": [
-   "947877963e2d57b249950ff75e218b23b19a0ef5",
+   "985252e8226e0cba567b49f44665804e3a12bc40",
    "reftest"
   ],
   "css/css-contain/contain-paint-001.html": [
-   "27fb558b0913d1787e881fa1db42f8e925ef859b",
+   "c26e9cc0daf7cb92b0966656a17fb0c931e86d5f",
    "reftest"
   ],
   "css/css-contain/contain-paint-002.html": [
-   "6c549e4be755d47fa4f0ffcffc62ffdab4edf15a",
+   "50adc0e83ba0d3bffd957dbf8acdf7474f6350f5",
    "reftest"
   ],
   "css/css-contain/contain-paint-003.html": [
-   "f49511f28e8b0f51df677acae3cd9c07b1717657",
+   "7eb703232b2a448b3b49394ed0102b65aa37e647",
    "reftest"
   ],
   "css/css-contain/contain-paint-004.html": [
-   "e39e7be877e3802262f1451067363d9c26b8dd4b",
+   "2db5aaea054ed4b3a2c2db1786f29fc44515cdd4",
    "reftest"
   ],
   "css/css-contain/contain-paint-005.html": [
-   "2c3063121d36648ffe636950f7a36f0d565331aa",
+   "68c7155386ef96ba8fe22ce55d996634f928b703",
    "reftest"
   ],
   "css/css-contain/contain-paint-006.html": [
-   "72b002b39ae9b252678157f1f95ecbcd33261230",
+   "935d160de8000eb1f83ac6a987b6c7047ca80e93",
    "reftest"
   ],
   "css/css-contain/contain-paint-007.html": [
-   "c78854ac437a9cf3433da3c99c9934384a22851d",
+   "3e7d3cd3ccb55b7b8574be24fb2f180a6ce0af36",
    "reftest"
   ],
   "css/css-contain/contain-paint-008.html": [
-   "0bd9de602bc622a1a1a74ac7d4434d66e6efadbe",
+   "5540aaf33b5b841d95f84ead3459f634cf444299",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-009.html": [
+   "b3a8ee7512f1f893b630453a8443edaed983f4c3",
+   "reftest"
+  ],
+  "css/css-contain/contain-paint-010.html": [
+   "e47f99a8fedb60f34ec7877686f478cbc002c6b4",
    "reftest"
   ],
   "css/css-contain/contain-size-001.html": [
-   "04979088ce29652117bc74c6cc34c054b258d153",
+   "089c4fd7352f91a85d5d8f6bf8c5f261c868cd37",
    "reftest"
   ],
   "css/css-contain/contain-size-002.html": [
-   "908f73fa8d56f2eb4bf39862a666875ea21b18db",
+   "ea16d90e56729c1678b327412cd945a0dea6b762",
    "reftest"
   ],
   "css/css-contain/contain-size-003.html": [
-   "8668ef203078d96a051cdf437fa8d089492c4121",
+   "4b1fd16d90f0eebd7ce97a82a5ef55806f92060e",
    "reftest"
   ],
   "css/css-contain/contain-size-004.html": [
-   "767d429b99eaf77227153d74a131864d0078d88a",
+   "94390f137f15d9667b3d5f105d13881fe7d53ea5",
    "reftest"
   ],
   "css/css-contain/contain-size-005.html": [
-   "fe04ae74a7bfb5fd3629651c3d9a6dcdc1084537",
+   "dfb0708ceeda5812a7434454f39a360d576597ea",
    "reftest"
   ],
   "css/css-contain/contain-size-breaks-001.html": [
-   "b936d15fad907793fb5a0249d643097cee2e79ff",
+   "3a3c80029a6c126c584a21e2ff3b25e5459c32e8",
    "reftest"
   ],
   "css/css-contain/contain-style-breaks-001.html": [
-   "9325ee8666d1825644849dee8068d9f1e415917b",
+   "cc6748966bc23c1f8be0aaa57384d0dc1d80c8d1",
    "reftest"
   ],
   "css/css-contain/contain-style-breaks-002.html": [
-   "60ba2d5b65d740365d248055cecaf0dbd5a38044",
+   "e4db568843b89407e787a4ace67602358a11d5d5",
    "reftest"
   ],
   "css/css-contain/contain-style-breaks-003.html": [
-   "9bc7320984a55b349dae3d3f891eb8524c82da26",
+   "fb79c638966ddbc1fd6f265d79569b1461558d08",
    "reftest"
   ],
   "css/css-contain/contain-style-breaks-004.html": [
-   "eb389ef6335039fddf1db70307d4c0886a6a1d06",
+   "8f485b4c176a0fbd46494e678a1b65fee881b799",
    "reftest"
   ],
   "css/css-contain/contain-style-breaks-005.html": [
-   "f88bf147234294dffdbd831de90c20dbe81d0342",
+   "2c57f0016d0e8f43c5a37bd169cd948794c686ea",
    "reftest"
   ],
   "css/css-contain/contain-style-counters-ref.html": [
@@ -493520,35 +496594,35 @@
    "support"
   ],
   "css/css-contain/contain-style-counters.html": [
-   "056b3597f3555c803c74a8f6277a06626efd12ea",
+   "712b04117d388e4e2d6747edde2c955b54d397fd",
    "reftest"
   ],
   "css/css-contain/counter-scoping-001.html": [
-   "aba8dd6e85fc14d928de33903eed919f527ccfaf",
+   "237c7d44e913ef11a77260d6bf890f8da64a7cb6",
    "reftest"
   ],
   "css/css-contain/counter-scoping-002.html": [
-   "cdab600690babdcebe693991bf716f4772eeda4a",
+   "e54d1abf1026d6fd371685ca60d73a791b2ea67e",
    "reftest"
   ],
   "css/css-contain/counter-scoping-003.html": [
-   "220a8cb80dc067593b3eb72e9bee6d03589483e7",
+   "547aeb36f80a406f3c3a5502001e6799f5308142",
    "reftest"
   ],
   "css/css-contain/quote-scoping-001.html": [
-   "33a5755b8e14976806afe451621875c5e150b0de",
+   "8c2594eb25b5c44503fd33311ddeed1ba494bf7e",
    "reftest"
   ],
   "css/css-contain/quote-scoping-002.html": [
-   "0130a683755b8829033d053b7f7bb7d48c04639a",
+   "2bb36460620d89989cbb49bd84d7d9f736a4e5a4",
    "reftest"
   ],
   "css/css-contain/quote-scoping-003.html": [
-   "26e5a5d36ac865c4253da894375a3194f97c7f01",
+   "46aa7fadb81fbf45c379edc7771fb4d1e0858f29",
    "reftest"
   ],
   "css/css-contain/quote-scoping-004.html": [
-   "fb3af3126d0700e58219fe0550bab57661c7b7ad",
+   "5067c9308951cae6deb33f4383398f96d859428f",
    "reftest"
   ],
   "css/css-contain/reference/contain-layout-002-ref.html": [
@@ -493627,6 +496701,10 @@
    "6b72ea53450c5a08ef3ddd897608aa9cf7e68e00",
    "support"
   ],
+  "css/css-content/OWNERS": [
+   "d3f0adf12724f2b230ffa3b2845e273ba4200076",
+   "support"
+  ],
   "css/css-content/attr-case-insensitive-ref.html": [
    "30577fc39afb6ac028e25be11f363e060c0850b2",
    "support"
@@ -494647,6 +497725,10 @@
    "f7d3cda238b0209165a77571c59af0701bcede17",
    "reftest"
   ],
+  "css/css-display/display-list-item-height-after-dom-change.html": [
+   "3f4efe05678b7a3faac63fa98822d1711e2a54ae",
+   "testharness"
+  ],
   "css/css-display/run-in/OWNERS": [
    "6634529fb114ab2e29cb2fa4a633289ee9038c22",
    "support"
@@ -495691,6 +498773,10 @@
    "cfaff82945bd52baafb8c4c16eb38c9dbee14da6",
    "testharness"
   ],
+  "css/css-fill-stroke/OWNERS": [
+   "d9c8054b356c9273a054a83abeb9be0626c23921",
+   "support"
+  ],
   "css/css-fill-stroke/paint-order-001.tentative.html": [
    "46e784929d8a661eb432fa04cc79e0612bd5d194",
    "reftest"
@@ -495699,6 +498785,30 @@
    "35eb3b4cfe4505a5c9761dcecc047a8cd09f8fb9",
    "support"
   ],
+  "css/css-filter/filtered-block-is-container-ref.html": [
+   "937aebf17944a83bfb41b3d9a6035f00e975c05d",
+   "support"
+  ],
+  "css/css-filter/filtered-block-is-container.html": [
+   "e910cc30bcb2aecc0fcc60ca3cbf381c39dab837",
+   "reftest"
+  ],
+  "css/css-filter/filtered-html-is-not-container-ref.html": [
+   "2e7b8249aa26a996e173f8f0d5e42b0b45457719",
+   "support"
+  ],
+  "css/css-filter/filtered-html-is-not-container.html": [
+   "5fb31e59005e70dd8bb10525698c4b343c22b2dc",
+   "reftest"
+  ],
+  "css/css-filter/filtered-inline-is-container-ref.html": [
+   "7c985ca7fb9e26a2b6139ff863817aaf236d6af2",
+   "support"
+  ],
+  "css/css-filter/filtered-inline-is-container.html": [
+   "0c1b258810f515e72269ab07d8efb34791a9b0c4",
+   "reftest"
+  ],
   "css/css-flexbox/Flexible-order.html": [
    "ff6b01d6069b9106c60e3f86ac29bffb7c94f916",
    "reftest"
@@ -496703,6 +499813,10 @@
    "edbe32d6daa5527617fa7f0069c49616b1c1efec",
    "reftest"
   ],
+  "css/css-flexbox/flexbox_first-letter.html": [
+   "fbf5e6dd608d335ba902faefd21eae5ecb7c8387",
+   "testharness"
+  ],
   "css/css-flexbox/flexbox_first-line-ref.html": [
    "09592ea23ba4deef09d16b630c46611c528fe342",
    "support"
@@ -498811,6 +501925,10 @@
    "62ff3e2eac64bb2057391e4dcc4664a4839bbbe8",
    "reftest"
   ],
+  "css/css-font-loading/OWNERS": [
+   "19b55d317925d28a18230592db5d05426f16537c",
+   "support"
+  ],
   "css/css-font-loading/fontfacesetloadevent-constructor.html": [
    "ad355c3d5220c1b938182241a8e8abe030ace699",
    "testharness"
@@ -498828,11 +501946,11 @@
    "support"
   ],
   "css/css-fonts/alternates-order-ref.html": [
-   "5ca219e9f3b14418a44e771d6b00d487debe15af",
+   "9c5fe651a47243060ec7a30bc02cba7d85f853f2",
    "support"
   ],
   "css/css-fonts/alternates-order.html": [
-   "9232ad7768f5bea41d87469113b210b3c663750e",
+   "104ef4541a76b22dc574fc1a0dfbcb0fc822ef88",
    "reftest"
   ],
   "css/css-fonts/calc-in-font-variation-settings.html": [
@@ -498951,9 +502069,13 @@
    "aed82b64751022903531c88bbd5934557ebece24",
    "reftest"
   ],
+  "css/css-fonts/font-face-unicode-range-2-ref.html": [
+   "0921411342afbc6a372057020f9a32ddc0fe6e41",
+   "support"
+  ],
   "css/css-fonts/font-face-unicode-range-2.html": [
-   "50f4c2851ce756571ebfb694ec19e3a47513b51a",
-   "visual"
+   "d7da3ed2e9d88ba38ae7b118d5e752c9f2540676",
+   "reftest"
   ],
   "css/css-fonts/font-face-unicode-range.html": [
    "e3c480ef4443eb2e22d9a717f41cecdf63febf31",
@@ -499083,6 +502205,14 @@
    "6a46776acc325ad42993555d516c6a057d801df8",
    "support"
   ],
+  "css/css-fonts/font-feature-settings-descriptor-01-ref.html": [
+   "04e058c647517729219ff890434eb8d2275eec25",
+   "support"
+  ],
+  "css/css-fonts/font-feature-settings-descriptor-01.html": [
+   "c7af57927b99d476e80ffdbfaac06b42fb04b71a",
+   "reftest"
+  ],
   "css/css-fonts/font-feature-settings-serialization-001.html": [
    "bf557e7f93663a36dab3ea358401b16c2e88811a",
    "testharness"
@@ -499147,13 +502277,21 @@
    "003d315d72019673041c63b28a90f436c7e3855f",
    "testharness"
   ],
+  "css/css-fonts/font-size-adjust-001-ref.html": [
+   "f477ee1d0669cc35acc873d267a5a9e7bcac8dae",
+   "support"
+  ],
   "css/css-fonts/font-size-adjust-001.html": [
-   "9c8cda6faa82407d5d236d25d07004405dfe93ac",
+   "efbcd282a92449551fd908695b4af734e74e9a2c",
    "visual"
   ],
+  "css/css-fonts/font-size-adjust-002-ref.html": [
+   "a4ac8846a65ef54e77e0df2c5cd1336553b77e69",
+   "support"
+  ],
   "css/css-fonts/font-size-adjust-002.html": [
-   "15d7f4802c6b1eeeead5b9cea6f61f21a0eee5f2",
-   "visual"
+   "9efe4ad3aac00e484791445ddaf47aa4625fb980",
+   "reftest"
   ],
   "css/css-fonts/font-size-adjust-003.xht": [
    "b75bfc06da526994f86a4d06c094e2be845994ba",
@@ -499900,7 +503038,7 @@
    "support"
   ],
   "css/css-fonts/matching/README.md": [
-   "194fbc4cdaf1ff4a43e1a4e6b7bc7fbc17eec6d8",
+   "d1bf1cd04e0df5e54eeeb60c8a9311cb2d63f15e",
    "support"
   ],
   "css/css-fonts/matching/fixed-stretch-style-over-weight-ref.html": [
@@ -500079,7 +503217,7 @@
    "69e4080710f24b062203f56aa6ae2d991d4fa19a",
    "support"
   ],
-  "css/css-fonts/support/fonts/font-feature-settings-rendering-2-expected.html": [
+  "css/css-fonts/support/fonts/font-feature-settings-rendering-2-ref.html": [
    "883083cdde66caca05384d3d6930070454e94fad",
    "support"
   ],
@@ -506036,7 +509174,7 @@
    "support"
   ],
   "css/css-fonts/variations/at-font-face-descriptors.html": [
-   "3d0373ab9db1641f5a6f91066b7ff1237674ffa8",
+   "86a27733b254e430e4a94502cbca8cc466428474",
    "testharness"
   ],
   "css/css-fonts/variations/at-font-face-font-matching.html": [
@@ -506084,7 +509222,7 @@
    "testharness"
   ],
   "css/css-fonts/variations/font-weight-matching-installed-fonts.html": [
-   "f0362338e6a16a1c3cd2823f2da30651ba63b567",
+   "c56c7b8c274f918945f8cfc02ddc3543b4ff0c4f",
    "manual"
   ],
   "css/css-fonts/variations/font-weight-matching.html": [
@@ -508199,6 +511337,14 @@
    "ca7e5d89d56f33291e83647bef188205bf01ef84",
    "reftest"
   ],
+  "css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html": [
+   "443082a15b4c90d0717a1ae3da015ff723e3f7d4",
+   "support"
+  ],
+  "css/css-grid/grid-items/percentage-size-replaced-subitems-001.html": [
+   "700a4464e7bda63aed59ed56e7ed4e1077b2571d",
+   "reftest"
+  ],
   "css/css-grid/grid-items/percentage-size-subitems-001-ref.html": [
    "5d6652ce5649d15ecdeac623fea3541f5271be2a",
    "support"
@@ -508395,6 +511541,10 @@
    "d1cf60290fb927f91dc132fd801b92b84262e003",
    "testharness"
   ],
+  "css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html": [
+   "151c91043591b3f372e8c97699e051c3253d0e40",
+   "testharness"
+  ],
   "css/css-grid/layout-algorithm/grid-layout-free-space-unit.html": [
    "5873efcda9c17e48a8437a62bf6871cbf96bdc46",
    "reftest"
@@ -508656,7 +511806,7 @@
    "testharness"
   ],
   "css/css-images/parsing/resources/parsing-testcommon.js": [
-   "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
    "support"
   ],
   "css/css-images/support/1x1-green.gif": [
@@ -510020,7 +513170,7 @@
    "testharness"
   ],
   "css/css-masking/parsing/resources/parsing-testcommon.js": [
-   "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
    "support"
   ],
   "css/css-masking/test-mask-ref.html": [
@@ -512279,6 +515429,10 @@
    "7f8a5b4d9047c07378473362acb3d001e70d5663",
    "support"
   ],
+  "css/css-properties-values-api/OWNERS": [
+   "b098aad4eacf3991e0930a0953067c1b1135c519",
+   "support"
+  ],
   "css/css-properties-values-api/register-property-syntax-parsing.html": [
    "b065f4840b3c1deb4a2f8a59428e102f2ae11686",
    "testharness"
@@ -514655,6 +517809,14 @@
    "918bd04b95a276c6035383f2fe4dcfe4274bceeb",
    "reftest"
   ],
+  "css/css-scoping/keyframes-001.html": [
+   "1b72da32df7b17edbd42429d2dc8b791b9f49eff",
+   "testharness"
+  ],
+  "css/css-scoping/keyframes-002.html": [
+   "87f06cf1de80a4cf001fff6d150ce7013e78d604",
+   "testharness"
+  ],
   "css/css-scoping/reference/green-box.html": [
    "a736f68dc602c0fccab56ec5cc6234cb3298c88d",
    "support"
@@ -514723,6 +517885,18 @@
    "27d36ba54623bbee2cdd09b7a9322873d5ab0011",
    "reftest"
   ],
+  "css/css-scoping/stylesheet-title-001.html": [
+   "2e49b6d74d2021144444ca77e62acbc6aeffac2a",
+   "reftest"
+  ],
+  "css/css-scoping/stylesheet-title-002.html": [
+   "5816d3d7af3c4bef07f4a299ab65c74b7b8d80f9",
+   "testharness"
+  ],
+  "css/css-scroll-anchoring/OWNERS": [
+   "d9c8054b356c9273a054a83abeb9be0626c23921",
+   "support"
+  ],
   "css/css-scroll-anchoring/README.md": [
    "31205944cbcf321f7aa77e3bef0f8835cc7b6d13",
    "support"
@@ -514803,6 +517977,10 @@
    "de66dba5bce15b7403e9e582d982d4e3e4aed552",
    "testharness"
   ],
+  "css/css-scroll-snap/OWNERS": [
+   "d9c8054b356c9273a054a83abeb9be0626c23921",
+   "support"
+  ],
   "css/css-scroll-snap/scroll-snap-type-proximity.html": [
    "75bfc0b6c7686afbbf431e653ab674496ad3fe46",
    "testharness"
@@ -514823,6 +518001,10 @@
    "dfaf8675bec557c9f2178ad48b29c803f94056b5",
    "testharness"
   ],
+  "css/css-shadow-parts/OWNERS": [
+   "d9c8054b356c9273a054a83abeb9be0626c23921",
+   "support"
+  ],
   "css/css-shadow-parts/all-hosts.html": [
    "a92019bba916ed3242dcdf66184d73b915f2689d",
    "testharness"
@@ -514868,7 +518050,7 @@
    "testharness"
   ],
   "css/css-shapes/parsing/resources/parsing-testcommon.js": [
-   "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
    "support"
   ],
   "css/css-shapes/parsing/shape-image-threshold-invalid.html": [
@@ -515051,6 +518233,38 @@
    "2f2b95904fad670919fae32cb94284118a45566c",
    "reftest"
   ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html": [
+   "2226228acb7badb0145118891235733b62bd5504",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html": [
+   "8bcee868c33ce352ff4435584b01b91a867e2699",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html": [
+   "a8f9bd56d4fe6f508c4251f97ff32b0555c3b8ac",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html": [
+   "f4e6edd54826da5374c63651af925bcb4dc2f7d3",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html": [
+   "764980f1beaedaf608096161525ee1f4326bee18",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html": [
+   "42305d67e0f88ed75bee44edc992c0e92a761597",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html": [
+   "b8294d4201dd68a5c91c6f4da7acb9a352ba0cbc",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html": [
+   "18d2fe95bf79efe975a07b332aad3e0fd0e0f298",
+   "reftest"
+  ],
   "css/css-shapes/shape-outside/shape-image/gradients/shape-outside-radial-gradient-001.html": [
    "b13df2df3be12ac74a7933794d91558c416b412c",
    "testharness"
@@ -515235,6 +518449,10 @@
    "c20645a47561cfa655b759d20f52d22536776893",
    "reftest"
   ],
+  "css/css-shapes/shape-outside/shape-image/shape-image-026.html": [
+   "a7cbad00762e590050f118a84ef5d6a6fbbb3db3",
+   "reftest"
+  ],
   "css/css-shapes/shape-outside/shape-image/support/animated.gif": [
    "c5252926d8dbf82c06cdb615fda708ca7728f0bb",
    "support"
@@ -515496,7 +518714,11 @@
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html": [
-   "67161f08b8aec3fe9bd94e14cbe865dd4c9d3664",
+   "763518bc498fa2560e91eb6dfd13803a5dab2e17",
+   "reftest"
+  ],
+  "css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html": [
+   "e5b82f3b41a856a34152af46c9cc659202c61843",
    "reftest"
   ],
   "css/css-shapes/shape-outside/supported-shapes/polygon/reference/shape-outside-polygon-007-ref.html": [
@@ -515868,43 +519090,43 @@
    "reftest"
   ],
   "css/css-shapes/spec-examples/shape-outside-010.html": [
-   "7baf8e86ee451f08ab18e03000d64a529a2824d0",
+   "929078a33a23f1d10ce9d0f89016725f233e133e",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-011.html": [
-   "3620cce0bf178d1bc67faa372406c50b3b07c086",
+   "af178c8f965ce5f48673a4b67aa15f4974a09a2a",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-012.html": [
-   "1db1130bb5f2f5a8a12bab7ec5a9fa0c40165be4",
+   "67e23bdb9873267a12790cf4cd60b704f423f8a5",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-013.html": [
-   "155d33ea047169acdc6b29b4716fa7237b133d51",
+   "7bd3ac39a58324354fa2c36fa98b151ce1292c85",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-014.html": [
-   "ab449eda8aa379e0149c759e9dcd9a866c1ed3db",
+   "e87ca4ce9f46103091139fda326452e4c66b1980",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-015.html": [
-   "f0ce9eb24d3b6bf8b8aa03f5cd02f82acfcdf8cd",
+   "d30174b5995f0831f2535a7a817f6ad5af5a6ba8",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-016.html": [
-   "2ea1538bff7b1825cdd63ea6510435c7aa52aebc",
+   "585b41b91bd9d452b616f87e81c8a47576299719",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-017.html": [
-   "366e0ad5c7ae7f2663f9c6bc6c0eba51e299f120",
+   "9593d57329acf1998d4b5ada5a230f3fed0d3c32",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-018.html": [
-   "08c9fd21d74ae52b98581c7d013275c30d49e18c",
+   "c81ef4303d00a4f490f8cada68d8a6449daa56c3",
    "testharness"
   ],
   "css/css-shapes/spec-examples/shape-outside-019.html": [
-   "46de7762b9a9c29a0aa798775cea5dfb17bbf5a0",
+   "3eaf5c74cfbbb676b3f2ccae55a96d3999ac890b",
    "testharness"
   ],
   "css/css-shapes/spec-examples/support/circle-no-shadow.png": [
@@ -515920,7 +519142,7 @@
    "support"
   ],
   "css/css-shapes/spec-examples/support/spec-example-utils.js": [
-   "137b347da1085eb0042f1d2fc017694ff528180b",
+   "de748e548169b360cf0d31a5499d766dd8bc2a7d",
    "support"
   ],
   "css/css-shapes/support/1x1-green.png": [
@@ -516083,6 +519305,22 @@
    "43d44ad3a75e6abb9d66d06c3cdc71dbcb366651",
    "reftest"
   ],
+  "css/css-sizing/intrinsic-percent-non-replaced-004-ref.html": [
+   "4b93517397b4332b3062804e2d6047afdd169fae",
+   "support"
+  ],
+  "css/css-sizing/intrinsic-percent-non-replaced-004.html": [
+   "42bc0191ff3ba22c5ceb377f1bc68131d652509e",
+   "reftest"
+  ],
+  "css/css-sizing/intrinsic-percent-non-replaced-005-ref.html": [
+   "a2cd75ab26376e74e26414013fc34b8e7fdb1a68",
+   "support"
+  ],
+  "css/css-sizing/intrinsic-percent-non-replaced-005.html": [
+   "33aa880de7eb7c4128022871dfd5e2895be30dcc",
+   "reftest"
+  ],
   "css/css-speech/Integer.html": [
    "8db91e711b22ead393b1d9a18c224a7f838b85b0",
    "manual"
@@ -516531,6 +519769,10 @@
    "7ce37259edc09da4e36f40c026ac76f33d829720",
    "testharness"
   ],
+  "css/css-syntax/unicode-range-selector.html": [
+   "781f8a4a4cc74736485d1c63f9d42562def2423d",
+   "testharness"
+  ],
   "css/css-tables/OWNERS": [
    "eccf10a7909e2358ac6425140e87c323ed786296",
    "support"
@@ -523172,7 +526414,7 @@
    "reftest"
   ],
   "css/css-transforms/2d-rotate-js.html": [
-   "ed492813fb9a406fed9383b698aad5399f9e2a70",
+   "be0007472b224565f92cb7db80de6706ad23f919",
    "testharness"
   ],
   "css/css-transforms/2d-rotate-notref.html": [
@@ -524292,7 +527534,7 @@
    "testharness"
   ],
   "css/css-transforms/parsing/resources/parsing-testcommon.js": [
-   "b5cc6f7c0c7729328bbbc45ec2a8147dae8d8668",
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
    "support"
   ],
   "css/css-transforms/parsing/rotate-parsing-invalid.html": [
@@ -531523,6 +534765,98 @@
    "78390a1cce8c291b93e1399018c02727ac96aa41",
    "reftest"
   ],
+  "css/css-ui/parsing/box-sizing-invalid.html": [
+   "f6d47c2136afc9b6538e2dfc5b8f1f13efd51359",
+   "testharness"
+  ],
+  "css/css-ui/parsing/box-sizing-valid.html": [
+   "ae42aa258f80502238e4106c5aad8cd3a86b67be",
+   "testharness"
+  ],
+  "css/css-ui/parsing/caret-color-invalid.html": [
+   "4f661bf5354591a4763dc0e2e24262135274e851",
+   "testharness"
+  ],
+  "css/css-ui/parsing/caret-color-valid.html": [
+   "43e5e627b82425fe9b5f2e8aa631a3e29076a894",
+   "testharness"
+  ],
+  "css/css-ui/parsing/cursor-invalid.html": [
+   "9dc6470ff66b178b131df50baa4983e9c268f150",
+   "testharness"
+  ],
+  "css/css-ui/parsing/cursor-valid.html": [
+   "b0a45e0783e4fc8d238941add086337a26352f97",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-color-invalid.html": [
+   "c2c76b237c6a3cb3e6c739b46907afb3b168a00c",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-color-valid-mandatory.html": [
+   "d4353c1c614c9352636351fd4f6060d5ebdf2551",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-color-valid-optional.html": [
+   "b68ab57f63120ae95944c55e0ea52d3155573267",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-invalid.html": [
+   "e579a7ab952531873dea0ea2c1b749949336024c",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-offset-invalid.html": [
+   "924035eac723af4bf4712c3786543306ae6fcc10",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-offset-valid.html": [
+   "1f0e8b438dec00532cc115f959db11b77cedfb31",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-style-invalid.html": [
+   "3f6a0a0842d5ca76c481eb92269fff221c8386c9",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-style-valid.html": [
+   "a72005f961c1aad7ef1244541193e4959e496a71",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-valid-mandatory.html": [
+   "567b86da51778fc5350d11288dbd3e3f3e12bada",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-valid-optional.html": [
+   "aa6ea1da3f43ca74a44527e84cee0ab8d2e4b091",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-width-invalid.html": [
+   "78e0dc7d541e7000d507a4773908ca851c50a5cb",
+   "testharness"
+  ],
+  "css/css-ui/parsing/outline-width-valid.html": [
+   "a31c9f3572566e75dce6a36d58f9e21aaa727405",
+   "testharness"
+  ],
+  "css/css-ui/parsing/resize-invalid.html": [
+   "972f102e81b150ea63b9616728aa0c27b6f31dfb",
+   "testharness"
+  ],
+  "css/css-ui/parsing/resize-valid.html": [
+   "f10a19dae64b6b8d02bc188dc2bb7df778fa4d60",
+   "testharness"
+  ],
+  "css/css-ui/parsing/resources/parsing-testcommon.js": [
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
+   "support"
+  ],
+  "css/css-ui/parsing/text-overflow-invalid.html": [
+   "576fd63bd6455a8e0e3623e853dfc260662d3a86",
+   "testharness"
+  ],
+  "css/css-ui/parsing/text-overflow-valid.html": [
+   "79c05636c160aa39475e059ede5de6b60afafaca",
+   "testharness"
+  ],
   "css/css-ui/reference/box-sizing-001-ref.html": [
    "04fa9c2beed67d222479d37a99b66e1b262dd8b2",
    "support"
@@ -540127,6 +543461,10 @@
    "f033a1ec4b1f0636897c4ee16b67c1c13f0eac4e",
    "testharness"
   ],
+  "css/cssom-view/elementScroll-002.html": [
+   "98dec0c15711c0f7baf4a0ea404e1fda872e3d5b",
+   "testharness"
+  ],
   "css/cssom-view/elementScroll.html": [
    "2119d689cc369bd6632ee1a9525bcbf7d1d4ba65",
    "testharness"
@@ -540172,7 +543510,7 @@
    "support"
   ],
   "css/cssom-view/interfaces.html": [
-   "84067e6095d184488dc1c44a7ba17792d946976b",
+   "af6db1b54502f6174c644f06c19f39b8350add8d",
    "testharness"
   ],
   "css/cssom-view/matchMedia.xht": [
@@ -540600,7 +543938,7 @@
    "testharness"
   ],
   "css/cssom/cssom-setProperty-shorthand.html": [
-   "14c752e5dbeab2d58983d53aceab08519379bf0f",
+   "905be9c1bbbaceea752ea0577ce475cc246ae49d",
    "testharness"
   ],
   "css/cssom/cssstyledeclaration-csstext-final-delimiter.html": [
@@ -540660,7 +543998,7 @@
    "testharness"
   ],
   "css/cssom/historical.html": [
-   "02b135e62439d775d7e8de7ca94c831a8d00e077",
+   "89c506ea58f2ad38eb9ecc1e5f422b81a45b07fa",
    "testharness"
   ],
   "css/cssom/inline-style-001.html": [
@@ -540719,6 +544057,14 @@
    "85952fbd040de03f5082f28ba8116fd4827a1fc3",
    "testharness"
   ],
+  "css/cssom/preferred-stylesheet-order.html": [
+   "5e9dca55be95bcbd999d32d9c975c5e343db7f35",
+   "testharness"
+  ],
+  "css/cssom/preferred-stylesheet-reversed-order.html": [
+   "b47c6d8f66ea0481b64f506c466476342cb28599",
+   "testharness"
+  ],
   "css/cssom/selectorSerialize.html": [
    "d93c31a8261ddc3b83bb4def15f7c8eb765b9dc7",
    "testharness"
@@ -540787,6 +544133,10 @@
    "cab23bdf8b92c8194cc71b1a8ce34155f89f42cf",
    "testharness"
   ],
+  "css/cssom/stylesheet-title.html": [
+   "69938dc0f6d1a266e028d14950a7265124ff0733",
+   "testharness"
+  ],
   "css/cssom/support/1x1-green.png": [
    "51e7b6974a09eda6cb31337717c5eaeb9c44b443",
    "support"
@@ -541268,7 +544618,7 @@
    "testharness"
   ],
   "css/filter-effects/parsing/resources/parsing-testcommon.js": [
-   "e1e3a86c14c73867a050311b8f69db2cc4764797",
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
    "support"
   ],
   "css/filter-effects/reference/filters-opacity-001-ref.html": [
@@ -541716,7 +545066,7 @@
    "support"
   ],
   "css/mediaqueries/test_media_queries.html": [
-   "234627714b5f304ad7efbeaf2dea3455125f8cc4",
+   "cff3585932589f611a7101329d3b5b6ca27820aa",
    "testharness"
   ],
   "css/mediaqueries/viewport-script-dynamic-ref.html": [
@@ -541860,7 +545210,7 @@
    "testharness"
   ],
   "css/motion/parsing/resources/parsing-testcommon.js": [
-   "bb1376de12185a14f77fd28be757cc8db2a9929d",
+   "14f32b772f27a9bc75fe90e2ea1d8e4fb3649e95",
    "support"
   ],
   "css/reference/OWNERS": [
@@ -549476,7 +552826,7 @@
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list": [
-   "cf1af7daefe2db67dedf186e44744bbb03e537c3",
+   "dd45c0949b1301d526a2ea5b66684e1c7a8b812c",
    "support"
   ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-border-box-001-ref.html": [
@@ -549759,6 +553109,14 @@
    "3fa72763f5861efda170bc258a152b9d36c16877",
    "reftest"
   ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html": [
+   "2d26e3249f3fff3ab6b81016784068f6433b1c6e",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html": [
+   "923c596ff05fd5546847db4a3676cc51122681e1",
+   "reftest"
+  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-content-box-001-ref.html": [
    "dbd151f3c71007b3788fe86ca245405c8f479325",
    "support"
@@ -549943,6 +553301,14 @@
    "74cc5ab0e72399c572059bdb0fc29bc743a93e35",
    "reftest"
   ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html": [
+   "2d26e3249f3fff3ab6b81016784068f6433b1c6e",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html": [
+   "ead96f4fca2d3b31049362702df96ef63da83a2b",
+   "reftest"
+  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-inset-016-ref.html": [
    "e6cb3ee3eb3d0c521303b6010546e0b743a4090c",
    "support"
@@ -550255,6 +553621,14 @@
    "217e140bdd429d6889102e43253e6fb64dca4705",
    "reftest"
   ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html": [
+   "890dd0754f2c985719c75200dd9ef70e8c1abe14",
+   "support"
+  ],
+  "css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html": [
+   "bc5ea0a69154ce2cc4d08ea3b5d48b62a6c7fedc",
+   "reftest"
+  ],
   "css/vendor-imports/mozilla/mozilla-central-reftests/sync-tests-filter": [
    "2c4512ec008c997d1254b5822ade227c057b7e24",
    "support"
@@ -553119,6 +556493,10 @@
    "2ec52a6baa7490478ec61e72bf89b2ec09d453b5",
    "testharness"
   ],
+  "device-memory/OWNERS": [
+   "c328f48fe12bce670646911964930d221c768f1d",
+   "support"
+  ],
   "device-memory/device-memory.https.any.js": [
    "4e746987c6580c6ff388f1512a02cc6fe33393ea",
    "testharness"
@@ -553208,7 +556586,7 @@
    "support"
   ],
   "docs/_running-tests/chrome_android.md": [
-   "082b7697eed61caefcc0a280cba6cee24ff12e7d",
+   "7a26348aabd414f1d8e2da68717dd0a16d3f6ce8",
    "support"
   ],
   "docs/_running-tests/index.md": [
@@ -553268,23 +556646,27 @@
    "support"
   ],
   "docs/_writing-tests/server-features.md": [
-   "c9ed5970c091c7fe7aa16847b8c68783b133a25a",
+   "31af790d058eda13ec0ecf06e1c65d13419e4920",
    "support"
   ],
   "docs/_writing-tests/submission-process.md": [
    "62747b6d0328445778050f3e4d6ec46dbdc3a18c",
    "support"
   ],
+  "docs/_writing-tests/testdriver-tutorial.md": [
+   "f98be71f37dad3a469de5f4b55b99b8392255476",
+   "support"
+  ],
   "docs/_writing-tests/testdriver.md": [
    "2ffb3871fb13e6acd3171205bf80517dca06bcfe",
    "support"
   ],
   "docs/_writing-tests/testharness-api.md": [
-   "5fa854f33ee9141f2226fa1e1b4e5aa44c3b75c7",
+   "6e49764657b4aa160f3db1a85f92910bfccae1e2",
    "support"
   ],
   "docs/_writing-tests/testharness.md": [
-   "6d581e1021a2401b34c0c024990b5e85dbef1fa5",
+   "0a0d88c5ddde91514a51d607405c2b7dedee4776",
    "support"
   ],
   "docs/_writing-tests/visual.md": [
@@ -553364,11 +556746,11 @@
    "support"
   ],
   "docs/introduction.md": [
-   "ea9a85d79dbf66598ee05da17d34f9e786a3ce78",
+   "0e7e19e553874040f954d81ca85b06a212126c11",
    "support"
   ],
   "dom/OWNERS": [
-   "2bfae729fb0eab4081f06e51ae5640b49e012b8e",
+   "8c6222f056d7e5b318f37a80774f40889558df3f",
    "support"
   ],
   "dom/abort/event.any.js": [
@@ -553604,7 +556986,7 @@
    "testharness"
   ],
   "dom/events/relatedTarget.window.js": [
-   "0426d2ecae3f3562be175e4364353d979365ed1c",
+   "563ac74d2750439ccac70c524c61f74d4eb49275",
    "testharness"
   ],
   "dom/historical.html": [
@@ -554440,7 +557822,7 @@
    "testharness"
   ],
   "dom/nodes/Node-normalize.html": [
-   "6480a28f06e2556b5fa88521f6bcfd36f4cb0c09",
+   "0c2a0a00238c982d35d1a9cd9b6dafa736bf5bfa",
    "testharness"
   ],
   "dom/nodes/Node-parentElement.html": [
@@ -555080,159 +558462,159 @@
    "support"
   ],
   "dpub-aam/doc-abstract-manual.html": [
-   "db010032cbeebdde1c59d301d02dc1079ac8bef8",
+   "070022922fe7beb75b62776b24e3b5f74cdcfb3c",
    "manual"
   ],
   "dpub-aam/doc-acknowledgments-manual.html": [
-   "a2275ae536cd37f9014e32db720f3c9de3e31731",
+   "c99d67348b4d612e488375f5e14d2520683fdcb9",
    "manual"
   ],
   "dpub-aam/doc-afterword-manual.html": [
-   "1b5984592c07f925b7e5e50a975415871d0fbef5",
+   "93e4bb8ec1c2948fbf929e8e1481877896d92b2a",
    "manual"
   ],
   "dpub-aam/doc-appendix-manual.html": [
-   "a95c68b3db24bba85efad275c2d88fc84ab513b1",
+   "1bd7c6a7805289f38dac379997e37773bef62df1",
    "manual"
   ],
   "dpub-aam/doc-backlink-manual.html": [
-   "e311587406c5b88e592bfd4a1bd8b6c0562dc38f",
+   "db6b47bfc17bcef7958a13b1dc1fc2f947600ea8",
    "manual"
   ],
   "dpub-aam/doc-biblioentry-manual.html": [
-   "cede32da267cdb9da0ef0a3a94b38bebd88db4cc",
+   "ebc18406bf4ba3cefb46554617f74df98d3f0791",
    "manual"
   ],
   "dpub-aam/doc-bibliography-manual.html": [
-   "dc2845dca57c7dcb3d8afe5b864e5221ce13e3b1",
+   "9ff9bc6105a017f4a319c79a18875580959a91ca",
    "manual"
   ],
   "dpub-aam/doc-biblioref-manual.html": [
-   "b8462b8f347678042dd35cea11269d2e4d4c5db3",
+   "9916423e4cca087a13f04b937f7e75dc56507075",
    "manual"
   ],
   "dpub-aam/doc-chapter-manual.html": [
-   "ec1bb79d43c515815fe51c435c942daf971aff4f",
+   "7617b5e5e12e7e1572e0a95ea4edf9a9eba82b8c",
    "manual"
   ],
   "dpub-aam/doc-colophon-manual.html": [
-   "f6e5f99ca284a1edb1ee3954897384fe35025103",
+   "eda5f3c25c3a9addd785b70d2df05b5157143664",
    "manual"
   ],
   "dpub-aam/doc-conclusion-manual.html": [
-   "1335bbf52562adfc9439961d31b7edf0f50ef024",
+   "fbef819f31eca3de0a1a8c68634ea771f3a4b615",
    "manual"
   ],
   "dpub-aam/doc-cover-manual.html": [
-   "8f643cef033607187f2ade6328e8eb48989fb4fb",
+   "e1670e6e4e5697fbbecb830b00eec49a162c97ae",
    "manual"
   ],
   "dpub-aam/doc-credit-manual.html": [
-   "89c08d3ba2f7a199e91a32b4be8b079f8c01c96f",
+   "7dab789526ba347bd1ccb1e6e1dbc24ba402d1a8",
    "manual"
   ],
   "dpub-aam/doc-credits-manual.html": [
-   "73f018976929746530ded8ecf98d53af0b59ae5b",
+   "407530b1954d68f549f1fcaa758e9162db04e238",
    "manual"
   ],
   "dpub-aam/doc-dedication-manual.html": [
-   "c93d97051189aec775a1d62e2ee50a98fb6735c7",
+   "50f8151778a2b9e0ec78b40e10495387e51734b6",
    "manual"
   ],
   "dpub-aam/doc-endnote-manual.html": [
-   "59fbf494eae63db03455fb0e28c5c02627d3363d",
+   "f08d0ecc3cda8682bf57b0306bc21b6ba68bd196",
    "manual"
   ],
   "dpub-aam/doc-endnotes-manual.html": [
-   "e55ed6488a0a8b6901085e175c57b83dc5ec5861",
+   "1f569d45de1fae87d5988a92edb9e8a2e03d8ad6",
    "manual"
   ],
   "dpub-aam/doc-epigraph-manual.html": [
-   "0680698a36ee7104e45426e8d2801cb9c95c9770",
+   "d7fbd45774f7151c7c78f6fe1af24a4e3669cc81",
    "manual"
   ],
   "dpub-aam/doc-epilogue-manual.html": [
-   "bf79ff7ef266ae329881fe569fc94272e24ec10e",
+   "8747eb5e587c5be71cff45bd8eb8b934b29a08d3",
    "manual"
   ],
   "dpub-aam/doc-errata-manual.html": [
-   "750c10409f689ad5355cddafdbcdc67ffa1d8377",
+   "41fa772dd80c9cf708afc180c23f7f7ea75015ab",
    "manual"
   ],
   "dpub-aam/doc-example-manual.html": [
-   "e23b0e0fbfe8d7943c1369d5a9801f9bf2266d21",
+   "81e3e1630f2ecbff9377f71d220c1d06f4547c7d",
    "manual"
   ],
   "dpub-aam/doc-footnote-manual.html": [
-   "7ec6a5a11c609da425ba24eba2177ff9f6a9a271",
+   "06abcde8a2df312c6f159d2bf22443f66b19c689",
    "manual"
   ],
   "dpub-aam/doc-foreword-manual.html": [
-   "c568b2a39ceede888795fde325e3afbdae8d4b7e",
+   "9f5f3a8e525771de50f1dcc8a82f2e7b3e7e916e",
    "manual"
   ],
   "dpub-aam/doc-glossary-manual.html": [
-   "4e563f91709a81b1a3328595b0dbda4071336abf",
+   "5ae20eac34a9fb9d60d1f25095304683de5badc3",
    "manual"
   ],
   "dpub-aam/doc-glossref-manual.html": [
-   "b4312dca5df927018ae6bc9b4f19e87614101ac9",
+   "9f9f207926f209a45937a0887a941243732efeb0",
    "manual"
   ],
   "dpub-aam/doc-index-manual.html": [
-   "dad15f86619ce8485bc08bc97cd3c260b5151b12",
+   "e7c6525b9bcd161d5d0b4e12b0e2b27265567c27",
    "manual"
   ],
   "dpub-aam/doc-introduction-manual.html": [
-   "d8193c4a29c7c0179b19ea2da55f26b004f5cfc2",
+   "990ec8900b96332c80bf33722b29afd9a461bb17",
    "manual"
   ],
   "dpub-aam/doc-noteref-manual.html": [
-   "92dd7d70c414ed617d98e453e61cef11ca039694",
+   "14d47b4bcf4e170081a4d677ab8ab7c5bca0127f",
    "manual"
   ],
   "dpub-aam/doc-notice-manual.html": [
-   "cf0d12bb10f3d4300c8fd165fd210a6c3bb2ac85",
+   "4fd92963e62e28b6742a3bf354be40ac24befd65",
    "manual"
   ],
   "dpub-aam/doc-pagebreak-manual.html": [
-   "a45144f32e79c5073b61eb9b94ac88a992026793",
+   "24583d4b4dd7a693c0429fe128a144453f6e2a3f",
    "manual"
   ],
   "dpub-aam/doc-pagelist-manual.html": [
-   "ab945743bff60e4dcac61efc4e5c6db57cd4ef90",
+   "53cb2215125ed2cb7d34075006f470ddf0e2f7ee",
    "manual"
   ],
   "dpub-aam/doc-part-manual.html": [
-   "9747a5139ead45a6d5abee26528bc195be42b61a",
+   "fba068fc053e9308c8d58dfa50d3d9c9774ff8a9",
    "manual"
   ],
   "dpub-aam/doc-preface-manual.html": [
-   "9f1908845b75e63b7a590364cb6b9bdbc351dc00",
+   "d8ca7388c8fe5aac27db2170cb02aa39535da788",
    "manual"
   ],
   "dpub-aam/doc-prologue-manual.html": [
-   "251c03feb95ea33b9f25c07f6e0d74445ee5b82f",
+   "80a7edb53e1de3104e9ce84e6e9906434d729e8b",
    "manual"
   ],
   "dpub-aam/doc-pullquote-manual.html": [
-   "a6a15a5d7a86a2fd3e6f7235668cbd09292239a6",
+   "028fdef75e8c1c3a73ae48017c39b38468d6e3c1",
    "manual"
   ],
   "dpub-aam/doc-qna-manual.html": [
-   "4d3e659dc66aea87e44426a815a128cabcf339e7",
+   "9947487fbcb6f2723a1b642af51e7ed7829e018e",
    "manual"
   ],
   "dpub-aam/doc-subtitle-manual.html": [
-   "ad507918447a7fd73b73104a279d3782457d53f3",
+   "f17ae04f67531c7e15ed96abd91db85c92f2418a",
    "manual"
   ],
   "dpub-aam/doc-tip-manual.html": [
-   "c54e3458ed49b3824d1236a74f8bb389fd285d83",
+   "49a17438161277621b6580ed2737d648b88ec6c4",
    "manual"
   ],
   "dpub-aam/doc-toc-manual.html": [
-   "0c5b3572dc1b27b7a1bf331b78b8f0f75100cd6b",
+   "af3d42ea176aaf16a34ad07078e7aba707f80210",
    "manual"
   ],
   "dpub-aria/.editorconfig": [
@@ -555248,7 +558630,7 @@
    "support"
   ],
   "dpub-aria/inuse-manual.html": [
-   "2342ccf97a30c1ac671ce34d354f85673449b69d",
+   "6a7dda423fc08a42f87acb0827e0182e468c1fa6",
    "manual"
   ],
   "editing/OWNERS": [
@@ -557959,6 +561341,10 @@
    "7be60c6f51698ea1e63030bf94aad995881e0049",
    "support"
   ],
+  "feature-policy/experimental-features/resources/vertical-scroll-touch-action.html": [
+   "a85e54c23c9e055c959a86187d07f1c0d943f37d",
+   "support"
+  ],
   "feature-policy/experimental-features/resources/vertical-scroll.js": [
    "cfa86de92596fa755d2c3a001b2c33f74283665a",
    "support"
@@ -557979,6 +561365,10 @@
    "fe6000c242c73c81b5fc3c227f7703299fea455c",
    "testharness"
   ],
+  "feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html": [
+   "bdaef76d16a826efebedade2127f006c5c3a49ea",
+   "manual"
+  ],
   "feature-policy/feature-policy-frame-policy-allowed-for-all.https.sub.html": [
    "a48c092204750e00c9aa167a9ef9d2d239445d22",
    "testharness"
@@ -558172,7 +561562,7 @@
    "support"
   ],
   "feature-policy/resources/picture-in-picture.js": [
-   "20355b27be4404af59fc2742b43c6600147eccd3",
+   "5f8637f67053cd55cfa0aa03d0bcbc7dee3ba876",
    "support"
   ],
   "feature-policy/resources/redirect-on-load.html": [
@@ -558196,7 +561586,7 @@
    "testharness"
   ],
   "fetch/api/abort/serviceworker-intercepted.https.html": [
-   "ee3512098bed44d034d9a0e6f2ccdbd5a07c7e42",
+   "b5169e88b2146712ee98cd2c6f7575ce3f2999a3",
    "testharness"
   ],
   "fetch/api/basic/accept-header.any.js": [
@@ -558307,42 +561697,18 @@
    "246a6e661ef1179330f9109131cfcb2fa9f5bf64",
    "testharness"
   ],
-  "fetch/api/cors/cors-expose-star-worker.html": [
-   "fff53964064bd5f0a7f216b940dda7b01854105c",
-   "testharness"
-  ],
-  "fetch/api/cors/cors-expose-star.html": [
-   "5a9f1e1fc61dc64598a943a8fafc34bb5a2f48d6",
-   "testharness"
-  ],
-  "fetch/api/cors/cors-expose-star.js": [
-   "338dc1bf4cfe3b61209b5ffd362ecc3175890c1b",
-   "support"
-  ],
-  "fetch/api/cors/cors-filtering-worker.html": [
-   "636a08cb1943b3f1cb6a06944bdc7675d18233f0",
-   "testharness"
-  ],
-  "fetch/api/cors/cors-filtering.html": [
-   "758f06e2f78808f3437f62c51b9fc730461c2fc1",
+  "fetch/api/cors/cors-expose-star.sub.any.js": [
+   "f026be2d5244f1077b6f65e2c22ecbfdb40026c2",
    "testharness"
   ],
-  "fetch/api/cors/cors-filtering.js": [
-   "5beac80fa31e80addfdd29fa58557ef59865744a",
-   "support"
-  ],
-  "fetch/api/cors/cors-multiple-origins-worker.html": [
-   "d05043bda6972c41a28557cbff1294c0ac83bbed",
+  "fetch/api/cors/cors-filtering.sub.any.js": [
+   "a97ffb8496022e3806ca3b1c9cbb299eae49ddcb",
    "testharness"
   ],
-  "fetch/api/cors/cors-multiple-origins.html": [
-   "89bc503dcdc1dc32cfe42c0cf10e050859af0b10",
+  "fetch/api/cors/cors-multiple-origins.sub.any.js": [
+   "162ae575876397495f10ce377d871d8f45998da5",
    "testharness"
   ],
-  "fetch/api/cors/cors-multiple-origins.js": [
-   "96b1f59e7c7608af442b561a09cc3f63061388b7",
-   "support"
-  ],
   "fetch/api/cors/cors-no-preflight.any.js": [
    "a4952e4133f893bf90ae282c0dc819cdd9099f3a",
    "testharness"
@@ -558563,106 +561929,42 @@
    "9aefc6a6198eaec591e432bb5454e1ebb22e58a1",
    "support"
   ],
-  "fetch/api/redirect/redirect-count-worker.html": [
-   "61f80dc021081bea6fee7ef6dda10498515308ad",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-count.html": [
-   "0ef8800e90abbcccdeace87d483e9efae3444242",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-count.js": [
-   "2c01e28adc2334a1405fc2f53481584be89dd5d5",
-   "support"
-  ],
-  "fetch/api/redirect/redirect-empty-location-worker.html": [
-   "12efb427d7507bb712dfe8734c0c3af25fbfb34d",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-empty-location.html": [
-   "1fcd9a1d5e05204da9e6bdc9b7794e887c857950",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-empty-location.js": [
-   "1b3e1c6ea531f0e313c6a41ed4d4b16df27022d4",
-   "support"
-  ],
-  "fetch/api/redirect/redirect-location-worker.html": [
-   "f3c0991345e839954459801454d22fe81df8d72d",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-location.html": [
-   "1c50b134b8f6041c3bae1ef320d2a86570c9c7f3",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-location.js": [
-   "c8795b2a372e365e1b6e052d8a3309f3bfb2c143",
-   "support"
-  ],
-  "fetch/api/redirect/redirect-method-worker.html": [
-   "06954c75c2b6b64b56d674cf626e3c6220833821",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-method.html": [
-   "4e5404d271dcd4fb59b2f80bee32e56e666f428a",
+  "fetch/api/redirect/redirect-count.any.js": [
+   "4a34ca3e45905d13423426134675c52102cc54d3",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-method.js": [
-   "6e1d7ec853ecc7f15af9119cd1ff30027fd6beb2",
-   "support"
-  ],
-  "fetch/api/redirect/redirect-mode-worker.html": [
-   "bccd984f902bcfde3882c6202995b5efba82b792",
+  "fetch/api/redirect/redirect-empty-location.any.js": [
+   "0c70c7a4cc044ed2e6eedbd30ebfd93a1961f871",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-mode.html": [
-   "60ef7b28da442f7b7f008368606f7d6ef4560adc",
+  "fetch/api/redirect/redirect-location.any.js": [
+   "5396e80df0d0d820f95bae8c74140321271d1147",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-mode.js": [
-   "8553fa7a2d2df7e4b14b6fdd9dedd5856645beb4",
-   "support"
-  ],
-  "fetch/api/redirect/redirect-origin-worker.html": [
-   "b3bc9e04ce8a6a5383b4a93dbe092b84af0f6b7d",
+  "fetch/api/redirect/redirect-method.any.js": [
+   "ba3e1b33f42d3ab4e3114cd727f195d4d8f9bb7e",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-origin.html": [
-   "7a56a9a4ebdf1d6cec0a5dfcfee9b8d53434c7aa",
+  "fetch/api/redirect/redirect-mode.any.js": [
+   "6dae5802c01587a37959a9c93f80a6fb19f7e4fd",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-origin.js": [
-   "ecab66c33873c5023a204616299f0d64799a72a9",
-   "support"
-  ],
-  "fetch/api/redirect/redirect-referrer-worker.html": [
-   "0f0e258553e0579b71e88dea5ecebbddebd1243c",
+  "fetch/api/redirect/redirect-origin.any.js": [
+   "b975d49e3a988058f0bc968c7b552c9c1256c8a5",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-referrer.html": [
-   "982e3bc3c7d3c8e713d1183762b95d12b0d8c967",
+  "fetch/api/redirect/redirect-referrer.any.js": [
+   "e0f03272e1f2705b2f7111a1e0d0c72321045338",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-referrer.js": [
-   "a7dfef66fc61f8340f794aac5de75aaf6c848a08",
-   "support"
-  ],
   "fetch/api/redirect/redirect-schemes.html": [
    "d190e3d919ec5339ab811237cb62a8e0cb0b0526",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-to-dataurl-worker.html": [
-   "91f828ebee88acd3b37aea45666230d39ad8e1a2",
-   "testharness"
-  ],
-  "fetch/api/redirect/redirect-to-dataurl.html": [
-   "b019b8217832c5b7df482a0941e3217b3ef1a0e4",
+  "fetch/api/redirect/redirect-to-dataurl.any.js": [
+   "bcd9893b121cbf18bd1103f08e35873271873eac",
    "testharness"
   ],
-  "fetch/api/redirect/redirect-to-dataurl.js": [
-   "3099fb27913f11a983f955cb2a883a882911bfe4",
-   "support"
-  ],
   "fetch/api/request/destination/fetch-destination-iframe.https.html": [
    "8b9f5f87086914fa8964702042a21bb833ff2d54",
    "testharness"
@@ -559044,7 +562346,11 @@
    "testharness"
   ],
   "fetch/api/response/response-stream-disturbed-6.html": [
-   "af3dcd2f8918b5c1365191490d127dcf2cc35cd9",
+   "f55b1c4a1fd57c227f52abddf002bbf5f76bc455",
+   "testharness"
+  ],
+  "fetch/api/response/response-stream-with-broken-then.any.js": [
+   "5fa2f4b55656018f60021a8060f0b7f5f8dcd503",
    "testharness"
   ],
   "fetch/api/response/response-trailer.html": [
@@ -559059,36 +562365,44 @@
    "b6053e53d641cd7f6575096cbf6854c52be82d20",
    "support"
   ],
+  "fetch/content-length/content-length.html": [
+   "5ade7f549fe195af4e897debb4913e07ad237243",
+   "testharness"
+  ],
+  "fetch/content-length/content-length.html.headers": [
+   "c86f164a128d02814744e0456e4588062eb016c8",
+   "support"
+  ],
   "fetch/corb/README.md": [
-   "d532c359cdb1359f88ef79afff88052b3387dbf6",
+   "c786c1df10c1edad9b25be4ec112250864c328e5",
    "support"
   ],
-  "fetch/corb/img-html-correctly-labeled.sub-expected.html": [
+  "fetch/corb/img-html-correctly-labeled.sub-ref.html": [
    "a252054121e7f50a3bcb949ae5a40f278c842c04",
    "support"
   ],
   "fetch/corb/img-html-correctly-labeled.sub.html": [
-   "699a8b2c8bb1f089f3ef1827bf8cfe1873849bf8",
+   "0c080d27dfcc89fc1f7e92be063f4d2d95fa9d6c",
    "reftest"
   ],
   "fetch/corb/img-mime-types-coverage.tentative.sub.html": [
-   "58422f923455c1f62e0c4e743b1c900061657146",
+   "02da8b9ee9430d552c4cb71fb759e05e939ec05e",
    "testharness"
   ],
-  "fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-expected.html": [
+  "fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html": [
    "1980633a4167993d90636be2ebba2aa8d72299b7",
    "support"
   ],
   "fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html": [
-   "7169e4ebe99797d15f006f6787e84093780fbaa6",
+   "2005cb1cd7a313d8ca7ee89c32e5bc54c39b2da5",
    "reftest"
   ],
-  "fetch/corb/img-png-mislabeled-as-html.sub-expected.html": [
+  "fetch/corb/img-png-mislabeled-as-html.sub-ref.html": [
    "730878950e0b7a4097d42e7eaaae79304fe05106",
    "support"
   ],
   "fetch/corb/img-png-mislabeled-as-html.sub.html": [
-   "a7775fb534d38a5d5b5827a27f0c16e1268f4d0b",
+   "cafbaa0cf543dc360a6261258e88339b2ad1dcb3",
    "reftest"
   ],
   "fetch/corb/preload-image-png-mislabeled-as-html-nosniff.tentative.sub.html": [
@@ -559131,6 +562445,22 @@
    "41e260e7df49e0e4ddb1fc5df11913dbda15edd7",
    "support"
   ],
+  "fetch/corb/resources/html-js-polyglot.js": [
+   "529e81f0fa614cb1707cf759f6bf1c7990f4d51f",
+   "support"
+  ],
+  "fetch/corb/resources/html-js-polyglot.js.headers": [
+   "41e260e7df49e0e4ddb1fc5df11913dbda15edd7",
+   "support"
+  ],
+  "fetch/corb/resources/html-js-polyglot2.js": [
+   "2a314fc6b634c7f6a6117d5602f9a4520397850d",
+   "support"
+  ],
+  "fetch/corb/resources/html-js-polyglot2.js.headers": [
+   "41e260e7df49e0e4ddb1fc5df11913dbda15edd7",
+   "support"
+  ],
   "fetch/corb/resources/js-mislabeled-as-html-nosniff.js": [
    "ec322736e35e0649e1f3cd4d5b88e2f211436e2b",
    "support"
@@ -559176,7 +562506,11 @@
    "support"
   ],
   "fetch/corb/script-html-correctly-labeled.tentative.sub.html": [
-   "71cb97517821177aa1c1d116f830cd2315963d18",
+   "971fcca2f52153a39bf3643b52fb69b6255acf32",
+   "testharness"
+  ],
+  "fetch/corb/script-html-js-polyglot.sub.html": [
+   "0e9042bc4d7492b17aeb69c9062ca9682000936b",
    "testharness"
   ],
   "fetch/corb/script-html-via-cross-origin-blob-url.sub.html": [
@@ -559208,7 +562542,7 @@
    "testharness"
   ],
   "fetch/data-urls/README.md": [
-   "83d54a0532dd87ab1fa9f5f9b7e01d9a43d91eae",
+   "868cb170fa0c5626008fef77e37dee16e76b10d5",
    "support"
   ],
   "fetch/data-urls/base64.any.js": [
@@ -559235,6 +562569,14 @@
    "b9ccc7958ae3b00cd1b9c08b1e673b49ace0ca1c",
    "support"
   ],
+  "fetch/http-cache/basic-auth-cache-test-ref.html": [
+   "42fbbd76956a8d2a84221500f70bd5c42cf5c75a",
+   "support"
+  ],
+  "fetch/http-cache/basic-auth-cache-test.html": [
+   "8b1a7f0af30c997b57ad063b5ef73082904de8b3",
+   "reftest"
+  ],
   "fetch/http-cache/cc-request.html": [
    "2002d341679139428e164cfe916dd39b9b664a3e",
    "testharness"
@@ -559263,6 +562605,10 @@
    "f2e102b289c8ef55628800ae07b3737367ecbf65",
    "support"
   ],
+  "fetch/http-cache/resources/securedimage.py": [
+   "e1206a227bf8641abee0900391fd6e500973ab78",
+   "support"
+  ],
   "fetch/http-cache/status.html": [
    "dac72c83edb75519e8ef5c3324442def4f380349",
    "testharness"
@@ -559340,7 +562686,7 @@
    "testharness"
   ],
   "fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html": [
-   "92c4633c3d684de4b1d959dbff4f2bab1eaf15a0",
+   "1059b1c0907444bd416889f99d766a566ba9bde3",
    "testharness"
   ],
   "fetch/security/dangling-markup-mitigation.tentative.html": [
@@ -560239,16 +563585,20 @@
    "b1349055762c7d44414c0c11fb8500d5eee9a75f",
    "support"
   ],
+  "generic-sensor/README.md": [
+   "48615c1b9e70e02c02ea0246eb7ca1953bab0c68",
+   "support"
+  ],
   "generic-sensor/SensorErrorEvent-constructor.https.html": [
    "99bcfb42c91e084a3b847ab4bab2bad80e548540",
    "testharness"
   ],
   "generic-sensor/generic-sensor-feature-policy-test.sub.js": [
-   "c7c9c4d1c578f267cbb4241d7ea7a981be6f49ee",
+   "f90a08bd96c729c5c166fd628e69f01c3413a78c",
    "support"
   ],
   "generic-sensor/generic-sensor-tests.js": [
-   "6364f1838215eaafd91b86690039da41d4c19cd1",
+   "a23c776f7536e3f406c78a5aa02359c7dde8c745",
    "support"
   ],
   "generic-sensor/idlharness.https.html": [
@@ -560376,31 +563726,31 @@
    "support"
   ],
   "graphics-aam/graphics-document_on_html_element-manual.html": [
-   "933fcb47c29bb5e119326147266457231dabf810",
+   "f686aecabb2b93aec606027a0c49deb6a6a47be4",
    "manual"
   ],
   "graphics-aam/graphics-document_on_svg_element-manual.html": [
-   "126688d4b899c2b718914a9e7454f4ff14e21ae3",
+   "4032238193305de5716fd73fda5565b5b4be0d30",
    "manual"
   ],
   "graphics-aam/graphics-object_on_html_element-manual.html": [
-   "5fef647bd9e1cfed38467ca790b8796ef9d58bbe",
+   "a5b486cd6a8ab9b3cff11bc05ff53cf282540959",
    "manual"
   ],
   "graphics-aam/graphics-object_on_svg_element-manual.html": [
-   "ae94b8f962584ba8afa6ccb40c992a597bb9d9af",
+   "0026225d08a733406bf83bd33847950dea7832f8",
    "manual"
   ],
   "graphics-aam/graphics-symbol_on_html_element-manual.html": [
-   "be301a3a71514708c547fa033eab0271367a3fb9",
+   "9641390cc19feb44f311b46c32f45c913412c000",
    "manual"
   ],
   "graphics-aam/graphics-symbol_on_svg_element-manual.html": [
-   "52b2e48333492373708b86cf558e578b04ac5977",
+   "433d0e83ee0556b94e00edc138bd32e36b10b1a0",
    "manual"
   ],
   "gyroscope/Gyroscope-disabled-by-feature-policy.https.html": [
-   "bc6f85cb3506d3e3e062eef43dca88bf3a4ebe89",
+   "64db7d9fe9726d6c04e97802f2328e3cfe6e2585",
    "testharness"
   ],
   "gyroscope/Gyroscope-disabled-by-feature-policy.https.html.headers": [
@@ -560408,15 +563758,15 @@
    "support"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "cc1f4082fa420a9076f929d88268f5a1d921a44a",
+   "6f9c2974d9fa82d85ecc299990295f7bb44fbced",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html": [
-   "75429c87bbebd19df7b4edaddc5869c6202b3fab",
+   "413cad8e563dd38decb5e388a3a10363417cd413",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy.https.html": [
-   "5129c05f9b226650a9b7fed4841871045525bf15",
+   "5c723e19f2f67d50d7e5d1ea75a5c09b4eeec4a3",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-by-feature-policy.https.html.headers": [
@@ -560424,7 +563774,7 @@
    "support"
   ],
   "gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html": [
-   "2603bd858929ae6f84ebbe0cce34c5417ccdae06",
+   "3b6cc272c04aee446ce8dffbe041330e5c2298ea",
    "testharness"
   ],
   "gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html.headers": [
@@ -560432,7 +563782,7 @@
    "support"
   ],
   "gyroscope/Gyroscope.https.html": [
-   "504abfa42529e08576e49c3296464bcea5fe0b8a",
+   "e2b1919195d0af74bb7733a6d8a299adf43f4ee4",
    "testharness"
   ],
   "gyroscope/Gyroscope_insecure_context.html": [
@@ -560440,7 +563790,7 @@
    "testharness"
   ],
   "gyroscope/Gyroscope_onerror-manual.https.html": [
-   "1e15b883bd317ca83783864fc563794cb0f6df8e",
+   "c8f346f00bbc296e89e132926f974ee408d66fcf",
    "manual"
   ],
   "gyroscope/OWNERS": [
@@ -561167,6 +564517,30 @@
    "272d9e767599cd6215770cb9f6286c54458f3215",
    "testharness"
   ],
+  "html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md": [
+   "908c496fea2d5e4397d64c3190c963a28c2465b7",
+   "support"
+  ],
+  "html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js": [
+   "d49d82110916c7bb675bb1c332c0d5499c180028",
+   "testharness"
+  ],
+  "html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis": [
+   "b0986e96d4eea0e280aec1a82bec472e39abcb22",
+   "support"
+  ],
+  "html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py": [
+   "a64a162dee650125a4ba6244caa9a8a1de397371",
+   "support"
+  ],
+  "html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt": [
+   "eb5608b416f1f461e2acd0dbc848cd93807250d9",
+   "support"
+  ],
+  "html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js": [
+   "dd861a7c3fd42255edb603f50c7466dd9132917c",
+   "testharness"
+  ],
   "html/browsers/browsing-the-web/navigating-across-documents/source/navigate-child-function-parent.html": [
    "dc948f346289dc8ad33129a7794f823865e319e8",
    "testharness"
@@ -561819,6 +565193,10 @@
    "8add09b76d8662f4343188a1ac36fe71fd4a225d",
    "testharness"
   ],
+  "html/browsers/history/the-history-interface/history_pushstate_url.html": [
+   "bf3c08fc9730f233fd05bac58be4b73d152ac923",
+   "testharness"
+  ],
   "html/browsers/history/the-history-interface/history_replacestate.html": [
    "91cf4970bfa565ee8b846582bdbe608d38902fe7",
    "testharness"
@@ -562539,10 +565917,6 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "html/browsers/origin/.gitkeep": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
   "html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html": [
    "604c6ee2bd78187a600dd28e03b60caf89580cfe",
    "testharness"
@@ -562564,25 +565938,17 @@
    "support"
   ],
   "html/browsers/origin/origin-of-data-document.html": [
-   "9fec457691ac4b071e9bc8de1ebf6f13dbadd4e5",
+   "844b162882b27fd3ec0a07c8d4c1a6a6254b69ca",
    "testharness"
   ],
-  "html/browsers/origin/relaxing-the-same-origin-restriction/.gitkeep": [
-   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
-   "support"
-  ],
   "html/browsers/origin/relaxing-the-same-origin-restriction/document_domain.html": [
    "9839a9c24ce78ec42da8a60d2175df06e19983c1",
    "testharness"
   ],
   "html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html": [
-   "1f0408464d8d98341c9537c3e3356cacbcf2f489",
+   "74417f69455c12f894207e23496c0f92edff7eae",
    "testharness"
   ],
-  "html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_iframe.html": [
-   "d33427abcc87693bce1f5610f460aad12cb99759",
-   "support"
-  ],
   "html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_null.tentative.html": [
    "212e7be483bcb35413156231afcda8fe074558fc",
    "testharness"
@@ -562595,6 +565961,10 @@
    "80d3d94c22642b2c07dae8f9cd8a50b563d36ef3",
    "support"
   ],
+  "html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html": [
+   "d33427abcc87693bce1f5610f460aad12cb99759",
+   "support"
+  ],
   "html/browsers/sandboxing/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -563871,6 +567241,10 @@
    "e7c9064ba73547f25e0c7f202f14d51ee4e10fd1",
    "testharness"
   ],
+  "html/dom/dynamic-markup-insertion/document-write/contentType.window.js": [
+   "f39e34dec9f0a9ca12e76085a26b567dff96dc55",
+   "testharness"
+  ],
   "html/dom/dynamic-markup-insertion/document-write/document.write-01.xhtml": [
    "3b309503bf8f002712eafba1d5e7a1f3f743d7e1",
    "testharness"
@@ -564135,10 +567509,22 @@
    "a2a5acc9dfe53c7482eeaa4be3a4819238f8e120",
    "testharness"
   ],
+  "html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js": [
+   "b021d6fcc38925ddf39309e21716c5be37791247",
+   "testharness"
+  ],
+  "html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js": [
+   "ccf357a8081b99de1d85e05196145e83b3de2ab5",
+   "testharness"
+  ],
   "html/dom/dynamic-markup-insertion/opening-the-input-stream/mutation-events.window.js": [
    "1e1c656e1d19c9c459faf16327e099a4c9e13872",
    "testharness"
   ],
+  "html/dom/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html": [
+   "1d8ae9f75fe05343c1858caad637c9f7602c9f28",
+   "support"
+  ],
   "html/dom/dynamic-markup-insertion/opening-the-input-stream/type-argument-plaintext-subframe.txt": [
    "8d06cea05d408d70c59b1dbc5df3bda374d869a4",
    "support"
@@ -565304,7 +568690,7 @@
    "support"
   ],
   "html/editing/dnd/datastore/015-manual.html": [
-   "e83d2bbe807f1e3e0ab85e7ddcc4d260ccd02ab5",
+   "ff22955ac3be6c9e602b15bba119d60038ef0b7c",
    "manual"
   ],
   "html/editing/dnd/datastore/016.xhtml": [
@@ -565892,11 +569278,11 @@
    "support"
   ],
   "html/editing/dnd/events/events-cross-document-suite-manual.html": [
-   "0e051592fc8cc2d2dd37f4275e1ec6dbb3f29131",
+   "e8e8f73b31f559fa80d47da7b039a72ebd0f1c98",
    "manual"
   ],
   "html/editing/dnd/events/events-file-suite-manual.html": [
-   "1e0629010837f83b4e829271bfe304b947305312",
+   "3f5955f1ff95afec2713ccd9bf50d184f62bd812",
    "manual"
   ],
   "html/editing/dnd/events/events-non-draggable-001.html": [
@@ -565908,7 +569294,7 @@
    "support"
   ],
   "html/editing/dnd/events/events-suite-manual.html": [
-   "6b940e48678f498192e3cfe531e3e82c4d5affc6",
+   "355c39e32d5ba9128d9a0909af4a44b7cc8b39a1",
    "manual"
   ],
   "html/editing/dnd/events/helper-drag-me-input-with-circle.xhtml": [
@@ -565932,15 +569318,15 @@
    "manual"
   ],
   "html/editing/dnd/file/001.html": [
-   "28e4e1d0e06a8c300c116aeb2d07e4808bdf56fe",
+   "9a004cc780577f28242feeedce7a15deb7849c8c",
    "support"
   ],
   "html/editing/dnd/file/002.html": [
-   "62f40d477019e663e377f314947c28ea6b556864",
+   "fdb4d92324f81cd4412fa8334aeb75fa79044804",
    "support"
   ],
   "html/editing/dnd/file/003.html": [
-   "df5bb0614ea6c7135caead8c5a1258bf981aeb13",
+   "578bc2823d303d41577abc9c0a855af338baf8be",
    "support"
   ],
   "html/editing/dnd/file/004.html": [
@@ -565956,11 +569342,11 @@
    "support"
   ],
   "html/editing/dnd/file/007.html": [
-   "21851c97db234d854576e3ea6e1029ffed38a761",
+   "bb927ac9126c217f7cb0bcf07e58f6e8f756fc06",
    "support"
   ],
   "html/editing/dnd/file/008.html": [
-   "081def5342c9b8bb426812bef312e6cdee3dd66e",
+   "b632d267d0c66c631670957566e763d8511efbe4",
    "support"
   ],
   "html/editing/dnd/file/009.html": [
@@ -565972,7 +569358,7 @@
    "support"
   ],
   "html/editing/dnd/file/011.html": [
-   "6c5de23f6a63e817d60d1357020ee90f71193372",
+   "4e78bcbbdd8b8f220e1b431f964c299636d2a064",
    "support"
   ],
   "html/editing/dnd/file/fail.txt": [
@@ -568636,19 +572022,19 @@
    "testharness"
   ],
   "html/editing/dnd/synthetic/005-manual.html": [
-   "2c34cba5b352e89c7c4f2a1703c3ef658b43210d",
+   "f0aa10823510a6cb31a893275b8b368fb31c7fea",
    "manual"
   ],
   "html/editing/dnd/synthetic/006-manual.html": [
-   "9e36bdbecc05807d517056934e473bf21556d3fc",
+   "71db416e3fed6a9862316fa3fc8911a9aaeda872",
    "manual"
   ],
   "html/editing/dnd/target-origin/001-manual.html": [
-   "6d9a6910e4afcb1f369e3ba490f8a4559492ec40",
+   "ced623f68d2973d0dd8f276f2bf94f191fc7d46e",
    "manual"
   ],
   "html/editing/dnd/target-origin/002-manual.html": [
-   "b4aff5f5ad993cd6da595a135f0100929e3bae33",
+   "0dfb0de055d6e7a77bcf7ff9ad013df9d7211298",
    "manual"
   ],
   "html/editing/dnd/target-origin/003-manual.html": [
@@ -568704,7 +572090,7 @@
    "manual"
   ],
   "html/editing/dnd/target-origin/101-manual.html": [
-   "b7c79cd240dfa0f5facb2df39322adcb76c8cf17",
+   "8b5f4f858072cfa6e692638b2c9e21dc208f7d81",
    "manual"
   ],
   "html/editing/dnd/target-origin/102-manual.html": [
@@ -569675,6 +573061,10 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html": [
+   "bc42ced67ad1368f3cf459dd113b131c69aaba78",
+   "testharness"
+  ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/blank.py": [
    "e55787bc9f46f01aece15afed2ce0686d143dc03",
    "support"
@@ -569692,7 +573082,7 @@
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js": [
-   "5b09875b7207da2b908e66e1d75f095f12887247",
+   "70fd863f8335a2026d5755cf2ba7a01d98222ec0",
    "support"
   ],
   "html/infrastructure/urls/resolving-urls/query-encoding/resources/resource.py": [
@@ -570707,6 +574097,14 @@
    "9c96574d448d5df8aeb64bcdda404660e99d815f",
    "support"
   ],
+  "html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html": [
+   "0f71104298fa4dbfa07139c34f1735279f78a1c7",
+   "support"
+  ],
+  "html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html": [
+   "5b111e4a102e7d1795a9a68daad92dda9fa707d3",
+   "reftest"
+  ],
   "html/rendering/replaced-elements/image-maps-0/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -570964,7 +574362,7 @@
    "testharness"
   ],
   "html/semantics/document-metadata/the-link-element/link-rel-attribute.html": [
-   "45824076fb8696f775582c7bcfab093ebfb3055c",
+   "4baacb7829d841fcef0086d2f1ec6e5fc915179e",
    "testharness"
   ],
   "html/semantics/document-metadata/the-link-element/link-rellist.html": [
@@ -574188,7 +577586,7 @@
    "testharness"
   ],
   "html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html": [
-   "aa99ece8022ddd68be6b8350a51c77647a0a19f7",
+   "47e56d828d8c366a95d0ea77571a1dbcaaca3164",
    "support"
   ],
   "html/semantics/embedded-content/the-img-element/srcset/common.js": [
@@ -574563,6 +577961,10 @@
    "5cb7e225df89561a1137933615b93c9912444006",
    "support"
   ],
+  "html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js": [
+   "727543085a822c9976f443b2e5adbf9708aecec2",
+   "testharness"
+  ],
   "html/semantics/forms/form-submission-0/form-data-set-usv-form.html": [
    "82386590b55a9028e47d16d6a8c67cd0e44e919e",
    "support"
@@ -576216,7 +579618,7 @@
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/execution-timing/077.html": [
-   "2bfe280f0ae7b745f2217055e66579ab6fb06769",
+   "077bf7437a9ef4f6d51d0fa26b45ae7c765feb9f",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/execution-timing/078.html": [
@@ -577032,7 +580434,7 @@
    "support"
   ],
   "html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html": [
-   "9758a62ec1f943c00dcd9b58ca62464c5c78bbb3",
+   "3328350068373e6ad5cfd06f1180468ea4dccfb8",
    "testharness"
   ],
   "html/semantics/scripting-1/the-script-element/module/import-something-namespace.js": [
@@ -579179,6 +582581,10 @@
    "2bea14569ddd5c874a05d7ad72f083b2918d6e84",
    "support"
   ],
+  "html/user-activation/activation-thru-contextmenu-event-manual.html": [
+   "6383438f2069930b8f7fe684c5a2850d138e6073",
+   "manual"
+  ],
   "html/webappapis/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -579659,6 +583065,18 @@
    "ab8348537b946dcb70e91187e4cf7a260c6b92ed",
    "testharness"
   ],
+  "html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js": [
+   "e488880385c699e76127f7d30624fad4e0b6eb4b",
+   "support"
+  ],
+  "html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js": [
+   "2b3b580c1f0ab10158cb73d707f49ca964c4233b",
+   "support"
+  ],
+  "html/webappapis/structured-clone/structured-clone-battery-of-tests.js": [
+   "68f8eda2182bdcbbf5fea63a0a196e9c3893ffe8",
+   "support"
+  ],
   "html/webappapis/system-state-and-capabilities/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -579723,6 +583141,10 @@
    "49fd55dbbf64c6973a0e76284c0e3d8b7bf0ef3c",
    "testharness"
   ],
+  "html/webappapis/timers/missing-timeout-setinterval.any.js": [
+   "40ad74d6ed3719dcad2097246d74d49c87b989aa",
+   "testharness"
+  ],
   "html/webappapis/timers/negative-setinterval.html": [
    "405046cab9cd15a88d57eace1f293ebdd7b1b3e2",
    "testharness"
@@ -579755,52 +583177,8 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "http/OWNERS": [
-   "0bf8031d11c018af20c2a7387685b7b370ce643a",
-   "support"
-  ],
-  "http/basic-auth-cache-test-ref.html": [
-   "42fbbd76956a8d2a84221500f70bd5c42cf5c75a",
-   "support"
-  ],
-  "http/basic-auth-cache-test.html": [
-   "3695684b66b1929a582d7b1cffee9487400b9c1c",
-   "reftest"
-  ],
-  "http/content_length.html": [
-   "5ade7f549fe195af4e897debb4913e07ad237243",
-   "testharness"
-  ],
-  "http/content_length.html.headers": [
-   "c86f164a128d02814744e0456e4588062eb016c8",
-   "support"
-  ],
-  "http/refresh/README.md": [
-   "f503dfb32f6762191ad3fda507256b697ffd1602",
-   "support"
-  ],
-  "http/refresh/navigate.window.js": [
-   "d49d82110916c7bb675bb1c332c0d5499c180028",
-   "testharness"
-  ],
-  "http/refresh/resources/multiple.asis": [
-   "b0986e96d4eea0e280aec1a82bec472e39abcb22",
-   "support"
-  ],
-  "http/refresh/resources/refresh.py": [
-   "a64a162dee650125a4ba6244caa9a8a1de397371",
-   "support"
-  ],
-  "http/refresh/resources/refreshed.txt": [
-   "eb5608b416f1f461e2acd0dbc848cd93807250d9",
-   "support"
-  ],
-  "http/refresh/subresource.any.js": [
-   "dd861a7c3fd42255edb603f50c7466dd9132917c",
-   "testharness"
-  ],
-  "http/resources/securedimage.py": [
-   "d5aa250e8cba8384f47fca2c559aa6a310dff457",
+  "imagebitmap-renderingcontext/OWNERS": [
+   "07a7da62ef2c26f061cfc076d268f06a0cdcf72b",
    "support"
   ],
   "imagebitmap-renderingcontext/bitmaprenderer-as-imagesource.html": [
@@ -580104,13 +583482,17 @@
    "support"
   ],
   "infrastructure/browsers/firefox/prefs.html": [
-   "32cd95068c1f207719e75f27144ebe74eb7a9c75",
+   "398cab31de190004ff7c09659547aad4e8fe9910",
    "testharness"
   ],
   "infrastructure/expected-fail/failing-test.html": [
    "c832afb4826fd43d2fcc4f5e3fd6a773a6ee35f0",
    "testharness"
   ],
+  "infrastructure/expected-fail/timeout.html": [
+   "a91279f3455bdaf63412e9487192502da1e51baf",
+   "testharness"
+  ],
   "infrastructure/metadata/infrastructure/assumptions/html-elements.html.ini": [
    "0f536ac59a959769966d56c5a546f9f2c2557e97",
    "support"
@@ -580127,6 +583509,10 @@
    "7eecbfc4845e6befe54b0f007d587a1a003993dc",
    "support"
   ],
+  "infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini": [
+   "03ddb1ea28337dabd61082a566149fa1e94f3e97",
+   "support"
+  ],
   "infrastructure/metadata/infrastructure/reftest/reftest_and_fail.html.ini": [
    "b6c1fe38e610a8ffaf843c0c0b791c65fe6d5145",
    "support"
@@ -580244,7 +583630,7 @@
    "testharness"
   ],
   "infrastructure/server/wpt-server-http.sub.html": [
-   "c39602efd7574944e8495e9ed0d98c6811f9e2e7",
+   "2a400478de23a6aecf31bdc08b187784c36be629",
    "testharness"
   ],
   "infrastructure/server/wpt-server-websocket.sub.html": [
@@ -580344,7 +583730,7 @@
    "support"
   ],
   "interfaces/cookie-store.idl": [
-   "0d74ef8e7681fddddfb786b75075a1dd0ddb9147",
+   "bb4c385873deafd746f186058b111193c8aebf01",
    "support"
   ],
   "interfaces/css-font-loading.idl": [
@@ -580360,7 +583746,7 @@
    "support"
   ],
   "interfaces/cssom.idl": [
-   "3a1097a8c4cb4f63da97e126fbb302a5fec73968",
+   "42c8e1cb0e7fbc5bb6f8a811b73554e3b72a6abd",
    "support"
   ],
   "interfaces/dedicated-workers.idl": [
@@ -580420,13 +583806,17 @@
    "support"
   ],
   "interfaces/html.idl": [
-   "297268c7debe3d8ee741c4b1abd86a1e64f65e03",
+   "fe86c7370a537be87884d1b9da1f7b7630c6af41",
    "support"
   ],
   "interfaces/keyboard-lock.idl": [
    "7188a9233db3acc741650d46156e16e9e7a132fa",
    "support"
   ],
+  "interfaces/keyboard-map.idl": [
+   "1e9e311a4d347d9f036702d29ef0bc82fca04162",
+   "support"
+  ],
   "interfaces/magnetometer.idl": [
    "ffac480912edba82886fef6d5368092d237a0c7f",
    "support"
@@ -580567,6 +583957,10 @@
    "6cbea44f209e59ea0b901b0fe1cec7ac1aee0b64",
    "testharness"
   ],
+  "intersection-observer/isIntersecting-change-events.html": [
+   "6def578601e9fb21f2ffd5412a83036353b7647a",
+   "testharness"
+  ],
   "intersection-observer/multiple-targets.html": [
    "83173248b825b97063c61dd31c64d8fe7ba10aac",
    "testharness"
@@ -580604,7 +583998,7 @@
    "support"
   ],
   "intersection-observer/resources/intersection-observer-test-utils.js": [
-   "889d403e334e3c0fc4ae7a6af06ef9504145fa2b",
+   "dcfa6c9058145d3b1be7dea6864bb0464186494e",
    "support"
   ],
   "intersection-observer/resources/observer-in-iframe-subframe.html": [
@@ -580723,10 +584117,22 @@
    "581702f5f6b8f6e547918ae8f8a8547b103a9b6c",
    "testharness"
   ],
+  "keyboard-lock/OWNERS": [
+   "723bcf4599ad389962b61dd830818fc167049e7b",
+   "support"
+  ],
   "keyboard-lock/idlharness.https.html": [
    "010771094a9dc58e03a2c1ca2d8416866284fc2b",
    "testharness"
   ],
+  "keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html": [
+   "c51c1780a7c25938ee362234345f43711561fc73",
+   "testharness"
+  ],
+  "keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html": [
+   "381b3ce858035d2829b6a004b007fa1d06c9938b",
+   "testharness"
+  ],
   "keyboard-lock/navigator-keyboard-lock-two-parallel-requests.https.html": [
    "8d0517d7f78890aead8376dfa314220180d48b3e",
    "testharness"
@@ -580743,6 +584149,18 @@
    "f5cc2141ea7c74964d308784901d6d2c242f4369",
    "testharness"
   ],
+  "keyboard-lock/resources/iframe-lock-helper.html": [
+   "2ac2738dd428f3937fc2fd15dae2f98df5e3feb1",
+   "support"
+  ],
+  "keyboard-map/idlharness.https.html": [
+   "3215b6729d83ca2841baf6eb33445eb07e0a7c25",
+   "testharness"
+  ],
+  "keyboard-map/keyboard-map-https.html": [
+   "28b559875ce9514702d181cb4cb5e0a207083e2d",
+   "testharness"
+  ],
   "longtask-timing/OWNERS": [
    "30a9c29ba53bac131c0cca801c01dddb4779824e",
    "support"
@@ -580808,7 +584226,7 @@
    "support"
   ],
   "magnetometer/Magnetometer-disabled-by-feature-policy.https.html": [
-   "9af542095f2fcd57691c0432ef3248b04a0207a0",
+   "33e6cbd89ec34e729d84f5a50bd7f75c47fa42e8",
    "testharness"
   ],
   "magnetometer/Magnetometer-disabled-by-feature-policy.https.html.headers": [
@@ -580816,15 +584234,15 @@
    "support"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "47829ff5747eed99ba22e79b12ddfff288fd031e",
+   "3686719c3eab1867e5f5755dea11734f52123a68",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html": [
-   "3b6314e9176a24976d9d882644c30f00554eed6d",
+   "8c61e61e1a7b43a080991d12c7b469e30613a165",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy.https.html": [
-   "05128cdb7171ba230143e7b68b09968a484b602a",
+   "806b736a6320c82d5c6f10fae30ba5c35e695e10",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-by-feature-policy.https.html.headers": [
@@ -580832,7 +584250,7 @@
    "support"
   ],
   "magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html": [
-   "3240dafd2bc810dea0dc1ebc31728c86a29f2ec5",
+   "5871a3396ac4030f2202ea27f48fcb715de26236",
    "testharness"
   ],
   "magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html.headers": [
@@ -580840,7 +584258,7 @@
    "support"
   ],
   "magnetometer/Magnetometer.https.html": [
-   "240e7d0af55b8681f2f45ca22283634acc406325",
+   "85b033df53fcaec4a55175f6a9438bd2abf5e6ff",
    "testharness"
   ],
   "magnetometer/Magnetometer_insecure_context.html": [
@@ -580848,7 +584266,7 @@
    "testharness"
   ],
   "magnetometer/Magnetometer_onerror-manual.https.html": [
-   "da4e6b8975beecdcae24da26920a56a652f781e4",
+   "5da81d90bd6960c94d5b3dd7592aa4c93d996e1a",
    "manual"
   ],
   "magnetometer/OWNERS": [
@@ -581319,6 +584737,10 @@
    "b1f21c6a67c048f668ee6bd826fcfd903544ad41",
    "support"
   ],
+  "media-capabilities/OWNERS": [
+   "4704befc950341a16c061872e3d57fe9f0f743bf",
+   "support"
+  ],
   "media-capabilities/README.md": [
    "7d6ceec9a74d5485a6f7d51504f22e5eaf81bfee",
    "support"
@@ -581364,7 +584786,7 @@
    "testharness"
   ],
   "media-source/generate-config-change-tests.py": [
-   "044023540660d9b81484d1ae14851e13af907055",
+   "fefa39b93290d8d97b18f606c5166d7792193251",
    "support"
   ],
   "media-source/import_tests.sh": [
@@ -581867,6 +585289,10 @@
    "c3f2ab0ca87e837a5ffc6dfc1e757e1357c49d1f",
    "support"
   ],
+  "mediacapture-fromelement/OWNERS": [
+   "59be3c98404e4c52dae30bd9334cf00c6c4d2650",
+   "support"
+  ],
   "mediacapture-fromelement/capture.html": [
    "ff450ec02ee509df7a022a490bfc818c20983743",
    "testharness"
@@ -581883,6 +585309,10 @@
    "ceeb48e7982eb88561f4c1630cb0fcf15d9cf73c",
    "testharness"
   ],
+  "mediacapture-image/OWNERS": [
+   "d53c2a28adfbc343850c3362a180bba24ae63609",
+   "support"
+  ],
   "mediacapture-image/idlharness.html": [
    "7ccf7fcab0344a2e1893e89d7689e2312287b64d",
    "testharness"
@@ -581940,7 +585370,7 @@
    "testharness"
   ],
   "mediacapture-streams/MediaDevices-getUserMedia.https.html": [
-   "a515deeec87c394b4a826b538df6dd0baa05cae6",
+   "dbd2cbacb24f088167e1c34207bea12c19f5d0e1",
    "testharness"
   ],
   "mediacapture-streams/MediaStream-MediaElement-preload-none-manual.https.html": [
@@ -581995,16 +585425,20 @@
    "e3358344a76f874b68bdba743f113caa3b61ec88",
    "testharness"
   ],
+  "mediacapture-streams/MediaStreamTrack-applyConstraints.https.html": [
+   "cda78cab93e93f9e436d46db8b7a6a0d12471e87",
+   "testharness"
+  ],
   "mediacapture-streams/MediaStreamTrack-end-manual.https.html": [
    "6511203b417168722d1e05d90e58364ebce145ea",
    "manual"
   ],
   "mediacapture-streams/MediaStreamTrack-getCapabilities.https.html": [
-   "23863eb0835fb86d556e6ea95692f52572a38170",
+   "3a6bdcf56d9414934be70d32765c04449532b853",
    "testharness"
   ],
   "mediacapture-streams/MediaStreamTrack-getSettings.https.html": [
-   "013d31ba196d5a6f1506ceb8eab088e629dfd59b",
+   "e73c53bfd0c77c91f2f736cb5bb723856c2d1501",
    "testharness"
   ],
   "mediacapture-streams/MediaStreamTrack-id.https.html": [
@@ -582031,6 +585465,10 @@
    "f30bde11122411931ad98ef49047bd3755047fda",
    "testharness"
   ],
+  "mediasession/OWNERS": [
+   "4704befc950341a16c061872e3d57fe9f0f743bf",
+   "support"
+  ],
   "mediasession/README.md": [
    "5ceecb2611837e6c52a303cec32d8cb9fabe93a6",
    "support"
@@ -583787,6 +587225,10 @@
    "b9d933d6a33eabc0b9c9f856c91b802677fa1094",
    "testharness"
   ],
+  "netinfo/OWNERS": [
+   "93b655bb44ef39277cdc5308b2fefbc22ad96885",
+   "support"
+  ],
   "netinfo/netinfo-basics.html": [
    "972b4048bbb74e1489329ae48759b587b9ad3800",
    "testharness"
@@ -583887,6 +587329,10 @@
    "f31d50ead567908aab1d1dad577eb06c912c97f3",
    "manual"
   ],
+  "offscreen-canvas/OWNERS": [
+   "07a7da62ef2c26f061cfc076d268f06a0cdcf72b",
+   "support"
+  ],
   "offscreen-canvas/compositing/2d.composite.canvas.copy.html": [
    "983ae27346b47cd73000d9e3cd2264e3233705d1",
    "testharness"
@@ -589767,6 +593213,10 @@
    "054fe1ca53999433cf4cddff7193d9f05d6c48dd",
    "testharness"
   ],
+  "old-tests/OWNERS": [
+   "f304e4a3090cee48069599726312305250147495",
+   "support"
+  ],
   "old-tests/submission/Microsoft/foreigncontent/foreign_content_002.html": [
    "a1f1e455324826f2a67d82d2f88be69852709d45",
    "support"
@@ -589788,7 +593238,7 @@
    "testharness"
   ],
   "old-tests/submission/Microsoft/history/history_000.htm": [
-   "67c9d8a21aef80b124923effa8be40949d5e3e53",
+   "7f3698823c7c68617ce9f0fc9371158420e7ad0d",
    "testharness"
   ],
   "old-tests/submission/Microsoft/selection/RemoveElementContainingSelection.htm": [
@@ -589839,6 +593289,10 @@
    "dbebb6a0f2c125dc5c7ddeccccae2eb6496d29f0",
    "support"
   ],
+  "orientation-event/OWNERS": [
+   "10840492f7ff1b4a45d94e586463c307477ec3ba",
+   "support"
+  ],
   "orientation-event/devicemotionevent-init.html": [
    "fab191bbebab21f696fefc0ad9e8110b99855eee",
    "testharness"
@@ -589920,7 +593374,7 @@
    "manual"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html": [
-   "0c7657e32b46c64e5f050f04e40ccfc0dce32e47",
+   "d0ad686df1fc6e176a23f827f5afb61c55a7754b",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html.headers": [
@@ -589928,15 +593382,15 @@
    "support"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "71a6966fb91f8ddfe15ee690c843e4621a3b4720",
+   "c666593365dba60ccf03a354f997bb86cab6581c",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html": [
-   "9bbe39e1be4a669f31f0fb3960aca22d7d159c5e",
+   "cd0c5fb506d123dea5e162994e68e908b8e18fa0",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html": [
-   "9f110b8ceca3dd3ce3d2a9e2567d92a3fc6462bf",
+   "260958b236c47b8d8796c8003ce3c1b1cedbe162",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html.headers": [
@@ -589944,31 +593398,31 @@
    "support"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html": [
-   "c4404cf0b16c4d9ad15308392ecf52caee445b86",
+   "7d7709582f6fcfadd7000b79114a36adbf1c7dde",
    "testharness"
   ],
   "orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "cb27e0f09caa38fc80b29580be4b0c06c1024a18",
    "support"
   ],
+  "orientation-sensor/AbsoluteOrientationSensor.https.html": [
+   "c482c21d4336decf5d4c47b4e6911dc2b03a19e9",
+   "testharness"
+  ],
   "orientation-sensor/OWNERS": [
    "b119dbb984792f33c6e7463f3105d37c3c3b7ad8",
    "support"
   ],
-  "orientation-sensor/OrientationSensor.https.html": [
-   "ea9a61f9d526183071a0336e11ca844f59c284a9",
-   "testharness"
-  ],
   "orientation-sensor/OrientationSensor_insecure_context.html": [
    "eb64da888f1bedf9d5ed8b11edc1626da88b322b",
    "testharness"
   ],
   "orientation-sensor/OrientationSensor_onerror-manual.https.html": [
-   "6f0eb976affc21e49f48c42c1bd9d9eb0083ee40",
+   "c7d57da56142057f23503da971875df46ef6d137",
    "manual"
   ],
   "orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html": [
-   "8c6c5f8f3bc4421f5143a3e4fab287564cf4907d",
+   "c45d0a4cbfa68431c97e6d6288a9e57161100733",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html.headers": [
@@ -589976,15 +593430,15 @@
    "support"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html": [
-   "34a79c9033a41c0aceab3fa6a470dd5a76f2ac81",
+   "fb57e3d552c56f9b7e21f461b4938d850c5c9d8a",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html": [
-   "0e6260ccdaa8163b8db96516960be226a4d85ba7",
+   "04bf99c095016b4f39a99819f0cf3b5742c7e436",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html": [
-   "243b2d60d4c528a77e9cfb68fa256b35234e7346",
+   "2286335655c89a9428193cd42a42ec1df7ddf333",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html.headers": [
@@ -589992,17 +593446,25 @@
    "support"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html": [
-   "c9f234f6508fb778fdf91277bb8950c99479979d",
+   "4b529302141beb7cdf2b6569a0f836dc378ba062",
    "testharness"
   ],
   "orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html.headers": [
    "e6e93a77c618e8477d79f6cf1ff05d0f5865821c",
    "support"
   ],
+  "orientation-sensor/RelativeOrientationSensor.https.html": [
+   "9bf83c64eb5dcf284eb6c45db8ac278ab3c637a2",
+   "testharness"
+  ],
   "orientation-sensor/idlharness.https.html": [
    "1f94329cb330a1a904d409a6e158a5fe9f8dd709",
    "testharness"
   ],
+  "orientation-sensor/orientation-sensor-tests.js": [
+   "250d6009213e72069acd56e847fc9509c52c1d90",
+   "support"
+  ],
   "page-visibility/OWNERS": [
    "b82f9756b15ef3ea45fb250e304031d9ceaee9c7",
    "support"
@@ -590056,7 +593518,7 @@
    "testharness"
   ],
   "page-visibility/test_minimize-manual.html": [
-   "7cf8bf5781fc968fedbd346dafe098218e37f0ac",
+   "2b8cdc5d56ee9edde9a38920011b327e06249cb5",
    "manual"
   ],
   "page-visibility/test_read_only.html": [
@@ -590064,7 +593526,7 @@
    "testharness"
   ],
   "page-visibility/test_tab_state_change-manual.html": [
-   "6c6c0d50dc4cf367646375170181d0135a403ae3",
+   "8acd2d1b2f9e397f9f533f845686745059cba300",
    "manual"
   ],
   "page-visibility/unload-1.html": [
@@ -590148,7 +593610,7 @@
    "support"
   ],
   "payment-handler/app-can-make-payment.js": [
-   "95d11a09c5468bcea9172e1511be5c8fa5b4d9d7",
+   "f789d5de3dcb915d66ca43142c940ac74fcedf6a",
    "support"
   ],
   "payment-handler/basic-card.js": [
@@ -590164,7 +593626,7 @@
    "testharness"
   ],
   "payment-handler/can-make-payment-event-constructor.https.worker.js": [
-   "39e90eca2f6cb7d4fa62655a1aa492acea30f436",
+   "4a77b5b3444c490b673b7c08862f1565b705f0e2",
    "testharness"
   ],
   "payment-handler/can-make-payment-event.https.html": [
@@ -590232,7 +593694,7 @@
    "support"
   ],
   "payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html": [
-   "1a2bf6b62a5021eec649c0919a35574779e30d09",
+   "46cac5ba402841a8bc311b1a11de4a82589ee567",
    "manual"
   ],
   "payment-request/PaymentItem/type_member.https.html": [
@@ -590372,7 +593834,7 @@
    "testharness"
   ],
   "payment-request/payment-request-not-exposed.https.worker.js": [
-   "b1c3cdc182cb967ec11b1cad826b333511203d77",
+   "957e88d8e5f212254140487b6980abf40cf5ed96",
    "testharness"
   ],
   "payment-request/payment-request-onshippingaddresschange-attribute.https.html": [
@@ -590555,40 +594017,44 @@
    "dc978fd8669d67118109fcab245010fdd7d799b0",
    "testharness"
   ],
+  "picture-in-picture/OWNERS": [
+   "6f6511f82937c14788c608d760c567d47b139fc0",
+   "support"
+  ],
   "picture-in-picture/disable-picture-in-picture.html": [
-   "887338e9330b4d94d007685c2a511cf285bb0c3e",
+   "d97bf03a6e2f991c173248f9e28bd713da19a6f4",
    "testharness"
   ],
   "picture-in-picture/enter-picture-in-picture.html": [
-   "1286b5349d7787be49ad00f910e2bd7ec80ed87e",
+   "b17c772130104f1b1fa11dbdd9ac0b1f693d7433",
    "testharness"
   ],
   "picture-in-picture/exit-picture-in-picture.html": [
-   "b1103b96927872de07fc6eb5f34668a0267da6a2",
+   "4bcd6f2c68c4f6b9b17057d57d6cfe6101845e9d",
    "testharness"
   ],
   "picture-in-picture/leave-picture-in-picture.html": [
-   "178275fc27367da45895150124e1d2a0051f73d5",
+   "9f19a0c59604198b67a687b14455be6e5aad7fa8",
    "testharness"
   ],
   "picture-in-picture/picture-in-picture-element.html": [
-   "72f2d3b885be8f7268df828f7758b1bc05334d5e",
+   "98ad49176cbea00833479bd5aceed044b3cad1e0",
    "testharness"
   ],
   "picture-in-picture/picture-in-picture-window.html": [
-   "6e4e3995dd3b0540148e68c9cb8722eb139b24ac",
+   "e1dee4bfd55491d150c786e193c52148e91b525e",
    "testharness"
   ],
   "picture-in-picture/request-picture-in-picture.html": [
-   "3359d5a1a2c605847122da6ae3eab19e2751cdeb",
+   "3ffc08be84a5c7b67d35b21c614ccc8fa2a8c642",
    "testharness"
   ],
   "picture-in-picture/resources/picture-in-picture-helpers.js": [
-   "84462753efc9803a053e3675b850654c0e57ca93",
+   "2ad1e3e8c5b857fa747b840457f06e943461558b",
    "support"
   ],
   "picture-in-picture/shadow-dom.html": [
-   "d93f73abe52d38c26503c743fc64e440b8f779de",
+   "2db70930842eadd502dbd33ec06106c8a869c4aa",
    "testharness"
   ],
   "pointerevents/OWNERS": [
@@ -590651,6 +594117,10 @@
    "b010a8ff22c0522c8bbd5332e5d4ff8f1032a766",
    "manual"
   ],
+  "pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers-manual.html": [
+   "ed1a314a4240bdc127210fe11de23aabc6805ee2",
+   "manual"
+  ],
   "pointerevents/pointerevent_boundary_events_in_capturing-manual.html": [
    "f7159ac1ef1627fcd2d48497037bae2b67144e6f",
    "manual"
@@ -590919,6 +594389,10 @@
    "09da177c312d4112bc0177221cccaf787455db7e",
    "manual"
   ],
+  "pointerevents/pointerlock/pointerevent_movementxy_when_locked-manual.html": [
+   "0594dd75b63260bb7654ed1b18f21b50b2bd8eb4",
+   "manual"
+  ],
   "pointerevents/pointerlock/pointerevent_pointerlock_after_pointercapture-manual.html": [
    "272fc056c5a31a70d17fcde39fa99c27cde695b3",
    "manual"
@@ -590956,35 +594430,35 @@
    "testharness"
   ],
   "pointerlock/movementX_Y_basic-manual.html": [
-   "eb22c6fb2fbae178f2b662a09a9153635bdb17e6",
+   "45eea8be5393873e6c02331b4aff6f4622be692f",
    "manual"
   ],
   "pointerlock/movementX_Y_no-jumps-manual.html": [
-   "a58e494ab143d0658535cb571acbf85544c52c51",
+   "0d92e1e270e9ab01c863815c07a02ff3081aede9",
    "manual"
   ],
   "pointerlock/pointerlock_basic-manual.html": [
-   "4914806f0c1dc76a630dc82a8a0ee9ceacef06b4",
+   "c815d770b9663dbf9899b0cb53c16f246dc061af",
    "manual"
   ],
   "pointerlock/pointerlock_fullscreen-manual.html": [
-   "c6cf680894c699d610716dfce34e8c67d0917498",
+   "1a342e8a079fecf49b8e86145ef371325bdfa87f",
    "manual"
   ],
   "pointerlock/pointerlock_indefinite-manual.html": [
-   "d52319bd8c660491ac5528ae90aece83a2cf5642",
+   "599e7fab6b6592f23294f5183b10fae7c3bc041f",
    "manual"
   ],
   "pointerlock/pointerlock_leave_Tab-manual.html": [
-   "41b0799807f5b7d88ebfc1e819ef10b5d4194aaf",
+   "8a5ecf9e4bce67edf50ef6f672e6837c917d0999",
    "manual"
   ],
   "pointerlock/pointerlock_leave_UA-manual.html": [
-   "3794be5ea066cb99e32a5669f3e5d08b9732159d",
+   "c89cd123ef253704332cd3e80bc04c1188a7a2d0",
    "manual"
   ],
   "pointerlock/pointerlock_remove_target-manual.html": [
-   "6262b231ca8af095dee42c493e77662ee132dc05",
+   "d593c6f437c50ec52d5c6befed19f26627697379",
    "manual"
   ],
   "pointerlock/pointerlock_remove_target_on_mouseup-manual.html": [
@@ -591328,15 +594802,15 @@
    "support"
   ],
   "presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html": [
-   "ac16b8b189403d4b3c520f69c1675b6acd979e18",
+   "dba8e21a493a87fc11a14067c5cc99856877d7c5",
    "manual"
   ],
   "presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html": [
-   "e44406efbfe55bb74ac62d5fae7700102ce8e706",
+   "f0e257255a33eed38aa766ff6929562508b6a6e5",
    "manual"
   ],
   "presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html": [
-   "3c98bfaf0bc18436501f724210a1f33d9f273573",
+   "05fbd54d5ec8cec09ee3a9d2148e392640b602bf",
    "manual"
   ],
   "presentation-api/receiving-ua/PresentationConnection_send-manual.https.html": [
@@ -591360,7 +594834,7 @@
    "support"
   ],
   "presentation-api/receiving-ua/idlharness-manual.https.html": [
-   "fdabdbe847d78dd22754d72ed62f293cd55227ee",
+   "fadcaa8c9e3d9df537f8a9a7a02ecbea98b9c1bf",
    "manual"
   ],
   "presentation-api/receiving-ua/serviceworker.js": [
@@ -591492,7 +594966,7 @@
    "testharness"
   ],
   "referrer-policy/OWNERS": [
-   "f87103278641394f49c7e36acc9ff1ef60bacb79",
+   "01570ab696585cd0fbb1c2e159dc6f058844ee7c",
    "support"
   ],
   "referrer-policy/README.md": [
@@ -591715,6 +595189,18 @@
    "23e44fb1191c3925779a1cfab1e41a0c9433b137",
    "testharness"
   ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+   "ce22b663769ab4fbb3255d39594e53fdd03bc58c",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+   "0338f2b9056a17c1bf7da123ae4615a7a54ec892",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+   "f5945d7424fd24003912d977f0c274e85f5d00f6",
+   "testharness"
+  ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "33e51dc7cc9372c882785b4b2074b29f71bdb8f2",
    "testharness"
@@ -591739,6 +595225,18 @@
    "10d22a3ebc6165c49e1c998204efa03b9d3a8d23",
    "testharness"
   ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "77c7ecc1bb3e8970cd6aa4d491de9b88cf920034",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "f0e0071eae8322c8b005e509e5a1efbee800587a",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "4fa3afdc45b20c13f27c2599c4dd51175f0397ca",
+   "testharness"
+  ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
    "8dcec4e809a75120783eefec05f4d2c723d2d8ce",
    "testharness"
@@ -591763,6 +595261,18 @@
    "404856607ea69f2565f2b4c31e289070034dffd4",
    "testharness"
   ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+   "0bea9859731092e024104cdb5e7dbf060436bc16",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+   "38276c03ff2fc0300c5080c7406352e5d65d767b",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+   "2530effc8cff06f2a11330e9f9ab5b469de2cc97",
+   "testharness"
+  ],
   "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "f7ce280b058c192421b96e10ff548ce87f057693",
    "testharness"
@@ -591787,6 +595297,18 @@
    "0e453531b2ef9df66136b05b09b09fb0fbe1d702",
    "testharness"
   ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "2267b3d737399413a2eae029eeecbb7369384440",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "053e0de51ed8a3a97361bd6d43c74727d4b29dac",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "fcd1eb6d85b6869f79fcf807433a29318c78d175",
+   "testharness"
+  ],
   "referrer-policy/no-referrer-when-downgrade/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html": [
    "3ab7f6838a511559f3125294c30377173c4b16a6",
    "testharness"
@@ -592531,6 +596053,18 @@
    "8dc6b62fd7f1cb9185979d7be035de80d543a598",
    "testharness"
   ],
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+   "b537d5d2c53b8660975622addcf033f70970111b",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html": [
+   "d26f82d3fd9e8ca00332636c18f00e7cda06096e",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+   "3d394ebef91c974bd2eed15fe0682229282312c9",
+   "testharness"
+  ],
   "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
    "5b7658745d0034c7232ca496e4c1b16fd470da35",
    "testharness"
@@ -592555,6 +596089,18 @@
    "718f92ffc44407a5baad224c6ac126cf1588eb82",
    "testharness"
   ],
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+   "fc9c1ae199ac838aae1300e50a6a9a9d86f0fe1e",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html": [
+   "a327bd53a56adb7e298f7fb3712d4e17ae90292b",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+   "87757d9a6957f3053c10e27e37cac4d34bbb39cd",
+   "testharness"
+  ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
    "e81e5f42c0ede2bef8e86664020e782e84b19f14",
    "testharness"
@@ -592579,6 +596125,18 @@
    "483ca114ad9770a1393cf5e9a41768d1a9d13151",
    "testharness"
   ],
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+   "83c60178a18630ec023347aaa6d73ed315778e71",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html": [
+   "2e545cc7fe82ffa7543ccec8f15b5d64d6ef38b1",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+   "cbf5971dadd7b0f436fcdb85ac0e87355b40b6c8",
+   "testharness"
+  ],
   "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
    "e887516f1691c7e8261d6655910a378806615087",
    "testharness"
@@ -592603,6 +596161,18 @@
    "7c94113c5d73e3dc3fdd8bc5dee16142e0d78f78",
    "testharness"
   ],
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+   "fb0c597d3a886879f81aaf64a2c17a5b901b64c6",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html": [
+   "35916403a0839b3c2f8aa72fcb6300739807f694",
+   "testharness"
+  ],
+  "referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+   "db80602e38efd61237a29aa79cad31eba1f0455f",
+   "testharness"
+  ],
   "referrer-policy/no-referrer/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html": [
    "38809ba23121b8aff39aa28df7cf18e07b67d39f",
    "testharness"
@@ -593347,6 +596917,18 @@
    "846b3347d9973dbf46eeae1383be3aaa1d19183d",
    "testharness"
   ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html": [
+   "952700e12aceab33a2af06f23ed1842dff408e09",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html": [
+   "2b3c2c8a10686acabeec43738dad39fc6c2ac5e2",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html": [
+   "c1b4c20e5578ea9a35baca4eae109f5b46215cde",
+   "testharness"
+  ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
    "66cff14960c354e2f82a73e37611d250ad858bb4",
    "testharness"
@@ -593371,6 +596953,18 @@
    "f6e240ecaa2c20359ee1093cba343ff83d75d791",
    "testharness"
   ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html": [
+   "8099689002ac57fdd79ef1c18f537aabcc6848bc",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html": [
+   "08c73d3d1f7b6cfd262c1ce74f81b8f8bc89e5ac",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html": [
+   "c60f9a781a4b5f0b9a90ae6b36cada3b1fbb5a1e",
+   "testharness"
+  ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
    "c9a5e8c5a727b7aaa793a2fd3b3a488d0cac989b",
    "testharness"
@@ -593395,6 +596989,18 @@
    "9cfd20b265862f0d88681ab583a37dc2dbadf342",
    "testharness"
   ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html": [
+   "3d2b96c285cfe4992e6aef78a4652278fa1e7df1",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html": [
+   "c356f80a1b5061d35dbeae0de0710bd5ec39d343",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+   "de794f6dd4bd6f271143e53631b08665d795d4c8",
+   "testharness"
+  ],
   "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
    "59aee1151b51e5d28470c27107798b538b8507af",
    "testharness"
@@ -593451,6 +597057,34 @@
    "ae2d7528298d91bbde7e731ab043ef4b07e0cffc",
    "testharness"
   ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html": [
+   "13af32e9edfe28bb38a2e80c45a9847316f716ff",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html": [
+   "9f0f0b68f9f329cafff9b4b036cf1a184575f4e6",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html": [
+   "d925484a3e4e7d22cd84a337e1438a44a33eb5c5",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+   "d925484a3e4e7d22cd84a337e1438a44a33eb5c5",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html": [
+   "13af32e9edfe28bb38a2e80c45a9847316f716ff",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html": [
+   "9f0f0b68f9f329cafff9b4b036cf1a184575f4e6",
+   "testharness"
+  ],
+  "referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html": [
+   "d925484a3e4e7d22cd84a337e1438a44a33eb5c5",
+   "testharness"
+  ],
   "referrer-policy/origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html": [
    "2adc94235bfce1ecf133c995d3d1038591969d68",
    "testharness"
@@ -594435,6 +598069,18 @@
    "7aa70f80081af9e2044c0e91a8d8f071ad1aaefd",
    "testharness"
   ],
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+   "e998d4c037be765b5199e2ba5fe0370a0c18f93e",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html": [
+   "22f3c4314db0ffbf94ead2afbf9caf0eb9c2eb88",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+   "a17dddd188668f712ca2673a07bee1e3d818148e",
+   "testharness"
+  ],
   "referrer-policy/origin/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
    "4d5c093d8fe412a8b3590a56a3a2e3ea50b06a7a",
    "testharness"
@@ -594459,6 +598105,18 @@
    "0bd358340cfdb2fa864146e7615663130392ee34",
    "testharness"
   ],
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+   "d237c93bfa893788850abdacb266e56fe7b6077f",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html": [
+   "326eb0ebb68a7f91a1edcc4d386b98456c92e0ac",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+   "92c2cc2ef2a79e7943dd859c53fcc82243f9bc56",
+   "testharness"
+  ],
   "referrer-policy/origin/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
    "c02793a136dfee13dc7c1820cda8c68f02a79ab8",
    "testharness"
@@ -594483,6 +598141,18 @@
    "cb8d9d6bd08e87ce579237b73ccb2bbf7c439f5d",
    "testharness"
   ],
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+   "cef6d9c56cb6e5c3774f64fbcac9a98f04d67aef",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html": [
+   "578112023804c8b1e1efa8b99db7edb32ae404aa",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+   "72f855af834e77be887eeaca6de4f0bdefd2112c",
+   "testharness"
+  ],
   "referrer-policy/origin/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
    "67cf05d1c4a0365bf6995e16fdb2460b36582895",
    "testharness"
@@ -594507,6 +598177,18 @@
    "30140e4be783b8c6cf1983ba812fcb4d41db8929",
    "testharness"
   ],
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+   "e596b588cea44e0d45da81108b212ddf56418cd4",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html": [
+   "4f1812804fb75d32ef6f4ccee618e994ae28f9da",
+   "testharness"
+  ],
+  "referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+   "9f8b474c4f26c176002a8f2b4805d868b176a787",
+   "testharness"
+  ],
   "referrer-policy/origin/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html": [
    "e1a6965b397efee4ae6fdb5e2f161e996155ec1d",
    "testharness"
@@ -595251,6 +598933,18 @@
    "cb53c4771987c07f22f0598c178566d23f9f5048",
    "testharness"
   ],
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html": [
+   "a3d250357fba87fe9236bf7a4046ae75954c54ca",
+   "testharness"
+  ],
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html": [
+   "6bf350caf61d5a41f6bbd3adeb98c07ce1b84c32",
+   "testharness"
+  ],
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html": [
+   "f03ebbbe4dbcc9f4bbfddced63b08141c8a59dd0",
+   "testharness"
+  ],
   "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/iframe-tag/cross-origin.keep-origin-redirect.http.html": [
    "cb34aa5dfd6279888cffbe67103d0527c1c5fce1",
    "testharness"
@@ -595275,6 +598969,18 @@
    "bb2c41c615084063bbc911b2f129b054ba894e5d",
    "testharness"
   ],
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html": [
+   "e1a8ea451211c6e3e02304011ed7afc235f4ccd9",
+   "testharness"
+  ],
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html": [
+   "6756257ac973900438e2f30e3fe9448ebdd86a19",
+   "testharness"
+  ],
+  "referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html": [
+   "04ab965d5d752668ecc467a2baa8a7af8b59952b",
+   "testharness"
+  ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-http/iframe-tag/same-origin-insecure.keep-origin-redirect.http.html": [
    "b895a5ed02531a8bbbc21e0efc96ec7de14eba0f",
    "testharness"
@@ -595299,6 +599005,18 @@
    "238d7eaae5f403904aa94b8dfaa69a35f2c8901d",
    "testharness"
   ],
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html": [
+   "010bfbfd2998710beac795d2de1568fe2738f8db",
+   "testharness"
+  ],
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html": [
+   "15cef443f9124e4dbe9a3cef601a43f55ae86efb",
+   "testharness"
+  ],
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+   "e25ccfea21d727bbd95fa034fb32b76402dcc2c5",
+   "testharness"
+  ],
   "referrer-policy/same-origin/attr-referrer/same-origin/http-https/iframe-tag/same-origin-insecure.swap-origin-redirect.http.html": [
    "5276e5db3eb5d859d200ddc2a50315b228865285",
    "testharness"
@@ -595307,6 +599025,10 @@
    "40a82c22b14f58676f1d808ae7036932f955728b",
    "testharness"
   ],
+  "referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html": [
+   "4e701b6d0b80378e9ed2b4682574a9821fc97576",
+   "testharness"
+  ],
   "referrer-policy/same-origin/http-rp/cross-origin/http-http/fetch-request/cross-origin.keep-origin-redirect.http.html": [
    "a333b2c69561eb24e920d56ee83f6d9449b7d76e",
    "testharness"
@@ -595908,11 +599630,11 @@
    "testharness"
   ],
   "referrer-policy/spec.src.json": [
-   "f8eed8168c4682b3d005532c106eebb32c9bf9b4",
+   "549de3a278c5cb471d89ca1c483ad4dafbd86bcf",
    "support"
   ],
   "referrer-policy/spec_json.js": [
-   "694f076b518353393a87dbfd5b8a5d094382325c",
+   "a7752a2be23d80b0e22b178310a7cd6f6b869639",
    "support"
   ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/iframe-tag/cross-insecure.keep-origin-redirect.http.html": [
@@ -595939,6 +599661,18 @@
    "6a7100c237cdc1c1b5af77e89f4c0e39ce04e79c",
    "testharness"
   ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html": [
+   "d27ef0c3a182f460c75b06dd5df47cb6c711b502",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html": [
+   "8fc539a23b9ad18d9ffd9e4f1f99e691b183a440",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html": [
+   "3594647e20b90b7a2d5c91a5643cf572746eb8e7",
+   "testharness"
+  ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "2aaf8a7146d61fa3c5130c24fc7206bc8ad53251",
    "testharness"
@@ -595963,6 +599697,18 @@
    "2f30bdfdfaee06724331f3457abb6896bfd3ed91",
    "testharness"
   ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "fe48edc91843dbb616262c76b91e31c507cec4aa",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "c01400f2f3531f5e8306680b048d6ec4e12faedc",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "ddb846a66f65a7eb921f646672dd7d93cfcc72f3",
+   "testharness"
+  ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/iframe-tag/same-insecure.keep-origin-redirect.http.html": [
    "f833481698590bc5ab0e19e2a81635bd7ff926db",
    "testharness"
@@ -595987,6 +599733,18 @@
    "1e2c351cedb2c31974281cfb95f1c0745f74464a",
    "testharness"
   ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html": [
+   "37d33604006466558f94100fdfa4726ee7dca6db",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html": [
+   "183e1a50e41a85b52323cb2eede9d01555429962",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html": [
+   "e49c2e84263c0020283f29b176899ae3201d87c0",
+   "testharness"
+  ],
   "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "abf47572e186e29b04be5ac8c7db3d8fd9567711",
    "testharness"
@@ -596011,6 +599769,18 @@
    "2eab682f949294399b34ab3f9c2c0a790688c9af",
    "testharness"
   ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "3fad13d7ae819338cb6d33b3e3a3ba603f3724f7",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "7465b3b657f755489446212c8abc1e3bc422476a",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "54badda0b00a60e69dafb45fe194f0f723c5255b",
+   "testharness"
+  ],
   "referrer-policy/strict-origin-when-cross-origin/http-rp/cross-origin/http-http/fetch-request/cross-insecure.keep-origin-redirect.http.html": [
    "625d5298b385892aa49ac074791b04f6d00a514c",
    "testharness"
@@ -596755,6 +600525,18 @@
    "56f0bd5a42f2245c71645b4f9d906560d8ad5415",
    "testharness"
   ],
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+   "3ad0195910c10a0a8f3dc043bd8007d384c4b2ed",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+   "7a9975522ae371b91f044b65e87983f0ad9f9bf2",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+   "d352e744bde02dd1968dce92eb99cc754011874c",
+   "testharness"
+  ],
   "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "788352b0ad1c8167718b36510a9e2c543bc4406e",
    "testharness"
@@ -596779,6 +600561,18 @@
    "266d0889e762ea3ac1a8d2ac3c362a36bb247513",
    "testharness"
   ],
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "125c38d42a7eae0a028019449e483cb445569bcf",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "a39f3f694aebe3319849c9a903787995d1c1ea05",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "3b3234a13acc65e98156980fb33145ee4c65e64a",
+   "testharness"
+  ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
    "eb1885e2e33eb08d5b05c2a7ced3593a18211211",
    "testharness"
@@ -596803,6 +600597,18 @@
    "5a9b51f2e56113d874cdd3fd2491f927e97659b0",
    "testharness"
   ],
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+   "e3ee456285d29db1b377804d5969bb8c1913c83c",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+   "c76033ec9b114b490856063f7817bd7b6cdc929a",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+   "056248a7f63b40454db3bca9e6c991d93583496c",
+   "testharness"
+  ],
   "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "b2cb7c472c70fd7d2f65fd0a2bfa77c13f16c0ae",
    "testharness"
@@ -596827,6 +600633,18 @@
    "c5f215d55e861b4bd6737bdd87b7f025faea214a",
    "testharness"
   ],
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "d7e6b4fd04897ffc7e3691a3495a701060b8dfee",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "d98d198dbaa1e0ea22d9324018515068d95ca0f1",
+   "testharness"
+  ],
+  "referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "ed3f16095cb4ee8104b4d166aac5c10740d77a51",
+   "testharness"
+  ],
   "referrer-policy/strict-origin/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html": [
    "d5009becd67a3581cd223ce5777c8728ab7dd1c0",
    "testharness"
@@ -597571,6 +601389,18 @@
    "ed55d0ef56a18b78a9b55d4c65fb50049a1f8057",
    "testharness"
   ],
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+   "cc1c37f2b88c174d640179a31583d2f7ad4ed0e6",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html": [
+   "e054a13f91fb57fd08e7b799db08f7dadb04ba13",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+   "21db60f6b4da4f8a20f99a236cfd429cccbfbf0c",
+   "testharness"
+  ],
   "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
    "4f18dcafbdbd96ca2a4dd65f98481e4097d60252",
    "testharness"
@@ -597595,6 +601425,18 @@
    "f14acde174681666966419c82a072941ec585a13",
    "testharness"
   ],
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+   "82932e99fa5e5778ecaf2a299d09e9ca3595d0cc",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html": [
+   "af9b6ef65842e80bbb81b61a88159cea3302825f",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+   "d3845f6d8880bc9305ccc05bd2361ee53f111ad5",
+   "testharness"
+  ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/iframe-tag/generic.keep-origin-redirect.http.html": [
    "d569f85bcfae3358525b753f4af2e49ad695f318",
    "testharness"
@@ -597619,6 +601461,18 @@
    "84e45ba2ff455ee250d2e43a880c30c68a89f4b3",
    "testharness"
   ],
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html": [
+   "186fef00293bb890805b6befc631554a63b65f86",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html": [
+   "592a9712e3940bf62300b4b33dec9266d9c02050",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html": [
+   "60ad2f54b943a00bd1266c2789797edf6fa53e13",
+   "testharness"
+  ],
   "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/iframe-tag/generic.keep-origin-redirect.http.html": [
    "d90bb821fec5d79947f112e585ee2f0b3de05cef",
    "testharness"
@@ -597643,6 +601497,18 @@
    "90a22c7ff8c01733f1b12b9836a802727458208a",
    "testharness"
   ],
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html": [
+   "bfd62b8d209da8c0f61e1e91447bd7218fb66be3",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html": [
+   "6ac828cb9fe9a4e36d1c6ac00a20caa7194c91df",
+   "testharness"
+  ],
+  "referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html": [
+   "bead3a46fea2821e483c53e7cb064736752fdfa1",
+   "testharness"
+  ],
   "referrer-policy/unsafe-url/http-rp/cross-origin/http-http/fetch-request/generic.keep-origin-redirect.http.html": [
    "6b8af984abce2e0c32380b196e77ea5d25c298fe",
    "testharness"
@@ -598387,6 +602253,18 @@
    "8d7ba313f0194ddde4c17abc3fbdd762b4817a87",
    "testharness"
   ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+   "0f6fe3cb21327ed650393f7dbff46136f2857cad",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+   "10e75aee08e5f593a19ad80af675a3fb38a14d88",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+   "c834d55ff8d753544695c441c700c135e7e3ceb6",
+   "testharness"
+  ],
   "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "ad8ac960bd8ff67146375f780cd58e9952f33f49",
    "testharness"
@@ -598411,6 +602289,18 @@
    "917d549a711168876cd602de1cc9da27cc46863d",
    "testharness"
   ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "64fea0bc65daa30e3657bbbf17186abf95671339",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "ac3bdb6f6ab82fc2985f491e7b4bdcc425b0865f",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "9c0bbe2835145af7cea2beb88ae4b6390189465d",
+   "testharness"
+  ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/iframe-tag/insecure-protocol.keep-origin-redirect.http.html": [
    "6826b134c95dacb62e9aacb8831ada32994883c6",
    "testharness"
@@ -598435,6 +602325,18 @@
    "1e83c8c91202672482cae762571247ba8a0d460f",
    "testharness"
   ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html": [
+   "d3d72766804958592359280ec08bbb60cb8343a5",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html": [
+   "3c1b07986d4d82b5ddb2718cbccdf96a38475240",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html": [
+   "0dab905cd123fd66834a49229e988c7e48a2dd9c",
+   "testharness"
+  ],
   "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/iframe-tag/upgrade-protocol.keep-origin-redirect.http.html": [
    "84c2c5147aa2e2b99f4d54bf4ab464c44a17a698",
    "testharness"
@@ -598459,6 +602361,18 @@
    "68e51834ff6c49d8db56c4f4e830900bfe1ae63e",
    "testharness"
   ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html": [
+   "81deba7309ad43fa6e7a05e9337188d1565791e5",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html": [
+   "ab8834378a748d9349954ad91485fb7c324b0782",
+   "testharness"
+  ],
+  "referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html": [
+   "95d1f7b4f25c7f0e8783bec6bdcde571406839fe",
+   "testharness"
+  ],
   "referrer-policy/unset-referrer-policy/http-rp/cross-origin/http-http/fetch-request/insecure-protocol.keep-origin-redirect.http.html": [
    "100dee48f27f4e3b2de14e196e08d5c5865fd9e3",
    "testharness"
@@ -598939,6 +602853,10 @@
    "23c8725d3585fcfbe17fb2125f82c3146668ff3a",
    "testharness"
   ],
+  "remote-playback/OWNERS": [
+   "4704befc950341a16c061872e3d57fe9f0f743bf",
+   "support"
+  ],
   "remote-playback/README.md": [
    "ec6bc4453c4f187bd0640195a912a364955f6569",
    "support"
@@ -599388,7 +603306,7 @@
    "testharness"
   ],
   "screen-orientation/page-visibility-manual.html": [
-   "dab433a2b2f0c479f03fc54119b89501c907fda9",
+   "e53d0575971ee59ed235eb08ccf0355d2bb5acbd",
    "manual"
   ],
   "screen-orientation/resources/iframe-listen-orientation-change.html": [
@@ -599399,6 +603317,10 @@
    "27c3eb23f9931697d65c64a2c7a46be77f8961ee",
    "support"
   ],
+  "secure-contexts/OWNERS": [
+   "c7e6702e4472c55bb6e9c543bed62de2d2a7331d",
+   "support"
+  ],
   "secure-contexts/basic-dedicated-worker.html": [
    "3e2dc8d37996552fc830ee6931f67091e83aa174",
    "testharness"
@@ -599647,18 +603569,30 @@
    "01ae6e757d428800555012783e290ebba575bcab",
    "testharness"
   ],
+  "server-timing/OWNERS": [
+   "99acae581c71af3f6306bff62a1172955e83f756",
+   "support"
+  ],
   "server-timing/cross_origin.html": [
-   "661cf7f329590a89aa2644a102a10d1ba34feb75",
+   "e20e60bef34167b4608a837d0ddb311effa20773",
    "testharness"
   ],
   "server-timing/navigation_timing_idl.html": [
    "191f42a92f0ac135de816275920e54fa50065b15",
    "testharness"
   ],
+  "server-timing/navigation_timing_idl.https.html": [
+   "191f42a92f0ac135de816275920e54fa50065b15",
+   "testharness"
+  ],
   "server-timing/resource_timing_idl.html": [
    "eba493537f5d156b4fb074e24787e522ea3c7971",
    "testharness"
   ],
+  "server-timing/resource_timing_idl.https.html": [
+   "eba493537f5d156b4fb074e24787e522ea3c7971",
+   "testharness"
+  ],
   "server-timing/resources/blue.png": [
    "7de5cdb5ad04ac365430b3b5f5ba01d2ba57ea23",
    "support"
@@ -599667,6 +603601,14 @@
    "549289fb534722e17eea4477638e8da59e043c13",
    "support"
   ],
+  "server-timing/resources/blue_tao.png": [
+   "7de5cdb5ad04ac365430b3b5f5ba01d2ba57ea23",
+   "support"
+  ],
+  "server-timing/resources/blue_tao.png.sub.headers": [
+   "b946f1d6581cf7a62aa01e0deda46cd04ef858c4",
+   "support"
+  ],
   "server-timing/resources/green.png": [
    "ef91d21307a12b2cfaf33a90dffe16aa1cba42c9",
    "support"
@@ -600351,6 +604293,18 @@
    "10f756bbf749b7ad8f7c6eb4efe752ee79c44b4a",
    "testharness"
   ],
+  "server-timing/server_timing_header-parsing.https.html": [
+   "10f756bbf749b7ad8f7c6eb4efe752ee79c44b4a",
+   "testharness"
+  ],
+  "server-timing/service_worker_idl.html": [
+   "cb5ea3136399f88fb6c4e8071ad8e3b7ccebb242",
+   "testharness"
+  ],
+  "server-timing/sw.js": [
+   "47e2601a903e34c2c8afc90e544026e8c6d11d05",
+   "support"
+  ],
   "server-timing/test_server_timing.html": [
    "7c778ca856e5cff0bbc785f59c9ccf1ec86456fb",
    "testharness"
@@ -600359,6 +604313,14 @@
    "77000d65537ef522a3471002118a120d2faf296a",
    "support"
   ],
+  "server-timing/test_server_timing.https.html": [
+   "7c778ca856e5cff0bbc785f59c9ccf1ec86456fb",
+   "testharness"
+  ],
+  "server-timing/test_server_timing.https.html.sub.headers": [
+   "77000d65537ef522a3471002118a120d2faf296a",
+   "support"
+  ],
   "service-workers/OWNERS": [
    "153554b1fb793acd7a005c50b12678305e02014a",
    "support"
@@ -600696,7 +604658,7 @@
    "testharness"
   ],
   "service-workers/service-worker/activation.https.html": [
-   "b7a9ca969b4122f1b9adc973c60044a6ab2a2a95",
+   "0babac43537db803219877f24f51c60fb6aabbb0",
    "testharness"
   ],
   "service-workers/service-worker/active.https.html": [
@@ -600792,7 +604754,7 @@
    "testharness"
   ],
   "service-workers/service-worker/detached-context.https.html": [
-   "a4e96edc51927eb29873b0c97a7232f71ae43378",
+   "81fc149311b54f92a2daedd81ffaba33fb88e831",
    "testharness"
   ],
   "service-workers/service-worker/embed-and-object-are-not-intercepted.https.html": [
@@ -601320,7 +605282,7 @@
    "testharness"
   ],
   "service-workers/service-worker/registration-updateviacache.https.html": [
-   "c1caf6840bc36eed4f4ece8e42702151e08b3754",
+   "c5fe71cfb142f80d451f541accaa0120d9923f2b",
    "testharness"
   ],
   "service-workers/service-worker/rejections.https.html": [
@@ -601331,6 +605293,10 @@
    "e93efe04f35ff8c9ce15969a7b3f6373b098c4a8",
    "testharness"
   ],
+  "service-workers/service-worker/resource-timing-cross-origin.https.html": [
+   "a100738d8300a6f8361ed040bda6503be240c2cf",
+   "testharness"
+  ],
   "service-workers/service-worker/resource-timing.https.html": [
    "23cadb03b48a885dbbd9a5dfdc38b5b58f99d18a",
    "testharness"
@@ -601827,6 +605793,10 @@
    "b1a69bedbfbcb8f5b38d35f637f75f167d80118a",
    "support"
   ],
+  "service-workers/service-worker/resources/iframe-with-image.html": [
+   "979ab7a2ad813948d68c7ecdde8349960fbdb867",
+   "support"
+  ],
   "service-workers/service-worker/resources/immutable-prototype-serviceworker.js": [
    "0a428649e0ceaaacdea5d156e829c63668bc3f72",
    "support"
@@ -602184,7 +606154,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/resource-timing-worker.js": [
-   "45dd429936a3e3f558fac21a5a2e69ec7fa5ab5a",
+   "04a965dc0324c035bb3331e546d9bb43230d5eac",
    "support"
   ],
   "service-workers/service-worker/resources/respond-then-throw-worker.js": [
@@ -602271,6 +606241,10 @@
    "fa547a180b73a5422d52c1702c9d1e43b1083f9c",
    "support"
   ],
+  "service-workers/service-worker/resources/square.png.sub.headers": [
+   "34d0864df728804709caf1281dfd86587636fb2f",
+   "support"
+  ],
   "service-workers/service-worker/resources/success.py": [
    "628bc36bef749e1a2ffda104f71a17acee69b13b",
    "support"
@@ -602288,7 +606262,7 @@
    "support"
   ],
   "service-workers/service-worker/resources/test-helpers.sub.js": [
-   "fee1648c02422cd2607b008b9a1ef0834385c69c",
+   "74ea529125a5e2c5cd3d350f7c56ae614f82010d",
    "support"
   ],
   "service-workers/service-worker/resources/testharness-helpers.js": [
@@ -602351,6 +606325,10 @@
    "22fc24fa277508cabfdfa500745b3446e7a8c076",
    "support"
   ],
+  "service-workers/service-worker/resources/worker-fetching-cross-origin.js": [
+   "9bd4fb4507f5d7458b8702c5a0d34116acab4fcb",
+   "support"
+  ],
   "service-workers/service-worker/resources/worker-interception-iframe.https.html": [
    "b9fd4ea281b328c1f21573d1563c968dac52cf22",
    "support"
@@ -603116,7 +607094,7 @@
    "testharness"
   ],
   "shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html": [
-   "c6c873beefb35326c2823703752c2644252dbb69",
+   "61b01f2b7f4a8aa128e885ce67223867e74ee708",
    "testharness"
   ],
   "shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/window-named-properties-001.html": [
@@ -604667,34 +608645,50 @@
    "6ed9e162526cbf37fb07c1cb7abbe79d987601c8",
    "testharness"
   ],
+  "svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html": [
+   "a5fbcba1ea5ba32d55210b0a87b6ecdeafbae5fe",
+   "testharness"
+  ],
+  "svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html": [
+   "18e188a6279e64cbabdd4bb638b06d4a5b22fca8",
+   "support"
+  ],
+  "svg/extensibility/foreignObject/foreign-object-paints-before-rect.html": [
+   "f626d744f7bd101cf31d85e59747e8470fa91398",
+   "reftest"
+  ],
+  "svg/extensibility/foreignObject/foreign-object-size-ref.html": [
+   "cd7374d866ab39c91c0b43e7751b7127c6a8bb23",
+   "support"
+  ],
+  "svg/extensibility/foreignObject/foreign-object-size.html": [
+   "7dc4510474ddc78c95236b19a1ea198b3619cfa6",
+   "reftest"
+  ],
+  "svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html": [
+   "1dc201dc096298f81fd21646fd3bc018c127d0c1",
+   "support"
+  ],
+  "svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html": [
+   "c39d839db59b5fc6adb2ed606b088e4774253372",
+   "reftest"
+  ],
   "svg/extensibility/foreignObject/properties.svg": [
    "974affbb2c135c9aaa7a3f27687157b5e1250a9f",
    "testharness"
   ],
-  "svg/extensibility/foreignObject/stacking-context-expected.html": [
+  "svg/extensibility/foreignObject/stacking-context-ref.html": [
    "6ea850b74b6a03554305ed95df45079bdbcb15dd",
    "support"
   ],
   "svg/extensibility/foreignObject/stacking-context.html": [
-   "ef9026d2b8b27a258c3921139c46692292377dfe",
+   "7e3601ac1fcac50bf989f3767cc81ad84bc99276",
    "reftest"
   ],
   "svg/extensibility/interfaces/foreignObject-graphics.svg": [
    "16a7ef4c64dab3706120a2221dd6bec5ca8e9062",
    "testharness"
   ],
-  "svg/foreignobject/foreign-object-circular-filter-reference-crash.html": [
-   "a5fbcba1ea5ba32d55210b0a87b6ecdeafbae5fe",
-   "testharness"
-  ],
-  "svg/foreignobject/position-svg-root-in-foreign-object-ref.html": [
-   "1dc201dc096298f81fd21646fd3bc018c127d0c1",
-   "support"
-  ],
-  "svg/foreignobject/position-svg-root-in-foreign-object.html": [
-   "c14ce9ff2df60975888de9c5cc31755325701d71",
-   "reftest"
-  ],
   "svg/historical.html": [
    "f18f89f68fdf1266768700235f08e7181ce0e0e1",
    "testharness"
@@ -607340,11 +611334,11 @@
    "support"
   ],
   "touch-events/create-touch-touchlist.html": [
-   "b599de3a9a30809679c7479fe38c2e10c6dfe2df",
+   "4872b365fc9e704fc873b411dd0ab60a509531ab",
    "testharness"
   ],
   "touch-events/historical.html": [
-   "e03c5d8efc58acd552a394f23b66eceeef448f86",
+   "0ccfb39ef6b094dadc6e6ac91de937b5180b2c84",
    "testharness"
   ],
   "touch-events/multi-touch-interactions-manual.html": [
@@ -607356,11 +611350,11 @@
    "support"
   ],
   "touch-events/multi-touch-interfaces-manual.html": [
-   "ed96c462404889ad1115b8efb65226282ce058bf",
+   "59b59712370c421bf3e53ddf975c6758f2bf4b13",
    "manual"
   ],
   "touch-events/single-touch-manual.html": [
-   "948939aac27e2bddc1a5c2dda6a4f911933acf73",
+   "24cf0c09922fd6fc3c767a1a1cf47369bfe8d4f9",
    "manual"
   ],
   "touch-events/touch-globaleventhandler-interface.html": [
@@ -607379,6 +611373,10 @@
    "11c8d88f78cb3e857479000332af49484da99212",
    "testharness"
   ],
+  "trusted-types/OWNERS": [
+   "c7e6702e4472c55bb6e9c543bed62de2d2a7331d",
+   "support"
+  ],
   "trusted-types/TrustedHTML.tentative.html": [
    "1bcbd6d4d990c00449a95fd9c410c199b83b6661",
    "testharness"
@@ -607855,6 +611853,10 @@
    "5bbfdb72bba4bb37a8b27c85fbc5ae5e7470e390",
    "support"
   ],
+  "upgrade-insecure-requests/OWNERS": [
+   "c7e6702e4472c55bb6e9c543bed62de2d2a7331d",
+   "support"
+  ],
   "upgrade-insecure-requests/iframe-redirect-upgrade.https.html": [
    "c5c8b359e0613176641b41d5f2a684e3d017cd1c",
    "testharness"
@@ -607976,7 +611978,7 @@
    "support"
   ],
   "url/README.md": [
-   "165b2a70da8bc2a7df3fe424a540f36b4f7be899",
+   "67bbc49a62ee08a94b7b55fff97e1160bf88bc33",
    "support"
   ],
   "url/a-element-origin-xhtml.xhtml": [
@@ -608008,7 +612010,7 @@
    "testharness"
   ],
   "url/failure.html": [
-   "908456e354703473b0806bbdac6d60216505905f",
+   "82c87b01a847f2821d1d71ea5e1c2ce8528f4deb",
    "testharness"
   ],
   "url/historical.any.js": [
@@ -608020,7 +612022,7 @@
    "testharness"
   ],
   "url/setters_tests.json": [
-   "8d58bd1c98f4d987e6abe66659c812591b197e60",
+   "7c9707c02714de9a17989ecc71775978e994ae8a",
    "support"
   ],
   "url/toascii.json": [
@@ -608064,7 +612066,7 @@
    "testharness"
   ],
   "url/urlsearchparams-foreach.html": [
-   "604154351de9db97183b3cfc149d3ca6c5132723",
+   "8f2adc3468f0f017253ed90fd68872ea0ad1d59f",
    "testharness"
   ],
   "url/urlsearchparams-get.html": [
@@ -608092,7 +612094,7 @@
    "testharness"
   ],
   "url/urltestdata.json": [
-   "59d1f7c678f29a70df885bdfbf9d491899f0038c",
+   "442c5f9d5faeb6752c8b33a04c73f3f3ba82ccb7",
    "support"
   ],
   "user-timing/OWNERS": [
@@ -608199,6 +612201,10 @@
    "3e7332f352713b52fe898941089c89dc1d1bf522",
    "support"
   ],
+  "user-timing/user-timing-tojson.html": [
+   "72a7303180b68b7933df39d4183172fde06f7aac",
+   "testharness"
+  ],
   "user-timing/user_timing_exists.any.js": [
    "b042938e492c9017402e07d3a551d503ec32fa91",
    "testharness"
@@ -608368,627 +612374,627 @@
    "support"
   ],
   "wai-aria/alertdialog_modal_false-manual.html": [
-   "68c8a71cadc32818bf2f4ae2e1b5b06c3dfbc169",
+   "2214933591fd9e41d432dfd479694ab92b43918c",
    "manual"
   ],
   "wai-aria/alertdialog_modal_true-manual.html": [
-   "81119cf76329ec2e7134a77ea964ad29a31fd5c4",
+   "2cd3ce236b612be111c945e4415bfc7c7a0b97a0",
    "manual"
   ],
   "wai-aria/application_activedescendant-manual.html": [
-   "14fa698d19749083c7f3ca357e554495f22248c9",
+   "c31927bb08c8230bdaf2b37126ae517444d1c87f",
    "manual"
   ],
   "wai-aria/application_activedescendant_value_changes-manual.html": [
-   "898ce622e52ed46ce58b8923a757d4c0f0a1705a",
+   "8bfc156154260a70332759e4c7e1ae184bc97824",
    "manual"
   ],
   "wai-aria/aria-current_not_declared-manual.html": [
-   "0f63350ee33dd244b71b5b076211d2bf0fa1b20a",
+   "f04938e083e3cce0995a0787c413d359c596d659",
    "manual"
   ],
   "wai-aria/aria-current_with_value_changes-manual.html": [
-   "9278b8da982531f967d200c5dcbd3d374c78458e",
+   "d34fea4ce904bc65d2a34caae0bd368978a9adc5",
    "manual"
   ],
   "wai-aria/aria-current_with_value_date-manual.html": [
-   "5142568284f266a990aaac4d3be3cdb7774cd815",
+   "4c4ccec4c9b7ab96386997ba7525a002bbfb69da",
    "manual"
   ],
   "wai-aria/aria-current_with_value_location-manual.html": [
-   "9c74ddcabcd68a3a33c4b722a951d548e7381cb2",
+   "eec8bd8ae3fb9cc4ab0bc8de89057130f2fe6b51",
    "manual"
   ],
   "wai-aria/aria-current_with_value_page-manual.html": [
-   "3e52165dbf19d8b51740b21b56a9ac8da9f22dbc",
+   "3c4206de53093ee908c6f022eb04ff4706299fdc",
    "manual"
   ],
   "wai-aria/aria-current_with_value_step-manual.html": [
-   "aa1d055ed14a4801b5b750531227f3b275be90e0",
+   "605a8ccbead874f17db9c1086c1b8c13cbe5e7c9",
    "manual"
   ],
   "wai-aria/aria-current_with_value_time-manual.html": [
-   "46c451ab94f2d7df1d86ae9d5e34b8a484582744",
+   "8a1eae9417529a2d1995ec9b2870f2eace52b129",
    "manual"
   ],
   "wai-aria/aria-current_with_value_true-manual.html": [
-   "cce63c887ce3da546bcf14b2238c8ec27abfaf49",
+   "2ec61c70b8c2e044438dfe6588b76819d6e630f4",
    "manual"
   ],
   "wai-aria/aria-current_with_value_unspecified-manual.html": [
-   "4bcd84c4da792c0cc9bdf4f9e70b4e403af06c96",
+   "684c304726bcaf2c36b3ea265924d2d2c9122e6a",
    "manual"
   ],
   "wai-aria/aria-details_pointing_to_details_element-manual.html": [
-   "60892180a26cd8dfa5cb991616219e0cc3354880",
+   "1d8ae7a06231d87e7f17175fca669797ba8912d6",
    "manual"
   ],
   "wai-aria/aria-details_pointing_to_div_element-manual.html": [
-   "17fe5b8de027cab8c5d0305876307b6de71ce9c9",
+   "dbbb1ab3352f5e630a564059c23972425ac76206",
    "manual"
   ],
   "wai-aria/article_in_feed_posinset_and_setsize-manual.html": [
-   "55b95ad109f110b888856193aeb949bbb48b2422",
+   "9fb168666ca93eeb075f7f83e1a37e46f74200ee",
    "manual"
   ],
   "wai-aria/article_in_feed_setsize_-1-manual.html": [
-   "bc8588586ea12e4f6ea32bc993cb7e6820503273",
+   "e359677b1e2c2149dba577c8ec46fc75d89dff4e",
    "manual"
   ],
   "wai-aria/article_not_in_feed_posinset_and_setsize-manual.html": [
-   "ea70af19b8e0e3fc98b511161cabda07a9b1456d",
+   "c7348915ce20cb2f6acc6ade9b39ac98f5ac9644",
    "manual"
   ],
   "wai-aria/button_haspopup_dialog-manual.html": [
-   "108f4a0796ba86bfbf3547328c43b62c1553d1b5",
+   "c2e8015a4df6afa202cdaa51de0daa669fac0f10",
    "manual"
   ],
   "wai-aria/button_haspopup_emptystring-manual.html": [
-   "d008f881767d98788a280c28f30dd15e0b4507f1",
+   "7b8e19d6ac57ae6c282ea5656292c51375bb0e28",
    "manual"
   ],
   "wai-aria/button_haspopup_false-manual.html": [
-   "cf3d8c78029128c0f9540fa5f340cfce69e28d2d",
+   "9d471f8895b5b7a1d0c5f07af35cdfa3b2c6e32d",
    "manual"
   ],
   "wai-aria/button_haspopup_foo-manual.html": [
-   "e0161c6f138b6d6c6fea5ce5a30b605ccfc2cbc8",
+   "80bbed1e4e98c24261079eee3fd9237f05d9be39",
    "manual"
   ],
   "wai-aria/button_haspopup_grid-manual.html": [
-   "d679d1a2e13a5d73658c804e7fa3ed8465fcfa8a",
+   "8a0d69a22365968a827520b4e21fcca640a2365f",
    "manual"
   ],
   "wai-aria/button_haspopup_listbox-manual.html": [
-   "f4c0e3ea8c2c27588937a3eb24661da832406ecf",
+   "df921f70a9d67746ad78b47a9cf72d1c7f0ce115",
    "manual"
   ],
   "wai-aria/button_haspopup_menu-manual.html": [
-   "e547bf37ad3062035a845b6e8ff85c2082bdcfc4",
+   "bd23557eb7a5018c458c937e9fb4529bd0bbe997",
    "manual"
   ],
   "wai-aria/button_haspopup_tree-manual.html": [
-   "04c5530a3c3b0d97e39a23788304da6085c7c88f",
+   "e2bcb3c8bd243a0a248c3718ae58c1489051dd51",
    "manual"
   ],
   "wai-aria/button_haspopup_true-manual.html": [
-   "06660fa8fe7b4a4a19727c1e1f4e93bf3b7e06fa",
+   "e33f61b329a5cddc37c9220de49682ba7d5af4f4",
    "manual"
   ],
   "wai-aria/button_haspopup_unspecified-manual.html": [
-   "abaf3e93a69898fd35917fcc98d8828dfa1b99a0",
+   "6578c9f123104f5a49ce04f621e74e314c961d39",
    "manual"
   ],
   "wai-aria/button_roledescription_empty-manual.html": [
-   "17b0e96fad091190986d6329e57c0a4ec6f29059",
+   "ba2a1d07376b2df07b3e88b4d88628d47f0e1bd4",
    "manual"
   ],
   "wai-aria/button_roledescription_valid-manual.html": [
-   "eb0a2a85cddceeb1bd107a4e4d43cc9ddfae5fbc",
+   "b1afcd84d1eca53671d056a1445a1c20851659a7",
    "manual"
   ],
   "wai-aria/button_roledescription_whitespace_only-manual.html": [
-   "b6d27fa239c4031ad4bb9fb93fc0eccf391c244b",
+   "cda9928858c3ddbb3b54a9f5beb50ea326463e2a",
    "manual"
   ],
   "wai-aria/cell-manual.html": [
-   "2369dfd3f4f5b8e6af8f325b547f13ecb9e28859",
+   "774bd4305289d3eaf0148db0f36d4b7a798cfd66",
    "manual"
   ],
   "wai-aria/cell_aria-colspan_2_on_div-manual.html": [
-   "9783e733d27321c5c3f84d863043fe0849412a68",
+   "c73677e19db6c2ac1a34320667fb0dbfd8155b02",
    "manual"
   ],
   "wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html": [
-   "cba6254e6306b3647733b1823b1f5543fb6064a9",
+   "0c95f4bb8b8b9d303275bd0141280bb6ce2e7125",
    "manual"
   ],
   "wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html": [
-   "8c1afae9c0188db50ce4205892d23aedf565cc52",
+   "5864eb6ae02bff98223c0e748405fd18dc56284d",
    "manual"
   ],
   "wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html": [
-   "3392bae47ac091fc13dde3b0f456956862b51779",
+   "f5bde1a4fe0aed73dbff632151fdffe979cf8d7a",
    "manual"
   ],
   "wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html": [
-   "d3a95edb251182a03f3484052a037bb406185118",
+   "507aa5c31efbf013bbcde87bb2b2c366ce292445",
    "manual"
   ],
   "wai-aria/cell_aria-rowspan_2_on_div-manual.html": [
-   "cb4f984d568e04062c9088a60dc0aacf889ea673",
+   "388afc520f313b8031bdfe36723176fa9d85b7f8",
    "manual"
   ],
   "wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html": [
-   "25e0bd008d159211311ee22406364943a93d05cb",
+   "c9dfdc3968a2ffe0abaa2ca8149ec703788a31b9",
    "manual"
   ],
   "wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html": [
-   "752117c6c50282b6e63f31ca2ebe28471c94f333",
+   "ffef162303f8b294429a51f5ff901b4a834d9364",
    "manual"
   ],
   "wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html": [
-   "1fe80df91327bd67d4a16cf48b4c6b20e04d10b9",
+   "925d5c9d61b592bcc2c2e9e1705c78532a62fb26",
    "manual"
   ],
   "wai-aria/cell_colindex_4-manual.html": [
-   "41702551c72d187a2d3f0605923065aaa635b302",
+   "6f91d9201d2daf232147e12259aca9d555245371",
    "manual"
   ],
   "wai-aria/cell_rowindex_4-manual.html": [
-   "5fc16311adf938a1c3961d3e27254061ceab2570",
+   "9016627feb3deb919f7675aff91c72f7149d136c",
    "manual"
   ],
   "wai-aria/checkbox_readonly_false-manual.html": [
-   "058bb4a14ac1a1893e0acbe12e4e1476299940c9",
+   "8036d9b67a804c9b5c0464668a3c7466280ce950",
    "manual"
   ],
   "wai-aria/checkbox_readonly_true-manual.html": [
-   "725838c76624e45f116938df24308807b042e4c5",
+   "33a2cab5d0697a6dce4678d457e750d5248753d1",
    "manual"
   ],
   "wai-aria/checkbox_readonly_unspecified-manual.html": [
-   "d024eb792e244e844972a729983a63ddba4762b6",
+   "b8dc490bf12759ff400d9fd129721decacda6bab",
    "manual"
   ],
   "wai-aria/columnheader_aria-colspan_2_on_div-manual.html": [
-   "8af44c7fa3c79d6f414bf5ee927e423770dd066e",
+   "5f461af55656695f89df6c2d2b5fd42626dbab48",
    "manual"
   ],
   "wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html": [
-   "099b9973f09a33a0976693c9410efa4824767780",
+   "5d7b935eba87483abf223c2416ea2d74d2e5b7b4",
    "manual"
   ],
   "wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html": [
-   "bef87265d36cfa93b037746087e9074c44743641",
+   "1470f02d1bff0810054b9ccfcb62685f7f484853",
    "manual"
   ],
   "wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html": [
-   "272c32c2f62d34a87a626f788ab428e71ad7b3e5",
+   "e832c06e6b261e2e025f04d3ad1e354b53298ede",
    "manual"
   ],
   "wai-aria/columnheader_aria-rowspan_2_on_div-manual.html": [
-   "88e831f09c24bb87c250643b272955973244966e",
+   "bcf6b25031d27ac83bbab491286952ada512684d",
    "manual"
   ],
   "wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html": [
-   "9e95976e9856c87c4aab9ec18cedc1c2b18b7413",
+   "1681b870e6ebe3f619f0180ede2dc3b19064e987",
    "manual"
   ],
   "wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html": [
-   "6391733367e9dbffe58c784e510d02850a2b8837",
+   "b3877c2d73df230fb49dbdad580469d254e85ca2",
    "manual"
   ],
   "wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html": [
-   "c8d79061be3616bef54668c6788b86e029ecf563",
+   "f09e5ad4beb4c76e2a2840fc962a90036963afb3",
    "manual"
   ],
   "wai-aria/columnheader_colindex_4-manual.html": [
-   "b5754c7fd7f67bbd0fe304a3c492805c8c808407",
+   "aa98217a0b4dc71bd880e7d014f0eeb8662c38a4",
    "manual"
   ],
   "wai-aria/columnheader_rowindex_4-manual.html": [
-   "761ee820e9284c1b37683155a9b372ed0d3652df",
+   "d7ece3e26fabc7152e26afd26692dedefbc9ad88",
    "manual"
   ],
   "wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html": [
-   "a5194b21acc10f7ce439cc2730cd2c14884905da",
+   "23f09badb1cd77261becb628ba96c08eb540c006",
    "manual"
   ],
   "wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html": [
-   "5a2daef90b1ef37b62f66802e3e4611657443510",
+   "8bc711ecdb51485bedb07bd898b70f21927f362b",
    "manual"
   ],
   "wai-aria/combobox_controls_an_invalid_id-manual.html": [
-   "7bd7949e3668b305a5a623368ed6da2e144e2032",
+   "1d2a1a0456d382abefe019eee4633343dfcc0945",
    "manual"
   ],
   "wai-aria/combobox_haspopup_dialog-manual.html": [
-   "84712f94d0952c201ec3a510f07a5c30ea45fa90",
+   "177751da9179eda369a397855d668c3d6b01647b",
    "manual"
   ],
   "wai-aria/combobox_haspopup_false-manual.html": [
-   "cfd88ca222c07f255ed566c56660fc9681cce69c",
+   "38efe6a9ca2d602acf14d86dcf35c63734e2e014",
    "manual"
   ],
   "wai-aria/combobox_haspopup_grid-manual.html": [
-   "aa45fe6a5877bbfbe7a418513a5efe2279889313",
+   "f2e50308dd725c11c7c36696bf8c47b8793c5a6b",
    "manual"
   ],
   "wai-aria/combobox_haspopup_listbox-manual.html": [
-   "3e4c72e9b5601b834395a5dcd8c9e317e071f079",
+   "88cd0319453da8a55077b733656c3b6ae45e24f6",
    "manual"
   ],
   "wai-aria/combobox_haspopup_menu-manual.html": [
-   "c9a582516c3d701af6d73211315b713ac4f7953f",
+   "520c94eecd9b1032059ef5e466ea1d9e2c6d728d",
    "manual"
   ],
   "wai-aria/combobox_haspopup_tree-manual.html": [
-   "c21fd5d22a2b9a6baa22a44bc5319412b35f89cd",
+   "09a22b99e85a78e58902480b16dcfcdcc33d8aa4",
    "manual"
   ],
   "wai-aria/combobox_haspopup_true-manual.html": [
-   "5c37cccbe5a4a642d0344a61bf6949e0fb773fed",
+   "f3375559a4c739cc7ccc9ff861445cfab6d7cebc",
    "manual"
   ],
   "wai-aria/combobox_haspopup_unspecified-manual.html": [
-   "2e7f0d5ed6da38621543c09019bbbab6e0a21a55",
+   "5cda19935d94780b990d904591d91876c6ac5024",
    "manual"
   ],
   "wai-aria/combobox_orientation_horizontal-manual.html": [
-   "2c42a67ab05697533fae78a33406a9abd0397478",
+   "a043f4f91dcf7b4f0b7b7bfa39a5e84dc4fb2bd5",
    "manual"
   ],
   "wai-aria/combobox_orientation_unspecified-manual.html": [
-   "59bbe7645fa43dcf8b05db1677fd4de4baf01e4a",
+   "51a27aadce1d17fcf44d42200f8ce5ade360a40e",
    "manual"
   ],
   "wai-aria/combobox_orientation_vertical-manual.html": [
-   "281ae8a1d54636527974d722341347e1c2df0d57",
+   "54841c9370707dca17ce83aa79ca2b188213c81d",
    "manual"
   ],
   "wai-aria/combobox_readonly_false-manual.html": [
-   "c0f42748cd164b12fb8b2a02afada5ecb88b93e0",
+   "14c4b8b2edb1cb56bcca9cc57a9adea3624e78ca",
    "manual"
   ],
   "wai-aria/combobox_readonly_true-manual.html": [
-   "bc0c9f2f8bf72d41bdf94ed276e3ae58c5c988f7",
+   "c16617015a2929aa33733ab2e2e498a2431ffad4",
    "manual"
   ],
   "wai-aria/combobox_readonly_unspecified-manual.html": [
-   "c9d7c778a4249153fbd6ea7744e4231e3a4f58b2",
+   "ee9c65a09751a1b46fb267b0e973dc8ead691f39",
    "manual"
   ],
   "wai-aria/dialog_modal_false-manual.html": [
-   "58f1b7506b1b77d71943d9718584e961914dd746",
+   "c33ff09e7086128f94d58a6aa71ea9b70f8554c9",
    "manual"
   ],
   "wai-aria/dialog_modal_true-manual.html": [
-   "db0066cf92f7eb9b2b209c078f5039992c4c1dab",
+   "3b468ea7f5818e962357d01204971b47715093b3",
    "manual"
   ],
   "wai-aria/dialog_modal_unspecified-manual.html": [
-   "38fa5a8ff1627cbfb35978d190422eb2d50dab6d",
+   "9cd734a39d3c6f99be85e8a71c410b8d098e9509",
    "manual"
   ],
   "wai-aria/div_element_without_role_roledescription_valid-manual.html": [
-   "0856d271322865f790130e958c3f1529f7527e62",
+   "e35086fe4748d8f1cf6e6474d1517a6fe2e64647",
    "manual"
   ],
   "wai-aria/errormessage_object_in_invalid_state-manual.html": [
-   "e2777cdbdc84dd824761ec3f0cceb8642a0b092a",
+   "08411ebce5a88be06a3ed3488f1259bc140a3bbe",
    "manual"
   ],
   "wai-aria/errormessage_object_in_valid_state-manual.html": [
-   "a8cbccf6b396b44067876244f98d0b62f83774f5",
+   "76d3d459e45cd3f9253eb50577dae6b0e7ae1bfc",
    "manual"
   ],
   "wai-aria/feed-manual.html": [
-   "1ec93583fcd22913d4650b23f93df495ba7eb940",
+   "43cbc1d30ed948955c061aa0515bddd0509f74f0",
    "manual"
   ],
   "wai-aria/figure-manual.html": [
-   "e082e00d346e721471f03b73374b4c38526be0a9",
+   "c3a69ff5bd8359032cb9b487a4f2c7fec9bae9ab",
    "manual"
   ],
   "wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html": [
-   "13716046d5ca45cb13583922b40fabc705672b21",
+   "6a97401326f64c2e8d5cb625709bed8742ae774e",
    "manual"
   ],
   "wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html": [
-   "96b04b9751b434510f85bbcb61af7875318e80fc",
+   "d81073a7560d6b961e26b2e683c4412d77b7575b",
    "manual"
   ],
   "wai-aria/grid_busy_false-manual.html": [
-   "9f5aba26e274bfac88ca011fd67afeefd82dc573",
+   "1431f217983bbcb0efb59291085c3d771eac1656",
    "manual"
   ],
   "wai-aria/grid_busy_true-manual.html": [
-   "fbd73fad52937eaecc80cceb381f2c460d961234",
+   "109090f9eb33905eac5b096f0393b8ca4534d67e",
    "manual"
   ],
   "wai-aria/grid_busy_value_changes-manual.html": [
-   "f419a3519d0c3355e9262c2a4468a327f54dbd8d",
+   "53bb4b6af58b4fa582b7648e310d287fa29de78f",
    "manual"
   ],
   "wai-aria/grid_colcount_8-manual.html": [
-   "25a8241b4c86a07ab24d639bd7465246ed6e342a",
+   "6ac4d1b4eb78a4fe50016af9132f07a6b6b43996",
    "manual"
   ],
   "wai-aria/grid_columnheader_readonly_false-manual.html": [
-   "25d164213bf6bceb17d8c1592a9e32aaec8bc879",
+   "125da8518386e2749a6ffa0a4560dc9e305c5eef",
    "manual"
   ],
   "wai-aria/grid_columnheader_readonly_true-manual.html": [
-   "369312f28ca1c8686177e634a449b2bf5f0089d0",
+   "eecb196521a8d7e716ae8e4f3cba11d28a942393",
    "manual"
   ],
   "wai-aria/grid_columnheader_readonly_unspecified-manual.html": [
-   "45d9897d73f16fdc19ac25e6a304836d503e044b",
+   "ed733314bde9c73cafaa0a83f8b135436a480117",
    "manual"
   ],
   "wai-aria/grid_columnheader_required_false-manual.html": [
-   "e40b2a1e0b14713978b55b16bb87bc597f4b8550",
+   "a24be163a0b022bbaa1cffa9b3b34be214310c6b",
    "manual"
   ],
   "wai-aria/grid_columnheader_required_true-manual.html": [
-   "7d3b2cdacc03e0e9b575c57009eefd13d9bdb784",
+   "4d228f0a6c7771415b05ed23ebae624805d6849b",
    "manual"
   ],
   "wai-aria/grid_columnheader_required_unspecified-manual.html": [
-   "866dc8878b90126c09538726413c7f768ee48dd4",
+   "fcd967fc1c23c8e55a2a9f1de0ac864f9f5ff728",
    "manual"
   ],
   "wai-aria/grid_rowcount_3-manual.html": [
-   "47a0ce3042898e15e03ee2746b6586767e76066f",
+   "0fa89608eaa54a52d73713398806d934d1418e3e",
    "manual"
   ],
   "wai-aria/grid_rowheader_readonly_false-manual.html": [
-   "69ecf3bb059feb1d33475b0b762f2db4a9e46aa7",
+   "44310ebc7e614894104fe0fdea5c09b0901d10a2",
    "manual"
   ],
   "wai-aria/grid_rowheader_readonly_true-manual.html": [
-   "6f2e76bfbb203ab92ede1fd6de820a4037d79c4f",
+   "6a959528f76665d4abf941e563169d521130a684",
    "manual"
   ],
   "wai-aria/grid_rowheader_readonly_unspecified-manual.html": [
-   "6b0d9a86da3b08110240bf212312e0d2152b74ef",
+   "a713d3a4e7dd01097ba829ea4fb41fb6834411cf",
    "manual"
   ],
   "wai-aria/grid_rowheader_required_false-manual.html": [
-   "33520550b7acf017941c8e2c22c02e085849de21",
+   "81df3f050ee53af1d4147687e0fd0cc8b2e667db",
    "manual"
   ],
   "wai-aria/grid_rowheader_required_true-manual.html": [
-   "85eb3649a12956bb0f06f23642899f526e1fe693",
+   "72cc2adb533915363bdf6c53831ba01709d90fbe",
    "manual"
   ],
   "wai-aria/grid_rowheader_required_unspecified-manual.html": [
-   "948edf09c08b89aa6e3d11d4539a56a23bf7a6af",
+   "51e49d9d9aeee252462a6c01328fdab50d900518",
    "manual"
   ],
   "wai-aria/gridcell_aria-colspan_2_on_div-manual.html": [
-   "e463c3b895a445aa3ddeff7f6d53b86be8f2d405",
+   "3a3b3e7b25ed13929147b7f43058af88c3b2ce9e",
    "manual"
   ],
   "wai-aria/gridcell_aria-rowspan_2_on_div-manual.html": [
-   "dd18af945e17147bb2b639831c92900c0ec5d9ef",
+   "4a4f94160bdd100ce3c1f28db475cfbb362ad1fc",
    "manual"
   ],
   "wai-aria/gridcell_colindex_4-manual.html": [
-   "a6c675d773c11685b6bdb9a52141f483779277a9",
+   "85d607a457a02ddb157f55b161f5c28010507c08",
    "manual"
   ],
   "wai-aria/gridcell_rowindex_4-manual.html": [
-   "29615e12a755dedd0c486028ea58b7a4210953cd",
+   "39d479fb18a7b765b6f275e6073a896ead58608d",
    "manual"
   ],
   "wai-aria/group_hidden_undefined_element_not_rendered-manual.html": [
-   "5a83d0417dbc93b6795ea0bd4f58080dbf70b1be",
+   "8e914db9f9cf9f2a1d310ed1096db3a61fd47206",
    "manual"
   ],
   "wai-aria/group_hidden_undefined_element_rendered-manual.html": [
-   "b7d21c9cd9ce418ad1e85c90a72aaea74350bf5a",
+   "420e116e10384955f1741a5b3ca532018d642fc0",
    "manual"
   ],
   "wai-aria/heading_level_unspecified-manual.html": [
-   "3776012458f8cbdce68e503f2a56e79512e7825f",
+   "812d51693e47e0c51efe2932af91492cad00edfc",
    "manual"
   ],
   "wai-aria/keyshortcuts_multiple_shortcuts-manual.html": [
-   "d2ac7049387ae7bd4f0d38dfca46e38b4d0a68f7",
+   "8237d5deec8d29de45cc086249c137bc70faf761",
    "manual"
   ],
   "wai-aria/keyshortcuts_one_shortcut-manual.html": [
-   "cf820ebb599b8097edb69be4c1551b24ab43a55f",
+   "c09477d160757b32de5435125c65b11c32b3e265",
    "manual"
   ],
   "wai-aria/listbox_busy_false-manual.html": [
-   "44b35c288b1ba06c5d1c59599ef2c8be6b14b61d",
+   "78884cd94efe01a4a9515c39122ff0e0edc832f6",
    "manual"
   ],
   "wai-aria/listbox_busy_true-manual.html": [
-   "b20396f47215f777c5351ac998b8e7d438a341a0",
+   "9ed7a59d26151af14045acfa1083ae3bca4433aa",
    "manual"
   ],
   "wai-aria/listbox_orientation_horizontal-manual.html": [
-   "8d6f01eb9bbd232968163683d086f81dabd6e03d",
+   "73a93166e566d719ba325d93ffbc1889127c72ac",
    "manual"
   ],
   "wai-aria/listbox_orientation_unspecified-manual.html": [
-   "757b5f1983cfddce21316ffc6efc8c7d3b473245",
+   "510332ad1fbb059107d80d6d0886bde1903ff87f",
    "manual"
   ],
   "wai-aria/listbox_orientation_vertical-manual.html": [
-   "9f3b0e23df678ea853a38fd036708a5c99b1dad8",
+   "dc5734f14a9da39ec6b768ca1f703226f8340ca3",
    "manual"
   ],
   "wai-aria/listbox_readonly_false-manual.html": [
-   "6f5fc88fbcd65713a2b11d2995efe4fefa6bcdad",
+   "316fe805228e8876f4150fad38f9f07cc633b48e",
    "manual"
   ],
   "wai-aria/listbox_readonly_true-manual.html": [
-   "a9bec885bc448239ce5fc4810d1ba1ce3b374f2c",
+   "5e6e07b21a8d3bc346651f58a36f01af88779115",
    "manual"
   ],
   "wai-aria/listbox_readonly_unspecified-manual.html": [
-   "d9f6aabfe918604ad7358f9cd5dbd0c8660e0d51",
+   "1a63ce0087e2cf53ce533c11e55820b2570a87bf",
    "manual"
   ],
   "wai-aria/listitem_setsize_-1-manual.html": [
-   "52df1676c1c1ffc3083c1f4660a70df8ac8c5dec",
+   "5487f594684d7d683eaddb36a13c68a1bc511966",
    "manual"
   ],
   "wai-aria/menu_orientation_horizontal-manual.html": [
-   "207ea1baeac038d05aa63b4acfb2b4bfee95a6a1",
+   "d73a6fafc291e7ce29ce233851995341bcbc612c",
    "manual"
   ],
   "wai-aria/menu_orientation_unspecified-manual.html": [
-   "8667ad48461e0d9c48d48fbb32f9bbd6113ea218",
+   "ad5247858a3578d078739b5b8c3bec49e15268c1",
    "manual"
   ],
   "wai-aria/menu_orientation_vertical-manual.html": [
-   "4946be44782f6172c2d3453cbe206e49c0685665",
+   "e4068826d111498d9f4eea09db356dc976d8c291",
    "manual"
   ],
   "wai-aria/menubar_busy_false-manual.html": [
-   "8a03b7ae3025ab854b322c12d528162e3467d030",
+   "6eb5e21cd4f9a1caa7f5c45c0871a3de8f009e52",
    "manual"
   ],
   "wai-aria/menubar_busy_true-manual.html": [
-   "51e683d83464e09e894b5c037da9aa4e812fa7e4",
+   "53c8a1bf8b43c4a882144ed90b3ec81c4d29517b",
    "manual"
   ],
   "wai-aria/menubar_orientation_horizontal-manual.html": [
-   "0dce46771c55df1e9f2f2b00ac958e3602340759",
+   "28077dc88586f1b159244fec8b021c0a5e7a51b2",
    "manual"
   ],
   "wai-aria/menubar_orientation_unspecified-manual.html": [
-   "bc4dc9287e5a95fdd3fed9199499f2b947d036ee",
+   "0d30556023ff84ef0a898d579c466f662488becf",
    "manual"
   ],
   "wai-aria/menubar_orientation_vertical-manual.html": [
-   "c7115c655a70aeb4d35ce1f9eac9a2c687123758",
+   "605e89402a28bfe3e52c1dc02d32f0f242a89b24",
    "manual"
   ],
   "wai-aria/menuitem_posinset_and_setsize-manual.html": [
-   "5dce1f03cc4961eed0ec6813b42653a1229b5d7b",
+   "9f66c7473f487001c4db836db170b7cff3e1ab12",
    "manual"
   ],
   "wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html": [
-   "b0f48dfef7fc382d75bc1aea29bfb15c6bc1940e",
+   "7cdfd2b970d2bd1fc114d832c4d0c0711073ec45",
    "manual"
   ],
   "wai-aria/menuitemcheckbox_readonly_false-manual.html": [
-   "d207839d0ef1761a186aeefff4d7fa53a0f41040",
+   "63f32f05566a1a85ae146b395adcb042c4bcbaef",
    "manual"
   ],
   "wai-aria/menuitemcheckbox_readonly_true-manual.html": [
-   "b6c26c26e07770f4279c530ce3354b449ffe4bfc",
+   "9d5870457a4d50df2b4bf7d4710325f768f859d6",
    "manual"
   ],
   "wai-aria/menuitemcheckbox_readonly_unspecified-manual.html": [
-   "f5435462f1dbaa7e2493b453b5183bbbea333fbd",
+   "5174a8db9b91b94b0496410645b0df56b1071f48",
    "manual"
   ],
   "wai-aria/menuitemradio_posinset_and_setsize-manual.html": [
-   "3cc12d0ddcddecbf870a3a0615914b4c4ca3a741",
+   "0a96f2ef994e3c6428c7dbbcedd48aca5c78370d",
    "manual"
   ],
   "wai-aria/menuitemradio_readonly_false-manual.html": [
-   "88fc3c5514fa07e2ad3641224a3ebbb61778b2e8",
+   "91c0843b151c25b0218045592d3c98aad6df877f",
    "manual"
   ],
   "wai-aria/menuitemradio_readonly_true-manual.html": [
-   "5e082185bd8bfacca8da1dd7b2d147a6b1c528e1",
+   "f5f4a2828e2924e108d137195d2ba91ea66679a6",
    "manual"
   ],
   "wai-aria/menuitemradio_readonly_unspecified-manual.html": [
-   "e3b521691a02724bef7025eecfac91b47a71875d",
+   "a33ea193a875d381f05c653841346bdded371273",
    "manual"
   ],
   "wai-aria/none-manual.html": [
-   "6f177f7c60f6063074cb7b22ff4798818a088a57",
+   "57acf0f0248363194ae9f8449ff4e4cdf9a3cc9b",
    "manual"
   ],
   "wai-aria/option_selected_false-manual.html": [
-   "147b98f2d89560a1c4ab30166ac7df25392ff751",
+   "e4ae75248f2e1c2fcf67446584eb29bd382bc4aa",
    "manual"
   ],
   "wai-aria/option_selected_true-manual.html": [
-   "1e96b25c9464122c2fdd55c491c8c5f4d8d5041c",
+   "d2cf3aec8c474456f61ae2f34aa9ea4965568208",
    "manual"
   ],
   "wai-aria/option_selected_undefined-manual.html": [
-   "48e855811cefd7ea8d7744db5031fe32321978c5",
+   "911381284cd31cc1a1d1c39eb7d9fa98c5f96745",
    "manual"
   ],
   "wai-aria/option_selected_value_changes-manual.html": [
-   "e359cc94d1ef484632bf190876447654a23404ad",
+   "66a0ad451360f18077db4e09cb53fbeede2dfa0e",
    "manual"
   ],
   "wai-aria/radiogroup_orientation_horizontal-manual.html": [
-   "c373a9f15b9c108a03cec7662d92ca21b98cb006",
+   "4a992e57540779bc62c5c26d67ac212b2b3a20dd",
    "manual"
   ],
   "wai-aria/radiogroup_orientation_unspecified-manual.html": [
-   "771cdca0240576bcc253df114799de995c81e0ad",
+   "d1ee7e71fb1ee9ec2ce1cf5371ad2004ed3782d4",
    "manual"
   ],
   "wai-aria/radiogroup_orientation_vertical-manual.html": [
-   "efc922127513bda2d553331f33c4c077053b42e0",
+   "b7cb866c4fcc91ea5afd7926a042408d85d8efbe",
    "manual"
   ],
   "wai-aria/radiogroup_readonly_false-manual.html": [
-   "be82d9478bf8d8f7292daaf0a53af4841c5a34a7",
+   "025286c708ff7c7dc247fc133d0ad636019cf020",
    "manual"
   ],
   "wai-aria/radiogroup_readonly_true-manual.html": [
-   "b2bfef17fa599d5f25fac4811bbe43e615e117ee",
+   "f7088edcfe839301a327ce69751ae2e9a4a19e0f",
    "manual"
   ],
   "wai-aria/radiogroup_readonly_unspecified-manual.html": [
-   "0d4fc6e2740c3d8b0f20f4edd632637f5e7b9542",
+   "6aeec267278f5439528077cc1ec230bc5395b907",
    "manual"
   ],
   "wai-aria/region_with_name-manual.html": [
-   "1200dd9cd7882ddb7d01602723023d379df0eb1c",
+   "39c12fb4f27986528297d0806b15b6f939ab0261",
    "manual"
   ],
   "wai-aria/region_without_name-manual.html": [
-   "a860494a93a7d7d5b01cdd0028b38c4048e51e4b",
+   "08940dbbacb9f954882160468eb467188e8e202c",
    "manual"
   ],
   "wai-aria/row_colindex_4-manual.html": [
-   "d3db5c738273004b2390a0ff49a8637425968626",
+   "3132898938ccd3446aea6526fb64e423f50692cf",
    "manual"
   ],
   "wai-aria/row_rowindex_4-manual.html": [
-   "e668877bd45fc7d249ad8915671d738bf0646cc8",
+   "ddfe366280232db44e4817ed6ed8c004bf89af09",
    "manual"
   ],
   "wai-aria/rowheader_aria-colspan_2_on_div-manual.html": [
-   "3a6b424100bc0e94a6970a18ff21a5be54931721",
+   "f769b49e191332ab241f45bb3b71abc30a4cda7a",
    "manual"
   ],
   "wai-aria/rowheader_aria-rowspan_2_on_div-manual.html": [
-   "4b50fd0b4054963cfc2711e2b7c6987aba1ec75a",
+   "26739d2913a44d6fc992aed4fc8239a2d7b54468",
    "manual"
   ],
   "wai-aria/rowheader_colindex_4-manual.html": [
-   "84c0f043ee5f87fc478fce61055d8bf3c8bdc4a6",
+   "715a78f143de01e5284f722aee3b5542c7279510",
    "manual"
   ],
   "wai-aria/rowheader_rowindex_4-manual.html": [
-   "f4b4d80cc2c804cd03f85db6e2f01408662922b1",
+   "4dabfecc9fbb059c567455ce9c475a6684863bcd",
    "manual"
   ],
   "wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html": [
-   "1ac89c790fc77941821d5b25fa9f80bbc4512421",
+   "fc8ae61138d41fdf9879c33514c0755067ff4e43",
    "manual"
   ],
   "wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html": [
-   "adedbbf77b2b1881dc97e41365ede3159b7c0745",
+   "1b7deb77e11091fd2f5654f19e8d975deb18550e",
    "manual"
   ],
   "wai-aria/scripts/ATTAcomm.js": [
@@ -609000,239 +613006,239 @@
    "support"
   ],
   "wai-aria/scrollbar_all_values_unspecified-manual.html": [
-   "4fe8f7a1640e7343ee583991b5bf93467aa2df52",
+   "fd4558605c2d28cefa9be5af6e577a62b08147fb",
    "manual"
   ],
   "wai-aria/scrollbar_only_valuenow_unspecified-manual.html": [
-   "476de611a9d3437254cbb75aafe0b74fc2eb40de",
+   "6c3a3bd4b0f2e7eca68532634a17d0ad28d2fa99",
    "manual"
   ],
   "wai-aria/scrollbar_orientation_unspecified-manual.html": [
-   "0b232b5bf4c14c11ae57f90b533cfbaae559a7ad",
+   "d3b058efa8bdf91ac82e0c35b919ef997fd83410",
    "manual"
   ],
   "wai-aria/searchbox-manual.html": [
-   "feb163a6b4c81d6c76381aeae8048ed5578151bd",
+   "17f8dd605b88237752652a6c4ec490a40278b634",
    "manual"
   ],
   "wai-aria/searchbox_activedescendant-manual.html": [
-   "dd14675cec701d0f5c06c8bf03d5837aeebe9a7f",
+   "67cddeb872ebe6d2300ccc9479eedc8941b3167a",
    "manual"
   ],
   "wai-aria/searchbox_activedescendant_value_changes-manual.html": [
-   "a8de5f8f1116e4009d158fc2e0c4dc2ebf0b30c5",
+   "203180c556540050e5eeab5857fc5429ba40acfd",
    "manual"
   ],
   "wai-aria/searchbox_autocomplete_both-manual.html": [
-   "7763946ddb6d67a28c294c000370b9b3427b51bc",
+   "e0e0f0ce41a7003d418ed9a3f39266fa11b5dc72",
    "manual"
   ],
   "wai-aria/searchbox_autocomplete_inline-manual.html": [
-   "57285eeb124be858e60aca78ddb32ea94c0866bf",
+   "6066c975be6515705f9f0adedcd9a5c6f0c8e537",
    "manual"
   ],
   "wai-aria/searchbox_autocomplete_list-manual.html": [
-   "b5c9b3cddd08e18eccfdd5e865973c6d9846059d",
+   "d84fae68b5dd37fb6633b95bca09aa9628d92b1a",
    "manual"
   ],
   "wai-aria/searchbox_autocomplete_none-manual.html": [
-   "30a44a4066dda6ad45eec4b10556ce8f48693829",
+   "385e484fac18540ecbadaadaf865b5212af5a82e",
    "manual"
   ],
   "wai-aria/searchbox_autocomplete_unspecified-manual.html": [
-   "a92974567bbb8a7762abbcc726393cad8ccece73",
+   "d25438ae99d3f5ba7ebd65cf6f8a9b132e0bec10",
    "manual"
   ],
   "wai-aria/searchbox_multiline_false-manual.html": [
-   "d75e8e7b1f0abee0ff159a5085d399c29c3b8973",
+   "2d5f84b16b4442c685b6f0aacc64fb47d7f298a5",
    "manual"
   ],
   "wai-aria/searchbox_multiline_true-manual.html": [
-   "ae24cec0788402b73330d86c80f0e1a91def537a",
+   "f384be260a1583224c2f27ec16fb5e47d71ae0bc",
    "manual"
   ],
   "wai-aria/searchbox_multiline_unspecified-manual.html": [
-   "492dc789fed40c60776f8dffa6022c7bb6ac5f36",
+   "6ea29851bd387c0513033ecf5899ca6cbb8005cd",
    "manual"
   ],
   "wai-aria/searchbox_placeholder-manual.html": [
-   "e417f86e61db8cfcea05661654a53a6846c33f90",
+   "b1189a382227951cc680d85f183677d2c31e2499",
    "manual"
   ],
   "wai-aria/searchbox_readonly_false-manual.html": [
-   "074c62ee94902d39ae5c934f0e60efb9d7316e92",
+   "7b79ffa76f36cafa51066935265dab394df367d9",
    "manual"
   ],
   "wai-aria/searchbox_readonly_true-manual.html": [
-   "00c08ed1b329fd47a8c3f95147436c525e552201",
+   "e3500a8ed1b2e24d161ef5707c56f2b9443094fa",
    "manual"
   ],
   "wai-aria/searchbox_readonly_unspecified-manual.html": [
-   "ea8a4407904b1e3e0157007ac960cf2899a24c68",
+   "a4c9ffde1c33fe47ca859dfdc948fde672979c45",
    "manual"
   ],
   "wai-aria/searchbox_required_false-manual.html": [
-   "d0bc17a378163abe1763b868434a6e3f1b44f963",
+   "ecc7a32774da0109db7d6f19d4f37988ace6eba6",
    "manual"
   ],
   "wai-aria/searchbox_required_true-manual.html": [
-   "30dcd28acda9f5aa6554b63bd2a3017cbc1fa575",
+   "5cfa6f5e2e6190a9cef59f1c7cc0f28f373929cc",
    "manual"
   ],
   "wai-aria/searchbox_required_unspecified-manual.html": [
-   "24e3b6cb84507de31c4583bb74752873eaa16258",
+   "7fb3cc602bbe8e5349ead4fcd1948d7321023e28",
    "manual"
   ],
   "wai-aria/separator_focusable_all_values_unspecified-manual.html": [
-   "eff36944c37a10d6aaef3667e6fb0dcd83eeb3ac",
+   "7ad743d54b72a816f8ad588fb1c539570c3bd5f3",
    "manual"
   ],
   "wai-aria/separator_focusable_only_valuenow_unspecified-manual.html": [
-   "50270b9571dec5504619eed1b126d3930de113d1",
+   "c3d26689b598c9e94d8f33cb39242e2080d646ed",
    "manual"
   ],
   "wai-aria/separator_focusable_valuetext-manual.html": [
-   "46b37611b28860f380d4ae3ae5cf8e94f8ff58fe",
+   "6a07d47b112906f7108b25e2178ae29f4bb19290",
    "manual"
   ],
   "wai-aria/separator_orientation_unspecified-manual.html": [
-   "72cf219215e0f9602f305200b211d4b3f846e780",
+   "8d795f445bedb843978d466bb66252555aea727c",
    "manual"
   ],
   "wai-aria/separator_unfocusable_all_values_unspecified-manual.html": [
-   "de8a98e36d471c02024d5e51402f73ab4bd19747",
+   "17c9cf065251a4b104a64b3255247706d758480e",
    "manual"
   ],
   "wai-aria/separator_unfocusable_valuetext-manual.html": [
-   "cb5ded5679f9dee5737bbe56aca270863885b9ed",
+   "aee06b632569b2d4d97acf2a22aab5cf8cf65174",
    "manual"
   ],
   "wai-aria/slider_all_values_unspecified-manual.html": [
-   "0a151a69f4b3eac15d9af37f65782ab63c9f80c6",
+   "91449879ecdbf2667ba3a55ada3b339b33beac9c",
    "manual"
   ],
   "wai-aria/slider_only_valuenow_unspecified-manual.html": [
-   "b9ef4db978d658eb6b3abd661987160cc845abb7",
+   "febbe20600bb4d61241b86b49f00e3ec1daf5140",
    "manual"
   ],
   "wai-aria/slider_orientation_unspecified-manual.html": [
-   "2ac72cd52bf16d3d82cd061297653110d5879be3",
+   "7b8beda876f92c13b20e4ce0a6422944df3122f6",
    "manual"
   ],
   "wai-aria/slider_readonly_false-manual.html": [
-   "d8aa26c156de9f4a97a4a31cf115a570813811b8",
+   "06e82b9ce1ce35c50a085638c36a5da9071804b1",
    "manual"
   ],
   "wai-aria/slider_readonly_true-manual.html": [
-   "954d5fb2adc0429a240d48fb5c323e6228a30fc8",
+   "806df56621071f712c3d2eb710c7ee5594a6564b",
    "manual"
   ],
   "wai-aria/slider_readonly_unspecified-manual.html": [
-   "8a98ae32d296dc966833679d638dbaf7ae18995e",
+   "0ebd95161dcccd60a1732264808d0da65f46f24e",
    "manual"
   ],
   "wai-aria/spinbutton_all_values_unspecified-manual.html": [
-   "cb8639bbf923f16a1d626e194e8ebfbbd684f9fc",
+   "5adef9a7ecf494c81d38ceebb7fb778e2c7f21c9",
    "manual"
   ],
   "wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html": [
-   "3674425097ac4819c6ba9c1177dfac2b4e561d69",
+   "7176d4db2cf523f3f8a2b8e72b95f077ed2a0b40",
    "manual"
   ],
   "wai-aria/spinbutton_readonly_false-manual.html": [
-   "0403e092e86dcb6378453b0127a9b54e634b28de",
+   "e3d2be53703e2c67883f2f15a6faba9e3408d183",
    "manual"
   ],
   "wai-aria/spinbutton_readonly_true-manual.html": [
-   "47193688d79a6f9d46c22646b237a98eb5690fe1",
+   "757ba2feea88cf20c5af5995d35c2a629902d79f",
    "manual"
   ],
   "wai-aria/spinbutton_readonly_unspecified-manual.html": [
-   "fbf40e53e2f991c6aaf515659bf71c6a090a92ac",
+   "9a8dc8f64985ebe8cdc60734e8c2c005b7ee4606",
    "manual"
   ],
   "wai-aria/switch_checked_false-manual.html": [
-   "36c819b01b491f4ecdf6b84fd672699eb9c345b9",
+   "25d0d39fabbe978ec431c87af016741c38f74479",
    "manual"
   ],
   "wai-aria/switch_checked_mixed-manual.html": [
-   "f1a95385e6d02c40d8714fc0ae7c363ca92874e5",
+   "8b4990563cd8c06734f749695a5ebb6146f04c18",
    "manual"
   ],
   "wai-aria/switch_checked_true-manual.html": [
-   "80360ed1af6019dbcf507ca9b2583f473ac292e5",
+   "07d8f82c86dc4325c2f46c0eac85e50fe01a7055",
    "manual"
   ],
   "wai-aria/switch_checked_undefined-manual.html": [
-   "0cb7f30250e94a430a1d6a823dc56d123ff9a26d",
+   "bc3d64ec11738d9ccc1aeb9c320d21f8bdc6d413",
    "manual"
   ],
   "wai-aria/switch_checked_value_changes-manual.html": [
-   "42f4203b9c3dda7512e628603c2989a096fb3200",
+   "2319afc11f9996adc05612e7447b76e2d6f7faaa",
    "manual"
   ],
   "wai-aria/switch_readonly_false-manual.html": [
-   "8aaf6c375293c37f652b10de9887341c75aae74b",
+   "4a04c2938f9bea89e5063c3bcba314fca1fcf22f",
    "manual"
   ],
   "wai-aria/switch_readonly_true-manual.html": [
-   "35e4ed5ac27e810cfed0fc23383e1ca57663e0b5",
+   "ae5ba0e2ef2e5ca3c614c96a498f44b4e7ddebba",
    "manual"
   ],
   "wai-aria/switch_readonly_unspecified-manual.html": [
-   "52979509b5daa2aa436e28d609dbb2e186e39320",
+   "a30d9da2a5205fec7eacee6617ccb4230bab3e3d",
    "manual"
   ],
   "wai-aria/tab_posinset_and_setsize-manual.html": [
-   "561a5b5d3785e26252b633da3900fb88af0705db",
+   "41127dc9108b2c9dd1aea9774e06ffa0d9a30467",
    "manual"
   ],
   "wai-aria/table_colcount_-1-manual.html": [
-   "b387f7abc0b1f6bb98ff075ff161dd73e0b694cc",
+   "0871f677e43f81d70816b34f20a9bd6033f1de13",
    "manual"
   ],
   "wai-aria/table_colcount_8-manual.html": [
-   "2935a284b72da21579cf03dd6192becb85143f87",
+   "d43981921e51ffc912a4fe42208305cc68bbaedc",
    "manual"
   ],
   "wai-aria/table_rowcount_-1-manual.html": [
-   "c537fa6393815df461dcf979fa2ffd2170e688db",
+   "9577cdf976eaee97fd48bdf79991bf399e2ec53b",
    "manual"
   ],
   "wai-aria/table_rowcount_3-manual.html": [
-   "7a00f028a3fb4d57f27acdf0033120ac1621cc55",
+   "98b3af35be9d73e2c0d1abddf18e2a06199510ca",
    "manual"
   ],
   "wai-aria/tablist_orientation_horizontal-manual.html": [
-   "2874e38a586fe85df586eb4f63fd1b47ee5b9691",
+   "ca8551d5bf9f812e9e4b0e37546e9d4756921b52",
    "manual"
   ],
   "wai-aria/tablist_orientation_unspecified-manual.html": [
-   "0f476db12e0a08e8f9a59a92f91ce2321be8194e",
+   "4d5a4d5aca48824144d3f7c789d61b95bf254991",
    "manual"
   ],
   "wai-aria/tablist_orientation_vertical-manual.html": [
-   "8114fc4112021e280b3ae0d4148099c9a274bbec",
+   "7522633eba07cd1089c8ca359b09340fc160b7e3",
    "manual"
   ],
   "wai-aria/term_role-manual.html": [
-   "8f6b3bfa5c5c2edcad6b5de867a957ffcd021999",
+   "166c359674dc451ada5f6937837203cfce6e788c",
    "manual"
   ],
   "wai-aria/textbox_placeholder-manual.html": [
-   "d027578eb8bab6f98a45fa37ecebf54ddf7310bc",
+   "4651808a01e7cb02da585b2bb80e972172796ee3",
    "manual"
   ],
   "wai-aria/toolbar_orientation_horizontal-manual.html": [
-   "e1a0e1b40d281ccabfa66b50eb7c20c396d4c1e9",
+   "c6c97ac67eeb271e4c215d0d028b34820a401c66",
    "manual"
   ],
   "wai-aria/toolbar_orientation_unspecified-manual.html": [
-   "7b4b9bdc5997a34558b4db149ffd53f017933dbc",
+   "e6da61e0af8fb4904a3b013864d6a3268f669b55",
    "manual"
   ],
   "wai-aria/toolbar_orientation_vertical-manual.html": [
-   "dc6cf78657dacad6c2a547c07df672b147d03b2a",
+   "e66d3f93e1af02a6c71383c7cedea51788643e9c",
    "manual"
   ],
   "wai-aria/tools/convert_wiki.pl": [
@@ -609240,55 +613246,55 @@
    "support"
   ],
   "wai-aria/tools/make_tests.pl": [
-   "54a8f59aa4bafab1987f6c1c5016fd6ee44e574a",
+   "0359c634ff904a468221e6e43e149be71933d23e",
    "support"
   ],
   "wai-aria/tree_orientation_horizontal-manual.html": [
-   "6a8bfea8cb1970f9b1a3db6cf226b1cf2028a1cf",
+   "13b932ea0e861e20e6b9a83fe31a7d7d4c76a433",
    "manual"
   ],
   "wai-aria/tree_orientation_unspecified-manual.html": [
-   "3561b3619dbc9e8f501eed1ba11a641748090b04",
+   "ff8e7c8951f8d36342d2dbbc7e66a4f65e6b1375",
    "manual"
   ],
   "wai-aria/tree_orientation_vertical-manual.html": [
-   "76339d1518a278b4ee2f101fd3aec2d5d6d49736",
+   "01bc012761dac90baecad04112f98343e4450da9",
    "manual"
   ],
   "wai-aria/treegrid_colcount_8-manual.html": [
-   "0570ea3de9fe899cd7f235dd594e84f286ed01e2",
+   "49de06a346b175976ecb5fa6c2877228a90b9daa",
    "manual"
   ],
   "wai-aria/treegrid_orientation_horizontal-manual.html": [
-   "3040b777d962f2bdfb45ee45a6a12df6faa9bfc7",
+   "3b920cab3ff2478c5550ac4a39e0532191bb5c47",
    "manual"
   ],
   "wai-aria/treegrid_orientation_unspecified-manual.html": [
-   "790b9a0ad5f7200b6ada1c6b2c8b809e3a0a8449",
+   "446000d817f0d06a6787d6c2f575b4620f4789c0",
    "manual"
   ],
   "wai-aria/treegrid_orientation_vertical-manual.html": [
-   "2cf7399d1a07559a25b24e9444dfca83797a1056",
+   "4307c24f262395a049e4bb6d35e572f07dac8330",
    "manual"
   ],
   "wai-aria/treegrid_rowcount_3-manual.html": [
-   "7dd93febb3cf0264e0806146f24fc01bc65db093",
+   "830c52e6c375320555d9e2fc39db90ca2b09b785",
    "manual"
   ],
   "wai-aria/treeitem_selected_false-manual.html": [
-   "f8415c67231925ead8b95d4c1d0b99e70631a118",
+   "f5b6cdc972b0f4ba28009b8f8c52183fec46811c",
    "manual"
   ],
   "wai-aria/treeitem_selected_true-manual.html": [
-   "036b95e2f0c9c94e95889486b98d778254c1a600",
+   "d8e2cd3cffce3330321fb25c0bf195efb7a80ee6",
    "manual"
   ],
   "wai-aria/treeitem_selected_undefined-manual.html": [
-   "cbc6184c2b9cd7ee1e45a99b9aef9849b383fced",
+   "6af60593f7b8d4bff09b0735fce6f72760e58320",
    "manual"
   ],
   "wai-aria/treeitem_selected_value_changes-manual.html": [
-   "e82b65811aa337b03cfe72d25215c29234b798dd",
+   "c2f608333d243b0a5cb9296a1dc39c168d69527f",
    "manual"
   ],
   "wake-lock/OWNERS": [
@@ -609371,6 +613377,10 @@
    "caaf2634451eb9228c0b20f0ac817d7a3d3fa685",
    "testharness"
   ],
+  "wasm/OWNERS": [
+   "e4284c7c52365b575b20abcf696a5634ef86b769",
+   "support"
+  ],
   "wasm/compile_worker.js": [
    "652193b876206d7a0f361f145469a604d03e3784",
    "support"
@@ -609528,7 +613538,7 @@
    "testharness"
   ],
   "web-animations/interfaces/Animation/idlharness.html": [
-   "c73f39e1c27f1b04b4c44ac4e1e747ef3d24b287",
+   "e6fb57362e315021729a7a81b62fa383e51818e3",
    "testharness"
   ],
   "web-animations/interfaces/Animation/oncancel.html": [
@@ -609560,7 +613570,7 @@
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffect/getComputedTiming.html": [
-   "fc183c88c463e08880cc0ed381474ee69d6e5056",
+   "3bd2527a7e6d135b30ca81a4968e1a4871906429",
    "testharness"
   ],
   "web-animations/interfaces/AnimationEffect/updateTiming.html": [
@@ -609576,7 +613586,7 @@
    "testharness"
   ],
   "web-animations/interfaces/Document/getAnimations.html": [
-   "41edbdf1f03889156068f38d87875387f129924f",
+   "6efcb382f3203dc51487b366c13d463d697ac100",
    "testharness"
   ],
   "web-animations/interfaces/Document/timeline.html": [
@@ -609768,31 +613778,31 @@
    "testharness"
   ],
   "web-nfc/nfc_push_ArrayBuffer-manual.https.html": [
-   "79189e00a1d62f0e1f936d5ca687bb48522dd0bc",
+   "acb2d28a5af18c96a234f4ff3312e7ea1831e23a",
    "manual"
   ],
   "web-nfc/nfc_push_DOMString-manual.https.html": [
-   "f2656df15c0d0cf49eeb3645cf71bc1ab1c967c9",
+   "7cdeafe31291135dd99eb956fc9c6ff1b76211c0",
    "manual"
   ],
   "web-nfc/nfc_recordType_empty-manual.https.html": [
-   "e85ae0dbad98d4f842d3b9d8b4a6f36b8071e5d6",
+   "4c24083a30ca16067454b6131ef2ae9f9ca12e27",
    "manual"
   ],
   "web-nfc/nfc_recordType_json-manual.https.html": [
-   "58a65c05bbb9ba434dffb5d4a4adf9575ee5eaf8",
+   "194fa3df3ba9fd0e817c7c5651766d3c1c3d4292",
    "manual"
   ],
   "web-nfc/nfc_recordType_opaque-manual.https.html": [
-   "3dd5221c1532b10c6aeb1e2380da73977f59993f",
+   "2aad46712ae71944fad51eca2b7a763866ba135f",
    "manual"
   ],
   "web-nfc/nfc_recordType_text-manual.https.html": [
-   "287fb5e7659b0fe56e7747f8d0ecbeb461494b0d",
+   "9971b4c2c05587ceb3c6620fafd53887f0e1815d",
    "manual"
   ],
   "web-nfc/nfc_recordType_url-manual.https.html": [
-   "efeacce32b87627d824131af5624d4f88f1f6045",
+   "f1b038d79eaf826bd52f8f137d4015e00650f81d",
    "manual"
   ],
   "web-nfc/nfc_watch.https.html": [
@@ -609912,13 +613922,17 @@
    "support"
   ],
   "webaudio/js/helpers.js": [
-   "3cb468605c1fa8e5005bc8552b15f7a37ee9b935",
+   "358f8c8b19509c9d0b1f24d098585add5c9f4519",
    "support"
   ],
   "webaudio/refresh_idl.rb": [
    "9ef52c13448d19b241b40a5c81f4a0480c05c5de",
    "support"
   ],
+  "webaudio/resources/audio-param.js": [
+   "d1b1f1fdeb695b9fe72857aa9fca1320b6c36ee1",
+   "support"
+  ],
   "webaudio/resources/audionodeoptions.js": [
    "d7712311bddd23e171e7e1f024aec0a565b08a13",
    "support"
@@ -609959,6 +613973,10 @@
    "a00d7729bc338c12846f36b450b895d7d118f95e",
    "support"
   ],
+  "webaudio/resources/mix-testing.js": [
+   "d35005ab2225da8c4438f2bb4bf3fbed8155f106",
+   "support"
+  ],
   "webaudio/resources/mixing-rules.js": [
    "4508f0205419865b6166340ce6d4f955f914b6b1",
    "support"
@@ -609991,6 +614009,18 @@
    "7e35ac29f00d39c84230535212c0b9ea081951d3",
    "testharness"
   ],
+  "webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html": [
+   "a4058a967414b087e19ad8dd2af0999152f1491c",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html": [
+   "f4a4122ebd500cba1d5fb383369849e31f73d7f7",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html": [
+   "9389a7e0b4c115a756e547225140150136d1103d",
+   "testharness"
+  ],
   "webaudio/the-audio-api/the-analysernode-interface/test-analyser-gain.html": [
    "e2320e33ef1df0155d5fcf536550e0e398b15407",
    "testharness"
@@ -610015,6 +614045,18 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html": [
+   "b9edb1bd4139c0a045936942d35ac8c763460f5b",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html": [
+   "cf04a13efacb1fe79856999db3ef1831749b4af0",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html": [
+   "938459ceae37c527140f30d9fc793536b4290c4b",
+   "testharness"
+  ],
   "webaudio/the-audio-api/the-audiobuffer-interface/ctor-audiobuffer.html": [
    "34d9e7ccb333ce23c838126a4e84918321292d33",
    "testharness"
@@ -610035,6 +614077,18 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html": [
+   "03d32deacab7a98f3cce29562b84158e3f512668",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html": [
+   "0ef6d19b75e1437ea71846d5a0d1af7dd426dc83",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html": [
+   "21ea30d8fa92e908da66e79fd127e8fa0203a4c5",
+   "testharness"
+  ],
   "webaudio/the-audio-api/the-audiodestinationnode-interface/.gitkeep": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -610087,6 +614141,50 @@
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html": [
+   "3a34d654e3f9f150a7efb3e18733ec8c9fc5635e",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html": [
+   "db9fce12e15e0a640f13180e245488c6fab911f4",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html": [
+   "0ce966ac4f2878a64822e997ef683d42f120d4c1",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html": [
+   "6259a5438e1548ffbb3245e1211ae77348441622",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html": [
+   "d40bf6c901e81a22d24ffd3d5142be8f2ae61252",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html": [
+   "5b008e87cad5952ce8bc4ce5e0501decb51ceaeb",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html": [
+   "e5dd2bcc3900d082f23a1ed169a8c2f17c463cca",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html": [
+   "4fef01ac78d1274baec74a7609e65d7a087bb130",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html": [
+   "297e745cd05bedd8d8069136b08cb583f20b474e",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html": [
+   "c9e8ab0b530ad296654697dabf44c6403afbade7",
+   "testharness"
+  ],
+  "webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html": [
+   "debf11e342633d931eb7c14e673a70b8e4ec84c6",
+   "testharness"
+  ],
   "webaudio/the-audio-api/the-audioparam-interface/automation-rate-testing.js": [
    "abd017009aff151436f4f17ea51fe94e20c1cf6a",
    "support"
@@ -610095,6 +614193,10 @@
    "b02f43f108b7e1ba9c33aa0b872ee1bc60d31a25",
    "testharness"
   ],
+  "webaudio/the-audio-api/the-audioparam-interface/event-insertion.html": [
+   "a41ff42bd211f135a9942e885f2134fa41a1e1d7",
+   "testharness"
+  ],
   "webaudio/the-audio-api/the-audioparam-interface/idl-test.html": [
    "871ff25a150ee9a893d4580b13acd79ca3dd5a4d",
    "testharness"
@@ -610743,6 +614845,14 @@
    "b2ebe4b632b1a75e7334b97c3df7075f494dd5c6",
    "support"
   ],
+  "webdriver/tests/accept_alert/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/accept_alert/accept.py": [
+   "840f2ba655688ac1ff7581557f7560f641b61fe8",
+   "wdspec"
+  ],
   "webdriver/tests/actions/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
@@ -610807,36 +614917,56 @@
    "95203777fcc012ab64465287737a89a4ba2c31dc",
    "support"
   ],
-  "webdriver/tests/conftest.py": [
-   "c812269d034c9ca1b8c4f136dd5d0cea52f4d0f0",
+  "webdriver/tests/add_cookie/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/contexts/json_serialize_windowproxy.py": [
-   "d29c82c48b3bd1e2b07c40798a774eb77d6178a5",
+  "webdriver/tests/add_cookie/add.py": [
+   "29891e121def1917c47c70efd19b40ed5f2ea61d",
    "wdspec"
   ],
-  "webdriver/tests/contexts/maximize_window.py": [
-   "e0dfeb6234371077baa7f67a45d7ffa9b61c9759",
+  "webdriver/tests/close_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/close_window/close.py": [
+   "a98fdaa5d8afe6ddca892e8857c134ba24b0e43a",
    "wdspec"
   ],
-  "webdriver/tests/contexts/resizing_and_positioning.py": [
-   "479379109115668183643e8a050396219332887d",
+  "webdriver/tests/close_window/user_prompts.py": [
+   "30c12199dc21e1ffca80662d2cb7ec7bd3d9ef86",
    "wdspec"
   ],
-  "webdriver/tests/cookies/add_cookie.py": [
-   "29891e121def1917c47c70efd19b40ed5f2ea61d",
+  "webdriver/tests/conftest.py": [
+   "c812269d034c9ca1b8c4f136dd5d0cea52f4d0f0",
+   "support"
+  ],
+  "webdriver/tests/delete_cookie/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/delete_cookie/delete.py": [
+   "1f0d6b861be1ed682fd87a402908cee186a3987c",
    "wdspec"
   ],
-  "webdriver/tests/cookies/delete_cookie.py": [
-   "dbb50588ba525f3ec27a7408eaa4c240614696d5",
+  "webdriver/tests/delete_cookie/user_prompts.py": [
+   "65b753bd80a06c3c20b0330f624a4d395fdb7ab2",
    "wdspec"
   ],
-  "webdriver/tests/cookies/get_named_cookie.py": [
-   "a3116e826f4db0221224ccb9a0e0d71ecb1f9a85",
+  "webdriver/tests/dismiss_alert/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/dismiss_alert/dismiss.py": [
+   "e213f1939ff5cc2fbdebb2bd8e9445e284803a60",
    "wdspec"
   ],
-  "webdriver/tests/document_handling/page_source.py": [
-   "5dddfce0a5e43f02b8a050afda8c9a07c43cf797",
+  "webdriver/tests/element_clear/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/element_clear/clear.py": [
+   "d5a0a37d410f5a748aee5ac5be75acb837e491f8",
    "wdspec"
   ],
   "webdriver/tests/element_click/__init__.py": [
@@ -610844,7 +614974,7 @@
    "support"
   ],
   "webdriver/tests/element_click/bubbling.py": [
-   "67d9b7aeb95132759d28696cdcc60a279ccb702a",
+   "492e283b686abe0743d72e31017be149726628f9",
    "wdspec"
   ],
   "webdriver/tests/element_click/select.py": [
@@ -610852,183 +614982,323 @@
    "wdspec"
   ],
   "webdriver/tests/element_click/stale.py": [
-   "37af63203540dfe11d36fe05d74694f05c6505f2",
+   "490b6c17365c5eab24fd4a7ac07be6614a86a934",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/__init__.py": [
+  "webdriver/tests/element_send_keys/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/element_retrieval/find_element.py": [
-   "8c9ed3ac2169f4b65a2e172a6e77b9586d83afa2",
+  "webdriver/tests/element_send_keys/content_editable.py": [
+   "9c071e60e1203cf31120f20874b5f38ba41dacc3",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/find_element_from_element.py": [
-   "4ac7c4f27f19fe0b6a42fe888b478b78d9c4ca7e",
+  "webdriver/tests/element_send_keys/form_controls.py": [
+   "ec6bdf64c7c4d2e3963e89c8410f69f738565f78",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/find_elements.py": [
-   "fa8c2de1ffd12432bf14368b9c72000567ab8d20",
+  "webdriver/tests/element_send_keys/interactability.py": [
+   "5374827c90845ded660d540d23bb7e07ac84e445",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/find_elements_from_element.py": [
-   "0afca7c9c332ac6bc4da4dd9607ae36b42914a14",
+  "webdriver/tests/element_send_keys/scroll_into_view.py": [
+   "e4a50a53a13c1ab76c6c002bbda1c103f8c32ccf",
    "wdspec"
   ],
-  "webdriver/tests/element_retrieval/get_active_element.py": [
-   "7d40a7641dbf04cd78f1dba630afa2e8d80dad13",
+  "webdriver/tests/execute_async_script/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/execute_async_script/collections.py": [
+   "d6c95dfdcbfc3b9cf91cf6f943a17b7cd0fee79d",
    "wdspec"
   ],
-  "webdriver/tests/element_send_keys/__init__.py": [
+  "webdriver/tests/execute_async_script/user_prompts.py": [
+   "8b161d459074d7e2a3e726663cedfb1cd8636f0b",
+   "wdspec"
+  ],
+  "webdriver/tests/execute_script/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/element_send_keys/form_controls.py": [
-   "d169ab4ec07abb0ad3b7b2759f8156d0ab69c6db",
+  "webdriver/tests/execute_script/collections.py": [
+   "0ee4e340b38b6aa59043286755822460e76b2dbd",
    "wdspec"
   ],
-  "webdriver/tests/element_send_keys/interactability.py": [
-   "197bf11c6cae354d9f3cc07f836a857345046e1c",
+  "webdriver/tests/execute_script/cyclic.py": [
+   "21bae43b3a6e966b8698b7c439b29a68029adc58",
    "wdspec"
   ],
-  "webdriver/tests/element_send_keys/scroll_into_view.py": [
-   "fb192d5d1d93aa729b07cadcadfa630587bd0b39",
+  "webdriver/tests/execute_script/json_serialize_windowproxy.py": [
+   "20db10d82ed2b28a22674fcdc37cac0323d33c95",
    "wdspec"
   ],
-  "webdriver/tests/execute_async_script/__init__.py": [
+  "webdriver/tests/execute_script/user_prompts.py": [
+   "0e94c156954b90eca2005f6ad9fa5a4601169fd9",
+   "wdspec"
+  ],
+  "webdriver/tests/find_element/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/execute_async_script/collections.py": [
-   "b10e02dff5437ae2b6ed6cc17141e5643dc1b75d",
+  "webdriver/tests/find_element/find.py": [
+   "9af0db4de0d09cbf68fa43bb40145cffc7b95635",
    "wdspec"
   ],
-  "webdriver/tests/execute_async_script/user_prompts.py": [
-   "cf789bc7a329b78b7d61b894209d064d3d80b3b0",
+  "webdriver/tests/find_element_from_element/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/find_element_from_element/find.py": [
+   "7720ad2042fbb77c032223b224a8593b2a11506a",
    "wdspec"
   ],
-  "webdriver/tests/execute_script/__init__.py": [
+  "webdriver/tests/find_elements/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/execute_script/collections.py": [
-   "7162405055534f77fd7e57419b3cc2a210ddd4e0",
+  "webdriver/tests/find_elements/find.py": [
+   "27757f16906f636f42b82c21f4631eb83056cca8",
    "wdspec"
   ],
-  "webdriver/tests/execute_script/cyclic.py": [
-   "9d8a28b94b8cdac88650b675cb00bf21261444e8",
+  "webdriver/tests/find_elements_from_element/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/find_elements_from_element/find.py": [
+   "2daef29773c98649b04e3d6e97380ba569ec045d",
    "wdspec"
   ],
-  "webdriver/tests/execute_script/user_prompts.py": [
-   "1cb98dd72664cfcfede1255484239f4505c06d20",
+  "webdriver/tests/fullscreen_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/fullscreen_window/fullscreen.py": [
+   "8a6e06b2fbd2ec80326ab1145e6ddfb35c6995b4",
+   "wdspec"
+  ],
+  "webdriver/tests/fullscreen_window/user_prompts.py": [
+   "8d6d68bb6bfa9956db5b33598ae3cf33f7022de4",
    "wdspec"
   ],
-  "webdriver/tests/fullscreen_window.py": [
-   "c244064c0595d9274ddef98c527d193355ba13fa",
+  "webdriver/tests/get_active_element/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_active_element/get.py": [
+   "6d48b8577c9edf5f1e39fae461831de742ff9dd8",
    "wdspec"
   ],
-  "webdriver/tests/get_window_rect.py": [
-   "c9139c16aa950c734c776887d6a762b867790812",
+  "webdriver/tests/get_alert_text/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_alert_text/get.py": [
+   "f3bf7edd86c94e82c4d09973d4a4c7b35c3fa681",
    "wdspec"
   ],
-  "webdriver/tests/interaction/element_clear.py": [
-   "476fad0b4a5a38a9ac15ddeb1c26b0b18fd66e8c",
+  "webdriver/tests/get_current_url/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_current_url/get.py": [
+   "f65054e80f7ddc9a7b8600765929935355b5f447",
    "wdspec"
   ],
-  "webdriver/tests/interaction/send_keys_content_editable.py": [
-   "9c071e60e1203cf31120f20874b5f38ba41dacc3",
+  "webdriver/tests/get_current_url/user_prompts.py": [
+   "3241e1d4dbda430b32763006d558fb53d06ffaa1",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_attribute/get.py": [
+   "3fdd451b8aa73729f25325cb0e43ae389a223ee7",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_property/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_element_property/get.py": [
+   "2b36e390348a37e2138f480a7f36eb08ef6a2ee5",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_property/user_prompts.py": [
+   "84a1817bd815bd8c2267862eb3d5f927f2849777",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_tag_name/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_element_tag_name/get.py": [
+   "66a0b57c29a006b1200e63239a4ea5f8cb90c1bd",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_tag_name/user_prompts.py": [
+   "88ee5a130fb8fb55974b431d24163bd7de8b305f",
+   "wdspec"
+  ],
+  "webdriver/tests/get_element_text/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_element_text/get.py": [
+   "8edcb5068617b13c808ddc336196a7e0e98a8072",
+   "wdspec"
+  ],
+  "webdriver/tests/get_named_cookie/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_named_cookie/get.py": [
+   "a3116e826f4db0221224ccb9a0e0d71ecb1f9a85",
+   "wdspec"
+  ],
+  "webdriver/tests/get_timeouts/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_timeouts/get.py": [
+   "b1d170df31bf2b715a9da639cc3c833dde0a43d6",
+   "wdspec"
+  ],
+  "webdriver/tests/get_title/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_title/get.py": [
+   "69a3e55d2f34dc02285af89d78a75d46e7d1282c",
+   "wdspec"
+  ],
+  "webdriver/tests/get_title/user_prompts.py": [
+   "fd24d562bd7d945de1e5f87c241f4c3717359838",
+   "wdspec"
+  ],
+  "webdriver/tests/get_window_rect/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/get_window_rect/get.py": [
+   "8d687026889e601f4c1987996f4e5306b0f627f9",
+   "wdspec"
+  ],
+  "webdriver/tests/get_window_rect/user_prompts.py": [
+   "5fd2bc48547788bd24b3b5fc38a18209d85a6747",
    "wdspec"
   ],
   "webdriver/tests/interface.html": [
    "f7b2c45ff8b1b5790dd390fbe2ab997766f5d9a8",
    "testharness"
   ],
-  "webdriver/tests/minimize_window.py": [
-   "08d4414ce915f1ebe7825d5d99e204dc331fe155",
+  "webdriver/tests/is_element_selected/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/is_element_selected/selected.py": [
+   "afed5bfc86527410e0fb521f7f75d79bee1fb060",
+   "wdspec"
+  ],
+  "webdriver/tests/is_element_selected/user_prompts.py": [
+   "69d7821499ee460f31ed97f3f839cf6899add8fd",
    "wdspec"
   ],
-  "webdriver/tests/navigation/current_url.py": [
-   "828e40301838c99aa2978733bbce3db3acc185a0",
+  "webdriver/tests/maximize_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/maximize_window/maximize.py": [
+   "be54b714b8d6c8f282ee896af4a449ccba4cd060",
    "wdspec"
   ],
-  "webdriver/tests/navigation/get_title.py": [
-   "2ee18932a8ae3c4190b37e2b28141a6af49cc507",
+  "webdriver/tests/maximize_window/user_prompts.py": [
+   "99afcf2148c524eabee410c5ebb89327467a5e35",
    "wdspec"
   ],
-  "webdriver/tests/sessions/get_timeouts.py": [
-   "eaee354d16aa8c3a0fc960198fa4c5d9365bdee5",
+  "webdriver/tests/minimize_window/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/minimize_window/minimize.py": [
+   "8b59610ffcbb4ab41a74f149dc74d415edfaf60f",
+   "wdspec"
+  ],
+  "webdriver/tests/minimize_window/user_prompts.py": [
+   "668c775a0e60b377a5a558a2a38b8887ac2683a0",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/conftest.py": [
+  "webdriver/tests/new_session/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
+  ],
+  "webdriver/tests/new_session/conftest.py": [
    "d2df38e506cb9a3e501f03fe03e2a31af42d6f04",
    "support"
   ],
-  "webdriver/tests/sessions/new_session/create_alwaysMatch.py": [
+  "webdriver/tests/new_session/create_alwaysMatch.py": [
    "84f8ad0908e9ec787f9db73ff66cbe193c2c9626",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/create_firstMatch.py": [
+  "webdriver/tests/new_session/create_firstMatch.py": [
    "fbdabf1852c07db0f5df2d47954c1cd5d7285492",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/default_values.py": [
+  "webdriver/tests/new_session/default_values.py": [
    "92c26366f8fd0d37587457b9b5a630df4b19cc60",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/invalid_capabilities.py": [
+  "webdriver/tests/new_session/invalid_capabilities.py": [
    "fcc36e5ca46cb8a9fb9927d5f618c7e9433a0260",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/merge.py": [
+  "webdriver/tests/new_session/merge.py": [
    "000b28631bb6d862b654f1f998852f5f1a6b2e12",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/response.py": [
+  "webdriver/tests/new_session/response.py": [
    "5eabb99858b9c3051efb351096d7ba8dca8dbfce",
    "wdspec"
   ],
-  "webdriver/tests/sessions/new_session/support/__init__.py": [
+  "webdriver/tests/new_session/support/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/sessions/new_session/support/create.py": [
+  "webdriver/tests/new_session/support/create.py": [
    "4bfb99fd4ba44ab5b4e70e9246cbb200c098ae89",
    "support"
   ],
-  "webdriver/tests/sessions/status.py": [
-   "75edf0e629d9cd494c63585408c76217ff953722",
-   "wdspec"
+  "webdriver/tests/page_source/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
   ],
-  "webdriver/tests/set_window_rect.py": [
-   "079038aa66cb729cf205aac040a5fe075d01fd8a",
+  "webdriver/tests/page_source/source.py": [
+   "f5e96dee33de36e3626c3e9bbfdd0014b27c305c",
    "wdspec"
   ],
-  "webdriver/tests/state/__init__.py": [
+  "webdriver/tests/send_alert_text/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/state/get_element_attribute.py": [
-   "1fcd451313d40a0b0a84ced63596d032ffc97f2a",
+  "webdriver/tests/send_alert_text/send.py": [
+   "743b0285cb404d5a2aafde268f9ba7e574760bd1",
    "wdspec"
   ],
-  "webdriver/tests/state/get_element_property.py": [
-   "5e5d8e471d69dd8116e37de07abc07af09216f66",
-   "wdspec"
+  "webdriver/tests/set_window_rect/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
   ],
-  "webdriver/tests/state/get_element_tag_name.py": [
-   "ce749e286bd030083fcac15dd75c49caf032f990",
+  "webdriver/tests/set_window_rect/set.py": [
+   "79de443bc251f7effaa7c2ef3b95695f22db01c6",
    "wdspec"
   ],
-  "webdriver/tests/state/is_element_selected.py": [
-   "f52c565da22038a41db7344cbcfa2a6a101cc61d",
+  "webdriver/tests/set_window_rect/user_prompts.py": [
+   "4ed66d05835d3ab229cb90928e0ca2a15ba08c8a",
    "wdspec"
   ],
-  "webdriver/tests/state/text/__init__.py": [
+  "webdriver/tests/status/__init__.py": [
    "da39a3ee5e6b4b0d3255bfef95601890afd80709",
    "support"
   ],
-  "webdriver/tests/state/text/get_text.py": [
-   "570274d59020c4d8d0b8ecd604660ee7d710a165",
+  "webdriver/tests/status/status.py": [
+   "1302349ca7d6a3dcc49e26ca0345023a5c6bbe14",
    "wdspec"
   ],
   "webdriver/tests/support/__init__.py": [
@@ -611040,7 +615310,7 @@
    "support"
   ],
   "webdriver/tests/support/fixtures.py": [
-   "e787c0ef06fcdfc86f337be5af61e492be08ec9c",
+   "126e82c42568c9ecb240e735a2b1361882ecd9ba",
    "support"
   ],
   "webdriver/tests/support/http_request.py": [
@@ -611048,7 +615318,7 @@
    "support"
   ],
   "webdriver/tests/support/inline.py": [
-   "ffabd6a12d6e7928176fa00702214e0c8e0a25d7",
+   "48399821b7abca50df824e37c41829d7a4573be1",
    "support"
   ],
   "webdriver/tests/support/merge_dictionaries.py": [
@@ -611059,25 +615329,17 @@
    "511d4ba0ff21325b7503440b4111fac325139edc",
    "support"
   ],
-  "webdriver/tests/switch_to_parent_frame.py": [
-   "487a0588e9c017640017b775c06c21f919d16fa9",
-   "wdspec"
-  ],
-  "webdriver/tests/user_prompts/accept_alert.py": [
-   "9cd5e82f18455062ec07a5c8a0bef31cfe4ea86f",
-   "wdspec"
-  ],
-  "webdriver/tests/user_prompts/dismiss_alert.py": [
-   "f200db4350a738fc14c9aed853fd3011141e8f3a",
-   "wdspec"
+  "webdriver/tests/switch_to_parent_frame/__init__.py": [
+   "da39a3ee5e6b4b0d3255bfef95601890afd80709",
+   "support"
   ],
-  "webdriver/tests/user_prompts/get_alert_text.py": [
-   "5547f710db1787eb44454988d32a4b52c758e9c2",
+  "webdriver/tests/switch_to_parent_frame/switch.py": [
+   "c184952fc8a78f5edc7d573a9f8440b5eec334cc",
    "wdspec"
   ],
-  "webdriver/tests/user_prompts/send_alert_text.py": [
-   "e6878e7923b1cdddff2450057020de0bf2e6aa7c",
-   "wdspec"
+  "webgl/OWNERS": [
+   "0df8e72f3ab70719aac73d3b06f043fac629939b",
+   "support"
   ],
   "webgl/bufferSubData.html": [
    "526612470551a0eb157b310c587d50080087808d",
@@ -611592,7 +615854,7 @@
    "support"
   ],
   "webrtc/RTCDTMFSender-insertDTMF.https.html": [
-   "79574cff7e0500cecaf7e3ae182e89d98f49ce72",
+   "a5fc15d44fe572744c07d933b9204d9319c968cd",
    "testharness"
   ],
   "webrtc/RTCDTMFSender-ontonechange-long.https.html": [
@@ -611628,7 +615890,11 @@
    "testharness"
   ],
   "webrtc/RTCIceTransport.html": [
-   "c145a8a34c79dd970475e77ff5bf1a363c0ac56c",
+   "db758cc2a744c049c291575e408dbb5f280cdf19",
+   "testharness"
+  ],
+  "webrtc/RTCPeerConnection-add-track-no-deadlock.https.html": [
+   "a16eaf6805528c2b73650694f26568f41be5d5ff",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-addIceCandidate.html": [
@@ -611644,7 +615910,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-canTrickleIceCandidates.html": [
-   "0f585a89bd8f25aa8f83b6ec39b704cbb8e970b2",
+   "8401fdc22f8f8867aa361f6a83834cdeb7a2a9d1",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-connectionState.html": [
@@ -611680,11 +615946,11 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-getIdentityAssertion.html": [
-   "14467ef5431d17e7c6d37d78919c363cd5c98c6f",
+   "e87f8367bcd63ed4407e256b6fea42f9f66ecd40",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-getStats.https.html": [
-   "9446d7bc1aefa7edd28b425415d983d69311e0ca",
+   "913cbc3d2aaf724e70108e7854f56ad5bb9b2283",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-getTransceivers.html": [
@@ -611716,7 +615982,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-peerIdentity.html": [
-   "1cc5702e0aee887d925d2bf3471ac759d7430874",
+   "5aa9f3d712dd320cc85645abd39f960b5072349b",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-removeTrack.https.html": [
@@ -611724,7 +615990,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setDescription-transceiver.html": [
-   "aab677c9196488544b30c7eecd180c3046290bb2",
+   "a21fe04592ad6941aa4277535d6482519b67ae74",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setLocalDescription-answer.html": [
@@ -611772,7 +616038,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription.html": [
-   "2a2e3f9ff0a5912fa260d7124f7f5a9c3862c533",
+   "dc96d96b1bd10da63021adbd2a48b2f4fb35d31f",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-track-stats.https.html": [
@@ -611820,7 +616086,7 @@
    "testharness"
   ],
   "webrtc/RTCRtpReceiver-getContributingSources.https.html": [
-   "a81980a24e23e9c5c350d65be05bae97b3ef1e6d",
+   "11a63da6218738b5d67f0a7f15e57a077e76ba89",
    "testharness"
   ],
   "webrtc/RTCRtpReceiver-getParameters.html": [
@@ -611828,11 +616094,11 @@
    "testharness"
   ],
   "webrtc/RTCRtpReceiver-getStats.https.html": [
-   "a74bf84faa66028f23c5c0de8ea7b1e89aeed98b",
+   "ac5c0244fe64a5c07a7d255003c783e27a699728",
    "testharness"
   ],
   "webrtc/RTCRtpReceiver-getSynchronizationSources.https.html": [
-   "56d0157f4ce987436c12ddff886b74549abbe682",
+   "11aa1d9f6833dd019ae7ade7b9ec14780f271650",
    "testharness"
   ],
   "webrtc/RTCRtpSender-getCapabilities.html": [
@@ -611840,7 +616106,7 @@
    "testharness"
   ],
   "webrtc/RTCRtpSender-getStats.https.html": [
-   "64c4424e36c566294a317fb423eb02e97a9ebbca",
+   "ee215306e1d9d1fdcb65bd5244da09fb2005e799",
    "testharness"
   ],
   "webrtc/RTCRtpSender-replaceTrack.html": [
@@ -611904,7 +616170,7 @@
    "testharness"
   ],
   "webrtc/identity-helper.js": [
-   "c7639c627cceaad0e122d83ccde429d044c0773d",
+   "7e12bca67dadbdcec5cbba31817dbec3f01da57c",
    "support"
   ],
   "webrtc/interfaces.https.html": [
@@ -611919,6 +616185,14 @@
    "f0292ca52ee86920d0fdb8bccae2bc40a8ef99af",
    "testharness"
   ],
+  "webrtc/protocol/README.txt": [
+   "af7066f4e223c39ff45a095c78acf4ca59a211ba",
+   "support"
+  ],
+  "webrtc/protocol/video-codecs.html": [
+   "60f8a95a3fe3aac9b361e52d2d974cdd2483a46d",
+   "testharness"
+  ],
   "webrtc/simplecall.https.html": [
    "146432ca56e487a035df8ad9d5a7fa4a495b5405",
    "testharness"
@@ -613172,7 +617446,15 @@
    "support"
   ],
   "webusb/resources/usb-helpers.js": [
-   "c11bbbd5997aead080a98980bc86ae2ab757c5a9",
+   "7a5878c9f4c472bafa8f3db026573feba8e746b0",
+   "support"
+  ],
+  "webusb/resources/usb.dedicatedworker.sharedworker.js": [
+   "03b6be56c0697a47598582f0f94c138a275c0be1",
+   "support"
+  ],
+  "webusb/resources/usb.serviceworker.js": [
+   "04f3078ecce997964c055ef52dfbbc16bc367d78",
    "support"
   ],
   "webusb/usb-allowed-by-feature-policy-attribute-redirect-on-load.https.sub.html": [
@@ -613243,6 +617525,18 @@
    "f08a98a927d57cda8b780a8304a0fa6cf727cc81",
    "testharness"
   ],
+  "webusb/worker/usb.dedicatedworker.https.html": [
+   "556e26de5f184609e0e49f02795f96aef524a7c2",
+   "testharness"
+  ],
+  "webusb/worker/usb.serviceworker.https.html": [
+   "e225db3ae598448f9d02273f5df90d5078c4fbf2",
+   "testharness"
+  ],
+  "webusb/worker/usb.sharedworker.https.html": [
+   "54351ba4a607da19d5f190884b84c9cbea2e41b7",
+   "testharness"
+  ],
   "webvr/OWNERS": [
    "adb04954bffbb33f29864668db95f5c5367d6a05",
    "support"
@@ -616112,7 +620406,7 @@
    "support"
   ],
   "webxr/interfaces.https.html": [
-   "22e2278ab484ced51fd0a3880d2bfbf610650371",
+   "b723ad7105c7e5c12ba5fe75ceac3de3d990dfe2",
    "testharness"
   ],
   "webxr/resources/webxr_check.html": [
@@ -616828,33 +621122,53 @@
    "testharness"
   ],
   "workers/modules/dedicated-worker-import-meta.html": [
-   "ba8b24064e23f018ffd3ac9e4184d6f856123bff",
+   "32cd3419ff904a2440d9a6eaa7cb28f78d4a7e32",
    "testharness"
   ],
   "workers/modules/dedicated-worker-import.html": [
-   "752698b4f8f7298ca2ecc74d41887117a636118a",
+   "b9f5a7a0384ac3f34c48f32a378b758880f59b06",
+   "testharness"
+  ],
+  "workers/modules/dedicated-worker-options-credentials.html": [
+   "1d6a1629f81d26efcd05bf1c7d40011609238f4f",
    "testharness"
   ],
+  "workers/modules/dedicated-worker-options-credentials.html.headers": [
+   "0de4f6326452e016161eabf248e047253507b79d",
+   "support"
+  ],
   "workers/modules/dedicated-worker-options-type.html": [
    "9f6f1be759beb885e2baa746e36ace83685f649b",
    "testharness"
   ],
+  "workers/modules/resources/credentials.py": [
+   "62927510808ddb19a3e6fb11df3d894b3696c2b8",
+   "support"
+  ],
   "workers/modules/resources/dynamic-import-and-then-static-import-worker.js": [
    "f4df69196f64cd81e92705186325004ac94db659",
    "support"
   ],
   "workers/modules/resources/dynamic-import-given-url-worker.js": [
-   "372686abd1b2d2d09228a44f6420c646319e0bd1",
+   "0d2cfe16d71bb17577c6cf6cde5973c18c2c70fe",
    "support"
   ],
   "workers/modules/resources/dynamic-import-worker.js": [
    "444e313fe51923097e3672d88d0afd30aac5ecab",
    "support"
   ],
+  "workers/modules/resources/empty-worker.js": [
+   "84b3339c3419e318803e51f46d7252d9e8ac183b",
+   "support"
+  ],
   "workers/modules/resources/import-meta-url-worker.js": [
    "83f231a886c36543721c2b0204c18b97d10968f8",
    "support"
   ],
+  "workers/modules/resources/import-scripts-worker.js": [
+   "3fd01d578893de9ea6f19dadb5f34136b459e96e",
+   "support"
+  ],
   "workers/modules/resources/nested-dynamic-import-worker.js": [
    "4ee05f3be8a1b41a9e2fa3e24d40ec5103f67eac",
    "support"
@@ -616871,6 +621185,10 @@
    "f69987442b6a223a868e6c1a7ca6d9cee2976068",
    "support"
   ],
+  "workers/modules/resources/static-import-non-existent-script-worker.js": [
+   "e8e1f0aedcc780aac742af01387dd151b10104bc",
+   "support"
+  ],
   "workers/modules/resources/static-import-worker.js": [
    "6d5fb2c553d2f32cdd16722a85bd65e0a172768c",
    "support"
@@ -617095,30 +621413,14 @@
    "2d4308cba02b09c6f583783312317b885089e78c",
    "testharness"
   ],
-  "workers/semantics/structured-clone/common.js": [
-   "25b8197804b16b1deba10303eb7325e87f8f14d4",
-   "support"
-  ],
   "workers/semantics/structured-clone/dedicated.html": [
-   "3d2a1980b793fa385482dcb109ace6e5052d84c3",
+   "2b779dd62c6ee6fbd17a312ab21e822fd07b9bd6",
    "testharness"
   ],
-  "workers/semantics/structured-clone/dedicated.js": [
-   "e3b6de69002b2de825043a41b393f0b0a85fa2e5",
-   "support"
-  ],
   "workers/semantics/structured-clone/shared.html": [
-   "d85e6a73861fd7c7f0512dcb271700e5c7a5aff0",
+   "7db4e83fc461c0e331dac2807bd4d7c86ceb5b81",
    "testharness"
   ],
-  "workers/semantics/structured-clone/shared.js": [
-   "dbf3ac6451abd6bb6bd75a30dd6b2fe8d5976ea6",
-   "support"
-  ],
-  "workers/semantics/structured-clone/worker-common.js": [
-   "9d1c0adfcc82e9db2e5034255c82f5fba6268093",
-   "support"
-  ],
   "workers/semantics/xhr/001-1.xml": [
    "d4656827fb5e5b4dddfdfc748aa9187dbfdfb6e4",
    "support"
@@ -617255,6 +621557,10 @@
    "c6a02eed61fe26e59252314cbbe090eeed9de9ca",
    "testharness"
   ],
+  "worklets/OWNERS": [
+   "e2dd08513daf7b513cf2db811841d50153999954",
+   "support"
+  ],
   "worklets/README.md": [
    "33a3530260a18e74dd96470d9890bbdb4ecdb08d",
    "support"
@@ -617324,7 +621630,7 @@
    "support"
   ],
   "worklets/resources/credentials-tests.js": [
-   "642b8039439a20609788d36a0bc7d116fc8e4f6d",
+   "bddea8fd1aeab9ae3c6d6c0c6d3d286299e31b2e",
    "support"
   ],
   "worklets/resources/credentials.py": [
@@ -617416,7 +621722,7 @@
    "support"
   ],
   "worklets/resources/service-worker-interception-tests.js": [
-   "e23072b8b5695b7669d855197285b8ec3534b6e7",
+   "42ebe0dd946d39dcf3c211581a15d0f648a67a08",
    "support"
   ],
   "worklets/resources/service-worker.js": [
@@ -617439,6 +621745,10 @@
    "2984dfb09c88d7a1831a60d62c64c9b2ec2f6673",
    "support"
   ],
+  "x-frame-options/README.md": [
+   "cb5f2cb5d74263ce584e1ad76045a04afae4ba0a",
+   "support"
+  ],
   "x-frame-options/deny.sub.html": [
    "eb6b6474a393714f62a85bf435e7f342ceff2e0e",
    "testharness"
@@ -617620,15 +621930,15 @@
    "testharness"
   ],
   "xhr/access-control-basic-denied.htm": [
-   "b83febc0462507d5a26be9b801cd7842b97f6e90",
+   "665f4c60237b69e3f85cc18785fffc93e6bed11e",
    "testharness"
   ],
   "xhr/access-control-basic-get-fail-non-simple.htm": [
-   "54815c2c527f83e0dd2e4d0462efce8c91cdda6e",
+   "633746c76163c9e2427068c1d7dc7acd77ff1feb",
    "testharness"
   ],
   "xhr/access-control-basic-non-cors-safelisted-content-type.htm": [
-   "69be9a4a9241abd923539c351e60ff6f32b9790b",
+   "f13827add41610f3595d504780e289daccfb6b84",
    "testharness"
   ],
   "xhr/access-control-basic-post-success-no-content-type.htm": [
@@ -617636,7 +621946,7 @@
    "testharness"
   ],
   "xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm": [
-   "94c893c91a4ab574e956f4a27c62d5c294e29d7a",
+   "47266b34b4371387d8bdba2ac80feb0d6f7678c0",
    "testharness"
   ],
   "xhr/access-control-basic-preflight-denied.htm": [
@@ -617700,15 +622010,15 @@
    "testharness"
   ],
   "xhr/access-control-preflight-sync-header-denied.htm": [
-   "f10476c35d6316b90bebfc38fe5f4bf436b6d89b",
+   "d2f129e8190e7b7255ec816c0fbca921e24d590a",
    "testharness"
   ],
   "xhr/access-control-preflight-sync-method-denied.htm": [
-   "34b48c93dc7b4875082378c73d08eb0b22706e94",
+   "d20f43761f78b5b8679b7a25c41bf7493f754f40",
    "testharness"
   ],
   "xhr/access-control-preflight-sync-not-supported.htm": [
-   "bc71e3358aab575c9732eebe36eb4152964691cd",
+   "0afed5f832be48edf1f2f2118e95ddaf88025c97",
    "testharness"
   ],
   "xhr/access-control-recursive-failed-request.htm": [
@@ -617764,11 +622074,11 @@
    "testharness"
   ],
   "xhr/event-error-order.sub.html": [
-   "5d0328ace02c4e7075bcc310392940bb67bd627d",
+   "684305e60b6b116cf191992df94d46d98c077ea6",
    "testharness"
   ],
   "xhr/event-error.sub.html": [
-   "040207a85f39b12755bfb909afc3c31b0d823698",
+   "0504023101398c690fd231b7c301ce973aae8967",
    "testharness"
   ],
   "xhr/event-load.htm": [
@@ -618728,11 +623038,11 @@
    "testharness"
   ],
   "xhr/send-network-error-async-events.sub.htm": [
-   "85d0484051e19077c1dd0fde8845761fdca45b5a",
+   "7bf76749e25cfcd6472e45673fccedb121cc58f4",
    "testharness"
   ],
   "xhr/send-network-error-sync-events.sub.htm": [
-   "8dd189e5d654c1fc46808dbd860ed0b055851227",
+   "fdc6135b6834556c49943cc9a4d1fa8e75983e65",
    "testharness"
   ],
   "xhr/send-no-response-event-loadend.htm": [
@@ -618899,6 +623209,10 @@
    "42182437d8c1015339825c035127877f4970decb",
    "testharness"
   ],
+  "xhr/sync-no-progress.any.js": [
+   "db6171c61a37cd98ea5b9c1549432f1e2b53e7eb",
+   "testharness"
+  ],
   "xhr/template-element.html": [
    "748f12beaa646e244f8312afd545f56075cac727",
    "testharness"
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js.ini
new file mode 100644
index 000000000000..747bb9007a10
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_AES-CBC.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_AES-CBC.https.any.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js.ini
deleted file mode 100644
index 8ac82d02f130..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_AES-CBC.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js.ini
new file mode 100644
index 000000000000..01bfb625629f
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_AES-CTR.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_AES-CTR.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js.ini
deleted file mode 100644
index 965b8f240387..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_AES-CTR.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js.ini
new file mode 100644
index 000000000000..724fcb62a474
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_AES-GCM.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_AES-GCM.https.any.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js.ini
deleted file mode 100644
index 2dfaeb46c7e9..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_AES-GCM.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js.ini
new file mode 100644
index 000000000000..ff49a47c28cf
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_AES-KW.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_AES-KW.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js.ini
deleted file mode 100644
index d1de9f827a08..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_AES-KW.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDH.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDH.https.any.js.ini
new file mode 100644
index 000000000000..d68b8feea7c9
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDH.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_ECDH.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_ECDH.https.any.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js.ini
deleted file mode 100644
index b5483769a8ae..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_ECDH.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js.ini
new file mode 100644
index 000000000000..bcd83ba3f05d
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_ECDSA.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_ECDSA.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js.ini
deleted file mode 100644
index 41afcd71a309..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_ECDSA.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_HMAC.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_HMAC.https.any.js.ini
new file mode 100644
index 000000000000..6c6b095c84a6
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_HMAC.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_HMAC.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_HMAC.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js.ini
deleted file mode 100644
index e9b1b81046d3..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_HMAC.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js.ini
new file mode 100644
index 000000000000..46d87f2903d8
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_RSA-OAEP.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_RSA-OAEP.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js.ini
deleted file mode 100644
index caa72afe8193..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_RSA-OAEP.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js.ini
new file mode 100644
index 000000000000..f10928c61999
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_RSA-PSS.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_RSA-PSS.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js.ini
deleted file mode 100644
index e0caa79ea4fe..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_RSA-PSS.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js.ini
new file mode 100644
index 000000000000..8a3ec2222d18
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js.ini
@@ -0,0 +1,9 @@
+[failures_RSASSA-PKCS1-v1_5.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[failures_RSASSA-PKCS1-v1_5.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js.ini
deleted file mode 100644
index 18d6ba47d039..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[failures_RSASSA-PKCS1-v1_5.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js.ini
new file mode 100644
index 000000000000..35c0c6b6cf1d
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js.ini
@@ -0,0 +1,9 @@
+[successes_AES-CBC.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_AES-CBC.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js.ini
deleted file mode 100644
index 1e211bb6f65e..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_AES-CBC.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js.ini
new file mode 100644
index 000000000000..a33629bd16cc
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js.ini
@@ -0,0 +1,9 @@
+[successes_AES-CTR.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_AES-CTR.https.any.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js.ini
deleted file mode 100644
index a2883df07a68..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_AES-CTR.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js.ini
new file mode 100644
index 000000000000..469bc10db4a6
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js.ini
@@ -0,0 +1,9 @@
+[successes_AES-GCM.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_AES-GCM.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js.ini
deleted file mode 100644
index 0dd50458c8a4..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_AES-GCM.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js.ini
new file mode 100644
index 000000000000..6a25700c931a
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js.ini
@@ -0,0 +1,9 @@
+[successes_AES-KW.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_AES-KW.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js.ini
deleted file mode 100644
index 6a3dc9d94c24..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_AES-KW.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDH.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDH.https.any.js.ini
new file mode 100644
index 000000000000..21f9b845fd8b
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDH.https.any.js.ini
@@ -0,0 +1,9 @@
+[successes_ECDH.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_ECDH.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js.ini
deleted file mode 100644
index e4ed8296c893..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_ECDH.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js.ini
new file mode 100644
index 000000000000..0933802da49e
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js.ini
@@ -0,0 +1,9 @@
+[successes_ECDSA.https.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_ECDSA.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js.ini
deleted file mode 100644
index 605c0e88f46e..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_ECDSA.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_HMAC.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_HMAC.https.any.js.ini
new file mode 100644
index 000000000000..3f64336de856
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_HMAC.https.any.js.ini
@@ -0,0 +1,9 @@
+[successes_HMAC.https.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_HMAC.https.any.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js.ini
deleted file mode 100644
index 10ad8a77ee06..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_HMAC.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js.ini
new file mode 100644
index 000000000000..5d4624aa2f50
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js.ini
@@ -0,0 +1,159 @@
+[successes_RSA-OAEP.https.any.html?1-10]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?131-140]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?71-80]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?101-110]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?111-120]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?41-50]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?141-150]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?121-130]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?151-last]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?61-70]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?51-60]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?141-150]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?31-40]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?21-30]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?151-last]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?61-70]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?81-90]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?111-120]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?81-90]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?71-80]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?21-30]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?101-110]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?51-60]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?91-100]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?41-50]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?1-10]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?11-20]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.html?31-40]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?91-100]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?131-140]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?11-20]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-OAEP.https.any.worker.html?121-130]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js.ini
deleted file mode 100644
index ba0c117f6a91..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_RSA-OAEP.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js.ini
new file mode 100644
index 000000000000..5c69dd5ee7f7
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js.ini
@@ -0,0 +1,39 @@
+[successes_RSA-PSS.https.any.html?11-20]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-PSS.https.any.worker.html?11-20]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-PSS.https.any.html?31-last]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-PSS.https.any.html?1-10]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-PSS.https.any.worker.html?1-10]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-PSS.https.any.html?21-30]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-PSS.https.any.worker.html?31-last]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSA-PSS.https.any.worker.html?21-30]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js.ini
deleted file mode 100644
index e931d698970e..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_RSA-PSS.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js.ini
new file mode 100644
index 000000000000..6bbfc72c96e6
--- /dev/null
+++ b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js.ini
@@ -0,0 +1,39 @@
+[successes_RSASSA-PKCS1-v1_5.https.any.html?1-10]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSASSA-PKCS1-v1_5.https.any.html?31-last]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSASSA-PKCS1-v1_5.https.any.worker.html?11-20]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSASSA-PKCS1-v1_5.https.any.html?21-30]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSASSA-PKCS1-v1_5.https.any.worker.html?1-10]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSASSA-PKCS1-v1_5.https.any.worker.html?31-last]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSASSA-PKCS1-v1_5.https.any.html?11-20]
+  [Untitled]
+    expected: FAIL
+
+
+[successes_RSASSA-PKCS1-v1_5.https.any.worker.html?21-30]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js.ini
deleted file mode 100644
index 46f5a9c59537..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[successes_RSASSA-PKCS1-v1_5.https.worker.html]
-  [Untitled]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_aes-cbc.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_aes-cbc.https.html.ini
deleted file mode 100644
index f980bf8cd323..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_aes-cbc.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_aes-cbc.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_aes-ctr.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_aes-ctr.https.html.ini
deleted file mode 100644
index 73aad6096668..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_aes-ctr.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_aes-ctr.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html.ini
deleted file mode 100644
index d352875cbcf4..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_AES-CBC.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html.ini
deleted file mode 100644
index 0a12f0d07bf8..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_AES-CTR.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html.ini
deleted file mode 100644
index 5f8e9e19a7d6..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_AES-GCM.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-KW.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-KW.https.html.ini
deleted file mode 100644
index 8d48bb7152f4..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_AES-KW.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_AES-KW.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_ECDH.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_ECDH.https.html.ini
deleted file mode 100644
index 3dd69260844d..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_ECDH.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_ECDH.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_ECDSA.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_ECDSA.https.html.ini
deleted file mode 100644
index 3c8d2ae9c142..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_ECDSA.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_ECDSA.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_HMAC.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_HMAC.https.html.ini
deleted file mode 100644
index 7edd0c230440..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_HMAC.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_HMAC.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html.ini
deleted file mode 100644
index 9d850071fca7..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_RSA-OAEP.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html.ini
deleted file mode 100644
index 88d431ce74c5..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_RSA-PSS.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html.ini
deleted file mode 100644
index c6ec791fa631..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_failures_RSASSA-PKCS1-v1_5.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() for Failures]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html.ini
deleted file mode 100644
index 145e22845ac1..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_AES-CBC.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html.ini
deleted file mode 100644
index a925e1b2b859..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_AES-CTR.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html.ini
deleted file mode 100644
index 4a8645903e0f..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_AES-GCM.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-KW.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-KW.https.html.ini
deleted file mode 100644
index 964505bf0e0d..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_AES-KW.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_AES-KW.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_ECDH.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_ECDH.https.html.ini
deleted file mode 100644
index 1e2ee5896e01..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_ECDH.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_ECDH.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_ECDSA.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_ECDSA.https.html.ini
deleted file mode 100644
index 47abf393d466..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_ECDSA.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_ECDSA.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_HMAC.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_HMAC.https.html.ini
deleted file mode 100644
index 0322d691f116..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_HMAC.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_HMAC.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html.ini
deleted file mode 100644
index 80ae7170238b..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_RSA-OAEP.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html.ini
deleted file mode 100644
index 465b10daafe7..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_RSA-PSS.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html.ini
deleted file mode 100644
index 075e345a0adb..000000000000
--- a/tests/wpt/metadata/WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[test_successes_RSASSA-PKCS1-v1_5.https.html]
-  type: testharness
-  [WebCryptoAPI: generateKey() Successful Calls]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/WebCryptoAPI/idlharness.https.html.ini b/tests/wpt/metadata/WebCryptoAPI/idlharness.https.html.ini
index 4ff283312970..0b9f14e7c681 100644
--- a/tests/wpt/metadata/WebCryptoAPI/idlharness.https.html.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/idlharness.https.html.ini
@@ -279,3 +279,6 @@
   [SubtleCrypto interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [IDL check of WebCrypto]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebCryptoAPI/idlharness.https.worker.js.ini b/tests/wpt/metadata/WebCryptoAPI/idlharness.https.worker.js.ini
index c2f45af297c3..ccae4faf3b7e 100644
--- a/tests/wpt/metadata/WebCryptoAPI/idlharness.https.worker.js.ini
+++ b/tests/wpt/metadata/WebCryptoAPI/idlharness.https.worker.js.ini
@@ -170,3 +170,6 @@
   [SubtleCrypto interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/WebIDL/interfaces.html.ini b/tests/wpt/metadata/WebIDL/interfaces.html.ini
index 777f3bae5e87..666a8ee2ae31 100644
--- a/tests/wpt/metadata/WebIDL/interfaces.html.ini
+++ b/tests/wpt/metadata/WebIDL/interfaces.html.ini
@@ -270,3 +270,6 @@
   [DOMException interface: new DOMException("my message", "myName") must inherit property "DATA_CLONE_ERR" with the proper type]
     expected: FAIL
 
+  [WebIDL IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/cors/client-hint-request-headers.htm.ini b/tests/wpt/metadata/cors/client-hint-request-headers.htm.ini
new file mode 100644
index 000000000000..6dbed22b3941
--- /dev/null
+++ b/tests/wpt/metadata/cors/client-hint-request-headers.htm.ini
@@ -0,0 +1,4 @@
+[client-hint-request-headers.htm]
+  [Client hint headers are simple headers]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/cors/simple-requests.htm.ini b/tests/wpt/metadata/cors/simple-requests.htm.ini
new file mode 100644
index 000000000000..1fc531b871b0
--- /dev/null
+++ b/tests/wpt/metadata/cors/simple-requests.htm.ini
@@ -0,0 +1,10 @@
+[simple-requests.htm]
+  [No preflight GET and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"}]
+    expected: FAIL
+
+  [No preflight HEAD and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"}]
+    expected: FAIL
+
+  [No preflight POST and {"save-data":"on","device-memory":"2.0","dpr":"3.0","width":"1200","viewport-width":"1300"}]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/adjoining-float-new-fc.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/adjoining-float-new-fc.html.ini
new file mode 100644
index 000000000000..1454dbd4c3ae
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats-clear/adjoining-float-new-fc.html.ini
@@ -0,0 +1,2 @@
+[adjoining-float-new-fc.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/clear-after-top-margin.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/clear-after-top-margin.html.ini
new file mode 100644
index 000000000000..45e4300c13ac
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats-clear/clear-after-top-margin.html.ini
@@ -0,0 +1,2 @@
+[clear-after-top-margin.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html.ini
new file mode 100644
index 000000000000..d7fd6598ce0d
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html.ini
@@ -0,0 +1,2 @@
+[no-clearance-adjoining-opposite-float.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html.ini
new file mode 100644
index 000000000000..d4a609c99752
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html.ini
@@ -0,0 +1,2 @@
+[no-clearance-due-to-large-margin-after-left-right.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html.ini
new file mode 100644
index 000000000000..245967fc42da
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html.ini
@@ -0,0 +1,2 @@
+[no-clearance-due-to-large-margin.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html.ini
new file mode 100644
index 000000000000..6ad7741c4ee1
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html.ini
@@ -0,0 +1,2 @@
+[second-float-inside-empty-cleared-block-after-margin.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html.ini b/tests/wpt/metadata/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html.ini
new file mode 100644
index 000000000000..7797a77875ad
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html.ini
@@ -0,0 +1,2 @@
+[second-float-inside-empty-cleared-block.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini b/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini
new file mode 100644
index 000000000000..86715ffc9c20
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/floats-in-table-caption-001.html.ini
@@ -0,0 +1,2 @@
+[floats-in-table-caption-001.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/new-fc-beside-adjoining-float-2.html.ini b/tests/wpt/metadata/css/CSS2/floats/new-fc-beside-adjoining-float-2.html.ini
new file mode 100644
index 000000000000..068736c50621
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/new-fc-beside-adjoining-float-2.html.ini
@@ -0,0 +1,2 @@
+[new-fc-beside-adjoining-float-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/floats/new-fc-separates-from-float-2.html.ini b/tests/wpt/metadata/css/CSS2/floats/new-fc-separates-from-float-2.html.ini
new file mode 100644
index 000000000000..e48bc64ad5d7
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/new-fc-separates-from-float-2.html.ini
@@ -0,0 +1,2 @@
+[new-fc-separates-from-float-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-003.xht.ini b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-003.xht.ini
new file mode 100644
index 000000000000..452aa8d314ce
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-003.xht.ini
@@ -0,0 +1,2 @@
+[inline-block-baseline-003.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-004.xht.ini b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-004.xht.ini
new file mode 100644
index 000000000000..e571b3781cce
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-004.xht.ini
@@ -0,0 +1,2 @@
+[inline-block-baseline-004.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-005.xht.ini b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-005.xht.ini
new file mode 100644
index 000000000000..25c38efae23e
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-005.xht.ini
@@ -0,0 +1,2 @@
+[inline-block-baseline-005.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-006.xht.ini b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-006.xht.ini
new file mode 100644
index 000000000000..b436883f53e3
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/visudet/inline-block-baseline-006.xht.ini
@@ -0,0 +1,2 @@
+[inline-block-baseline-006.xht]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-animations/animationevent-interface.html.ini b/tests/wpt/metadata/css/css-animations/animationevent-interface.html.ini
index 60ed61deb50b..3b6037ad7a75 100644
--- a/tests/wpt/metadata/css/css-animations/animationevent-interface.html.ini
+++ b/tests/wpt/metadata/css/css-animations/animationevent-interface.html.ini
@@ -48,3 +48,6 @@
   [AnimationEventInit properties set value]
     expected: FAIL
 
+  [AnimationEvent.pseudoElement initialized from the dictionary]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-animations/animationevent-pseudoelement.html.ini b/tests/wpt/metadata/css/css-animations/animationevent-pseudoelement.html.ini
new file mode 100644
index 000000000000..fa19a3fabd92
--- /dev/null
+++ b/tests/wpt/metadata/css/css-animations/animationevent-pseudoelement.html.ini
@@ -0,0 +1,5 @@
+[animationevent-pseudoelement.html]
+  expected: TIMEOUT
+  [AnimationEvent should have the correct pseudoElement memeber]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/css/css-backgrounds/background-size-025.html.ini b/tests/wpt/metadata/css/css-backgrounds/background-size-025.html.ini
new file mode 100644
index 000000000000..4143512af62b
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/background-size-025.html.ini
@@ -0,0 +1,2 @@
+[background-size-025.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-backgrounds/background-size-027.html.ini b/tests/wpt/metadata/css/css-backgrounds/background-size-027.html.ini
new file mode 100644
index 000000000000..5c1f927e20e2
--- /dev/null
+++ b/tests/wpt/metadata/css/css-backgrounds/background-size-027.html.ini
@@ -0,0 +1,2 @@
+[background-size-027.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/font-face-unicode-range-2.html.ini b/tests/wpt/metadata/css/css-fonts/font-face-unicode-range-2.html.ini
new file mode 100644
index 000000000000..3f91daab7254
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-face-unicode-range-2.html.ini
@@ -0,0 +1,2 @@
+[font-face-unicode-range-2.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/font-feature-settings-descriptor-01.html.ini b/tests/wpt/metadata/css/css-fonts/font-feature-settings-descriptor-01.html.ini
new file mode 100644
index 000000000000..9ac48a087b24
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-feature-settings-descriptor-01.html.ini
@@ -0,0 +1,2 @@
+[font-feature-settings-descriptor-01.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/font-size-adjust-002.html.ini b/tests/wpt/metadata/css/css-fonts/font-size-adjust-002.html.ini
new file mode 100644
index 000000000000..15dfa5a5c624
--- /dev/null
+++ b/tests/wpt/metadata/css/css-fonts/font-size-adjust-002.html.ini
@@ -0,0 +1,2 @@
+[font-size-adjust-002.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-descriptors.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-descriptors.html.ini
index 649e089ce04c..9e3503f9bb55 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-descriptors.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-descriptors.html.ini
@@ -245,3 +245,9 @@
   [font-style(invalid): Extra content after upper bound: oblique 10deg 20deg 30deg]
     expected: FAIL
 
+  [font-stretch(valid): Negative calc value (to be clamped): calc(-100%)]
+    expected: FAIL
+
+  [font-stretch(valid): Negative calc expression (to be clamped): calc(50% - 50%*2)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
index 7c80799aece1..b075270b5f39 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/font-weight-matching.html.ini
@@ -38,3 +38,6 @@
   [Test @font-face matching for weight 249]
     expected: FAIL
 
+  [Test @font-face matching for weight 420]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-images/parsing/image-orientation-invalid.html.ini b/tests/wpt/metadata/css/css-images/parsing/image-orientation-invalid.html.ini
deleted file mode 100644
index 6336724c6356..000000000000
--- a/tests/wpt/metadata/css/css-images/parsing/image-orientation-invalid.html.ini
+++ /dev/null
@@ -1,28 +0,0 @@
-[image-orientation-invalid.html]
-  [e.style['image-orientation'\] = "auto" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "none" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "0" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "0 flip" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "0deg from-image" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "flip 0deg" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "flip from-image" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "from-image 0deg" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-orientation'\] = "from-image flip" should not set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-images/parsing/image-orientation-valid.html.ini b/tests/wpt/metadata/css/css-images/parsing/image-orientation-valid.html.ini
index 4eb18a63cbaf..2258081bad50 100644
--- a/tests/wpt/metadata/css/css-images/parsing/image-orientation-valid.html.ini
+++ b/tests/wpt/metadata/css/css-images/parsing/image-orientation-valid.html.ini
@@ -2,3 +2,12 @@
   [e.style['image-orientation'\] = "flip" should set the property value]
     expected: FAIL
 
+  [e.style['image-orientation'\] = "from-image" should set the property value]
+    expected: FAIL
+
+  [e.style['image-orientation'\] = "30deg" should set the property value]
+    expected: FAIL
+
+  [e.style['image-orientation'\] = "-1.25turn flip" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-images/parsing/image-resolution-invalid.html.ini b/tests/wpt/metadata/css/css-images/parsing/image-resolution-invalid.html.ini
deleted file mode 100644
index d20b6a85fd29..000000000000
--- a/tests/wpt/metadata/css/css-images/parsing/image-resolution-invalid.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[image-resolution-invalid.html]
-  [e.style['image-resolution'\] = "auto" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-resolution'\] = "100%" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-resolution'\] = "2" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-resolution'\] = "3dpi snap from-image" should not set the property value]
-    expected: FAIL
-
-  [e.style['image-resolution'\] = "from-image snap 4dppx" should not set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-images/parsing/image-resolution-valid.html.ini b/tests/wpt/metadata/css/css-images/parsing/image-resolution-valid.html.ini
new file mode 100644
index 000000000000..1a44e2a6cfa7
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/parsing/image-resolution-valid.html.ini
@@ -0,0 +1,37 @@
+[image-resolution-valid.html]
+  [e.style['image-resolution'\] = "1dpi" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "2dpcm from-image" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "3dppx from-image snap" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "4dpi snap" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "from-image" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "from-image 5dpcm" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "from-image 6dppx snap" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "from-image snap" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "snap 7.5dpi" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "snap -8dpcm from-image" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "snap from-image" should set the property value]
+    expected: FAIL
+
+  [e.style['image-resolution'\] = "snap from-image 0dppx" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-images/parsing/object-fit-invalid.html.ini b/tests/wpt/metadata/css/css-images/parsing/object-fit-invalid.html.ini
deleted file mode 100644
index 9df443d9ec42..000000000000
--- a/tests/wpt/metadata/css/css-images/parsing/object-fit-invalid.html.ini
+++ /dev/null
@@ -1,16 +0,0 @@
-[object-fit-invalid.html]
-  [e.style['object-fit'\] = "auto" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-fit'\] = "contain cover" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-fit'\] = "fill scale-down" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-fit'\] = "contain fill" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-fit'\] = "cover none" should not set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-images/parsing/object-fit-valid.html.ini b/tests/wpt/metadata/css/css-images/parsing/object-fit-valid.html.ini
new file mode 100644
index 000000000000..3b6f81591a1f
--- /dev/null
+++ b/tests/wpt/metadata/css/css-images/parsing/object-fit-valid.html.ini
@@ -0,0 +1,28 @@
+[object-fit-valid.html]
+  [e.style['object-fit'\] = "contain" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "contain scale-down" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "cover" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "cover scale-down" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "fill" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "scale-down" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "scale-down contain" should set the property value]
+    expected: FAIL
+
+  [e.style['object-fit'\] = "scale-down cover" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-images/parsing/object-position-invalid.html.ini b/tests/wpt/metadata/css/css-images/parsing/object-position-invalid.html.ini
deleted file mode 100644
index a6b7292a4afb..000000000000
--- a/tests/wpt/metadata/css/css-images/parsing/object-position-invalid.html.ini
+++ /dev/null
@@ -1,37 +0,0 @@
-[object-position-invalid.html]
-  [e.style['object-position'\] = "auto" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "1px 2px 3px" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "left right" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "bottom 10% top 20%" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "center left 1px" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "center top 2px" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "right 3% center" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "left 4px top" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "right top 5px" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "bottom 6% center" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "bottom 7% left" should not set the property value]
-    expected: FAIL
-
-  [e.style['object-position'\] = "bottom right 8%" should not set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-images/parsing/object-position-valid.html.ini b/tests/wpt/metadata/css/css-images/parsing/object-position-valid.html.ini
index df6b365d30db..b4985c5b3b68 100644
--- a/tests/wpt/metadata/css/css-images/parsing/object-position-valid.html.ini
+++ b/tests/wpt/metadata/css/css-images/parsing/object-position-valid.html.ini
@@ -20,3 +20,36 @@
   [e.style['object-position'\] = "top center" should set the property value]
     expected: FAIL
 
+  [e.style['object-position'\] = "right 30% top 60px" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "20% 30px" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "30px center" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "40px top" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "center 50px" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "center bottom" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "left bottom" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "left center" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "right 40%" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "center" should set the property value]
+    expected: FAIL
+
+  [e.style['object-position'\] = "center center" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-transforms/2d-rotate-js.html.ini b/tests/wpt/metadata/css/css-transforms/2d-rotate-js.html.ini
new file mode 100644
index 000000000000..ecdc32dc9bb0
--- /dev/null
+++ b/tests/wpt/metadata/css/css-transforms/2d-rotate-js.html.ini
@@ -0,0 +1,4 @@
+[2d-rotate-js.html]
+  [JS test: Rotate via javascript must show the correct computed rotation]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-ui/parsing/caret-color-valid.html.ini b/tests/wpt/metadata/css/css-ui/parsing/caret-color-valid.html.ini
new file mode 100644
index 000000000000..a2322039ffcf
--- /dev/null
+++ b/tests/wpt/metadata/css/css-ui/parsing/caret-color-valid.html.ini
@@ -0,0 +1,7 @@
+[caret-color-valid.html]
+  [e.style['caret-color'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['caret-color'\] = "rgba(10, 20, 30, 0.4)" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-ui/parsing/outline-color-valid-optional.html.ini b/tests/wpt/metadata/css/css-ui/parsing/outline-color-valid-optional.html.ini
new file mode 100644
index 000000000000..9b4b531885bc
--- /dev/null
+++ b/tests/wpt/metadata/css/css-ui/parsing/outline-color-valid-optional.html.ini
@@ -0,0 +1,4 @@
+[outline-color-valid-optional.html]
+  [e.style['outline-color'\] = "invert" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-ui/parsing/outline-valid-mandatory.html.ini b/tests/wpt/metadata/css/css-ui/parsing/outline-valid-mandatory.html.ini
new file mode 100644
index 000000000000..449a79c189e5
--- /dev/null
+++ b/tests/wpt/metadata/css/css-ui/parsing/outline-valid-mandatory.html.ini
@@ -0,0 +1,58 @@
+[outline-valid-mandatory.html]
+  [e.style['outline'\] = "rgba(10, 20, 30, 0.4)" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "dotted" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "dashed" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "solid" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "double" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "groove" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "ridge" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "inset" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "outset" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "0" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "1px" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "calc(2em + 3ex)" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "thin" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "medium" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "thick" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "dashed thin" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "medium rgba(10, 20, 30, 0.4)" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-ui/parsing/outline-valid-optional.html.ini b/tests/wpt/metadata/css/css-ui/parsing/outline-valid-optional.html.ini
new file mode 100644
index 000000000000..afd6185502b6
--- /dev/null
+++ b/tests/wpt/metadata/css/css-ui/parsing/outline-valid-optional.html.ini
@@ -0,0 +1,7 @@
+[outline-valid-optional.html]
+  [e.style['outline'\] = "invert" should set the property value]
+    expected: FAIL
+
+  [e.style['outline'\] = "invert dotted 1px" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-ui/parsing/resize-valid.html.ini b/tests/wpt/metadata/css/css-ui/parsing/resize-valid.html.ini
new file mode 100644
index 000000000000..bced7697157d
--- /dev/null
+++ b/tests/wpt/metadata/css/css-ui/parsing/resize-valid.html.ini
@@ -0,0 +1,13 @@
+[resize-valid.html]
+  [e.style['resize'\] = "none" should set the property value]
+    expected: FAIL
+
+  [e.style['resize'\] = "both" should set the property value]
+    expected: FAIL
+
+  [e.style['resize'\] = "horizontal" should set the property value]
+    expected: FAIL
+
+  [e.style['resize'\] = "vertical" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementScroll-002.html.ini b/tests/wpt/metadata/css/cssom-view/elementScroll-002.html.ini
new file mode 100644
index 000000000000..79b250394da7
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/elementScroll-002.html.ini
@@ -0,0 +1,7 @@
+[elementScroll-002.html]
+  [simple scroll with style: 'margin' and 'overflow: scroll']
+    expected: FAIL
+
+  [simple scroll with style: 'padding' and 'overflow: scroll']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementsFromPoint.html.ini b/tests/wpt/metadata/css/cssom-view/elementsFromPoint.html.ini
index 046b2acda848..44e1393786a3 100644
--- a/tests/wpt/metadata/css/cssom-view/elementsFromPoint.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/elementsFromPoint.html.ini
@@ -2,6 +2,7 @@
   type: testharness
   [SVG element at x,y]
     expected: FAIL
+
   [transformed element at x,y]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/cssom-view/interfaces.html.ini b/tests/wpt/metadata/css/cssom-view/interfaces.html.ini
index c84046474782..363e70f7cc0f 100644
--- a/tests/wpt/metadata/css/cssom-view/interfaces.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/interfaces.html.ini
@@ -507,3 +507,6 @@
   [CaretPosition interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [CSSOM View automated IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia.xht.ini b/tests/wpt/metadata/css/cssom-view/matchMedia.xht.ini
index ed947e81e1e5..24029f6afff6 100644
--- a/tests/wpt/metadata/css/cssom-view/matchMedia.xht.ini
+++ b/tests/wpt/metadata/css/cssom-view/matchMedia.xht.ini
@@ -3,18 +3,25 @@
   expected: TIMEOUT
   [window.matchMedia exists]
     expected: FAIL
+
   [MediaQueryList.matches for "(max-width: 199px), all and (min-width: 200px)"]
     expected: FAIL
+
   [MediaQueryList.matches for "(min-aspect-ratio: 1/1)"]
     expected: FAIL
+
   [MediaQueryList.matches for "(width: 200px)"]
     expected: FAIL
+
   [MediaQueryList.matches for "(min-width: 150px)"]
     expected: FAIL
+
   [Resize iframe from 200x100 to 200x50, then to 100x50]
     expected: NOTRUN
+
   [Listeners are called in the order which they have been added]
     expected: NOTRUN
+
   [Listener added twice is only called once.]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/css/cssom/interfaces.html.ini b/tests/wpt/metadata/css/cssom/interfaces.html.ini
index 9bdff659bccc..83856b7be5e8 100644
--- a/tests/wpt/metadata/css/cssom/interfaces.html.ini
+++ b/tests/wpt/metadata/css/cssom/interfaces.html.ini
@@ -642,3 +642,6 @@
   [CSSMarginRule interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [CSSOM automated IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom/preferred-stylesheet-order.html.ini b/tests/wpt/metadata/css/cssom/preferred-stylesheet-order.html.ini
new file mode 100644
index 000000000000..0852c6d6ba48
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/preferred-stylesheet-order.html.ini
@@ -0,0 +1,4 @@
+[preferred-stylesheet-order.html]
+  [Preferred stylesheet where insertion order is reversed tree order]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom/preferred-stylesheet-reversed-order.html.ini b/tests/wpt/metadata/css/cssom/preferred-stylesheet-reversed-order.html.ini
new file mode 100644
index 000000000000..49369172fe93
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/preferred-stylesheet-reversed-order.html.ini
@@ -0,0 +1,4 @@
+[preferred-stylesheet-reversed-order.html]
+  [Preferred stylesheet where insertion order is tree order]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom/stylesheet-title.html.ini b/tests/wpt/metadata/css/cssom/stylesheet-title.html.ini
new file mode 100644
index 000000000000..125b149276de
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/stylesheet-title.html.ini
@@ -0,0 +1,7 @@
+[stylesheet-title.html]
+  [Preferred style sheet name]
+    expected: FAIL
+
+  [StyleSheet.title]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/filter-effects/interfaces.any.js.ini b/tests/wpt/metadata/css/filter-effects/interfaces.any.js.ini
index 0efa750e3dc0..f845a40cc212 100644
--- a/tests/wpt/metadata/css/filter-effects/interfaces.any.js.ini
+++ b/tests/wpt/metadata/css/filter-effects/interfaces.any.js.ini
@@ -1,4 +1,5 @@
 [interfaces.any.worker.html]
+  expected: ERROR
   [Untitled]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/filter-effects/parsing/color-interpolation-filters-parsing-invalid.html.ini b/tests/wpt/metadata/css/filter-effects/parsing/color-interpolation-filters-parsing-invalid.html.ini
deleted file mode 100644
index bf732b1d3766..000000000000
--- a/tests/wpt/metadata/css/filter-effects/parsing/color-interpolation-filters-parsing-invalid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[color-interpolation-filters-parsing-invalid.html]
-  [e.style['color-interpolation-filters'\] = "none" should not set the property value]
-    expected: FAIL
-
-  [e.style['color-interpolation-filters'\] = "linearRGB sRGB" should not set the property value]
-    expected: FAIL
-
-  [e.style['color-interpolation-filters'\] = "auto sRGB linearRGB" should not set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html.ini b/tests/wpt/metadata/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html.ini
index ca738921a09c..a4fcf29600cc 100644
--- a/tests/wpt/metadata/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html.ini
+++ b/tests/wpt/metadata/css/filter-effects/parsing/color-interpolation-filters-parsing-valid.html.ini
@@ -5,3 +5,24 @@
   [Serialization should round-trip after setting e.style['color-interpolation-filters'\] = "LiNeArRgB"]
     expected: FAIL
 
+  [e.style['color-interpolation-filters'\] = "auto" should set the property value]
+    expected: FAIL
+
+  [e.style['color-interpolation-filters'\] = "sRGB" should set the property value]
+    expected: FAIL
+
+  [e.style['color-interpolation-filters'\] = "srgb" should set the property value]
+    expected: FAIL
+
+  [e.style['color-interpolation-filters'\] = "SrGb" should set the property value]
+    expected: FAIL
+
+  [e.style['color-interpolation-filters'\] = "linearRGB" should set the property value]
+    expected: FAIL
+
+  [e.style['color-interpolation-filters'\] = "linearrgb" should set the property value]
+    expected: FAIL
+
+  [e.style['color-interpolation-filters'\] = "LiNeArRgB" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/filter-effects/parsing/lighting-color-parsing-invalid.html.ini b/tests/wpt/metadata/css/filter-effects/parsing/lighting-color-parsing-invalid.html.ini
deleted file mode 100644
index 774900d35d64..000000000000
--- a/tests/wpt/metadata/css/filter-effects/parsing/lighting-color-parsing-invalid.html.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-[lighting-color-parsing-invalid.html]
-  [e.style['lighting-color'\] = "auto" should not set the property value]
-    expected: FAIL
-
-  [e.style['lighting-color'\] = "none" should not set the property value]
-    expected: FAIL
-
-  [e.style['lighting-color'\] = "#a" should not set the property value]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/filter-effects/parsing/lighting-color-parsing-valid.html.ini b/tests/wpt/metadata/css/filter-effects/parsing/lighting-color-parsing-valid.html.ini
index 89cf755a0d4a..288e51d1e475 100644
--- a/tests/wpt/metadata/css/filter-effects/parsing/lighting-color-parsing-valid.html.ini
+++ b/tests/wpt/metadata/css/filter-effects/parsing/lighting-color-parsing-valid.html.ini
@@ -5,3 +5,18 @@
   [Serialization should round-trip after setting e.style['lighting-color'\] = "#102030"]
     expected: FAIL
 
+  [e.style['lighting-color'\] = "rgb(1,2,3)" should set the property value]
+    expected: FAIL
+
+  [e.style['lighting-color'\] = "#102030" should set the property value]
+    expected: FAIL
+
+  [e.style['lighting-color'\] = "rgba(1, 2, 3, 0.5)" should set the property value]
+    expected: FAIL
+
+  [e.style['lighting-color'\] = "currentColor" should set the property value]
+    expected: FAIL
+
+  [e.style['lighting-color'\] = "currentcolor" should set the property value]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/geometry/interfaces.html.ini b/tests/wpt/metadata/css/geometry/interfaces.html.ini
index 03e693ce2f30..fc7bf385e0fe 100644
--- a/tests/wpt/metadata/css/geometry/interfaces.html.ini
+++ b/tests/wpt/metadata/css/geometry/interfaces.html.ini
@@ -372,3 +372,6 @@
   [Test default toJSON operation of DOMMatrixReadOnly]
     expected: FAIL
 
+  [Geometry APIs interface IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini b/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini
index 45d656e6725d..036601f92c9d 100644
--- a/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini
+++ b/tests/wpt/metadata/css/geometry/interfaces.worker.js.ini
@@ -92,3 +92,6 @@
   [Test default toJSON operation of DOMMatrixReadOnly]
     expected: FAIL
 
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/mediaqueries/test_media_queries.html.ini b/tests/wpt/metadata/css/mediaqueries/test_media_queries.html.ini
index 92789f0a78c8..c226b13e8fbc 100644
--- a/tests/wpt/metadata/css/mediaqueries/test_media_queries.html.ini
+++ b/tests/wpt/metadata/css/mediaqueries/test_media_queries.html.ini
@@ -536,27 +536,12 @@
   [subtest_318]
     expected: FAIL
 
-  [subtest_319]
-    expected: FAIL
-
   [subtest_320]
     expected: FAIL
 
-  [subtest_321]
-    expected: FAIL
-
   [subtest_322]
     expected: FAIL
 
-  [subtest_323]
-    expected: FAIL
-
-  [subtest_324]
-    expected: FAIL
-
-  [subtest_326]
-    expected: FAIL
-
   [subtest_330]
     expected: FAIL
 
@@ -752,21 +737,12 @@
   [subtest_332]
     expected: FAIL
 
-  [subtest_337]
-    expected: FAIL
-
-  [subtest_359]
-    expected: FAIL
-
   [subtest_360]
     expected: FAIL
 
   [subtest_334]
     expected: FAIL
 
-  [subtest_339]
-    expected: FAIL
-
   [subtest_342]
     expected: FAIL
 
@@ -785,9 +761,96 @@
   [subtest_356]
     expected: FAIL
 
-  [subtest_361]
+  [subtest_362]
     expected: FAIL
 
-  [subtest_362]
+  [subtest_293]
+    expected: FAIL
+
+  [subtest_296]
+    expected: FAIL
+
+  [subtest_298]
+    expected: FAIL
+
+  [subtest_300]
+    expected: FAIL
+
+  [subtest_301]
+    expected: FAIL
+
+  [subtest_303]
+    expected: FAIL
+
+  [subtest_327]
+    expected: FAIL
+
+  [subtest_331]
+    expected: FAIL
+
+  [subtest_336]
+    expected: FAIL
+
+  [subtest_341]
+    expected: FAIL
+
+  [subtest_343]
+    expected: FAIL
+
+  [subtest_344]
+    expected: FAIL
+
+  [subtest_345]
+    expected: FAIL
+
+  [subtest_346]
+    expected: FAIL
+
+  [subtest_347]
+    expected: FAIL
+
+  [subtest_349]
+    expected: FAIL
+
+  [subtest_353]
+    expected: FAIL
+
+  [subtest_357]
+    expected: FAIL
+
+  [subtest_358]
+    expected: FAIL
+
+  [subtest_363]
+    expected: FAIL
+
+  [subtest_365]
+    expected: FAIL
+
+  [subtest_371]
+    expected: FAIL
+
+  [subtest_374]
+    expected: FAIL
+
+  [subtest_375]
+    expected: FAIL
+
+  [subtest_378]
+    expected: FAIL
+
+  [subtest_379]
+    expected: FAIL
+
+  [subtest_382]
+    expected: FAIL
+
+  [subtest_383]
+    expected: FAIL
+
+  [subtest_384]
+    expected: FAIL
+
+  [subtest_385]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/dom/interfaces.html.ini b/tests/wpt/metadata/dom/interfaces.html.ini
index 62a37f6dcfc1..781447875ef2 100644
--- a/tests/wpt/metadata/dom/interfaces.html.ini
+++ b/tests/wpt/metadata/dom/interfaces.html.ini
@@ -924,3 +924,6 @@
   [Test driver]
     expected: FAIL
 
+  [DOM IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/nodes/MutationObserver-attributes.html.ini b/tests/wpt/metadata/dom/nodes/MutationObserver-attributes.html.ini
index a1151d55adaa..3adb1f43ffa3 100644
--- a/tests/wpt/metadata/dom/nodes/MutationObserver-attributes.html.ini
+++ b/tests/wpt/metadata/dom/nodes/MutationObserver-attributes.html.ini
@@ -1,6 +1,5 @@
 [MutationObserver-attributes.html]
   type: testharness
-
   [attributes/attributeFilter Element.id/Element.className: update mutation]
     expected: FAIL
 
@@ -9,3 +8,4 @@
 
   [attributeFilter alone Element.id/Element.className: multiple filter update mutation]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/dom/nodes/MutationObserver-characterData.html.ini b/tests/wpt/metadata/dom/nodes/MutationObserver-characterData.html.ini
index 7bc63c0cfe69..9a4b39b24219 100644
--- a/tests/wpt/metadata/dom/nodes/MutationObserver-characterData.html.ini
+++ b/tests/wpt/metadata/dom/nodes/MutationObserver-characterData.html.ini
@@ -1,7 +1,6 @@
 [MutationObserver-characterData.html]
   type: testharness
   expected: TIMEOUT
-
   [characterData Text.appendData: simple mutation]
     expected: TIMEOUT
 
@@ -10,3 +9,4 @@
 
   [characterData Text.appendData: null string mutation]
     expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/dom/nodes/MutationObserver-document.html.ini b/tests/wpt/metadata/dom/nodes/MutationObserver-document.html.ini
index e1be70090613..1b5555582d7b 100644
--- a/tests/wpt/metadata/dom/nodes/MutationObserver-document.html.ini
+++ b/tests/wpt/metadata/dom/nodes/MutationObserver-document.html.ini
@@ -1,6 +1,5 @@
 [MutationObserver-document.html]
   type: testharness
-
   [parser insertion mutations]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/dom/nodes/Node-normalize.html.ini b/tests/wpt/metadata/dom/nodes/Node-normalize.html.ini
new file mode 100644
index 000000000000..4e28b0e910fc
--- /dev/null
+++ b/tests/wpt/metadata/dom/nodes/Node-normalize.html.ini
@@ -0,0 +1,4 @@
+[Node-normalize.html]
+  [Non-text nodes with empty textContent values.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/encoding/idlharness.any.js.ini b/tests/wpt/metadata/encoding/idlharness.any.js.ini
index 6024e7606456..910710d7b6b0 100644
--- a/tests/wpt/metadata/encoding/idlharness.any.js.ini
+++ b/tests/wpt/metadata/encoding/idlharness.any.js.ini
@@ -14,6 +14,7 @@
 
 
 [idlharness.any.worker.html]
+  expected: ERROR
   [Untitled]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/eventsource/interfaces.html.ini b/tests/wpt/metadata/eventsource/interfaces.html.ini
new file mode 100644
index 000000000000..1818c6b58494
--- /dev/null
+++ b/tests/wpt/metadata/eventsource/interfaces.html.ini
@@ -0,0 +1,4 @@
+[interfaces.html]
+  [EventSource IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-expose-star.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-expose-star.html.ini
deleted file mode 100644
index 2dcee9d9ad6a..000000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-expose-star.html.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-[cors-expose-star.html]
-  type: testharness
-  [Basic Access-Control-Expose-Headers: * support]
-    expected: FAIL
-
-  [* can be one of several values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-expose-star-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-expose-star.sub.any.js.ini
similarity index 55%
rename from tests/wpt/metadata/fetch/api/cors/cors-expose-star-worker.html.ini
rename to tests/wpt/metadata/fetch/api/cors/cors-expose-star.sub.any.js.ini
index e0712fc68d68..8dc0bd71abf8 100644
--- a/tests/wpt/metadata/fetch/api/cors/cors-expose-star-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/cors/cors-expose-star.sub.any.js.ini
@@ -1,9 +1,13 @@
-[cors-expose-star-worker.html]
-  type: testharness
+[cors-expose-star.sub.any.html]
   [Basic Access-Control-Expose-Headers: * support]
     expected: FAIL
 
-  [Cannot use * for credentialed fetches]
+  [* can be one of several values]
+    expected: FAIL
+
+
+[cors-expose-star.sub.any.worker.html]
+  [Basic Access-Control-Expose-Headers: * support]
     expected: FAIL
 
   [* for credentialed fetches only matches literally]
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-filtering.sub.any.js.ini b/tests/wpt/metadata/fetch/api/cors/cors-filtering.sub.any.js.ini
new file mode 100644
index 000000000000..3e32abdf5614
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/cors/cors-filtering.sub.any.js.ini
@@ -0,0 +1,9 @@
+[cors-filtering.sub.any.html]
+  [CORS filter on Content-Length header]
+    expected: FAIL
+
+
+[cors-filtering.sub.any.worker.html]
+  [CORS filter on Content-Length header]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
deleted file mode 100644
index c13085b5ffe0..000000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins-worker.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[cors-multiple-origins-worker.html]
-  type: testharness
-  [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*" and http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*" and http://web-platform.test:8000)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini b/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
deleted file mode 100644
index 13332f46f8fb..000000000000
--- a/tests/wpt/metadata/fetch/api/cors/cors-multiple-origins.html.ini
+++ /dev/null
@@ -1,32 +0,0 @@
-[cors-multiple-origins.html]
-  type: testharness
-  [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*" and http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match the 3rd ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice (http://web-platform.test:8000)]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*")]
-    expected: FAIL
-
-  [3 origins allowed, match twice ("*" and http://web-platform.test:8000)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/idl.any.js.ini b/tests/wpt/metadata/fetch/api/idl.any.js.ini
index 07becda3091a..de5922b3d318 100644
--- a/tests/wpt/metadata/fetch/api/idl.any.js.ini
+++ b/tests/wpt/metadata/fetch/api/idl.any.js.ini
@@ -1,4 +1,5 @@
 [idl.any.worker.html]
+  expected: ERROR
   [Untitled]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
deleted file mode 100644
index 14079a030b34..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-count-worker.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[redirect-count-worker.html]
-  type: testharness
-  disabled: https://github.com/servo/servo/issues/13441
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
deleted file mode 100644
index 8e61caab1462..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-count.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[redirect-count.html]
-  type: testharness
-  disabled: https://github.com/servo/servo/issues/13441
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location-worker.html.ini
deleted file mode 100644
index e8f9df8334ef..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location-worker.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[redirect-empty-location-worker.html]
-  [redirect response with empty Location, follow mode]
-    expected: FAIL
-
-  [redirect response with empty Location, manual mode]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location.any.js.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location.any.js.ini
new file mode 100644
index 000000000000..32d2e40bec4f
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location.any.js.ini
@@ -0,0 +1,15 @@
+[redirect-empty-location.any.worker.html]
+  [redirect response with empty Location, follow mode]
+    expected: FAIL
+
+  [redirect response with empty Location, manual mode]
+    expected: FAIL
+
+
+[redirect-empty-location.any.html]
+  [redirect response with empty Location, follow mode]
+    expected: FAIL
+
+  [redirect response with empty Location, manual mode]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location.html.ini
deleted file mode 100644
index ee7d4a20660a..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-empty-location.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[redirect-empty-location.html]
-  [redirect response with empty Location, follow mode]
-    expected: FAIL
-
-  [redirect response with empty Location, manual mode]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
deleted file mode 100644
index fe8669ca69a5..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-location-worker.html.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[redirect-location-worker.html]
-  disabled: https://github.com/servo/servo/issues/13441
-  type: testharness
-  [Redirect 301 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 301 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 302 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 302 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 303 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 303 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 307 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 307 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 307 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 308 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 308 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 308 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 301 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 302 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 303 in "follow" mode with data location]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-location.any.js.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-location.any.js.ini
new file mode 100644
index 000000000000..28e581bd13bb
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-location.any.js.ini
@@ -0,0 +1,93 @@
+[redirect-location.any.worker.html]
+  [Redirect 301 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 301 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 301 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 302 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 302 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 302 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 303 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 303 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 303 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 307 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 307 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 307 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 308 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 308 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 308 in "manual" mode with data location]
+    expected: FAIL
+
+
+[redirect-location.any.html]
+  [Redirect 301 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 301 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 301 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 302 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 302 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 302 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 303 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 303 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 303 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 307 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 307 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 307 in "manual" mode with data location]
+    expected: FAIL
+
+  [Redirect 308 in "manual" mode without location]
+    expected: FAIL
+
+  [Redirect 308 in "manual" mode with invalid location]
+    expected: FAIL
+
+  [Redirect 308 in "manual" mode with data location]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
deleted file mode 100644
index 41ac455b7157..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-location.html.ini
+++ /dev/null
@@ -1,48 +0,0 @@
-[redirect-location.html]
-  disabled: https://github.com/servo/servo/issues/13441
-  type: testharness
-  [Redirect 301 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 301 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 302 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 302 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 303 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 303 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 307 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 307 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 307 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 308 in "manual" mode with invalid location]
-    expected: FAIL
-
-  [Redirect 308 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 308 in "manual" mode with data location]
-    expected: FAIL
-
-  [Redirect 301 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 302 in "follow" mode with data location]
-    expected: FAIL
-
-  [Redirect 303 in "follow" mode with data location]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
deleted file mode 100644
index 374359908145..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-method-worker.html.ini
+++ /dev/null
@@ -1,44 +0,0 @@
-[redirect-method-worker.html]
-  type: testharness
-  [Redirect 301 with GET]
-    expected: FAIL
-
-  [Redirect 301 with POST]
-    expected: FAIL
-
-  [Redirect 301 with HEAD]
-    expected: FAIL
-
-  [Redirect 302 with GET]
-    expected: FAIL
-
-  [Redirect 302 with POST]
-    expected: FAIL
-
-  [Redirect 302 with HEAD]
-    expected: FAIL
-
-  [Redirect 303 with GET]
-    expected: FAIL
-
-  [Redirect 303 with POST]
-    expected: FAIL
-
-  [Redirect 303 with HEAD]
-    expected: FAIL
-
-  [Redirect 307 with GET]
-    expected: FAIL
-
-  [Redirect 307 with POST]
-    expected: FAIL
-
-  [Redirect 307 with HEAD]
-    expected: FAIL
-
-  [Redirect 307 with POST (string body)]
-    expected: FAIL
-
-  [Redirect 307 with POST (blob body)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-method.any.js.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-method.any.js.ini
new file mode 100644
index 000000000000..4590ccc2583f
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-method.any.js.ini
@@ -0,0 +1,81 @@
+[redirect-method.any.worker.html]
+  [Redirect 301 with GET]
+    expected: FAIL
+
+  [Redirect 301 with POST]
+    expected: FAIL
+
+  [Redirect 301 with HEAD]
+    expected: FAIL
+
+  [Redirect 302 with GET]
+    expected: FAIL
+
+  [Redirect 302 with POST]
+    expected: FAIL
+
+  [Redirect 302 with HEAD]
+    expected: FAIL
+
+  [Redirect 303 with GET]
+    expected: FAIL
+
+  [Redirect 303 with POST]
+    expected: FAIL
+
+  [Redirect 303 with HEAD]
+    expected: FAIL
+
+  [Redirect 307 with GET]
+    expected: FAIL
+
+  [Redirect 307 with POST (string body)]
+    expected: FAIL
+
+  [Redirect 307 with POST (blob body)]
+    expected: FAIL
+
+  [Redirect 307 with HEAD]
+    expected: FAIL
+
+
+[redirect-method.any.html]
+  [Redirect 301 with GET]
+    expected: FAIL
+
+  [Redirect 301 with POST]
+    expected: FAIL
+
+  [Redirect 301 with HEAD]
+    expected: FAIL
+
+  [Redirect 302 with GET]
+    expected: FAIL
+
+  [Redirect 302 with POST]
+    expected: FAIL
+
+  [Redirect 302 with HEAD]
+    expected: FAIL
+
+  [Redirect 303 with GET]
+    expected: FAIL
+
+  [Redirect 303 with POST]
+    expected: FAIL
+
+  [Redirect 303 with HEAD]
+    expected: FAIL
+
+  [Redirect 307 with GET]
+    expected: FAIL
+
+  [Redirect 307 with POST (string body)]
+    expected: FAIL
+
+  [Redirect 307 with POST (blob body)]
+    expected: FAIL
+
+  [Redirect 307 with HEAD]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
deleted file mode 100644
index 3f92aa3540c1..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-method.html.ini
+++ /dev/null
@@ -1,44 +0,0 @@
-[redirect-method.html]
-  type: testharness
-  [Redirect 301 with GET]
-    expected: FAIL
-
-  [Redirect 301 with POST]
-    expected: FAIL
-
-  [Redirect 301 with HEAD]
-    expected: FAIL
-
-  [Redirect 302 with GET]
-    expected: FAIL
-
-  [Redirect 302 with POST]
-    expected: FAIL
-
-  [Redirect 302 with HEAD]
-    expected: FAIL
-
-  [Redirect 303 with GET]
-    expected: FAIL
-
-  [Redirect 303 with POST]
-    expected: FAIL
-
-  [Redirect 303 with HEAD]
-    expected: FAIL
-
-  [Redirect 307 with GET]
-    expected: FAIL
-
-  [Redirect 307 with POST]
-    expected: FAIL
-
-  [Redirect 307 with HEAD]
-    expected: FAIL
-
-  [Redirect 307 with POST (string body)]
-    expected: FAIL
-
-  [Redirect 307 with POST (blob body)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-mode.any.js.ini
similarity index 52%
rename from tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
rename to tests/wpt/metadata/fetch/api/redirect/redirect-mode.any.js.ini
index 764f49f378a9..b6eadc3b5cd6 100644
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-mode-worker.html.ini
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-mode.any.js.ini
@@ -1,20 +1,66 @@
-[redirect-mode-worker.html]
-  type: testharness
-  [Redirect 301 in "manual" mode ]
+[redirect-mode.any.worker.html]
+  [same-origin redirect 301 in manual redirect and cors mode]
+    expected: FAIL
+
+  [same-origin redirect 301 in manual redirect and no-cors mode]
+    expected: FAIL
+
+  [same-origin redirect 302 in manual redirect and cors mode]
+    expected: FAIL
+
+  [same-origin redirect 302 in manual redirect and no-cors mode]
+    expected: FAIL
+
+  [same-origin redirect 303 in manual redirect and cors mode]
     expected: FAIL
 
-  [Redirect 302 in "manual" mode ]
+  [same-origin redirect 303 in manual redirect and no-cors mode]
     expected: FAIL
 
-  [Redirect 303 in "manual" mode ]
+  [same-origin redirect 307 in manual redirect and cors mode]
     expected: FAIL
 
-  [Redirect 307 in "manual" mode ]
+  [same-origin redirect 307 in manual redirect and no-cors mode]
     expected: FAIL
 
-  [Redirect 308 in "manual" mode ]
+  [same-origin redirect 308 in manual redirect and cors mode]
+    expected: FAIL
+
+  [same-origin redirect 308 in manual redirect and no-cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 301 in manual redirect and cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 301 in manual redirect and no-cors mode]
     expected: FAIL
 
+  [cross-origin redirect 302 in manual redirect and cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 302 in manual redirect and no-cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 303 in manual redirect and cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 303 in manual redirect and no-cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 307 in manual redirect and cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 307 in manual redirect and no-cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 308 in manual redirect and cors mode]
+    expected: FAIL
+
+  [cross-origin redirect 308 in manual redirect and no-cors mode]
+    expected: FAIL
+
+
+[redirect-mode.any.html]
   [same-origin redirect 301 in manual redirect and cors mode]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
deleted file mode 100644
index 2a06be90e16b..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-mode.html.ini
+++ /dev/null
@@ -1,77 +0,0 @@
-[redirect-mode.html]
-  type: testharness
-  [Redirect 301 in "manual" mode ]
-    expected: FAIL
-
-  [Redirect 302 in "manual" mode ]
-    expected: FAIL
-
-  [Redirect 303 in "manual" mode ]
-    expected: FAIL
-
-  [Redirect 307 in "manual" mode ]
-    expected: FAIL
-
-  [Redirect 308 in "manual" mode ]
-    expected: FAIL
-
-  [same-origin redirect 301 in manual redirect and cors mode]
-    expected: FAIL
-
-  [same-origin redirect 301 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [same-origin redirect 302 in manual redirect and cors mode]
-    expected: FAIL
-
-  [same-origin redirect 302 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [same-origin redirect 303 in manual redirect and cors mode]
-    expected: FAIL
-
-  [same-origin redirect 303 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [same-origin redirect 307 in manual redirect and cors mode]
-    expected: FAIL
-
-  [same-origin redirect 307 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [same-origin redirect 308 in manual redirect and cors mode]
-    expected: FAIL
-
-  [same-origin redirect 308 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 301 in manual redirect and cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 301 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 302 in manual redirect and cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 302 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 303 in manual redirect and cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 303 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 307 in manual redirect and cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 307 in manual redirect and no-cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 308 in manual redirect and cors mode]
-    expected: FAIL
-
-  [cross-origin redirect 308 in manual redirect and no-cors mode]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
deleted file mode 100644
index 4680670cde57..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-origin-worker.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[redirect-origin-worker.html]
-  type: testharness
-  disabled: https://github.com/servo/servo/issues/13441
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin.any.js.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.any.js.ini
new file mode 100644
index 000000000000..473d1e45206b
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.any.js.ini
@@ -0,0 +1,33 @@
+[redirect-origin.any.html]
+  [Other origin to same origin redirection 301]
+    expected: FAIL
+
+  [Other origin to same origin redirection 302]
+    expected: FAIL
+
+  [Other origin to same origin redirection 303]
+    expected: FAIL
+
+  [Other origin to same origin redirection 307]
+    expected: FAIL
+
+  [Other origin to same origin redirection 308]
+    expected: FAIL
+
+
+[redirect-origin.any.worker.html]
+  [Other origin to same origin redirection 301]
+    expected: FAIL
+
+  [Other origin to same origin redirection 302]
+    expected: FAIL
+
+  [Other origin to same origin redirection 303]
+    expected: FAIL
+
+  [Other origin to same origin redirection 307]
+    expected: FAIL
+
+  [Other origin to same origin redirection 308]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
deleted file mode 100644
index 3b442a15f774..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-origin.html.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[redirect-origin.html]
-  type: testharness
-  disabled: https://github.com/servo/servo/issues/13441
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-referrer-worker.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-referrer-worker.html.ini
deleted file mode 100644
index c4e953f8d327..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-referrer-worker.html.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-[redirect-referrer-worker.html]
-  type: testharness
-  [Same origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, same-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, unsafe-url init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, no-referrer-when-downgrade init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, same-origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, origin-when-cross-origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, strict-origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, unsafe-url init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, no-referrer-when-downgrade init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, same-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, origin-when-cross-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, strict-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-referrer.any.js.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-referrer.any.js.ini
new file mode 100644
index 000000000000..e44f44dc7697
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/redirect/redirect-referrer.any.js.ini
@@ -0,0 +1,165 @@
+[redirect-referrer.any.worker.html]
+  [Same origin redirection, empty init, unsafe-url redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, same-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, strict-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, unsafe-url init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, no-referrer-when-downgrade init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, same-origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, origin-when-cross-origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, strict-origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, unsafe-url redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, strict-origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, unsafe-url init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, no-referrer-when-downgrade init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, same-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, origin-when-cross-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, strict-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
+    expected: FAIL
+
+
+[redirect-referrer.any.html]
+  [Same origin redirection, empty init, unsafe-url redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, same-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, strict-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, unsafe-url init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, no-referrer-when-downgrade init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, same-origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, origin-when-cross-origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, strict-origin init ]
+    expected: FAIL
+
+  [Same origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, unsafe-url redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, strict-origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, unsafe-url init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, no-referrer-when-downgrade init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, same-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, origin-when-cross-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, strict-origin init ]
+    expected: FAIL
+
+  [Cross origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/api/redirect/redirect-referrer.html.ini b/tests/wpt/metadata/fetch/api/redirect/redirect-referrer.html.ini
deleted file mode 100644
index e84202db2eae..000000000000
--- a/tests/wpt/metadata/fetch/api/redirect/redirect-referrer.html.ini
+++ /dev/null
@@ -1,83 +0,0 @@
-[redirect-referrer.html]
-  type: testharness
-  [Same origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, same-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, unsafe-url init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, no-referrer-when-downgrade init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, same-origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, origin-when-cross-origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, strict-origin init ]
-    expected: FAIL
-
-  [Same origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, unsafe-url redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, no-referrer-when-downgrade redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty init, strict-origin-when-cross-origin redirect header ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, unsafe-url init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, no-referrer-when-downgrade init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, same-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, origin-when-cross-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, strict-origin init ]
-    expected: FAIL
-
-  [Cross origin redirection, empty redirect header, strict-origin-when-cross-origin init ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/api/response/response-stream-with-broken-then.any.js.ini b/tests/wpt/metadata/fetch/api/response/response-stream-with-broken-then.any.js.ini
new file mode 100644
index 000000000000..843451220c4f
--- /dev/null
+++ b/tests/wpt/metadata/fetch/api/response/response-stream-with-broken-then.any.js.ini
@@ -0,0 +1,9 @@
+[response-stream-with-broken-then.any.html]
+  [Untitled]
+    expected: FAIL
+
+
+[response-stream-with-broken-then.any.worker.html]
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/corb/img-mime-types-coverage.tentative.sub.html.ini b/tests/wpt/metadata/fetch/corb/img-mime-types-coverage.tentative.sub.html.ini
index e607184f037b..0954682c7394 100644
--- a/tests/wpt/metadata/fetch/corb/img-mime-types-coverage.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/corb/img-mime-types-coverage.tentative.sub.html.ini
@@ -44,3 +44,9 @@
   [CORB should block the response if Content-Type is: 'APPLICATION/BLAH+XML'.  ]
     expected: FAIL
 
+  [CORB should block the response if Content-Type is: 'text/json;does=it;matter'.  ]
+    expected: FAIL
+
+  [CORB should block the response if Content-Type is: 'text/HTML;NO=it;does=NOT'.  ]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/corb/script-html-correctly-labeled.tentative.sub.html.ini b/tests/wpt/metadata/fetch/corb/script-html-correctly-labeled.tentative.sub.html.ini
index d4cfb2bb9615..5cc9d71e3150 100644
--- a/tests/wpt/metadata/fetch/corb/script-html-correctly-labeled.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/corb/script-html-correctly-labeled.tentative.sub.html.ini
@@ -2,3 +2,6 @@
   [Untitled]
     expected: FAIL
 
+  [CORB-blocked script has no syntax errors]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/http-cache/basic-auth-cache-test.html.ini b/tests/wpt/metadata/fetch/http-cache/basic-auth-cache-test.html.ini
new file mode 100644
index 000000000000..8d375b10ee02
--- /dev/null
+++ b/tests/wpt/metadata/fetch/http-cache/basic-auth-cache-test.html.ini
@@ -0,0 +1,2 @@
+[basic-auth-cache-test.html]
+  expected: TIMEOUT
diff --git a/tests/wpt/metadata/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html.ini
index 3906138abaf5..7ae085cb12d8 100644
--- a/tests/wpt/metadata/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html.ini
@@ -43,3 +43,6 @@
   [<iframe id="dangling"\\n        src="\\rdata:text/html,\\n            <img\\n              onload='window.parent.postMessage(&quot;loaded&quot;, &quot;*&quot;);'\\n              onerror='window.parent.postMessage(&quot;error&quot;, &quot;*&quot;);'\\n              src='http://web-platform.test:8000/images/gr&#10;een-256x256.png?&lt;'>\\n        ">\\n     </iframe>]
     expected: TIMEOUT
 
+  [<iframe id="dangling"\\n        src="data:text/html,\\n            <img\\n              onload='window.parent.postMessage(&quot;loaded&quot;, &quot;*&quot;);'\\n              onerror='window.parent.postMessage(&quot;error&quot;, &quot;*&quot;);'\\n              src='http://web-platform.test:8000/images/green-256x256.png?&amp;amp;%2310;&lt;'>\\n        ">\\n     </iframe>]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/fullscreen/interfaces.html.ini b/tests/wpt/metadata/fullscreen/interfaces.html.ini
index 6ca5a8b81d83..e08ea34df304 100644
--- a/tests/wpt/metadata/fullscreen/interfaces.html.ini
+++ b/tests/wpt/metadata/fullscreen/interfaces.html.ini
@@ -39,3 +39,6 @@
   [Unscopable handled correctly for fullscreen property on Document]
     expected: FAIL
 
+  [Fullscreen IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/hr-time/idlharness.html.ini b/tests/wpt/metadata/hr-time/idlharness.html.ini
index 1b082bfa85f9..7365fa021d17 100644
--- a/tests/wpt/metadata/hr-time/idlharness.html.ini
+++ b/tests/wpt/metadata/hr-time/idlharness.html.ini
@@ -27,3 +27,6 @@
   [Performance interface: window.performance must inherit property "toJSON()" with the proper type]
     expected: FAIL
 
+  [High Resolution Time IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/007.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/007.html.ini
index aadbdc0bedac..04538ab47a09 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/007.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/007.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [Link with onclick javascript url and href navigation ]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
index 78879bad5f14..5b38c37b0866 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/javascript-url-abort/javascript-url-abort-return-value-undefined.tentative.html.ini
@@ -1,5 +1,4 @@
 [javascript-url-abort-return-value-undefined.tentative.html]
-  expected: TIMEOUT
   [Not aborting fetch for javascript:undefined navigation]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js.ini
new file mode 100644
index 000000000000..bb1033eff95f
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js.ini
@@ -0,0 +1,8 @@
+[navigate.window.html]
+  expected: TIMEOUT
+  [When navigating the Refresh header needs to be followed]
+    expected: TIMEOUT
+
+  [When there's both a Refresh header and <meta> the Refresh header wins]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/001.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/001.html.ini
index ea827596bf49..e400bffbc98f 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/001.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/001.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [document.open in unload]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/002.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/002.html.ini
index 93d509d16091..614df76f702c 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/002.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/002.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [document.open in unload]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/003.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/003.html.ini
index 5eebab7723d7..be6bfc0f1595 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/003.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/003.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [document.open in beforeunload with link]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/004.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/004.html.ini
index a52c3225f462..3461893be54f 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/004.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/004.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [document.open in beforeunload with button]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/005.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/005.html.ini
index 7765d7e2549d..53dc4519c024 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/005.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/005.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [document.open in pagehide in iframe]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html.ini
index a7665ba15a5a..4b6c9580cc34 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-history-back.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [beforeunload event fires on history navigation back]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html.ini
index 2ec2483f679f..82b509db9734 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/beforeunload-on-navigation-of-parent.html.ini
@@ -2,5 +2,7 @@
   type: testharness
   [Triggering navigation from within beforeunload event]
     expected: FAIL
+
   [beforeunload in iframe on navigation of parent]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
index d8e44b25fd7d..c22659da3d55 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/navigation-within-beforeunload.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [Triggering navigation from within beforeunload event]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/003.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/003.html.ini
index f23c18eaad03..9bcbd45240b5 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/003.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/003.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [unload event properties]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/006.html.ini b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/006.html.ini
index 45b39bde1b22..2a9acfba6943 100644
--- a/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/006.html.ini
+++ b/tests/wpt/metadata/html/browsers/browsing-the-web/unloading-documents/unload/006.html.ini
@@ -3,3 +3,4 @@
   expected: TIMEOUT
   [salvagable state of document after setting pagehide listener]
     expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/assign_after_load.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/assign_after_load.html.ini
index 0ac3627e0726..cb59d5b63e2b 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/assign_after_load.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/assign_after_load.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [Assignment to location after document is completely loaded]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini
index 1acda0fafa50..6be14fec6f57 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken-weird.html.ini
@@ -3,3 +3,15 @@
   [Set location.protocol to x]
     expected: FAIL
 
+  [Set location.protocol to data]
+    expected: FAIL
+
+  [Set location.protocol to ftp]
+    expected: FAIL
+
+  [Set location.protocol to gopher]
+    expected: FAIL
+
+  [Set location.protocol to http+x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index fc20af26ee0e..6832a13a9e97 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -17,3 +17,16 @@
 
   [Set data URL frame location.protocol to http+x]
     expected: FAIL
+
+  [Set HTTP URL frame location.protocol to x]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to ftp]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to gopher]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to http+x]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html.ini
index 7dabdca26342..f914ca646301 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin-domain.sub.html.ini
@@ -2,14 +2,19 @@
   type: testharness
   [Cross-origin via document.domain: the prototype is null]
     expected: FAIL
+
   [Cross-origin via document.domain: setting the prototype to an empty object via __proto__ should throw a "SecurityError" DOMException]
     expected: FAIL
+
   [Cross-origin via document.domain: setting the prototype to an empty object via Reflect.setPrototypeOf should return false]
     expected: FAIL
+
   [Cross-origin via document.domain: setting the prototype to its original value via Object.setPrototypeOf should not throw]
     expected: FAIL
+
   [Cross-origin via document.domain: setting the prototype to its original value via __proto__ should throw a "SecurityError" since it ends up in CrossOriginGetOwnProperty]
     expected: FAIL
+
   [Cross-origin via document.domain: setting the prototype to its original value via Reflect.setPrototypeOf should return true]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html.ini
index 2f57f0ed51e2..73ea5ac32455 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-cross-origin.sub.html.ini
@@ -2,16 +2,22 @@
   type: testharness
   [Cross-origin: the prototype is null]
     expected: FAIL
+
   [Cross-origin: setting the prototype to an empty object via __proto__ should throw a "SecurityError" DOMException]
     expected: FAIL
+
   [Cross-origin: setting the prototype to an empty object via Reflect.setPrototypeOf should return false]
     expected: FAIL
+
   [Cross-origin: the prototype must still be null]
     expected: FAIL
+
   [Cross-origin: setting the prototype to null via Object.setPrototypeOf should not throw]
     expected: FAIL
+
   [Cross-origin: setting the prototype to null via __proto__ should throw a "SecurityError" since it ends up in CrossOriginGetOwnProperty]
     expected: FAIL
+
   [Cross-origin: setting the prototype to null via Reflect.setPrototypeOf should return true]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html.ini
index 075dd1b38f79..81c27855a035 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-goes-cross-origin-domain.sub.html.ini
@@ -2,20 +2,28 @@
   type: testharness
   [Became cross-origin via document.domain: the prototype is now null]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to an empty object via __proto__ should throw a "SecurityError" DOMException]
     expected: FAIL
+
   [Became cross-origin via document.domain: the prototype must still be null]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to null via Object.setPrototypeOf should not throw]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to null via __proto__ should throw a "SecurityError" since it ends up in CrossOriginGetOwnProperty]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to an empty object via Reflect.setPrototypeOf should return false]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to null via Reflect.setPrototypeOf should return true]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to the original value from before going cross-origin via __proto__ should throw a "SecurityError" DOMException]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to the original value from before going cross-origin via Reflect.setPrototypeOf should return false]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini
index dcfb3fb08d2f..f19667f3fbcd 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-prototype-setting-same-origin-domain.sub.html.ini
@@ -2,10 +2,13 @@
   type: testharness
   [Same-origin-domain: setting the prototype to an empty object via Reflect.setPrototypeOf should return false]
     expected: FAIL
+
   [Same-origin-domain: setting the prototype to its original value via Object.setPrototypeOf should not throw]
     expected: FAIL
+
   [Same-origin-domain: setting the prototype to its original value via __proto__ should not throw]
     expected: FAIL
+
   [Same-origin-domain: setting the prototype to its original value via Reflect.setPrototypeOf should return true]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-window-object/window-indexed-properties.html.ini b/tests/wpt/metadata/html/browsers/the-window-object/window-indexed-properties.html.ini
index 498ea7d0b6f9..3d24389f80e9 100644
--- a/tests/wpt/metadata/html/browsers/the-window-object/window-indexed-properties.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-window-object/window-indexed-properties.html.ini
@@ -2,3 +2,4 @@
   type: testharness
   [Indexed properties of the window object (non-strict mode) 1]
     expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html.ini b/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html.ini
index 7e0cc84a7f07..9505b8a64c8e 100644
--- a/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-goes-cross-origin-domain.sub.html.ini
@@ -2,16 +2,22 @@
   type: testharness
   [Became cross-origin via document.domain: the prototype is now null]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to an empty object via __proto__ should throw a "SecurityError" DOMException]
     expected: FAIL
+
   [Became cross-origin via document.domain: the prototype must still be null]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to null via Object.setPrototypeOf should not throw]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to null via __proto__ should throw a "SecurityError" since it ends up in CrossOriginGetOwnProperty]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to null via Reflect.setPrototypeOf should return true]
     expected: FAIL
+
   [Became cross-origin via document.domain: setting the prototype to the original value from before going cross-origin via __proto__ should throw a "SecurityError" DOMException]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html.ini b/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html.ini
index 658e31e48976..11f1543b1bf4 100644
--- a/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html.ini
+++ b/tests/wpt/metadata/html/browsers/the-windowproxy-exotic-object/windowproxy-prototype-setting-same-origin-domain.sub.html.ini
@@ -2,8 +2,10 @@
   type: testharness
   [Same-origin-domain: setting the prototype to its original value via Object.setPrototypeOf should not throw]
     expected: FAIL
+
   [Same-origin-domain: setting the prototype to its original value via __proto__ should not throw]
     expected: FAIL
+
   [Same-origin-domain: setting the prototype to its original value via Reflect.setPrototypeOf should return true]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js.ini b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js.ini
new file mode 100644
index 000000000000..b857fc763ee4
--- /dev/null
+++ b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js.ini
@@ -0,0 +1,4 @@
+[encoding.window.html]
+  [doucment.open() and the document's encoding]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js.ini b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js.ini
new file mode 100644
index 000000000000..a46d555d3a7e
--- /dev/null
+++ b/tests/wpt/metadata/html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js.ini
@@ -0,0 +1,7 @@
+[event-listeners.window.html]
+  [Event listeners are to be removed with immediate effect]
+    expected: FAIL
+
+  [Event listeners are to be removed from shadow trees as well]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/interfaces.https.html.ini b/tests/wpt/metadata/html/dom/interfaces.https.html.ini
index c6bb4b3d4bfa..1c47922b9063 100644
--- a/tests/wpt/metadata/html/dom/interfaces.https.html.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.https.html.ini
@@ -5729,3 +5729,6 @@
   [External interface: window.external must inherit property "IsSearchProviderInstalled()" with the proper type]
     expected: FAIL
 
+  [HTML IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/interfaces.worker.js.ini b/tests/wpt/metadata/html/dom/interfaces.worker.js.ini
index 740232527fb6..74606a21dbf0 100644
--- a/tests/wpt/metadata/html/dom/interfaces.worker.js.ini
+++ b/tests/wpt/metadata/html/dom/interfaces.worker.js.ini
@@ -255,3 +255,6 @@
   [Test driver]
     expected: FAIL
 
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/dom/self-origin.sub.html.ini b/tests/wpt/metadata/html/dom/self-origin.sub.html.ini
index 053ca2c72ed2..b43464deb110 100644
--- a/tests/wpt/metadata/html/dom/self-origin.sub.html.ini
+++ b/tests/wpt/metadata/html/dom/self-origin.sub.html.ini
@@ -1,6 +1,6 @@
 [self-origin.sub.html]
   type: testharness
-  expected: ERROR
+  expected: TIMEOUT
   [Should have the right origin for cross-origin subframe]
     expected: NOTRUN
 
@@ -25,6 +25,3 @@
   [javascript: subframe origins]
     expected: FAIL
 
-  [srcdoc subframe origins]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html.ini b/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html.ini
index e32416360278..13fb4ce7af97 100644
--- a/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html.ini
+++ b/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.html.ini
@@ -57,3 +57,6 @@
   [DOMStringList interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [DOMStringList IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js.ini b/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js.ini
index 99f4c8023c12..0ed4f5d4caaf 100644
--- a/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js.ini
+++ b/tests/wpt/metadata/html/infrastructure/common-dom-interfaces/collections/domstringlist-interface.worker.js.ini
@@ -27,3 +27,6 @@
   [DOMStringList interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
index d0913a41225c..1de3f8d68b28 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/image-maps/image-map-processing-model/hash-name-reference.html.ini
@@ -172,63 +172,3 @@
   [XHTML img usemap="http://example.org/#garbage-before-hash-id"]
     expected: FAIL
 
-  [XHTML img usemap="no-hash-name"]
-    expected: FAIL
-
-  [XHTML img usemap="no-hash-id"]
-    expected: FAIL
-
-  [XHTML img usemap="hash-last#"]
-    expected: FAIL
-
-  [XHTML img usemap=""]
-    expected: FAIL
-
-  [XHTML img usemap="#"]
-    expected: FAIL
-
-  [XHTML img usemap="#percent-escape-name-%41"]
-    expected: FAIL
-
-  [XHTML img usemap="#percent-escape-id-%41"]
-    expected: FAIL
-
-  [XHTML img usemap="#no-such-map"]
-    expected: FAIL
-
-  [XHTML img usemap="#different-CASE-name"]
-    expected: FAIL
-
-  [XHTML img usemap="#different-CASE-id"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="no-hash-name"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="no-hash-id"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="hash-last#"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap=""]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="#"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="#percent-escape-name-%41"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="#percent-escape-id-%41"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="#no-such-map"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="#different-CASE-name"]
-    expected: FAIL
-
-  [HTML (standards) IMG usemap="#different-CASE-id"]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html.ini
index bc9b2091881d..4d3b88d9ec31 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html.ini
@@ -2040,3 +2040,15 @@
   [<img srcset="/images/green-1x1.png?f49b 50w, /images/green-16x16.png?f49b 51w" sizes="(min-width:0) max(-200vw, 1px"> ref sizes="1px" (width:1000px)]
     expected: FAIL
 
+  [<img srcset="/images/green-1x1.png?f17a 50w, /images/green-16x16.png?f17a 51w" sizes="0.1x"> ref sizes="100vw" (standards mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?f17a 50w, /images/green-16x16.png?f17a 51w" sizes="0.1x"> ref sizes="100vw" (quirks mode)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?f17a 50w, /images/green-16x16.png?f17a 51w" sizes="0.1x"> ref sizes="100vw" (display:none)]
+    expected: FAIL
+
+  [<img srcset="/images/green-1x1.png?f17a 50w, /images/green-16x16.png?f17a 51w" sizes="0.1x"> ref sizes="100vw" (width:1000px)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js.ini
new file mode 100644
index 000000000000..5475d20803d4
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js.ini
@@ -0,0 +1,4 @@
+[form-data-set-empty-file.window.html]
+  [Empty <input type=file> is still serialized]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/animation-frames/idlharness.html.ini b/tests/wpt/metadata/html/webappapis/animation-frames/idlharness.html.ini
new file mode 100644
index 000000000000..6b96aee0986c
--- /dev/null
+++ b/tests/wpt/metadata/html/webappapis/animation-frames/idlharness.html.ini
@@ -0,0 +1,4 @@
+[idlharness.html]
+  [idlharness test]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/eventhandler-cancellation.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/eventhandler-cancellation.html.ini
index 3bf042ffda34..7d89d30d6be0 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/eventhandler-cancellation.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/eventhandler-cancellation.html.ini
@@ -1,4 +1,3 @@
 [eventhandler-cancellation.html]
   type: testharness
   expected: ERROR
-
diff --git a/tests/wpt/metadata/navigation-timing/idlharness.html.ini b/tests/wpt/metadata/navigation-timing/idlharness.html.ini
index bae322d90e6d..75ac6a64bbb6 100644
--- a/tests/wpt/metadata/navigation-timing/idlharness.html.ini
+++ b/tests/wpt/metadata/navigation-timing/idlharness.html.ini
@@ -1,6 +1,5 @@
 [idlharness.html]
   type: testharness
-  expected: ERROR
   [PerformanceTiming interface: attribute unloadEventStart]
     expected: FAIL
 
@@ -352,3 +351,6 @@
   [PerformanceNavigation interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [Navigation Timing IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/navigation-timing/nav2_idlharness.html.ini b/tests/wpt/metadata/navigation-timing/nav2_idlharness.html.ini
index 29263d6a1e7c..4b0d63606b08 100644
--- a/tests/wpt/metadata/navigation-timing/nav2_idlharness.html.ini
+++ b/tests/wpt/metadata/navigation-timing/nav2_idlharness.html.ini
@@ -51,3 +51,6 @@
   [PerformanceNavigationTiming interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [Navigation Timing 2 IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/performance-timeline/idlharness.html.ini b/tests/wpt/metadata/performance-timeline/idlharness.html.ini
index 39aea95bb4f7..b17d75503ece 100644
--- a/tests/wpt/metadata/performance-timeline/idlharness.html.ini
+++ b/tests/wpt/metadata/performance-timeline/idlharness.html.ini
@@ -15,3 +15,6 @@
   [Test default toJSON operation of PerformanceMark]
     expected: FAIL
 
+  [Performance Timeline IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..af1a4d21235a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 000000000000..c9b7885ec20f
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..391f7b1e9478
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..af7c169bca0e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 000000000000..27d142f019da
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..c029621d3cc9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..1612c253dbf9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 000000000000..eab5d86cbf92
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..8d71eddc43c7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..a3e147f82dc7
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html.ini
new file mode 100644
index 000000000000..01f1916eaba1
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..89f3479dce3e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[generic.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..37a69561dba8
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.keep-origin-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 000000000000..4764e6a9bc38
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.no-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..5bfa5cee8cd9
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.swap-origin-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..05c571a77d31
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.keep-origin-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.ini
new file mode 100644
index 000000000000..cc7da1446cb2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.no-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..0a0a28bf9714
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-origin.swap-origin-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..e35f083283cb
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.swap-origin-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..f2f3cdfa976b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-origin-insecure.swap-origin-redirect.http.html]
+  [The referrer URL is omitted when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..4185f79a4350
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html.ini
new file mode 100644
index 000000000000..943668189df2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..50cd65e76ba5
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[cross-insecure.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..c3c010192a3a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 000000000000..81f8266bc763
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..9bc949e32de6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..c680955c7b7e
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[same-insecure.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..a1631c6bb384
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 000000000000..3eac106db813
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..6abbdfd458a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..e2c8b87bfd7c
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 000000000000..ba6d3786bf11
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..b08ef45d07b0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..c3c010192a3a
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 000000000000..81f8266bc763
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..9bc949e32de6
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is cross-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..1543aa8e741b
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.ini
new file mode 100644
index 000000000000..a898eac03d98
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..1bf665d71bb2
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[insecure-protocol.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an http\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..a1631c6bb384
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.keep-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with keep-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
new file mode 100644
index 000000000000..3eac106db813
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.no-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with no-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
new file mode 100644
index 000000000000..6abbdfd458a0
--- /dev/null
+++ b/tests/wpt/metadata/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html.ini
@@ -0,0 +1,4 @@
+[upgrade-protocol.swap-origin-redirect.http.html]
+  [The referrer URL is origin when a\n                                 document served over http requires an https\n                                 sub-resource via script-tag using the attr-referrer\n                                 delivery method with swap-origin-redirect and when\n                                 the target request is same-origin.]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/touch-events/historical.html.ini b/tests/wpt/metadata/touch-events/historical.html.ini
new file mode 100644
index 000000000000..07822f74e3ce
--- /dev/null
+++ b/tests/wpt/metadata/touch-events/historical.html.ini
@@ -0,0 +1,16 @@
+[historical.html]
+  [Touch::webkitRadiusX]
+    expected: FAIL
+
+  [Touch::webkitRadiusY]
+    expected: FAIL
+
+  [Touch::webkitRotationAngle]
+    expected: FAIL
+
+  [Touch::webkitForce]
+    expected: FAIL
+
+  [Document::createTouch]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/uievents/interfaces.html.ini b/tests/wpt/metadata/uievents/interfaces.html.ini
index 6a747c231b3e..0e08d931fda0 100644
--- a/tests/wpt/metadata/uievents/interfaces.html.ini
+++ b/tests/wpt/metadata/uievents/interfaces.html.ini
@@ -192,3 +192,6 @@
   [CompositionEvent interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [UI Events IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/interfaces.any.js.ini b/tests/wpt/metadata/url/interfaces.any.js.ini
index 4f269699b990..8fece4f457bb 100644
--- a/tests/wpt/metadata/url/interfaces.any.js.ini
+++ b/tests/wpt/metadata/url/interfaces.any.js.ini
@@ -33,6 +33,7 @@
 
 [interfaces.any.worker.html]
   type: testharness
+  expected: ERROR
   [URL interface: operation toJSON()]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/url/url-setters.html.ini b/tests/wpt/metadata/url/url-setters.html.ini
index dcb7cf621960..a78f6df7be7d 100644
--- a/tests/wpt/metadata/url/url-setters.html.ini
+++ b/tests/wpt/metadata/url/url-setters.html.ini
@@ -978,3 +978,6 @@
   [<area>: Setting <http://example.net>.hash = '#foo`bar']
     expected: FAIL
 
+  [<area>: Setting <http://example.net:8080>.host = 'example.com:80' Port number is removed if new port is scheme default and existing URL has a non-default port]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webstorage/idlharness.html.ini b/tests/wpt/metadata/webstorage/idlharness.html.ini
new file mode 100644
index 000000000000..a02c58f603a2
--- /dev/null
+++ b/tests/wpt/metadata/webstorage/idlharness.html.ini
@@ -0,0 +1,4 @@
+[idlharness.html]
+  [Web Storage IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webvr/idlharness.https.html.ini b/tests/wpt/metadata/webvr/idlharness.https.html.ini
index 9a5d4e35979d..7d4cec8279ef 100644
--- a/tests/wpt/metadata/webvr/idlharness.https.html.ini
+++ b/tests/wpt/metadata/webvr/idlharness.https.html.ini
@@ -14,3 +14,6 @@
   [VRDisplay interface: operation exitPresent()]
     expected: FAIL
 
+  [WebVR IDL test]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/interfaces.worker.js.ini b/tests/wpt/metadata/workers/interfaces.worker.js.ini
index b2529dc21cb5..b31a14077413 100644
--- a/tests/wpt/metadata/workers/interfaces.worker.js.ini
+++ b/tests/wpt/metadata/workers/interfaces.worker.js.ini
@@ -1,6 +1,5 @@
 [interfaces.worker.html]
   type: testharness
-  expected: ERROR
   [WorkerGlobalScope interface: operation close()]
     expected: FAIL
 
@@ -271,3 +270,6 @@
   [DedicatedWorkerGlobalScope interface: internal [[SetPrototypeOf\]\] method of interface prototype object - setting to a new value via Object.setPrototypeOf should throw a TypeError]
     expected: TIMEOUT
 
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/workers/modules/dedicated-worker-import-meta.html.ini b/tests/wpt/metadata/workers/modules/dedicated-worker-import-meta.html.ini
index 5d11920aaf0f..3362697d228c 100644
--- a/tests/wpt/metadata/workers/modules/dedicated-worker-import-meta.html.ini
+++ b/tests/wpt/metadata/workers/modules/dedicated-worker-import-meta.html.ini
@@ -6,3 +6,6 @@
   [Test import.meta.url on the imported module script.]
     expected: NOTRUN
 
+  [Test import.meta.url on the imported module script with a fragment.]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/workers/modules/dedicated-worker-import.html.ini b/tests/wpt/metadata/workers/modules/dedicated-worker-import.html.ini
index 1c41f7a937b0..95b120688aaa 100644
--- a/tests/wpt/metadata/workers/modules/dedicated-worker-import.html.ini
+++ b/tests/wpt/metadata/workers/modules/dedicated-worker-import.html.ini
@@ -18,3 +18,15 @@
   [Test dynamic import and then static import on DedicatedWorkerGlobalScope.]
     expected: NOTRUN
 
+  [importScripts() on module worker should throw an exception.]
+    expected: NOTRUN
+
+  [Worker construction for non-existent script should throw an exception.]
+    expected: NOTRUN
+
+  [Static import for non-existent script should throw an exception.]
+    expected: NOTRUN
+
+  [Dynamic import for non-existent script should throw an exception.]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/workers/modules/dedicated-worker-options-credentials.html.ini b/tests/wpt/metadata/workers/modules/dedicated-worker-options-credentials.html.ini
new file mode 100644
index 000000000000..998ab7efe701
--- /dev/null
+++ b/tests/wpt/metadata/workers/modules/dedicated-worker-options-credentials.html.ini
@@ -0,0 +1,4 @@
+[dedicated-worker-options-credentials.html]
+  [DedicatedWorker: WorkerOptions 'credentials']
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/xhr/interfaces.html.ini b/tests/wpt/metadata/xhr/interfaces.html.ini
index 6d4dab47f6b2..ce197eac3e09 100644
--- a/tests/wpt/metadata/xhr/interfaces.html.ini
+++ b/tests/wpt/metadata/xhr/interfaces.html.ini
@@ -2,3 +2,6 @@
   [Testing Symbol.iterator property of iterable interface FormData]
     expected: FAIL
 
+  [XMLHttpRequest IDL tests]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/bluetooth/interfaces.html.ini b/tests/wpt/mozilla/meta/bluetooth/interfaces.html.ini
index 8edfcf5a3641..fbcb43098f36 100644
--- a/tests/wpt/mozilla/meta/bluetooth/interfaces.html.ini
+++ b/tests/wpt/mozilla/meta/bluetooth/interfaces.html.ini
@@ -576,3 +576,6 @@
   [BluetoothServiceDataMap interface: existence and properties of interface prototype object's @@unscopables property]
     expected: FAIL
 
+  [Untitled]
+    expected: FAIL
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
new file mode 100644
index 000000000000..1e2567027d8a
--- /dev/null
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/canvas/rapid-resizing.html.ini
@@ -0,0 +1,5 @@
+[rapid-resizing.html]
+  expected: TIMEOUT
+  [Overall test]
+    expected: NOTRUN
+
diff --git a/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html.ini b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html.ini
new file mode 100644
index 000000000000..fb8852c9e7a9
--- /dev/null
+++ b/tests/wpt/mozilla/meta/webgl/conformance-1.0.3/conformance/glsl/misc/shader-with-non-reserved-words.html.ini
@@ -0,0 +1,5 @@
+[shader-with-non-reserved-words.html]
+  expected: TIMEOUT
+  [Overall test]
+    expected: NOTRUN
+
diff --git a/tests/wpt/web-platform-tests/.taskcluster.yml b/tests/wpt/web-platform-tests/.taskcluster.yml
index 11109a544a0c..76f14e2755bd 100644
--- a/tests/wpt/web-platform-tests/.taskcluster.yml
+++ b/tests/wpt/web-platform-tests/.taskcluster.yml
@@ -11,12 +11,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 1 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -29,12 +28,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 2 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -47,12 +45,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 3 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -65,12 +62,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 4 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -83,12 +79,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 5 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -101,12 +96,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 6 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -119,12 +113,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 7 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -137,12 +130,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 8 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -155,12 +147,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 9 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -173,12 +164,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome reftest 10 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -191,12 +181,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome wdspec 1 1"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -209,12 +198,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 1 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -227,12 +215,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 2 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -245,12 +232,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 3 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -263,12 +249,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 4 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -281,12 +266,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 5 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -299,12 +283,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 6 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -317,12 +300,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 7 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -335,12 +317,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 8 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -353,12 +334,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 9 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -371,12 +351,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 10 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -389,12 +368,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 11 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -407,12 +385,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 12 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -425,12 +402,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 13 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -443,12 +419,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 14 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -461,12 +436,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} chrome-dev &&\n        \
+        \    cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ chrome testharness 15 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -479,12 +453,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 1 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -497,12 +470,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 2 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -515,12 +487,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 3 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -533,12 +504,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 4 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -551,12 +521,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 5 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -569,12 +538,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 6 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -587,12 +555,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 7 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -605,12 +572,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 8 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -623,12 +589,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 9 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -641,12 +606,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox reftest 10 10"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -659,12 +623,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox wdspec 1 1"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -677,12 +640,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 1 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -695,12 +657,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 2 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -713,12 +674,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 3 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -731,12 +691,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 4 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -749,12 +708,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 5 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -767,12 +725,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 6 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -785,12 +742,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 7 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -803,12 +759,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 8 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -821,12 +776,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 9 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -839,12 +793,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 10 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -857,12 +810,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 11 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -875,12 +827,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 12 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -893,12 +844,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 13 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -911,12 +861,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 14 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
@@ -929,12 +878,11 @@ tasks:
   payload:
     artifacts:
       public/results: {path: /home/test/artifacts, type: directory}
-    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh &&\n           \
-        \ cd /home/test/web-platform-tests &&\n            git fetch {{event.head.repo.url}}\
-        \ &&\n            git config advice.detachedHead false &&\n            git\
-        \ checkout {{event.head.sha}} &&\n            ./tools/ci/ci_taskcluster.sh\
+    command: [/bin/bash, --login, -c, ">-\n            ~/start.sh {{event.head.repo.url}}\
+        \ {{ event.head.repo.branch }} {{event.head.sha}} firefox-nightly &&\n   \
+        \         cd ~/web-platform-tests &&\n            ./tools/ci/ci_taskcluster.sh\
         \ firefox testharness 15 15"]
-    image: harjgam/web-platform-tests:0.6
+    image: harjgam/web-platform-tests:0.11
     maxRunTime: 7200
   provisionerId: '{{ taskcluster.docker.provisionerId }}'
   workerType: '{{ taskcluster.docker.workerType }}'
diff --git a/tests/wpt/web-platform-tests/.travis.yml b/tests/wpt/web-platform-tests/.travis.yml
index e3df73d1f214..6f06b671f0cc 100644
--- a/tests/wpt/web-platform-tests/.travis.yml
+++ b/tests/wpt/web-platform-tests/.travis.yml
@@ -47,7 +47,6 @@ matrix:
           packages:
             - libnss3-tools
       env:
-        - secure: "YTSXPwI0DyCA1GhYrLT9KMEV6b7QQKuEeaQgeFDP38OTzJ1+cIj3CC4SRNqbnJ/6SJwPGcdqSxLuV8m4e5HFFnyCcQnJe6h8EMsTehZ7W3j/fP9UYrJqYqvGpe3Vj3xblO5pwBYmq7sg3jAmmuCgAgOW6VGf7cRMucrsmFeo7VM="
         - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=firefox:nightly
     - os: linux
       sudo: required
@@ -58,7 +57,6 @@ matrix:
             - libappindicator1
             - fonts-liberation
       env:
-        - secure: "YTSXPwI0DyCA1GhYrLT9KMEV6b7QQKuEeaQgeFDP38OTzJ1+cIj3CC4SRNqbnJ/6SJwPGcdqSxLuV8m4e5HFFnyCcQnJe6h8EMsTehZ7W3j/fP9UYrJqYqvGpe3Vj3xblO5pwBYmq7sg3jAmmuCgAgOW6VGf7cRMucrsmFeo7VM="
         - JOB=stability SCRIPT=tools/ci/ci_stability.sh PRODUCT=chrome:dev
     - python: 2.7
       env: JOB=tools_unittest TOXENV=py27 HYPOTHESIS_PROFILE=ci SCRIPT=tools/ci/ci_tools_unittest.sh
@@ -95,4 +93,3 @@ notifications:
   email:
     on_success: never
     on_failure: always
-  webhooks: https://pulls.web-platform-tests.org/api/build
diff --git a/tests/wpt/web-platform-tests/.well-known/idp-proxy/OWNERS b/tests/wpt/web-platform-tests/.well-known/idp-proxy/OWNERS
new file mode 100644
index 000000000000..79ac31d21016
--- /dev/null
+++ b/tests/wpt/web-platform-tests/.well-known/idp-proxy/OWNERS
@@ -0,0 +1 @@
+@nils-ohlmeier
diff --git a/tests/wpt/web-platform-tests/2dcontext/OWNERS b/tests/wpt/web-platform-tests/2dcontext/OWNERS
new file mode 100644
index 000000000000..3bb6edf248aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/2dcontext/OWNERS
@@ -0,0 +1,5 @@
+@AmeliaBR
+@annevk
+@kenrussell
+@jdashg
+@fserb
diff --git a/tests/wpt/web-platform-tests/BackgroundSync/OWNERS b/tests/wpt/web-platform-tests/BackgroundSync/OWNERS
new file mode 100644
index 000000000000..9cc0eff9fd27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/BackgroundSync/OWNERS
@@ -0,0 +1 @@
+@beverloo
diff --git a/tests/wpt/web-platform-tests/BackgroundSync/interfaces.any.js b/tests/wpt/web-platform-tests/BackgroundSync/interfaces.any.js
index dd677fc4044c..207a0d5d684a 100644
--- a/tests/wpt/web-platform-tests/BackgroundSync/interfaces.any.js
+++ b/tests/wpt/web-platform-tests/BackgroundSync/interfaces.any.js
@@ -6,24 +6,16 @@
 // https://wicg.github.io/BackgroundSync/spec/
 
 promise_test(async () => {
-  const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
-  const html = await fetch('/interfaces/html.idl').then(r => r.text());
+  const idl = await fetch('/interfaces/BackgroundSync.idl').then(r => r.text());
   const sw = await fetch('/interfaces/ServiceWorker.idl').then(r => r.text());
-  const idl = await fetch('/interfaces/BackgroundSync.idl').then(response => response.text());
+  const html = await fetch('/interfaces/html.idl').then(r => r.text());
+  const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
 
   const idlArray = new IdlArray();
-  idlArray.add_untested_idls(dom, { only: ['Event', 'EventInit', 'EventTarget'] });
-  idlArray.add_untested_idls(html, { only: [
-    'WorkerGlobalScope',
-    'WindowOrWorkerGlobalScope'
-  ] });
-  idlArray.add_untested_idls(sw, { only: [
-    'ServiceWorkerRegistration',
-    'ServiceWorkerGlobalScope',
-    'ExtendableEvent',
-    'ExtendableEventInit',
-  ] });
   idlArray.add_idls(idl);
+  idlArray.add_dependency_idls(sw);
+  idlArray.add_dependency_idls(html);
+  idlArray.add_dependency_idls(dom);
   idlArray.test();
   done();
 }, 'Background Sync interfaces.');
diff --git a/tests/wpt/web-platform-tests/CONTRIBUTING.md b/tests/wpt/web-platform-tests/CONTRIBUTING.md
index d0852318dd63..427ec682793f 100644
--- a/tests/wpt/web-platform-tests/CONTRIBUTING.md
+++ b/tests/wpt/web-platform-tests/CONTRIBUTING.md
@@ -31,4 +31,4 @@ specification. All content is provided as-is to help reach interoperability.
 Documentation
 -------------
 
-See [web-platform-tests.org](http://web-platform-tests.org/).
+See [web-platform-tests.org](https://web-platform-tests.org/).
diff --git a/tests/wpt/web-platform-tests/FileAPI/historical.https.html b/tests/wpt/web-platform-tests/FileAPI/historical.https.html
index 877aed06466a..4f841f176394 100644
--- a/tests/wpt/web-platform-tests/FileAPI/historical.https.html
+++ b/tests/wpt/web-platform-tests/FileAPI/historical.https.html
@@ -53,9 +53,13 @@
         assert_false('isClosed' in Blob.prototype, 'isClosed in Blob.prototype');
     }, 'Blob.close() should not be supported');
 
-    // Only add service worker test if service workers are actually supported.
-    if (navigator.serviceWorker)
-      service_worker_test('support/historical-serviceworker.js', 'Service worker test setup');
+    test(() => {
+      const f = new File([], "");
+      assert_false("lastModifiedDate" in f);
+      assert_false("lastModifiedDate" in File.prototype);
+    }, "File's lastModifiedDate should not be supported");
+
+    service_worker_test('support/historical-serviceworker.js', 'Service worker test setup');
   </script>
  </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url-in-tags.window.js b/tests/wpt/web-platform-tests/FileAPI/url/url-in-tags.window.js
index 364d33bb89d5..f20b3599013b 100644
--- a/tests/wpt/web-platform-tests/FileAPI/url/url-in-tags.window.js
+++ b/tests/wpt/web-platform-tests/FileAPI/url/url-in-tags.window.js
@@ -31,7 +31,6 @@ async_test(t => {
 }, 'Blob URLs can be used in iframes, and are treated same origin');
 
 async_test(t => {
-  const scroll_position = 5000;
   const blob_contents = '<!doctype html>\n<meta charset="utf-8">\n' +
     '<style>body { margin: 0; } .block { height: 5000px; }</style>\n' +
     '<body>\n' +
@@ -43,8 +42,7 @@ async_test(t => {
   const frame = document.createElement('iframe');
   frame.setAttribute('src', url + '#block2');
   document.body.appendChild(frame);
-
-  frame.onload = t.step_func_done(() => {
+  frame.contentWindow.onscroll = t.step_func_done(() => {
     assert_equals(frame.contentWindow.scrollY, 5000);
   });
 }, 'Blob URL fragment is implemented.');
diff --git a/tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file-manual.html b/tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file-manual.html
index 469606a8e456..7ae32512e07c 100644
--- a/tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file-manual.html
+++ b/tests/wpt/web-platform-tests/FileAPI/url/url_createobjecturl_file-manual.html
@@ -3,9 +3,9 @@
 <title>FileAPI Test: Creating Blob URL with File</title>
 <link rel="author" title="Intel" href="http://www.intel.com">
 <link rel="author" title="JunChen Xia" href="mailto:xjconlyme@gmail.com">
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<meta name="timeout" content="long">
 
 <div>
   <p>Test steps:</p>
diff --git a/tests/wpt/web-platform-tests/IndexedDB/keypath-special-identifiers.htm b/tests/wpt/web-platform-tests/IndexedDB/keypath-special-identifiers.htm
index 331169b5c903..cb64d0b708eb 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/keypath-special-identifiers.htm
+++ b/tests/wpt/web-platform-tests/IndexedDB/keypath-special-identifiers.htm
@@ -38,11 +38,6 @@
     property: 'lastModified',
     instance: new File([''], '', {lastModified: 123}),
   },
-  {
-    type: 'File',
-    property: 'lastModifiedDate',
-    instance: new File([''], '', {lastModified: 123}),
-  },
 ].forEach(function(testcase) {
   indexeddb_test(
     (t, db) => {
diff --git a/tests/wpt/web-platform-tests/IndexedDB/keypath.htm b/tests/wpt/web-platform-tests/IndexedDB/keypath.htm
index b59d614e8a9b..4985712a215c 100644
--- a/tests/wpt/web-platform-tests/IndexedDB/keypath.htm
+++ b/tests/wpt/web-platform-tests/IndexedDB/keypath.htm
@@ -125,7 +125,7 @@
             "[Blob.length, Blob.type]");
     }
 
-    // File.name and File.lastModifiedDate is not testable automatically
+    // File.name and File.lastModified is not testable automatically
 
     keypath(['name', 'type'],
         [ { name: "orange", type: "fruit" }, { name: "orange", type: ["telecom", "french"] } ],
diff --git a/tests/wpt/web-platform-tests/README.md b/tests/wpt/web-platform-tests/README.md
index 182e4e70eee5..db5612ea03c0 100644
--- a/tests/wpt/web-platform-tests/README.md
+++ b/tests/wpt/web-platform-tests/README.md
@@ -44,10 +44,10 @@ For example, on most UNIX-like systems, you can setup the hosts file with:
 ./wpt make-hosts-file | sudo tee -a /etc/hosts
 ```
 
-And on Windows (note this requires an Administrator privileged shell):
+And on Windows (this must be run in a PowerShell session with Administrator privileges):
 
 ```bash
-python wpt make-hosts-file >> %SystemRoot%\System32\drivers\etc\hosts
+python wpt make-hosts-file | Out-File %SystemRoot%\System32\drivers\etc\hosts -Encoding ascii -Append
 ```
 
 If you are behind a proxy, you also need to make sure the domains above are
@@ -69,22 +69,19 @@ python wpt serve
 ```
 
 This will start HTTP servers on two ports and a websockets server on
-one port. By default the web servers start on ports 8000 and 8443 and the other
-ports are randomly-chosen free ports. Tests must be loaded from the
-*first* HTTP server in the output. To change the ports, copy the
-`config.default.json` file to `config.json` and edit the new file,
-replacing the part that reads:
+one port. By default the web servers start on ports 8000 and 8443 and
+the other ports are randomly-chosen free ports. Tests must be loaded
+from the *first* HTTP server in the output. To change the ports,
+create a `config.json` file in the wpt root directory, and add
+port definitions of your choice e.g.:
 
 ```
-"http": [8000, "auto"],
-"https":[8443]
-```
-
-to some ports of your choice e.g.
-
-```
-"http": [1234, "auto"],
-"https":[5678]
+{
+  "ports": {
+    "http": [1234, "auto"],
+    "https":[5678]
+  }
+}
 ```
 
 After your `hosts` file is configured, the servers will be locally accessible at:
@@ -262,11 +259,26 @@ If you forget to do this part, you will most likely see a 'File Not Found'
 error when you start wptserve.
 
 Finally, set the path value in the server configuration file to the
-default OpenSSL configuration file location. To do this,
-copy `config.default.json` in the web-platform-tests root to `config.json`.
-Then edit the JSON so that the key `ssl/openssl/base_conf_path` has a
-value that is the path to the OpenSSL config file (typically this
-will be `C:\\OpenSSL-Win32\\bin\\openssl.cfg`).
+default OpenSSL configuration file location. To do this create a file
+called `config.json`.  Then add the OpenSSL configuration below,
+ensuring that the key `ssl/openssl/base_conf_path` has a value that is
+the path to the OpenSSL config file (typically this will be
+`C:\\OpenSSL-Win32\\bin\\openssl.cfg`):
+
+```
+{
+  "ssl": {
+    "type": "openssl",
+    "encrypt_after_connect": false,
+    "openssl": {
+      "openssl_binary": "openssl",
+      "base_path: "_certs",
+      "force_regenerate": false,
+      "base_conf_path": "C:\\OpenSSL-Win32\\bin\\openssl.cfg"
+    },
+  },
+}
+```
 
 ### Trusting Root CA
 
@@ -361,7 +373,7 @@ web-platform-tests root directory to suppress the error reports.
 
 For more details, see the [lint-tool documentation][lint-tool].
 
-[lint-tool]: http://web-platform-tests.org/writing-tests/lint-tool.html
+[lint-tool]: https://web-platform-tests.org/writing-tests/lint-tool.html
 
 Adding command-line scripts ("tools" subdirs)
 ---------------------------------------------
@@ -437,5 +449,5 @@ is [archived][ircarchive].
 Documentation
 =============
 
-* [How to write and review tests](http://web-platform-tests.org/)
+* [How to write and review tests](https://web-platform-tests.org/)
 * [Documentation for the wptserve server](http://wptserve.readthedocs.org/en/latest/)
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js
new file mode 100644
index 000000000000..19c9fb28b3bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["AES-CBC"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js
deleted file mode 100644
index 7bb3e7f697fd..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CBC.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["AES-CBC"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js
new file mode 100644
index 000000000000..2f8a0b3596f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["AES-CTR"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js
deleted file mode 100644
index f6766b27bba3..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-CTR.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["AES-CTR"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js
new file mode 100644
index 000000000000..bb0ab46fbe6c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["AES-GCM"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js
deleted file mode 100644
index 1383e5895595..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-GCM.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["AES-GCM"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js
new file mode 100644
index 000000000000..54d685f75657
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["AES-KW"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js
deleted file mode 100644
index 04f5bb6edab6..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_AES-KW.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["AES-KW"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.any.js
new file mode 100644
index 000000000000..4c13c5ac5721
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["ECDH"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js
deleted file mode 100644
index a7e6a7240bcc..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDH.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["ECDH"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js
new file mode 100644
index 000000000000..74cd480e2c2d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["ECDSA"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js
deleted file mode 100644
index a1f471141de0..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_ECDSA.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["ECDSA"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.any.js
new file mode 100644
index 000000000000..708d33beba49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["HMAC"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js
deleted file mode 100644
index 9dfbbb9c065a..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_HMAC.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["HMAC"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js
new file mode 100644
index 000000000000..4ec0ec20bac1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["RSA-OAEP"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js
deleted file mode 100644
index 39de6d6efecf..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-OAEP.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["RSA-OAEP"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js
new file mode 100644
index 000000000000..557b5785e348
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["RSA-PSS"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js
deleted file mode 100644
index 8b1110d7f096..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSA-PSS.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["RSA-PSS"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js
new file mode 100644
index 000000000000..45771bf0d46e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.any.js
@@ -0,0 +1,4 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=failures.js
+run_test(["RSASSA-PKCS1-v1_5"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js
deleted file mode 100644
index 4df0b896fe37..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/failures_RSASSA-PKCS1-v1_5.https.worker.js
+++ /dev/null
@@ -1,6 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("failures.js");
-run_test(["RSASSA-PKCS1-v1_5"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.js
index 6a74c01ddde4..b99e44d66d40 100644
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.js
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes.js
@@ -70,7 +70,6 @@ function run_test(algorithmNames, slowTest) {
         }, testTag + ": generateKey" + parameterString(algorithm, extractable, usages));
     }
 
-
     // Test all valid sets of parameters for successful
     // key generation.
     testVectors.forEach(function(vector) {
@@ -78,7 +77,7 @@ function run_test(algorithmNames, slowTest) {
             allAlgorithmSpecifiersFor(name).forEach(function(algorithm) {
                 allValidUsages(vector.usages, false, vector.mandatoryUsages).forEach(function(usages) {
                     [false, true].forEach(function(extractable) {
-                        testSuccess(algorithm, extractable, usages, vector.resultType, "Success");
+                        subsetTest(testSuccess, algorithm, extractable, usages, vector.resultType, "Success");
                     });
                 });
             });
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js
new file mode 100644
index 000000000000..6feb60e5caa7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.any.js
@@ -0,0 +1,5 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["AES-CBC"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js
deleted file mode 100644
index 0710c9e7b504..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CBC.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["AES-CBC"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js
new file mode 100644
index 000000000000..7b4f2df5fb1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.any.js
@@ -0,0 +1,5 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["AES-CTR"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js
deleted file mode 100644
index 51529f000fd8..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-CTR.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["AES-CTR"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js
new file mode 100644
index 000000000000..8e7bc92170c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.any.js
@@ -0,0 +1,5 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["AES-GCM"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js
deleted file mode 100644
index 1f6a1bc96e00..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-GCM.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["AES-GCM"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js
new file mode 100644
index 000000000000..5eb023369f40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.any.js
@@ -0,0 +1,5 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["AES-KW"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js
deleted file mode 100644
index 058cf83d0576..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_AES-KW.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["AES-KW"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.any.js
new file mode 100644
index 000000000000..87590d23ea43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.any.js
@@ -0,0 +1,5 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["ECDH"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js
deleted file mode 100644
index a21b7d04e8bc..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDH.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["ECDH"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js
new file mode 100644
index 000000000000..734d86972fc6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.any.js
@@ -0,0 +1,5 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["ECDSA"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js
deleted file mode 100644
index 13f7e3539ec4..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_ECDSA.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["ECDSA"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.any.js
new file mode 100644
index 000000000000..bc106f3c117c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.any.js
@@ -0,0 +1,5 @@
+// META: timeout=long
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["HMAC"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js
deleted file mode 100644
index 2b50b9090585..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_HMAC.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["HMAC"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js
new file mode 100644
index 000000000000..b0412286c58e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.any.js
@@ -0,0 +1,21 @@
+// META: timeout=long
+// META: variant=?1-10
+// META: variant=?11-20
+// META: variant=?21-30
+// META: variant=?31-40
+// META: variant=?41-50
+// META: variant=?51-60
+// META: variant=?61-70
+// META: variant=?71-80
+// META: variant=?81-90
+// META: variant=?91-100
+// META: variant=?101-110
+// META: variant=?111-120
+// META: variant=?121-130
+// META: variant=?131-140
+// META: variant=?141-150
+// META: variant=?151-last
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["RSA-OAEP"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js
deleted file mode 100644
index 4b3538da6896..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-OAEP.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["RSA-OAEP"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js
new file mode 100644
index 000000000000..ea91c8f99b04
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.any.js
@@ -0,0 +1,9 @@
+// META: timeout=long
+// META: variant=?1-10
+// META: variant=?11-20
+// META: variant=?21-30
+// META: variant=?31-last
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["RSA-PSS"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js
deleted file mode 100644
index 52364f5c7f55..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSA-PSS.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["RSA-PSS"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js
new file mode 100644
index 000000000000..fc785f9b31c9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.any.js
@@ -0,0 +1,9 @@
+// META: timeout=long
+// META: variant=?1-10
+// META: variant=?11-20
+// META: variant=?21-30
+// META: variant=?31-last
+// META: script=../util/helpers.js
+// META: script=/common/subset-tests.js
+// META: script=successes.js
+run_test(["RSASSA-PKCS1-v1_5"]);
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js
deleted file mode 100644
index 4c6a02a98c62..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/successes_RSASSA-PKCS1-v1_5.https.worker.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// META: timeout=long
-importScripts("/resources/testharness.js");
-importScripts("../util/helpers.js");
-importScripts("successes.js");
-
-run_test(["RSASSA-PKCS1-v1_5"]);
-done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_aes-cbc.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_aes-cbc.https.html
deleted file mode 100644
index a3054a57a99a..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_aes-cbc.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test("AES-CBC");
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_aes-ctr.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_aes-ctr.https.html
deleted file mode 100644
index bb1abf0d948e..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_aes-ctr.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test("AES-CTR");
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html
deleted file mode 100644
index 7650908c09a1..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-CBC.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["AES-CBC"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html
deleted file mode 100644
index f08737c390a4..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-CTR.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["AES-CTR"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html
deleted file mode 100644
index 4ef6a7771025..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-GCM.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["AES-GCM"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-KW.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-KW.https.html
deleted file mode 100644
index 7cbb4f8bf036..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_AES-KW.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["AES-KW"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_ECDH.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_ECDH.https.html
deleted file mode 100644
index c606a5b9041c..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_ECDH.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["ECDH"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_ECDSA.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_ECDSA.https.html
deleted file mode 100644
index 8b742e80b1e1..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_ECDSA.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["ECDSA"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_HMAC.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_HMAC.https.html
deleted file mode 100644
index e037f0d07d55..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_HMAC.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["HMAC"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html
deleted file mode 100644
index ddd63beb3430..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSA-OAEP.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["RSA-OAEP"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html
deleted file mode 100644
index 2814b34e9a44..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSA-PSS.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["RSA-PSS"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html
deleted file mode 100644
index 0e28914af806..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_failures_RSASSA-PKCS1-v1_5.https.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() for Failures</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="failures.js"></script>
-
-<h1>generateKey Tests for Bad Parameters</h1>
-
-<div id="log"></div>
-<script>
-run_test(["RSASSA-PKCS1-v1_5"]);
-</script>
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html
deleted file mode 100644
index af8093539007..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-CBC.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["AES-CBC"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html
deleted file mode 100644
index 3608a4fde35b..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-CTR.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["AES-CTR"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html
deleted file mode 100644
index eb7c6b5d0069..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-GCM.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["AES-GCM"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-KW.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-KW.https.html
deleted file mode 100644
index 9beab2083466..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_AES-KW.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["AES-KW"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_ECDH.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_ECDH.https.html
deleted file mode 100644
index 9871f572b05c..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_ECDH.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["ECDH"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_ECDSA.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_ECDSA.https.html
deleted file mode 100644
index f32a556bb24a..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_ECDSA.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["ECDSA"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_HMAC.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_HMAC.https.html
deleted file mode 100644
index 819b35df08c5..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_HMAC.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["HMAC"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html
deleted file mode 100644
index db58fd6690ab..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-OAEP.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["RSA-OAEP"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html
deleted file mode 100644
index d6a3c1b02d0c..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSA-PSS.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["RSA-PSS"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html b/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html
deleted file mode 100644
index 35678798bdf7..000000000000
--- a/tests/wpt/web-platform-tests/WebCryptoAPI/generateKey/test_successes_RSASSA-PKCS1-v1_5.https.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<meta charset=utf-8>
-<meta name="timeout" content="long">
-<title>WebCryptoAPI: generateKey() Successful Calls</title>
-<link rel="author" title="Charles Engelke" href="mailto:w3c@engelke.com">
-<link rel="help" href="https://www.w3.org/TR/WebCryptoAPI/#dfn-SubtleCrypto-method-generateKey">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-
-<script src="/WebCryptoAPI/util/helpers.js"></script>
-<script src="successes.js"></script>
-
-<h1>generateKey Tests for Good Parameters</h1>
-<p>
-    <strong>Warning!</strong> RSA key generation is intrinsically
-    very slow, so the related tests can take up to
-    several minutes to complete, depending on browser!
-</p>
-
-<div id="log"></div>
-<script>
-run_test(["RSASSA-PKCS1-v1_5"]);
-</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
index 9476efb6a0f1..041ddc4470c6 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-disabled-by-feature-policy.https.html
@@ -8,8 +8,8 @@
 <script>
 "use strict";
 
-run_fp_tests_disabled(Accelerometer);
-run_fp_tests_disabled(LinearAccelerationSensor);
-run_fp_tests_disabled(GravitySensor);
+run_fp_tests_disabled('Accelerometer');
+run_fp_tests_disabled('LinearAccelerationSensor');
+run_fp_tests_disabled('GravitySensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index aa8ea10eb0b0..53f6960ce589 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -8,8 +8,8 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute_redirect_on_load(Accelerometer);
-run_fp_tests_enabled_by_attribute_redirect_on_load(LinearAccelerationSensor);
-run_fp_tests_enabled_by_attribute_redirect_on_load(GravitySensor);
+run_fp_tests_enabled_by_attribute_redirect_on_load('Accelerometer');
+run_fp_tests_enabled_by_attribute_redirect_on_load('LinearAccelerationSensor');
+run_fp_tests_enabled_by_attribute_redirect_on_load('GravitySensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
index 860a027b55bc..3dd49d330ecd 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy-attribute.https.html
@@ -8,8 +8,8 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute(Accelerometer);
-run_fp_tests_enabled_by_attribute(LinearAccelerationSensor);
-run_fp_tests_enabled_by_attribute(GravitySensor);
+run_fp_tests_enabled_by_attribute('Accelerometer');
+run_fp_tests_enabled_by_attribute('LinearAccelerationSensor');
+run_fp_tests_enabled_by_attribute('GravitySensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
index 889047a0703e..f5d08972d5ff 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-by-feature-policy.https.html
@@ -8,8 +8,8 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled(Accelerometer);
-run_fp_tests_enabled(LinearAccelerationSensor);
-run_fp_tests_enabled(GravitySensor);
+run_fp_tests_enabled('Accelerometer');
+run_fp_tests_enabled('LinearAccelerationSensor');
+run_fp_tests_enabled('GravitySensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
index bf458529e849..2074562b7ad5 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer-enabled-on-self-origin-by-feature-policy.https.html
@@ -8,8 +8,8 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_on_self_origin(Accelerometer);
-run_fp_tests_enabled_on_self_origin(LinearAccelerationSensor);
-run_fp_tests_enabled_on_self_origin(GravitySensor);
+run_fp_tests_enabled_on_self_origin('Accelerometer');
+run_fp_tests_enabled_on_self_origin('LinearAccelerationSensor');
+run_fp_tests_enabled_on_self_origin('GravitySensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer.https.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer.https.html
index 9563270fcda5..b601c6120827 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer.https.html
@@ -9,8 +9,8 @@
 <div id="log"></div>
 <script>
 
-runGenericSensorTests(Accelerometer);
-runGenericSensorTests(GravitySensor);
-runGenericSensorTests(LinearAccelerationSensor);
+runGenericSensorTests('Accelerometer');
+runGenericSensorTests('GravitySensor');
+runGenericSensorTests('LinearAccelerationSensor');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/accelerometer/Accelerometer_onerror-manual.https.html b/tests/wpt/web-platform-tests/accelerometer/Accelerometer_onerror-manual.https.html
index f69b1b6ce5c1..dec21881b631 100644
--- a/tests/wpt/web-platform-tests/accelerometer/Accelerometer_onerror-manual.https.html
+++ b/tests/wpt/web-platform-tests/accelerometer/Accelerometer_onerror-manual.https.html
@@ -15,8 +15,8 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorOnerror(Accelerometer);
-runGenericSensorOnerror(GravitySensor);
-runGenericSensorOnerror(LinearAccelerationSensor);
+runGenericSensorOnerror('Accelerometer');
+runGenericSensorOnerror('GravitySensor');
+runGenericSensorOnerror('LinearAccelerationSensor');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/accname/description_1.0_combobox-focusable-manual.html b/tests/wpt/web-platform-tests/accname/description_1.0_combobox-focusable-manual.html
index ce26e8a69362..c0d54d6c2338 100644
--- a/tests/wpt/web-platform-tests/accname/description_1.0_combobox-focusable-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_1.0_combobox-focusable-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description 1.0 combobox-focusable</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_from_content_of_describedby_element-manual.html b/tests/wpt/web-platform-tests/accname/description_from_content_of_describedby_element-manual.html
index 167b52972f5b..2911d1d031a8 100644
--- a/tests/wpt/web-platform-tests/accname/description_from_content_of_describedby_element-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_from_content_of_describedby_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description from content of describedby element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -75,7 +74,7 @@
         <span aria-label="Garaventa">Zambino</span>
       </span>
       <span>the weird.</span>
-      (<span>Q</span><span>E</span><span>D</span>)
+      (QED)
       <span class="hidden"><i><b>and don't you forget it.</b></i></span>
       <table>
         <tr>
diff --git a/tests/wpt/web-platform-tests/accname/description_from_content_of_describedby_element_which_is_hidden-manual.html b/tests/wpt/web-platform-tests/accname/description_from_content_of_describedby_element_which_is_hidden-manual.html
deleted file mode 100644
index a49a92295121..000000000000
--- a/tests/wpt/web-platform-tests/accname/description_from_content_of_describedby_element_which_is_hidden-manual.html
+++ /dev/null
@@ -1,103 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Description from content of describedby element which is hidden</title>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
-    <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/wai-aria/scripts/ATTAcomm.js"></script>
-    <script>
-    setup({explicit_timeout: true, explicit_done: true });
-
-    var theTest = new ATTAcomm(
-    {
-   "steps" : [
-      {
-         "element" : "test",
-         "test" : {
-            "ATK" : [
-               [
-                  "property",
-                  "description",
-                  "is",
-                  "My name is Eli the weird. (QED) Where are my marbles?"
-               ]
-            ],
-            "AXAPI" : [
-               [
-                  "property",
-                  "AXHelp",
-                  "is",
-                  "My name is Eli the weird. (QED) Where are my marbles?"
-               ]
-            ],
-            "IAccessible2" : [
-               [
-                  "property",
-                  "accDescription",
-                  "is",
-                  "My name is Eli the weird. (QED) Where are my marbles?"
-               ]
-            ],
-            "UIA" : [
-               [
-                  "property",
-                  "Description",
-                  "is",
-                  "My name is Eli the weird. (QED) Where are my marbles?"
-               ]
-            ]
-         },
-         "title" : "step 1",
-         "type" : "test"
-      }
-   ],
-   "title" : "Description from content of describedby element which is hidden"
-}
-
-    ) ;
-    </script>
-  </head>
-  <body>
-  <p>This test examines the ARIA properties for Description from content of describedby element which is hidden.</p>
-    <style>
-    .hidden { display: none; }
-  </style>
-  <div>
-    <input id="test" type="text" aria-labelledby="lbl1 lbl2" aria-describedby="descId" />
-    <span>
-      <span aria-hidden="true" id="lbl1">Important</span>
-      <span class="hidden">
-        <span aria-hidden="true" id="lbl2">stuff</span>
-      </span>
-    </span>
-  </div>
-  <div class="hidden">
-    <div id="descId">
-      <span aria-hidden="true"><i> Hello, </i></span>
-      <span>My</span> name is
-      <div><img src="file.jpg" title="Bryan" alt="" role="presentation" /></div>
-      <span role="presentation" aria-label="Eli">
-        <span aria-label="Garaventa">Zambino</span>
-      </span>
-      <span>the weird.</span>
-      (<span>Q</span><span>E</span><span>D</span>)
-      <span class="hidden"><i><b>and don't you forget it.</b></i></span>
-      <table>
-        <tr>
-          <td>Where</td>
-          <td style="visibility:hidden;"><div>in</div></td>
-          <td><div style="display:none;">the world</div></td>
-          <td>are my marbles?</td>
-        </tr>
-      </table>
-    </div>
-  </div>
-
-  <div id="manualMode"></div>
-  <div id="log"></div>
-  <div id="ATTAmessages"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/accname/description_link-with-label-manual.html b/tests/wpt/web-platform-tests/accname/description_link-with-label-manual.html
index 0e4b2b2e5bdd..09c32db1c2ee 100644
--- a/tests/wpt/web-platform-tests/accname/description_link-with-label-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_link-with-label-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description link-with-label</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_557-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_557-manual.html
index 8c1790457434..1294baf65718 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_557-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_557-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 557</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_664-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_664-manual.html
index 0ba57426d2ed..f4e813643cab 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_664-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_664-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 664</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_665-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_665-manual.html
index 341d6d28a2db..e97a41de354a 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_665-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_665-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 665</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_666-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_666-manual.html
index 9681b89e98aa..378979ca7355 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_666-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_666-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 666</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_772-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_772-manual.html
index 03d46cbe3b38..efc58686ce6b 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_772-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_772-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 772</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_773-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_773-manual.html
index 727a8fe5a7de..ea004cffee06 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_773-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_773-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 773</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_774-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_774-manual.html
index 51f9380e4090..6fafc81be391 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_774-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_774-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 774</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_838-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_838-manual.html
index 99c49d9cbea3..df4210a77046 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_838-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_838-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case 838</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_broken_reference-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_broken_reference-manual.html
index c44b0a598a28..724849620124 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_broken_reference-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_broken_reference-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case broken reference</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_test_case_one_valid_reference-manual.html b/tests/wpt/web-platform-tests/accname/description_test_case_one_valid_reference-manual.html
index a998aae79600..bce5ce6cb7f2 100644
--- a/tests/wpt/web-platform-tests/accname/description_test_case_one_valid_reference-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_test_case_one_valid_reference-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description test case one valid reference</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/description_title-same-element-manual.html b/tests/wpt/web-platform-tests/accname/description_title-same-element-manual.html
index fe8cd37c703a..8c926e34c845 100644
--- a/tests/wpt/web-platform-tests/accname/description_title-same-element-manual.html
+++ b/tests/wpt/web-platform-tests/accname/description_title-same-element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Description title-same-element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-alternative-manual.html b/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-alternative-manual.html
index 000d3f6374fb..454be9e5e36a 100644
--- a/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-alternative-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-alternative-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name 1.0 combobox-focusable-alternative</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-manual.html b/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-manual.html
index abc53273b7c5..bb7a03121e85 100644
--- a/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_1.0_combobox-focusable-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name 1.0 combobox-focusable</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-combobox-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-combobox-manual.html
index 2797514bd7f4..24cbb7067121 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-combobox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-embedded-combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-listbox-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-listbox-manual.html
index ca28c177c404..a7bbe4c1928c 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-listbox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-listbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-embedded-listbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-menu-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-menu-manual.html
index f838f2426cfe..1c18b9853289 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-menu-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-embedded-menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-select-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-select-manual.html
index 52a5ca80bbb0..06c41e0b5dae 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-select-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-select-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-embedded-select</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-slider-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-slider-manual.html
index 520e4a45f871..48741d3c0fd8 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-slider-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-slider-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-embedded-slider</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-spinbutton-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-spinbutton-manual.html
index bf47b1d912c2..d5cf7a55bf37 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-spinbutton-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-spinbutton-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-embedded-spinbutton</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-textbox-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-textbox-manual.html
index 8b0f529f32e3..2d8642b7cca4 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-textbox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-embedded-textbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-embedded-textbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-alternative-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-alternative-manual.html
index 34bfd02b2926..9f446aaa667e 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-alternative-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-alternative-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-multiple-label-alternative</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-manual.html
index 37486e1f9506..54c218c41c4d 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-label-multiple-label-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-label-multiple-label</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_checkbox-title-manual.html b/tests/wpt/web-platform-tests/accname/name_checkbox-title-manual.html
index b5b9a5ea3e52..83b5a8c4d112 100644
--- a/tests/wpt/web-platform-tests/accname/name_checkbox-title-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_checkbox-title-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name checkbox-title</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-combobox-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-combobox-manual.html
index a2799324e1b2..06adca72fcac 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-combobox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-embedded-combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-menu-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-menu-manual.html
index 0a88e4d4b9d9..de6bcbaffebd 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-menu-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-embedded-menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-select-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-select-manual.html
index 7142c764a182..117e96cea66e 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-select-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-select-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-embedded-select</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-slider-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-slider-manual.html
index de08bbcc1060..22a9057f95b9 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-slider-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-slider-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-embedded-slider</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-spinbutton-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-spinbutton-manual.html
index 67934a329e17..1432e2fd2427 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-embedded-spinbutton-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-embedded-spinbutton-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-embedded-spinbutton</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-elements-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-elements-manual.html
index 74f2b7b71896..c2c16591119b 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-elements-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-elements-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-inline-block-elements</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-styles-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-styles-manual.html
index 80c2d98bcd4c..ecf6ed1bb9f9 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-styles-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-inline-block-styles-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-inline-block-styles</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-inline-hidden-elements-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-inline-hidden-elements-manual.html
index 2253f880bbe5..c982b42c16e3 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-inline-hidden-elements-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-inline-hidden-elements-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-inline-hidden-elements</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-manual.html
index 287a7ee23dd9..79a69177e320 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-owned-combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-owned-listbox-manual.html b/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-owned-listbox-manual.html
index c8de748de3d9..4bbc6f3613d2 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-owned-listbox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-label-owned-combobox-owned-listbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-label-owned-combobox-owned-listbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_file-title-manual.html b/tests/wpt/web-platform-tests/accname/name_file-title-manual.html
index 5eae799d78d8..77b7bf68bc66 100644
--- a/tests/wpt/web-platform-tests/accname/name_file-title-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_file-title-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name file-title</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_from_content-manual.html b/tests/wpt/web-platform-tests/accname/name_from_content-manual.html
index 832652c2277f..f7e2491d3a27 100644
--- a/tests/wpt/web-platform-tests/accname/name_from_content-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_from_content-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name from content</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -73,7 +72,7 @@
       <span aria-label="Garaventa">Zambino</span>
     </span>
     <span>the weird.</span>
-    (<span>Q</span><span>E</span><span>D</span>)
+    (QED)
     <span class="hidden"><i><b>and don't you forget it.</b></i></span>
     <table>
       <tr>
diff --git a/tests/wpt/web-platform-tests/accname/name_from_content_of_label-manual.html b/tests/wpt/web-platform-tests/accname/name_from_content_of_label-manual.html
index 1ceb4ab4dc1b..3eb5b779267b 100644
--- a/tests/wpt/web-platform-tests/accname/name_from_content_of_label-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_from_content_of_label-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name from content of label</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -74,7 +73,7 @@
       <span aria-label="Garaventa">Zambino</span>
    </span>
    <span>the weird.</span>
-   (<span>Q</span><span>E</span><span>D</span>)
+   (QED)
    <span class="hidden"><i><b>and don't you forget it.</b></i></span>
    <table>
      <tr>
diff --git a/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_element-manual.html b/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_element-manual.html
index ebb0946a5ce6..a60a8c0a0e0b 100644
--- a/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_element-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name from content of labelledby element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -74,7 +73,7 @@
       <span aria-label="Garaventa">Zambino</span>
     </span>
     <span>the weird.</span>
-    (<span>Q</span><span>E</span><span>D</span>)
+    (QED)
     <span class="hidden"><i><b>and don't you forget it.</b></i></span>
     <table>
       <tr>
diff --git a/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html b/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html
index 348d56224536..879393037e54 100644
--- a/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_from_content_of_labelledby_elements_one_of_which_is_hidden-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name from content of labelledby elements one of which is hidden</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -83,7 +82,7 @@
         <span aria-label="Garaventa">Zambino</span>
       </span>
       <span>the weird.</span>
-      (<span>Q</span><span>E</span><span>D</span>)
+      (QED)
       <span class="hidden"><i><b>and don't you forget it.</b></i></span>
       <table>
         <tr>
diff --git a/tests/wpt/web-platform-tests/accname/name_heading-combobox-focusable-alternative-manual.html b/tests/wpt/web-platform-tests/accname/name_heading-combobox-focusable-alternative-manual.html
index 2c7db17557bc..c1540b12bedc 100644
--- a/tests/wpt/web-platform-tests/accname/name_heading-combobox-focusable-alternative-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_heading-combobox-focusable-alternative-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name  heading-combobox-focusable-alternative</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_image-title-manual.html b/tests/wpt/web-platform-tests/accname/name_image-title-manual.html
index 51ead2588940..43ce9be14e63 100644
--- a/tests/wpt/web-platform-tests/accname/name_image-title-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_image-title-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name image-title</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_link-mixed-content-manual.html b/tests/wpt/web-platform-tests/accname/name_link-mixed-content-manual.html
index 9f8b92f971b5..f089ebde60cd 100644
--- a/tests/wpt/web-platform-tests/accname/name_link-mixed-content-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_link-mixed-content-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name link-mixed-content</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
@@ -71,7 +70,7 @@
     <div><img src="file.jpg" title="Bryan" alt="" role="presentation" /></div>
     <span role="presentation" aria-label="Eli"><span aria-label="Garaventa">Zambino</span></span>
     <span>the weird.</span>
-    (<span>Q</span><span>E</span><span>D</span>)
+    (QED)
     <span class="hidden"><i><b>and don't you forget it.</b></i></span>
   </div>
 
diff --git a/tests/wpt/web-platform-tests/accname/name_link-with-label-manual.html b/tests/wpt/web-platform-tests/accname/name_link-with-label-manual.html
index 18e82718b99c..e8f1e3f813fd 100644
--- a/tests/wpt/web-platform-tests/accname/name_link-with-label-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_link-with-label-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name link-with-label</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-combobox-manual.html b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-combobox-manual.html
index b2762aa6ae7c..39c8005a719f 100644
--- a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-combobox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name password-label-embedded-combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-menu-manual.html b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-menu-manual.html
index 8ef9d8dd2f50..d6ad64966ad4 100644
--- a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-menu-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name password-label-embedded-menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-select-manual.html b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-select-manual.html
index 36471160273b..f4b96e2cd199 100644
--- a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-select-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-select-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name password-label-embedded-select</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-slider-manual.html b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-slider-manual.html
index d5686a48c54c..7701b8b44e16 100644
--- a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-slider-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-slider-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name password-label-embedded-slider</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-spinbutton-manual.html b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-spinbutton-manual.html
index 73b0d664c78a..67cd55dc382d 100644
--- a/tests/wpt/web-platform-tests/accname/name_password-label-embedded-spinbutton-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_password-label-embedded-spinbutton-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name password-label-embedded-spinbutton</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_password-title-manual.html b/tests/wpt/web-platform-tests/accname/name_password-title-manual.html
index 2ea977fd2894..3f3eb416099b 100644
--- a/tests/wpt/web-platform-tests/accname/name_password-title-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_password-title-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name password-title</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-combobox-manual.html b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-combobox-manual.html
index 72d7017c534b..3facb5e1b2cc 100644
--- a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-combobox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name radio-label-embedded-combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-menu-manual.html b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-menu-manual.html
index 8ca6d11c05d2..3752b1fcd63c 100644
--- a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-menu-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name radio-label-embedded-menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-select-manual.html b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-select-manual.html
index 185d89329691..6f632f94cd03 100644
--- a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-select-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-select-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name radio-label-embedded-select</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-slider-manual.html b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-slider-manual.html
index aea5f8b85ce8..5c82a06bfb09 100644
--- a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-slider-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-slider-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name radio-label-embedded-slider</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-spinbutton-manual.html b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-spinbutton-manual.html
index af3fe8285ac2..ab4fdcce7f0c 100644
--- a/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-spinbutton-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_radio-label-embedded-spinbutton-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name radio-label-embedded-spinbutton</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_radio-title-manual.html b/tests/wpt/web-platform-tests/accname/name_radio-title-manual.html
index aef42728a6c6..cb6f065e8f68 100644
--- a/tests/wpt/web-platform-tests/accname/name_radio-title-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_radio-title-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name radio-title</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_539-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_539-manual.html
index da1925241c93..659740b8872d 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_539-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_539-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 539</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_540-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_540-manual.html
index 5fde86535bb3..c187c37ffc15 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_540-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_540-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 540</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_541-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_541-manual.html
index 74b44b57de4f..19405449d31f 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_541-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_541-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 541</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_543-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_543-manual.html
index 1759ffacdd8f..7908bf658ba7 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_543-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_543-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 543</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_544-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_544-manual.html
index 267c9302f7d5..1b7ba3772ddd 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_544-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_544-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 544</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_545-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_545-manual.html
index fda6fe1b50cc..19098046f439 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_545-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_545-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 545</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_546-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_546-manual.html
index 6dd735b6219b..f40aa2f38ac1 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_546-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_546-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 546</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_547-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_547-manual.html
index f80f7bb8a6fd..b7a977b12e95 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_547-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_547-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 547</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_548-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_548-manual.html
index f5f962a47b9b..d63ff4a2f618 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_548-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_548-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 548</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_549-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_549-manual.html
index 97839a4c6a8c..c729c1f51b12 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_549-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_549-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 549</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_550-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_550-manual.html
index 70740219883b..de8a635caeca 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_550-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_550-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 550</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_551-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_551-manual.html
index 2b55d07cb344..65e284f78065 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_551-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_551-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 551</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_552-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_552-manual.html
index 0b0ed397a12e..a48aaa3165c5 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_552-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_552-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 552</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_553-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_553-manual.html
index a7f67749f711..def83ed35950 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_553-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_553-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 553</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_556-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_556-manual.html
index 244535845612..5923db21e2da 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_556-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_556-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 556</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_557-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_557-manual.html
index 7d5d86748d29..1a81ffcb3d34 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_557-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_557-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 557</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_558-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_558-manual.html
index 0a5c42d27ef2..3e5b448ba32f 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_558-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_558-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 558</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_559-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_559-manual.html
index 61afa5552fee..00cc7d1d0e8a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_559-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_559-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 559</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_560-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_560-manual.html
index ada84849ed6f..05bf8d44b4ea 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_560-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_560-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 560</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_561-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_561-manual.html
index c4b2bccd72ad..5131744c071a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_561-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_561-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 561</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_562-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_562-manual.html
index 941e3cd6e8fc..f718b35f5e4c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_562-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_562-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 562</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_563-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_563-manual.html
index 580f515d07b9..5214fb946db4 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_563-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_563-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 563</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_564-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_564-manual.html
index 22c2a542a428..bac49adc4487 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_564-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_564-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 564</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_565-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_565-manual.html
index 64f6320d331d..749d24d53d62 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_565-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_565-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 565</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_566-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_566-manual.html
index 20189f31899b..5ffef66083c2 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_566-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_566-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 566</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_596-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_596-manual.html
index 2ee191c375e4..821b96b300c3 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_596-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_596-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 596</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_597-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_597-manual.html
index 4c4c527a661f..ed3e90f21010 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_597-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_597-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 597</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_598-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_598-manual.html
index 9a150111b325..89a0f899a297 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_598-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_598-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 598</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_599-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_599-manual.html
index 45041234ef81..9f186a63334e 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_599-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_599-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 599</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_600-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_600-manual.html
index 8f572563a2f0..091c8cb357b3 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_600-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_600-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 600</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_601-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_601-manual.html
index 4dadf8a05c22..8a87591f5a56 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_601-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_601-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 601</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_602-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_602-manual.html
index 8f7f11a506c8..71da6f713d30 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_602-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_602-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 602</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_603-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_603-manual.html
index c4e3d5e56977..5496f5043105 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_603-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_603-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 603</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_604-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_604-manual.html
index c1847087ee52..db0831c6ebe0 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_604-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_604-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 604</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_605-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_605-manual.html
index 5212857425eb..ec6c5a7d50fc 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_605-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_605-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 605</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_606-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_606-manual.html
index 8c3c4610b1a9..8bcdefac2f18 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_606-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_606-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 606</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_607-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_607-manual.html
index c68dd031dcfe..8737c8600cd6 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_607-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_607-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 607</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_608-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_608-manual.html
index cf4423cb4f03..4380f400e6fb 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_608-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_608-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 608</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_609-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_609-manual.html
index e7ce0ed57bee..d408962ae92a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_609-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_609-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 609</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_610-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_610-manual.html
index 3398e8437f76..fc8bcf2efa37 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_610-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_610-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 610</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_611-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_611-manual.html
index 458dc3532ed2..2ea08602383a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_611-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_611-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 611</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_612-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_612-manual.html
index c3e448066748..9faa92250f39 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_612-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_612-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 612</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_613-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_613-manual.html
index b83a7bdadc90..d8a27c372622 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_613-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_613-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 613</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_614-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_614-manual.html
index 0f6beb6b57c4..b2323aaa1dfd 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_614-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_614-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 614</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_615-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_615-manual.html
index ae06ecf21053..e1d53f4ac8ab 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_615-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_615-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 615</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_616-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_616-manual.html
index 335e781dcbd1..310bfca4d165 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_616-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_616-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 616</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_617-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_617-manual.html
index 2ba89d38e33b..292706330792 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_617-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_617-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 617</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_618-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_618-manual.html
index 0af6532c57b4..be74e08629a0 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_618-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_618-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 618</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_619-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_619-manual.html
index 154ad359f472..8bd082691596 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_619-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_619-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 619</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_620-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_620-manual.html
index b1774e2c00dc..855d0cc848c1 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_620-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_620-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 620</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_621-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_621-manual.html
index 8fb303bfb402..bb5780ad2b0a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_621-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_621-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 621</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_659-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_659-manual.html
index 97d84e5c92d5..1332c30c4929 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_659-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_659-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 659</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_660-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_660-manual.html
index 3cbd92a0adfc..66b36635d940 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_660-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_660-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 660</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_661-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_661-manual.html
index 4ed32ec07820..e1f25ba7c662 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_661-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_661-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 661</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_662-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_662-manual.html
index 15e706c8c860..4d69b0f1b57d 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_662-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_662-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 662</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_663-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_663-manual.html
deleted file mode 100644
index 883c1a9e38b5..000000000000
--- a/tests/wpt/web-platform-tests/accname/name_test_case_663-manual.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <title>Name test case 663</title>
-    <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
-    <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-    <script src="/wai-aria/scripts/ATTAcomm.js"></script>
-    <script>
-    setup({explicit_timeout: true, explicit_done: true });
-
-    var theTest = new ATTAcomm(
-    {
-   "steps" : [
-      {
-         "element" : "test",
-         "test" : {
-            "ATK" : [
-               [
-                  "property",
-                  "name",
-                  "is",
-                  "foo bar baz"
-               ]
-            ],
-            "AXAPI" : [
-               [
-                  "property",
-                  "AXDescription",
-                  "is",
-                  "foo bar baz"
-               ]
-            ],
-            "IAccessible2" : [
-               [
-                  "property",
-                  "accName",
-                  "is",
-                  "foo bar baz"
-               ]
-            ],
-            "UIA" : [
-               [
-                  "property",
-                  "Name",
-                  "is",
-                  "foo bar baz"
-               ]
-            ]
-         },
-         "title" : "step 1",
-         "type" : "test"
-      }
-   ],
-   "title" : "Name test case 663"
-}
-
-    ) ;
-    </script>
-  </head>
-  <body>
-  <p>This test examines the ARIA properties for Name test case 663.</p>
-    <style type="text/css">
-    label:before { content: "foo"; }
-    label:after { content: "baz"; }
-  </style>
-  <form>
-    <label for="test"><input id="test" type="file" name="test" title="bar"></label>
-  </form>
-
-  <div id="manualMode"></div>
-  <div id="log"></div>
-  <div id="ATTAmessages"></div>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_663a-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_663a-manual.html
index 1e71fd514c75..95ec2f857b7e 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_663a-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_663a-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 663a</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_721-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_721-manual.html
index 4a2d8c555b51..90e1911d15a7 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_721-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_721-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 721</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_723-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_723-manual.html
index 0d1535cb6cac..84cd65534fa0 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_723-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_723-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 723</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_724-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_724-manual.html
index d69eda490b96..69d8d70f0eff 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_724-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_724-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 724</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_725-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_725-manual.html
index 47bb9d5ff5a0..9d1b867122bd 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_725-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_725-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 725</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_726-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_726-manual.html
index 45996d9095fc..0faf0f27d31e 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_726-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_726-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 726</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_727-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_727-manual.html
index 2f7f589e9276..d009ae7fb383 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_727-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_727-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 727</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_728-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_728-manual.html
index 0a5d003839a4..f6a14e749415 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_728-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_728-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 728</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_729-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_729-manual.html
index a4a302ea49a2..f9b5e156f351 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_729-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_729-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 729</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_730-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_730-manual.html
index 230c1998942f..b213840268d1 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_730-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_730-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 730</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_731-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_731-manual.html
index 613bdc6f1064..50f4a5b2ebc7 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_731-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_731-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 731</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_733-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_733-manual.html
index 494dc333cce6..a9d3aaa6706c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_733-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_733-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 733</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_734-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_734-manual.html
index 7924d2cda456..fbf5a0c3dd7a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_734-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_734-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 734</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_735-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_735-manual.html
index 72b557ca3234..955af0f10d2f 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_735-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_735-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 735</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_736-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_736-manual.html
index e9dfd7853d2d..2518ff32bd6a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_736-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_736-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 736</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_737-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_737-manual.html
index 59c49305fb98..a550114b4fa0 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_737-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_737-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 737</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_738-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_738-manual.html
index a462b03973fd..ddf6210a9ad0 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_738-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_738-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 738</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_739-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_739-manual.html
index 3688cba8e028..241c0fbff024 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_739-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_739-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 739</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_740-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_740-manual.html
index 716b1f9d23bf..f13ac6b4ad2b 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_740-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_740-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 740</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_741-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_741-manual.html
index 6da7ff2d6f93..9b0b4bfef18e 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_741-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_741-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 741</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_742-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_742-manual.html
index 80f9e274bc35..e3fa6ad1fefd 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_742-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_742-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 742</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_743-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_743-manual.html
index 8df359cfc696..b226f00c7e0c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_743-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_743-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 743</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_744-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_744-manual.html
index 528cf71005e7..44a70f7c8eb6 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_744-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_744-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 744</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_745-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_745-manual.html
index f25740059d1f..e54efda31c7c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_745-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_745-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 745</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_746-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_746-manual.html
index 0477908e9c5e..132fe3030234 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_746-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_746-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 746</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_747-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_747-manual.html
index 015bd566fdec..be56f5b7f48a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_747-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_747-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 747</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_748-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_748-manual.html
index ddbed2c9a759..ad7581985b7a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_748-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_748-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 748</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_749-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_749-manual.html
index 0f542b347665..0ccaca7848a7 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_749-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_749-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 749</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_750-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_750-manual.html
index 603a698f8a9d..19f12432040c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_750-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_750-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 750</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_751-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_751-manual.html
index 029638194559..8f44ef9e4205 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_751-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_751-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 751</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_752-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_752-manual.html
index 52503e62397d..6d2593b3301c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_752-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_752-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 752</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_753-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_753-manual.html
index 8a1278bbe7fb..82ee27cc26be 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_753-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_753-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 753</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_754-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_754-manual.html
index 41f06aaea766..06d56eef393c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_754-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_754-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 754</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_755-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_755-manual.html
index dd410b88e92a..e621db7517fc 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_755-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_755-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 755</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_756-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_756-manual.html
index 600d75fe173a..70394d28a80c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_756-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_756-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 756</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_757-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_757-manual.html
index 993c4d16c16a..4e7fd81bcf7a 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_757-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_757-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 757</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_758-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_758-manual.html
index 9ab6467a2814..0381f1b94734 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_758-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_758-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 758</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_759-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_759-manual.html
index 159edc747287..a9b2d2fc6189 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_759-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_759-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 759</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_760-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_760-manual.html
index 30d8a7e0e9e1..bab3c19ead52 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_760-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_760-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 760</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_761-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_761-manual.html
index 3dedb942a4de..7848eea9b50c 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_761-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_761-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 761</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_test_case_762-manual.html b/tests/wpt/web-platform-tests/accname/name_test_case_762-manual.html
index e131861d0c74..d0d04e3ce42e 100644
--- a/tests/wpt/web-platform-tests/accname/name_test_case_762-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_test_case_762-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name test case 762</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-combobox-manual.html b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-combobox-manual.html
index 7fde09c3ce8f..a32b1c2b529b 100644
--- a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-combobox-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name text-label-embedded-combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-menu-manual.html b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-menu-manual.html
index 40b94fcc892c..d6fddc6f1c5b 100644
--- a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-menu-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name text-label-embedded-menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-select-manual.html b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-select-manual.html
index e27a302e6116..6a0f6e10b860 100644
--- a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-select-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-select-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name text-label-embedded-select</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-slider-manual.html b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-slider-manual.html
index d65c1c104b66..caf91243fa05 100644
--- a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-slider-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-slider-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name text-label-embedded-slider</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-spinbutton-manual.html b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-spinbutton-manual.html
index e81e220eef94..8e1b1e21dd8e 100644
--- a/tests/wpt/web-platform-tests/accname/name_text-label-embedded-spinbutton-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_text-label-embedded-spinbutton-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name text-label-embedded-spinbutton</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/accname/name_text-title-manual.html b/tests/wpt/web-platform-tests/accname/name_text-title-manual.html
index cc0b645e89a3..720a94cd7aeb 100644
--- a/tests/wpt/web-platform-tests/accname/name_text-title-manual.html
+++ b/tests/wpt/web-platform-tests/accname/name_text-title-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Name text-title</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html b/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html
index 310961363bf4..974bee11e4d0 100755
--- a/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html
+++ b/tests/wpt/web-platform-tests/acid/acid3/reference.sub.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
 <html>
  <title>The Acid3 Test (Reference Rendering)</title>
- <link rel="icon" href="http://nonexistent-origin.{{host}}">
+ <link rel="icon" href="http://nonexistent.{{host}}">
  <style type="text/css">
   html { margin: 0; padding: 0; }
   body { background: #c0c0c0 url(reference.png) top left no-repeat; margin: 0; padding: 0; }
diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html
index adfcca89da89..6116e4e776be 100644
--- a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationMusts-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>A single ANNOTATION has all required keys and all annotation keys used meet required value constraints</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals-manual.html b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals-manual.html
index 65be15a582cc..5d73034b486b 100644
--- a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationOptionals-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Annotation implements optional keys and meets optional key value constraints</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals-manual.html b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals-manual.html
index b187008dade9..3aadc2139a4d 100644
--- a/tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-model/annotations/annotationsAgentOptionals-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Annotation implements optional keys and meets optional key value constraints for Creator and Generator Agents</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts-manual.html b/tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts-manual.html
index d1ff44491b1c..a02395648472 100644
--- a/tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-model/collections/collectionMusts-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>A single Annotation Collection has all required keys and all collection keys used meet required value constraints</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals-manual.html b/tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals-manual.html
index ce489fce2044..24df82d98217 100644
--- a/tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-model/collections/collectionOptionals-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>A single Annotation Collection implements optional keys and meets optional key value constraints</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts-manual.html b/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts-manual.html
index 843faaf5e783..4422bbae3569 100644
--- a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageMusts-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>A single Annotation Page has all required keys and all page keys present meet required value constraints</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals-manual.html b/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals-manual.html
index e68f2d17c65d..95f66bb7f763 100644
--- a/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-model/collections/pages/pageOptionals-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>A single Annotation Page implements optional keys and meets optional key value constraints</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/template_js b/tests/wpt/web-platform-tests/annotation-model/tools/template_js
index 4be9fc8534e0..29b76b323f1c 100644
--- a/tests/wpt/web-platform-tests/annotation-model/tools/template_js
+++ b/tests/wpt/web-platform-tests/annotation-model/tools/template_js
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>{{TESTTITLE}}</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-model/tools/template_manual b/tests/wpt/web-platform-tests/annotation-model/tools/template_manual
index d7c3315c5076..14b3b9aa8be2 100644
--- a/tests/wpt/web-platform-tests/annotation-model/tools/template_manual
+++ b/tests/wpt/web-platform-tests/annotation-model/tools/template_manual
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>{{TESTTITLE}}</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/annotation-model/scripts/ajv.min.js"></script>
diff --git a/tests/wpt/web-platform-tests/annotation-vocab/01-validJSON-LD-manual.html b/tests/wpt/web-platform-tests/annotation-vocab/01-validJSON-LD-manual.html
index 88a4ccf2a16e..3d6623a3a504 100644
--- a/tests/wpt/web-platform-tests/annotation-vocab/01-validJSON-LD-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-vocab/01-validJSON-LD-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Ensure Vocabulary JSON-LD is valid</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff --git a/tests/wpt/web-platform-tests/annotation-vocab/02-context-to-triples-manual.html b/tests/wpt/web-platform-tests/annotation-vocab/02-context-to-triples-manual.html
index b9d6603f336d..bfe030d70e69 100644
--- a/tests/wpt/web-platform-tests/annotation-vocab/02-context-to-triples-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-vocab/02-context-to-triples-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>JSON-LD context document can be used to convert JSON-LD serialized Annotations into RDF triples</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff --git a/tests/wpt/web-platform-tests/annotation-vocab/03-graphs-are-isomorphic-manual.html b/tests/wpt/web-platform-tests/annotation-vocab/03-graphs-are-isomorphic-manual.html
index 5061c32eeff8..ed6869caf9de 100644
--- a/tests/wpt/web-platform-tests/annotation-vocab/03-graphs-are-isomorphic-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-vocab/03-graphs-are-isomorphic-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Graphs produced are isomorphic</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff --git a/tests/wpt/web-platform-tests/annotation-vocab/04-graphs-convert-lossless-manual.html b/tests/wpt/web-platform-tests/annotation-vocab/04-graphs-convert-lossless-manual.html
index 95ebfd612ebb..05e7fb72d274 100644
--- a/tests/wpt/web-platform-tests/annotation-vocab/04-graphs-convert-lossless-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-vocab/04-graphs-convert-lossless-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Graphs produced can be converted back into JSON-LD with no loss</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff --git a/tests/wpt/web-platform-tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html b/tests/wpt/web-platform-tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html
index 331eb23d7037..e1e41e6a487a 100644
--- a/tests/wpt/web-platform-tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-vocab/05-ontology-parsed-as-valid-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Ontology can be parsed without errors</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff --git a/tests/wpt/web-platform-tests/annotation-vocab/06-ontology-internally-consistent-manual.html b/tests/wpt/web-platform-tests/annotation-vocab/06-ontology-internally-consistent-manual.html
index 84aa43341254..de9b7d069d33 100644
--- a/tests/wpt/web-platform-tests/annotation-vocab/06-ontology-internally-consistent-manual.html
+++ b/tests/wpt/web-platform-tests/annotation-vocab/06-ontology-internally-consistent-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
 <title>Ontology is internally consistent</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 </head>
diff --git a/tests/wpt/web-platform-tests/apng/OWNERS b/tests/wpt/web-platform-tests/apng/OWNERS
new file mode 100644
index 000000000000..a2f0669fa514
--- /dev/null
+++ b/tests/wpt/web-platform-tests/apng/OWNERS
@@ -0,0 +1,3 @@
+@stuartparmenter
+@svgeesus
+@leonscroggins
diff --git a/tests/wpt/web-platform-tests/async-local-storage/storage-smoke-test.https.tentative.html b/tests/wpt/web-platform-tests/async-local-storage/storage-smoke-test.https.tentative.html
new file mode 100644
index 000000000000..b4d66dabc7a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/async-local-storage/storage-smoke-test.https.tentative.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Async local storage storage export smoke test</title>
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<script type="module">
+import { storage } from "std:async-local-storage";
+
+test(() => {
+  const { backingStore } = storage;
+  assert_array_equals(Object.keys(backingStore), ["database", "store", "version"]);
+  assert_own_property(backingStore, "database");
+  assert_own_property(backingStore, "store");
+  assert_own_property(backingStore, "version");
+  assert_equals(Object.getPrototypeOf(backingStore), Object.prototype);
+
+  assert_equals(backingStore.database, "async-local-storage:default");
+  assert_equals(backingStore.store, "store");
+  assert_equals(backingStore.version, 1);
+}, "backingStore returns the correct object");
+
+promise_test(async (t) => {
+  t.add_cleanup(async () => {
+    await storage.clear();
+  });
+
+  assert_equals(await storage.set("key", "value"), undefined);
+
+  assert_equals(await storage.get("key"), "value");
+  assert_equals(await storage.has("key"), true);
+  assert_array_equals(await storage.keys(), ["key"]);
+  assert_array_equals(await storage.values(), ["value"]);
+
+  const entries = await storage.entries();
+  assert_true(Array.isArray(entries));
+  assert_equals(entries.length, 1);
+  assert_array_equals(entries[0], ["key", "value"]);
+
+  assert_equals(await storage.delete("key"), undefined);
+
+  assert_equals(await storage.get("key"), undefined);
+  assert_equals(await storage.has("key"), false);
+}, "storage methods work, at least for one entry with string key and value");
+</script>
diff --git a/tests/wpt/web-platform-tests/audio-output/OWNERS b/tests/wpt/web-platform-tests/audio-output/OWNERS
new file mode 100644
index 000000000000..4a5c2a885b43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/audio-output/OWNERS
@@ -0,0 +1 @@
+@guidou
diff --git a/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js b/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js
index ed7f81ad9ffe..0a36283b2637 100644
--- a/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js
+++ b/tests/wpt/web-platform-tests/beacon/beacon-common.sub.js
@@ -56,7 +56,8 @@ var bufferSourceTests = [emptyBufferSourceTest, smallBufferSourceTest, mediumBuf
 var bufferSourceMaxTest = [maxBufferSourceTest];
 var formDataTests = [emptyFormDataTest, smallFormDataTest, mediumFormDataTest, largeFormDataTest];
 var formDataMaxTest = [largeFormDataTest];
-var allTests = [].concat(stringTests, stringMaxTest, blobTests, blobMaxTest, bufferSourceTests, bufferSourceMaxTest, formDataTests, formDataMaxTest);
+var contentTypeTests = [smallSafeContentTypeEncodedTest,smallSafeContentTypeFormTest,smallSafeContentTypeTextTest,smallCORSContentTypeTextTest];
+var allTests = [].concat(stringTests, stringMaxTest, blobTests, blobMaxTest, bufferSourceTests, bufferSourceMaxTest, formDataTests, formDataMaxTest, contentTypeTests);
 
 // This special cross section of test cases is meant to provide a slimmer but reasonably-
 // representative set of tests for parameterization across variables (e.g. redirect codes,
diff --git a/tests/wpt/web-platform-tests/beacon/headers/header-content-type.html b/tests/wpt/web-platform-tests/beacon/headers/header-content-type.html
index 9dd8787b76de..e2f2705ee649 100644
--- a/tests/wpt/web-platform-tests/beacon/headers/header-content-type.html
+++ b/tests/wpt/web-platform-tests/beacon/headers/header-content-type.html
@@ -19,8 +19,8 @@
   promise_test(async t => {
     const id = self.token();
     const testUrl = new Request(RESOURCES_DIR + "content-type.py?cmd=put&id=" + id).url;
-    assert_true(navigator.sendBeacon(testUrl, what), "SendBeacon Succeeded");
     assert_equals(performance.getEntriesByName(testUrl).length, 0);
+    assert_true(navigator.sendBeacon(testUrl, what), "SendBeacon Succeeded");
 
     do {
       await wait(50);
diff --git a/tests/wpt/web-platform-tests/budget-api/OWNERS b/tests/wpt/web-platform-tests/budget-api/OWNERS
new file mode 100644
index 000000000000..9cc0eff9fd27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/budget-api/OWNERS
@@ -0,0 +1 @@
+@beverloo
diff --git a/tests/wpt/web-platform-tests/check_stability.ini b/tests/wpt/web-platform-tests/check_stability.ini
index f5ec030149b0..b939328be1cb 100644
--- a/tests/wpt/web-platform-tests/check_stability.ini
+++ b/tests/wpt/web-platform-tests/check_stability.ini
@@ -6,5 +6,4 @@ skip_tests: conformance-checkers docs tools
 # Exhaustively validating such changes is highly resource intensive
 # (particularly in terms of execution time), making it impractical in most
 # cases.
-ignore_changes: resources
-results_url: https://pulls.web-platform-tests.org/api/stability
+ignore_changes: resources/**
diff --git a/tests/wpt/web-platform-tests/clear-site-data/OWNERS b/tests/wpt/web-platform-tests/clear-site-data/OWNERS
new file mode 100644
index 000000000000..fa38108161e7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/clear-site-data/OWNERS
@@ -0,0 +1,2 @@
+@mikewest
+@msramek
diff --git a/tests/wpt/web-platform-tests/client-hints/OWNERS b/tests/wpt/web-platform-tests/client-hints/OWNERS
new file mode 100644
index 000000000000..1bcab3b39a19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/client-hints/OWNERS
@@ -0,0 +1,3 @@
+@igrigorik
+@yoavweiss
+@tarunban
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html
index 447dd2861c9e..50d77646f89a 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html
@@ -10,20 +10,22 @@
 // the HTTP request headers if the response was delivered by an insecure HTTP
 // server. Test this functionality by fetching an XHR from this page hosted on
 // an insecure HTTP server. The response headers for this page include
-// "Accept-CH: device-memory, dpr, viewport-width".
+// "Accept-CH: device-memory, dpr, viewport-width, rtt, downlink, ect".
 //
-// echo_client_hints_received.py includes "device-memory-received",
-// "dpr-received" and "viewport-width-received" in the response headers
-// depending on the set of client hints it receives in the request headers.
+// echo_client_hints_received.py sets the response headers depending on the set
+// of client hints it receives in the request headers.
 
   promise_test(t => {
   return fetch("/client-hints/echo_client_hints_received.py").then(r => {
     assert_equals(r.status, 200)
     // Verify that the browser does not include client hints in the headers
     // when fetching the XHR from an insecure HTTP server.
-    assert_false(r.headers.has("device-memory-received"));
-    assert_false(r.headers.has("dpr-received"));
-    assert_false(r.headers.has("viewport-width-received"));
+    assert_false(r.headers.has("device-memory-received"), "device-memory-received");
+    assert_false(r.headers.has("dpr-received"), "dpr-received");
+    assert_false(r.headers.has("viewport-width-received"), "viewport-width-received");
+    assert_false(r.headers.has("rtt-received"), "rtt-received");
+    assert_false(r.headers.has("downlink-received"), "downlink-received");
+    assert_false(r.headers.has("ect-received"), "ect-received");
   });
 }, "Accept-CH header test");
 
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers
index 38f4f33be8a9..4f3a57b865b8 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.http.html.headers
@@ -1 +1 @@
-Accept-CH: device-memory, dpr, viewport-width
\ No newline at end of file
+Accept-CH: device-memory, dpr, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html
index 527a7c9d21d3..78c7ad0e1855 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html
@@ -10,11 +10,10 @@
 // HTTP request headers depending on whether the resource is being fetched from
 // the same origin or a different origin. Test this functionality by fetching
 // same-origin and cross-origin resources from this page. The response headers
-// for this page include "Accept-CH: device-memory, dpr, viewport-width".
+// for this page include "Accept-CH: device-memory, dpr, viewport-width, rtt, downlink, ect".
 //
-// echo_client_hints_received.py includes "device-memory-received",
-// "dpr-received" and "viewport-width-received" in the response headers
-// depending on the set of client hints it receives in the request headers.
+// echo_client_hints_received.py sets the response headers depending on the set
+// of client hints it receives in the request headers.
 
 promise_test(t => {
   return fetch("https://{{domains[]}}:{{ports[https][0]}}/client-hints/echo_client_hints_received.py", {"mode": "no-cors"}).then(r => {
@@ -24,6 +23,20 @@
     assert_true(r.headers.has("device-memory-received"), "device-memory-received");
     assert_true(r.headers.has("dpr-received"), "dpr-received");
     assert_true(r.headers.has("viewport-width-received"), "viewport-width-received");
+
+    assert_true(r.headers.has("rtt-received"), "rtt-received");
+    var rtt = parseInt(r.headers.get("rtt-received"));
+    assert_greater_than_equal(rtt, 0);
+    assert_less_than_equal(rtt, 3000);
+    assert_equals(rtt % 50, 0, 'rtt must be a multiple of 50 msec');
+
+    assert_true(r.headers.has("downlink-received"), "downlink-received");
+    var downlinkKbps  = r.headers.get("downlink-received") * 1000;
+    assert_greater_than_equal(downlinkKbps, 0);
+    assert_less_than_equal(downlinkKbps, 10000);
+
+    assert_in_array(r.headers.get("ect-received"), ["slow-2g", "2g",
+          "3g", "4g"], 'ect-received is unexpected');
   });
 }, "Accept-CH header test");
 
@@ -35,6 +48,9 @@
     assert_false(r.headers.has("device-memory-received"), "device-memory-received");
     assert_false(r.headers.has("dpr-received"), "dpr-received");
     assert_false(r.headers.has("viewport-width-received"), "viewport-width-received");
+    assert_false(r.headers.has("rtt-received"), "rtt-received");
+    assert_false(r.headers.has("downlink-received"), "downlink-received");
+    assert_false(r.headers.has("ect-received"), "ect-received");
   });
 }, "Cross-Origin Accept-CH header test");
 
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers
index 38f4f33be8a9..4f3a57b865b8 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch.sub.https.html.headers
@@ -1 +1 @@
-Accept-CH: device-memory, dpr, viewport-width
\ No newline at end of file
+Accept-CH: device-memory, dpr, viewport-width, rtt, downlink, ect
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/client-hints/accept_ch_malformed_header.https.html b/tests/wpt/web-platform-tests/client-hints/accept_ch_malformed_header.https.html
index 3de78b7cff85..70ccab8c80d0 100644
--- a/tests/wpt/web-platform-tests/client-hints/accept_ch_malformed_header.https.html
+++ b/tests/wpt/web-platform-tests/client-hints/accept_ch_malformed_header.https.html
@@ -14,6 +14,9 @@
     assert_false(r.headers.has("device-memory-received"), "device-memory-received");
     assert_false(r.headers.has("dpr-received"), "dpr-received");
     assert_false(r.headers.has("viewport-width-received"), "viewport-width-received");
+    assert_false(r.headers.has("rtt-received"), "rtt-received");
+    assert_false(r.headers.has("downlink-received"), "downlink-received");
+    assert_false(r.headers.has("ect-received"), "ect-received");
   });
 }, "Accept-CH header test");
 
diff --git a/tests/wpt/web-platform-tests/client-hints/echo_client_hints_received.py b/tests/wpt/web-platform-tests/client-hints/echo_client_hints_received.py
index ffec0c1dfc15..8f2ccaa2884f 100644
--- a/tests/wpt/web-platform-tests/client-hints/echo_client_hints_received.py
+++ b/tests/wpt/web-platform-tests/client-hints/echo_client_hints_received.py
@@ -1,14 +1,20 @@
 def main(request, response):
     """
-    Simple handler that sets a response header based on if device-memory
-    request header was received or not.
+    Simple handler that sets a response header based on which client hint
+    request headers were received.
     """
 
     response.headers.append("Access-Control-Allow-Origin", "*")
 
     if "device-memory" in request.headers:
-            response.headers.set("device-memory-received", "true")
+            response.headers.set("device-memory-received", request.headers.get("device-memory"))
     if "dpr" in request.headers:
-            response.headers.set("dpr-received", "true")
+            response.headers.set("dpr-received", request.headers.get("dpr"))
     if "viewport-width" in request.headers:
-            response.headers.set("viewport-width-received", "true")
\ No newline at end of file
+            response.headers.set("viewport-width-received", request.headers.get("viewport-width"))
+    if "rtt" in request.headers:
+            response.headers.set("rtt-received", request.headers.get("rtt"))
+    if "downlink" in request.headers:
+            response.headers.set("downlink-received", request.headers.get("downlink"))
+    if "ect" in request.headers:
+            response.headers.set("ect-received", request.headers.get("ect"))
diff --git a/tests/wpt/web-platform-tests/common/subset-tests.js b/tests/wpt/web-platform-tests/common/subset-tests.js
new file mode 100644
index 000000000000..1810320e6608
--- /dev/null
+++ b/tests/wpt/web-platform-tests/common/subset-tests.js
@@ -0,0 +1,33 @@
+// Only test a subset of tests with, e.g., ?1-10 in the URL.
+// Can be used together with <meta name="variant" content="...">
+// Sample usage:
+// for (const test of tests) {
+//   subsetTest(async_test, test.fn, test.name);
+// }
+(function() {
+  var subTestStart = 0;
+  var subTestEnd = Infinity;
+  var match;
+  if (location.search) {
+      match = /(?:^\?|&)(\d+)-(\d+|last)(?:&|$)/.exec(location.search);
+      if (match) {
+        subTestStart = parseInt(match[1], 10);
+        if (match[2] !== "last") {
+            subTestEnd = parseInt(match[2], 10);
+        }
+      }
+  }
+  function shouldRunSubTest(currentSubTest) {
+    return currentSubTest >= subTestStart && currentSubTest <= subTestEnd;
+  }
+  var currentSubTest = 0;
+  function subsetTest(testFunc, ...args) {
+    currentSubTest++;
+    if (shouldRunSubTest(currentSubTest)) {
+      return testFunc(...args);
+    }
+    return null;
+  }
+  self.shouldRunSubTest = shouldRunSubTest;
+  self.subsetTest = subsetTest;
+})();
diff --git a/tests/wpt/web-platform-tests/compat/css-style-declaration-alias-enumeration.html b/tests/wpt/web-platform-tests/compat/css-style-declaration-alias-enumeration.html
new file mode 100644
index 000000000000..4608af9d5fc7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/compat/css-style-declaration-alias-enumeration.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<title>Aliases enumerated on CSSStyleDeclaration</title>
+<link rel="author" title="Anders Hartvoll Ruud" href="andruud@chromium.org">
+<link rel="help" href="https://compat.spec.whatwg.org/#css-simple-aliases">
+<meta name="assert" content="This test verifies that aliases are enumerated on CSSStyleDeclaration" />
+
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+</body>
+<script>
+
+// Note: This is an arbitrarily chosen simple alias from the spec.
+const ALIAS_SAMPLE = 'webkitTransform';
+
+function find_alias(alias) {
+  for (let prop in document.body.style) {
+    if (prop == alias) {
+      return true;
+    }
+  }
+  return false;
+}
+
+test(() => {
+  assert_true(find_alias(ALIAS_SAMPLE), `Alias ${ALIAS_SAMPLE} seen`);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/config.default.json b/tests/wpt/web-platform-tests/config.default.json
deleted file mode 100644
index d08d7c4a3fe2..000000000000
--- a/tests/wpt/web-platform-tests/config.default.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{"browser_host": "web-platform.test",
- "doc_root": null,
- "ws_doc_root": null,
- "server_host": null,
- "ports":{"http":[8000, "auto"],
-          "https":[8443],
-          "ws":["auto"],
-          "wss":["auto"]},
- "check_subdomains": true,
- "log_level":"debug",
- "bind_address": true,
- "ssl": {"type": "pregenerated",
-         "encrypt_after_connect": false,
-         "openssl": {
-             "openssl_binary": "openssl",
-             "base_path": "_certs",
-             "force_regenerate": false,
-             "base_conf_path": null
-         },
-         "pregenerated": {
-             "host_key_path": "tools/certs/web-platform.test.key",
-             "host_cert_path": "tools/certs/web-platform.test.pem"
-         },
-         "none": {}
-        },
- "aliases": []
-}
diff --git a/tests/wpt/web-platform-tests/console/console-count-label-conversion.any.js b/tests/wpt/web-platform-tests/console/console-count-label-conversion.any.js
deleted file mode 100644
index ee37436f2c5f..000000000000
--- a/tests/wpt/web-platform-tests/console/console-count-label-conversion.any.js
+++ /dev/null
@@ -1,24 +0,0 @@
-"use strict";
-// https://console.spec.whatwg.org/#count
-
-test(() => {
-  let countLabelToStringCalled = false;
-
-  console.count({
-    toString() {
-      countLabelToStringCalled = true;
-    }
-  });
-
-  assert_true(countLabelToStringCalled, "toString() must be called on count()'s label when label is an object");
-}, "console.count()'s label gets converted to string via label.toString() when label is an object");
-
-test(() => {
-  assert_throws({name: "Error"}, () => {
-    console.count({
-      toString() {
-        throw new Error("conversion error");
-      }
-    });
-  }, "count() must re-throw any exceptions thrown by label.toString() conversion");
-}, "console.count() throws exceptions generated by erroneous label.toString() conversion");
diff --git a/tests/wpt/web-platform-tests/console/console-countReset-logging-manual.html b/tests/wpt/web-platform-tests/console/console-countReset-logging-manual.html
new file mode 100644
index 000000000000..e2ed2dd062f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/console/console-countReset-logging-manual.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<html>
+<head>
+<title>Console Count Reset - Logging Manual Test</title>
+<meta name="author" title="Dominic Farolino" href="mailto:domfarolino@gmail.com">
+<meta name="assert" content="Console countReset method">
+<link rel="help" href="https://console.spec.whatwg.org/#countReset">
+</head>
+<body>
+<p>Open the console inside the developer tools. It should contain lines whose contents are:</p>
+<p><code>default: 1</code></p>
+<p><code>default: 1</code></p>
+<p><code>default: 1</code></p>
+<p><code>default: 1</code></p>
+<p><code>default: 1</code></p>
+<p><code>default: 1</code></p>
+<p><code>default: 1</code></p>
+<p><code>default: 1</code></p>
+<p><code>a label: 1</code></p>
+<p><code>a label: 1</code></p>
+<p style="color:grey;">[some warning message indicating that a count for label "b" does not exist]</p>
+
+<script>
+console.count();
+console.countReset();
+console.count();
+
+console.count(undefined);
+console.countReset(undefined);
+console.count(undefined);
+
+console.count("default");
+console.countReset("default");
+console.count("default");
+
+console.count({toString() {return "default"}});
+console.countReset({toString() {return "default"}});
+console.count({toString() {return "default"}});
+
+console.count("a label");
+console.countReset();
+console.count("a label");
+
+console.countReset("b"); // should produce a warning
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/console/console-counting-label-conversion.any.js b/tests/wpt/web-platform-tests/console/console-counting-label-conversion.any.js
new file mode 100644
index 000000000000..bbc77f011b7b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/console/console-counting-label-conversion.any.js
@@ -0,0 +1,55 @@
+"use strict";
+// https://console.spec.whatwg.org/#count
+// https://console.spec.whatwg.org/#countreset
+
+// TODO(domfarolino): make this a link to
+// https://console.spec.whatwg/org/#counting pending
+// the resolution of https://github.com/whatwg/console/issues/135
+
+// TODO(domfarolino): DRY up the label conversion tests for count/countReset/time/timeEnd
+// by probably making a helper function that passes in the console method to perform the
+// conversion with so we're not duplicating everything
+
+test(() => {
+  let countLabelToStringCalled = false;
+
+  console.count({
+    toString() {
+      countLabelToStringCalled = true;
+    }
+  });
+
+  assert_true(countLabelToStringCalled, "toString() must be called on count()'s label when label is an object");
+}, "console.count()'s label gets converted to string via label.toString() when label is an object");
+
+test(() => {
+  assert_throws({name: "Error"}, () => {
+    console.count({
+      toString() {
+        throw new Error("conversion error");
+      }
+    });
+  }, "count() must re-throw any exceptions thrown by label.toString() conversion");
+}, "console.count() throws exceptions generated by erroneous label.toString() conversion");
+
+test(() => {
+  let countLabelToStringCalled = false;
+
+  console.countReset({
+    toString() {
+      countLabelToStringCalled = true;
+    }
+  });
+
+  assert_true(countLabelToStringCalled, "toString() must be called on countReset()'s label when label is an object");
+}, "console.countReset()'s label gets converted to string via label.toString() when label is an object");
+
+test(() => {
+  assert_throws({name: "Error"}, () => {
+    console.countReset({
+      toString() {
+        throw new Error("conversion error");
+      }
+    });
+  }, "countReset() must re-throw any exceptions thrown by label.toString() conversion");
+}, "console.countReset() throws exceptions generated by erroneous label.toString() conversion");
diff --git a/tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html b/tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html
index 6f59016fae36..6a0f0a1e76e8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/base-uri/report-uri-does-not-respect-base-uri.sub.html
@@ -5,7 +5,7 @@
   <script src='/resources/testharness.js'></script>
   <script src='/resources/testharnessreport.js'></script>
   <!-- if base is used for resolving the URL to report to then we will not get a report -->
-  <base href="http://nonexistent-origin.web-platform.test">
+  <base href="http://nonexistent.web-platform.test">
 </head>
 <body>
   <script>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers
index 7d5e85e7a10d..aced1c6d058f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-allowed.html.headers
@@ -1,4 +1,4 @@
 Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Pragma: no-cache
-Content-Security-Policy: navigate-to support/navigate_parent.sub.html
+Content-Security-Policy: navigate-to 'self' support/navigate_parent.sub.html
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.html
deleted file mode 100644
index b665b7ac7609..000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-
-<body>
-<script>
-  var t = async_test("Test that the child can't navigate the parent because the relevant policy belongs to the navigation initiator (in this case the child)");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-
-<iframe srcdoc="<iframe src='support/navigate_parent.sub.html?csp=navigate-to%20%27none%27'>">
-
-</body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html
new file mode 100644
index 000000000000..2acf417a3b90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+<iframe srcdoc="<iframe src='support/navigate_parent.sub.html?csp=navigate-to%20%27none%27&report_id={{$id:uuid()}}'>"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27none%27&reportID={{$id}}'></script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.html.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.html.headers
rename to tests/wpt/web-platform-tests/content-security-policy/navigate-to/child-navigates-parent-blocked.sub.html.headers
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-allowed.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-allowed.html
index c1a88b2772a8..aa38d898abdc 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-allowed.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-allowed.html
@@ -12,5 +12,5 @@
     assert_equals(e.data.result, 'success');
   });
 </script>
-<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27&action=post_message_to_frame_owner.html">
+<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27&action=post_message_to_frame_owner.html"></iframe>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.html
deleted file mode 100644
index 233db534f14d..000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-
-<body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27none%27&action=post_message_to_frame_owner.html">
-</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.sub.html
new file mode 100644
index 000000000000..beb22214faae
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-blocked.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27none%27&report_id={{$id:uuid()}}&action=post_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27none%27&reportID={{$id}}'></script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html
index a082786d0663..4d0ddc30f1ae 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-allowed.sub.html
@@ -12,5 +12,5 @@
     assert_equals(e.data.result, 'success');
   });
 </script>
-<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}&action=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html">
+<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}&action=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html"></iframe>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html
index e8e653ccfc04..49fe958adb77 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-cross-origin-blocked.sub.html
@@ -6,12 +6,7 @@
 </head>
 
 <body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27&action=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html">
+<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&action=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-allowed.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-allowed.html
index 7612d206d4d1..129b719c2258 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-allowed.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-allowed.html
@@ -12,5 +12,5 @@
     assert_equals(e.data.result, 'success');
   });
 </script>
-<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27&action=redirect_to_post_message_to_frame_owner.py">
+<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27&action=redirect_to_post_message_to_frame_owner.py%3Flocation%3Dpost_message_to_frame_owner.html"></iframe>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html
index 6f4e1ac80a8b..6adc9efdaaf8 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-redirected-blocked.sub.html
@@ -6,12 +6,7 @@
 </head>
 
 <body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20{{location[server]}}/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py&action=redirect_to_post_message_to_frame_owner.py">
+<iframe src="support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&action=redirect_to_post_message_to_frame_owner.py%3Flocation%3Dhttp%3A%2F%2F{{domains[www1]}}%3A{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-allowed.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-allowed.html
index e8896c8dbef8..16e11e0c6595 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-allowed.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-allowed.html
@@ -14,5 +14,4 @@
 
   window.open("support/href_location_navigation.sub.html?csp=navigate-to%20%27self%27&target=post_message_to_frame_owner.html", "_blank");
 </script>
-
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.html
deleted file mode 100644
index 5094784823ce..000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-
-<body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-
-  window.open("support/href_location_navigation.sub.html?csp=navigate-to%20%27none%27&target=post_message_to_frame_owner.html", "_blank");
-</script>
-
-</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.sub.html
new file mode 100644
index 000000000000..6aef250eeedd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-blocked.sub.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+<script>
+  window.open("support/href_location_navigation.sub.html?csp=navigate-to%20%27none%27&report_id={{$id:uuid()}}&target=post_message_to_frame_owner.html", "_blank");
+</script>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27none%27&reportID={{$id}}'></script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html
index 0009b6c2b839..a9396fc406c1 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-allowed.sub.html
@@ -14,5 +14,4 @@
 
   window.open("support/href_location_navigation.sub.html?csp=navigate-to%20http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html", "_blank");
 </script>
-
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html
index ef0d787c1a4b..894719b3ac86 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-cross-origin-blocked.sub.html
@@ -7,13 +7,8 @@
 
 <body>
 <script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-
-  window.open("support/href_location_navigation.sub.html?csp=navigate-to%20%27self%27&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html", "_blank");
+  window.open("support/href_location_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html", "_blank");
 </script>
 
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-allowed.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-allowed.html
index 4f535bf3d5c1..4dbfa7aef9db 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-allowed.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-allowed.html
@@ -14,5 +14,4 @@
 
   window.open("support/href_location_navigation.sub.html?csp=navigate-to%20%27self%27&target=redirect_to_post_message_to_frame_owner.py", "_blank");
 </script>
-
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html
index 8a0047dd6493..b91c473bef41 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/href-location-redirected-blocked.sub.html
@@ -7,13 +7,8 @@
 
 <body>
 <script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-
-  window.open("support/href_location_navigation.sub.html?csp=navigate-to%20{{location[server]}}/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py&target=redirect_to_post_message_to_frame_owner.py", "_blank");
+  window.open("support/href_location_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&target=redirect_to_post_message_to_frame_owner.py%3Flocation%3Dhttp%3A%2F%2F{{domains[www1]}}%3A{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html", "_blank");
 </script>
 
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-allowed.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-allowed.html
index 3f7f678c72a2..667a3a59f2fa 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-allowed.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-allowed.html
@@ -14,4 +14,4 @@
   });
 </script>
 <iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20%27self%27&target=post_message_to_frame_owner.html">
-</body>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.html
deleted file mode 100644
index 65de768802ba..000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-<meta name="timeout" content="long">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-
-<body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20%27none%27&target=post_message_to_frame_owner.html">
-</body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.sub.html
new file mode 100644
index 000000000000..0ad98264c963
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-blocked.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+<iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20%27none%27&report_id={{$id:uuid()}}&target=post_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27none%27&reportID={{$id}}'></script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html
index 360ede37f1db..2f9f0e2af0ce 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-allowed.sub.html
@@ -14,4 +14,4 @@
   });
 </script>
 <iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html">
-</body>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html
index 50f258ba7ffa..970f5a2d3065 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-cross-origin-blocked.sub.html
@@ -7,12 +7,7 @@
 </head>
 
 <body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20%27self%27&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html">
-</body>
+<iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-allowed.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-allowed.html
index e75a7e5a5021..81c4f4e1677f 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-allowed.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-allowed.html
@@ -14,4 +14,4 @@
   });
 </script>
 <iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20%27self%27&target=redirect_to_post_message_to_frame_owner.py">
-</body>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html
index 355e2c8598b7..bb61126244e5 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/link-click-redirected-blocked.sub.html
@@ -7,12 +7,7 @@
 </head>
 
 <body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20{{location[server]}}/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py&target=redirect_to_post_message_to_frame_owner.py">
-</body>
+<iframe src="support/link_click_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&target=redirect_to_post_message_to_frame_owner.py%3Flocation%3Dhttp%3A%2F%2F{{domains[www1]}}%3A{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.html
deleted file mode 100644
index 7acf68dd717f..000000000000
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE html>
-
-<head>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-</head>
-
-<body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/meta_refresh_navigation.sub.html?csp=navigate-to%20%27none%27&target=post_message_to_frame_owner.html">
-</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.sub.html
new file mode 100644
index 000000000000..d4d52a51ccbc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-blocked.sub.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+
+<body>
+<iframe src="support/meta_refresh_navigation.sub.html?csp=navigate-to%20%27none%27&report_id={{$id:uuid()}}&target=post_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27none%27&reportID={{$id}}'></script>
+</body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html
index 627744e346bb..2118b27ba33c 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-cross-origin-blocked.sub.html
@@ -6,12 +6,7 @@
 </head>
 
 <body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/meta_refresh_navigation.sub.html?csp=navigate-to%20%27self%27&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html">
+<iframe src="support/meta_refresh_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&target=http%3A%2F%2F{{domains[www1]}}:{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html
index 598600f639e7..55e3295ec1ab 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/meta-refresh-redirected-blocked.sub.html
@@ -6,12 +6,7 @@
 </head>
 
 <body>
-<script>
-  var t = async_test("Test that the child iframe navigation is blocked");
-  window.onmessage = t.step_func_done(function(e) {
-    assert_equals(e.data.result, 'fail');
-    assert_equals(e.data.violatedDirective, 'navigate-to');
-  });
-</script>
-<iframe src="support/meta_refresh_navigation.sub.html?csp=navigate-to%20{{location[server]}}/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py&target=redirect_to_post_message_to_frame_owner.py">
+<iframe src="support/meta_refresh_navigation.sub.html?csp=navigate-to%20%27self%27&report_id={{$id:uuid()}}&target=redirect_to_post_message_to_frame_owner.py%3Flocation%3Dhttp%3A%2F%2F{{domains[www1]}}%3A{{ports[http][0]}}%2Fcontent-security-policy%2Fnavigate-to%2Fsupport%2Fpost_message_to_frame_owner.html"></iframe>
+
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20%27self%27&reportID={{$id}}'></script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html
index 8353d394cff4..fc549b47fd8b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html
@@ -7,12 +7,6 @@
 
 <body>
 <script>
-  var t = async_test("Test that the parent can't navigate the child because the relevant policy belongs to the navigation initiator (in this case the parent)");
-  window.addEventListener('securitypolicyviolation', t.step_func_done(function(e) {
-    assert_equals(e.violatedDirective, 'navigate-to');
-  }));
-  window.onmessage = t.unreached_func("Should not have received a message from the child");
-
   var i = document.createElement('iframe');
   var src_changed = false;
   i.onload = function() {
@@ -20,7 +14,8 @@
     src_changed = true;
     i.src = "support/post_message_to_frame_owner.html";
   }
-  i.src = "support/wait_for_navigation.html?csp=navigate-to%20%self%27";
+  i.src = "support/wait_for_navigation.html?csp=navigate-to%20%27self%27";
   document.body.appendChild(i);
 </script>
+<script async defer src='../support/checkReport.sub.js?reportField=violated-directive&reportValue=navigate-to%20support%2Fwait_for_navigation.html'></script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers
similarity index 50%
rename from tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.headers
rename to tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers
index c2b8cd3540fd..6784a56c8eb5 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/parent-navigates-child-blocked.html.sub.headers
@@ -1,4 +1,5 @@
 Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Pragma: no-cache
-Content-Security-Policy: navigate-to support/wait_for_navigation.html
+Set-Cookie: parent-navigates-child-blocked={{$id:uuid()}}; Path=/content-security-policy/navigate-to/
+Content-Security-Policy: navigate-to support/wait_for_navigation.html; report-uri ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html
index be5be016b067..3e3e2afcacce 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html
@@ -13,9 +13,21 @@
 <body>
 <form action='{{GET[action]}}' target='_self' id='form'>
   <input type="text" name="dummy">
+  <div id="form-div"></div>
 </form>
 
 <script>
-  document.getElementById('form').submit();
+ try {
+  url = new URL("{{GET[action]}}", location.href);
+  for (var p of url.searchParams) {
+    var elem = document.createElement('input');
+    elem.type = 'text';
+    elem.name = p[0];
+    elem.value = p[1];
+    document.getElementById('form-div').appendChild(elem);
+  }
+ } catch(ex) {}
+ 
+ document.getElementById('form').submit();
 </script>
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers
index d3c635b9a062..9c572a961620 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/form_action_navigation.sub.html.sub.headers
@@ -1,4 +1,4 @@
 Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Pragma: no-cache
-Content-Security-Policy: {{GET[csp]}}
+Content-Security-Policy: {{GET[csp]}}; report-uri /content-security-policy/support/report.py?op=put&reportID={{GET[report_id]}}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html
index 2e8fad6d2699..c577e935cd43 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html
@@ -2,12 +2,6 @@
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-
-  <script>
-    window.addEventListener('securitypolicyviolation', function(e) {
-      window.opener.postMessage({result: 'fail', violatedDirective: e.violatedDirective}, '*');
-    });
-  </script>
 </head>
 
 <body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers
index d3c635b9a062..d01e2672a838 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/href_location_navigation.sub.html.sub.headers
@@ -1,4 +1,4 @@
 Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Pragma: no-cache
-Content-Security-Policy: {{GET[csp]}}
+Content-Security-Policy: {{GET[csp]}}; report-uri /content-security-policy/support/report.py?op=put&reportID={{GET[report_id]}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html
index 2469ed6d580b..f1b424283443 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html
@@ -2,12 +2,6 @@
 <head>
   <script src="/resources/testharness.js"></script>
   <script src="/resources/testharnessreport.js"></script>
-
-  <script>
-    window.addEventListener('securitypolicyviolation', function(e) {
-      top.postMessage({result: 'fail', violatedDirective: e.violatedDirective}, '*');
-    });
-  </script>
 </head>
 
 <body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers
index d3c635b9a062..d01e2672a838 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/link_click_navigation.sub.html.sub.headers
@@ -1,4 +1,4 @@
 Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Pragma: no-cache
-Content-Security-Policy: {{GET[csp]}}
+Content-Security-Policy: {{GET[csp]}}; report-uri /content-security-policy/support/report.py?op=put&reportID={{GET[report_id]}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html
index 3a841410cb63..64bae27fed66 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html
@@ -9,7 +9,7 @@
     });
   </script>
 
-  <meta http-equiv="refresh" content="1; url={{GET[target]}}">
+  <meta http-equiv="refresh" content="0; url={{GET[target]}}">
 </head>
 
 <body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers
index d3c635b9a062..d01e2672a838 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/meta_refresh_navigation.sub.html.sub.headers
@@ -1,4 +1,4 @@
 Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Pragma: no-cache
-Content-Security-Policy: {{GET[csp]}}
+Content-Security-Policy: {{GET[csp]}}; report-uri /content-security-policy/support/report.py?op=put&reportID={{GET[report_id]}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers
index d3c635b9a062..d01e2672a838 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/navigate_parent.sub.html.sub.headers
@@ -1,4 +1,4 @@
 Expires: Mon, 26 Jul 1997 05:00:00 GMT
 Cache-Control: no-store, no-cache, must-revalidate
 Pragma: no-cache
-Content-Security-Policy: {{GET[csp]}}
+Content-Security-Policy: {{GET[csp]}}; report-uri /content-security-policy/support/report.py?op=put&reportID={{GET[report_id]}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py
index 77e725b6daaa..652f9a57b967 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/support/redirect_to_post_message_to_frame_owner.py
@@ -1,3 +1,6 @@
 def main(request, response):
     response.status = 302
-    response.headers.set("Location", "post_message_to_frame_owner.html")
\ No newline at end of file
+    if "location" in request.GET:
+        response.headers.set("Location", request.GET["location"])
+    else:
+        response.headers.set("Location", "post_message_to_frame_owner.html")
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js b/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
index 7e5417b5e685..1ae7d0982624 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
+++ b/tests/wpt/web-platform-tests/content-security-policy/support/checkReport.sub.js
@@ -24,18 +24,20 @@
     reportCookieName = location.pathname.split('/')[location.pathname.split('/').length - 1].split('.')[0];
   }
 
-  var reportID = "";
-
-  var cookies = document.cookie.split(';');
-  for (var i = 0; i < cookies.length; i++) {
-    var cookieName = cookies[i].split('=')[0].trim();
-    var cookieValue = cookies[i].split('=')[1].trim();
-
-    if (cookieName == reportCookieName) {
-      reportID = cookieValue;
-      var cookieToDelete = cookieName + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=" + document.location.pathname.substring(0, document.location.pathname.lastIndexOf('/') + 1);
-      document.cookie = cookieToDelete;
-      break;
+  var reportID = "{{GET[reportID]}}";
+
+  if (reportID == "") {
+    var cookies = document.cookie.split(';');
+    for (var i = 0; i < cookies.length; i++) {
+      var cookieName = cookies[i].split('=')[0].trim();
+      var cookieValue = cookies[i].split('=')[1].trim();
+
+      if (cookieName == reportCookieName) {
+        reportID = cookieValue;
+        var cookieToDelete = cookieName + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT; path=" + document.location.pathname.substring(0, document.location.pathname.lastIndexOf('/') + 1);
+        document.cookie = cookieToDelete;
+        break;
+      }
     }
   }
 
diff --git a/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html b/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html
index e313b04ff8f3..98354275814b 100644
--- a/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html
+++ b/tests/wpt/web-platform-tests/cookie-store/idlharness.tentative.html
@@ -42,6 +42,11 @@
     'EventModifierInit',
   ] });
 
+  idl_array.add_untested_idls(
+    `dictionary ExtendableEventInit {};`);
+  idl_array.add_untested_idls(
+    `[Global=ExtendableEvent, Exposed=ServiceWorker]
+     interface ExtendableEvent : Event {};`);
   idl_array.add_untested_idls(
     `[Global=ServiceWorker, Exposed=ServiceWorker]
      interface ServiceWorkerGlobalScope {};`);
diff --git a/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js b/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js
index e2e838dc7e61..ba804132ca44 100644
--- a/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js
+++ b/tests/wpt/web-platform-tests/cookie-store/idlharness_serviceworker.js
@@ -16,8 +16,12 @@ promise_test(async t => {
   idl_array.add_untested_idls(
     `[Global=Event, Exposed=ServiceWorker]
      interface Event {};`);
+  idl_array.add_untested_idls(
+    `[Global=ExtendableEvent, Exposed=ServiceWorker]
+     interface ExtendableEvent : Event {};`);
   idl_array.add_untested_idls('dictionary EventHandler {};');
   idl_array.add_untested_idls('dictionary EventInit {};');
+  idl_array.add_untested_idls('dictionary ExtendableEventInit {};');
   idl_array.add_untested_idls(
     `[Global=EventTarget, Exposed=ServiceWorker]
      interface EventTarget {};`);
@@ -32,7 +36,8 @@ promise_test(async t => {
 
   idl_array.add_objects({
     CookieStore: [self.cookieStore],
-    CookieChangeEvent: [new CookieChangeEvent('change')],
+    ExtendableCookieChangeEvent: [
+        new ExtendableCookieChangeEvent('cookiechange')],
   });
   idl_array.test();
 }, 'Interface test');
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions.js
new file mode 100644
index 000000000000..3f1b0ff46364
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions.js
@@ -0,0 +1,113 @@
+self.GLOBAL = {
+  isWindow: function() { return false; },
+  isWorker: function() { return true; },
+};
+importScripts("/resources/testharness.js");
+
+self.addEventListener('install', (event) => {
+  event.waitUntil((async () => {
+    // The subscribeToChanges calls are not done in parallel on purpose. Having
+    // multiple in-flight requests introduces failure modes aside from the
+    // cookie change logic that this test aims to cover.
+    await cookieStore.subscribeToChanges([
+      { name: 'cookie-name1', matchType: 'equals', url: '/scope/path1' }]);
+    await cookieStore.subscribeToChanges([
+      { },  // Test the default values for subscription properties.
+      { name: 'cookie-prefix', matchType: 'startsWith' },
+    ]);
+  })());
+});
+
+// Workaround because add_cleanup doesn't support async functions yet.
+// See https://github.com/w3c/web-platform-tests/issues/6075
+async function async_cleanup(cleanup_function) {
+  try {
+    await cleanup_function();
+  } catch (e) {
+    // Errors in cleanup functions shouldn't result in test failures.
+  }
+}
+
+// Resolves when the service worker receives the 'activate' event.
+const kServiceWorkerActivatedPromise = new Promise(resolve => {
+  self.addEventListener('activate', event => { resolve(); });
+});
+
+// sort() comparator that uses the < operator.
+//
+// This is intended to be used for sorting strings. Using < is preferred to
+// localeCompare() because the latter has some implementation-dependent
+// behavior.
+function CompareStrings(a, b) {
+  return a < b ? -1 : (b < a ? 1 : 0);
+}
+
+promise_test(async testCase => {
+  await kServiceWorkerActivatedPromise;
+
+  const subscriptions = await cookieStore.getChangeSubscriptions();
+  assert_equals(subscriptions.length, 3);
+
+  subscriptions.sort((a, b) => CompareStrings(`${a.name}`, `${b.name}`));
+
+  assert_equals(subscriptions[0].name, 'cookie-name1');
+  assert_equals('equals', subscriptions[0].matchType);
+
+  assert_equals(subscriptions[1].name, 'cookie-prefix');
+  assert_equals('startsWith', subscriptions[1].matchType);
+
+  assert_false('name' in subscriptions[2]);
+  assert_equals('startsWith', subscriptions[2].matchType);
+}, 'getChangeSubscriptions returns subscriptions passed to subscribeToChanges');
+
+promise_test(async testCase => {
+  promise_rejects(
+      testCase, new TypeError(),
+      cookieStore.subscribeToChanges([{ name: 'cookie-name2' }]));
+}, 'subscribeToChanges rejects when called outside the install handler');
+
+
+// Accumulates cookiechange events dispatched to the service worker.
+let g_cookie_changes = [];
+
+// Resolved when a cookiechange event is received. Rearmed by
+// ResetCookieChangeReceivedPromise().
+let g_cookie_change_received_promise = null;
+let g_cookie_change_received_promise_resolver = null;
+self.addEventListener('cookiechange', (event) => {
+  g_cookie_changes.push(event);
+  if (g_cookie_change_received_promise_resolver)
+    g_cookie_change_received_promise_resolver();
+});
+function RearmCookieChangeReceivedPromise() {
+  g_cookie_change_received_promise = new Promise((resolve) => {
+    g_cookie_change_received_promise_resolver = resolve;
+  });
+}
+RearmCookieChangeReceivedPromise();
+
+promise_test(async testCase => {
+  await kServiceWorkerActivatedPromise;
+
+  await cookieStore.set('cookie-name', 'cookie-value');
+
+  await g_cookie_change_received_promise;
+
+  assert_equals(g_cookie_changes.length, 1);
+  const event = g_cookie_changes[0]
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'cookie-name');
+  assert_equals(event.changed[0].value, 'cookie-value');
+  assert_equals(event.deleted.length, 0);
+  assert_true(event instanceof ExtendableCookieChangeEvent);
+  assert_true(event instanceof ExtendableEvent);
+
+  await async_cleanup(() => {
+    cookieStore.delete('cookie-name');
+    g_cookie_changes = [];
+    RearmCookieChangeReceivedPromise();
+  });
+}, 'cookiechange dispatched with cookie change that matches subscription');
+
+done();
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html
new file mode 100644
index 000000000000..723de2312fe6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions.tentative.https.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Async Cookies: cookie change events in ServiceWorker</title>
+<link rel="help" href="https://github.com/WICG/cookie-store">
+<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+'use strict';
+
+(async () => {
+  const scope = 'scope';
+
+  let registration = await navigator.serviceWorker.getRegistration(scope);
+  if (registration)
+    await registration.unregister();
+  registration = await navigator.serviceWorker.register(
+      'serviceworker_cookieStore_subscriptions.js', {scope});
+
+  fetch_tests_from_worker(registration.installing);
+})();
+</script>
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.js b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.js
new file mode 100644
index 000000000000..68edc0e30ff1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.js
@@ -0,0 +1,63 @@
+self.GLOBAL = {
+  isWindow: function() { return false; },
+  isWorker: function() { return true; },
+};
+importScripts("/resources/testharness.js");
+
+self.addEventListener('install', (event) => {
+  event.waitUntil((async () => {
+    cookieStore.subscribeToChanges([
+      { name: 'cookie-name', matchType: 'equals', url: '/scope/path' }]);
+  })());
+});
+
+// Workaround because add_cleanup doesn't support async functions yet.
+// See https://github.com/w3c/web-platform-tests/issues/6075
+async function async_cleanup(cleanup_function) {
+  try {
+    await cleanup_function();
+  } catch (e) {
+    // Errors in cleanup functions shouldn't result in test failures.
+  }
+}
+
+// Resolves when the service worker receives the 'activate' event.
+const kServiceWorkerActivatedPromise = new Promise(resolve => {
+  self.addEventListener('activate', event => { resolve(); });
+});
+
+promise_test(async testCase => {
+  await kServiceWorkerActivatedPromise;
+
+  const subscriptions = await cookieStore.getChangeSubscriptions();
+  assert_equals(subscriptions.length, 1);
+
+  assert_equals(subscriptions[0].name, 'cookie-name');
+  assert_equals('equals', subscriptions[0].matchType);
+}, 'getChangeSubscriptions returns a subscription passed to subscribeToChanges');
+
+
+promise_test(async testCase => {
+  await kServiceWorkerActivatedPromise;
+
+  cookie_change_received_promise = new Promise((resolve) => {
+    self.addEventListener('cookiechange', (event) => {
+      resolve(event);
+    });
+  });
+
+  await cookieStore.set('cookie-name', 'cookie-value');
+
+  const event = await cookie_change_received_promise;
+  assert_equals(event.type, 'cookiechange');
+  assert_equals(event.changed.length, 1);
+  assert_equals(event.changed[0].name, 'cookie-name');
+  assert_equals(event.changed[0].value, 'cookie-value');
+  assert_equals(event.deleted.length, 0);
+  assert_true(event instanceof ExtendableCookieChangeEvent);
+  assert_true(event instanceof ExtendableEvent);
+
+  await async_cleanup(() => { cookieStore.delete('cookie-name'); });
+}, 'cookiechange dispatched with cookie change that matches subscription');
+
+done();
diff --git a/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.tentative.https.html b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.tentative.https.html
new file mode 100644
index 000000000000..525c3b3c5c15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookie-store/serviceworker_cookieStore_subscriptions_basic.tentative.https.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Async Cookies: cookie change events in ServiceWorker</title>
+<link rel="help" href="https://github.com/WICG/cookie-store">
+<link rel="author" href="pwnall@chromium.org" title="Victor Costan">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+'use strict';
+
+(async () => {
+  const scope = 'scope';
+
+  let registration = await navigator.serviceWorker.getRegistration(scope);
+  if (registration)
+    await registration.unregister();
+  registration = await navigator.serviceWorker.register(
+      'serviceworker_cookieStore_subscriptions_basic.js', {scope});
+
+  fetch_tests_from_worker(registration.installing);
+})();
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__host.document-cookie.non-secure.html b/tests/wpt/web-platform-tests/cookies/prefix/__host.document-cookie.non-secure.html
new file mode 100644
index 000000000000..e1a272a23409
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/prefix/__host.document-cookie.non-secure.html
@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  ["", "domain="+document.location.hostname, "MaxAge=10", "HttpOnly"].forEach(extraParams => {
+    // Without 'secure'
+    set_prefixed_cookie_via_dom_test({
+      prefix: "__Host-",
+      params: "Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Host: Non-secure origin: 'Path=/;" + extraParams + "'"
+    });
+
+    // With 'secure'
+    set_prefixed_cookie_via_dom_test({
+      prefix: "__Host-",
+      params: "Secure; Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Host: Non-secure origin: 'Secure; Path=/;" + extraParams + "'"
+    });
+  });
+
+  set_prefixed_cookie_via_dom_test({
+    prefix: "__Host-",
+    params: "Secure; Path=/cookies/resources/list.py",
+    shouldExistInDOM: false,
+    shouldExistViaHTTP: false,
+    title: "__Host: Non-secure origin: 'Secure; Path=/cookies/resources/list.py'"
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__host.http.non-secure.html b/tests/wpt/web-platform-tests/cookies/prefix/__host.http.non-secure.html
new file mode 100644
index 000000000000..3ce587354388
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/prefix/__host.http.non-secure.html
@@ -0,0 +1,34 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  ["", "domain="+document.location.hostname, "MaxAge=10", "HttpOnly"].forEach(extraParams => {
+    // Without 'secure'
+    set_prefixed_cookie_via_http_test({
+      prefix: "__Host-",
+      params: "Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Host: Non-secure origin: 'Path=/;" + extraParams + "'"
+    });
+
+    // With 'secure'
+    set_prefixed_cookie_via_http_test({
+      prefix: "__Host-",
+      params: "Secure; Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Host: Non-secure origin: 'Secure; Path=/;" + extraParams + "'"
+    });
+  });
+
+  set_prefixed_cookie_via_http_test({
+    prefix: "__Host-",
+    params: "Secure; Path=/cookies/resources/list.py",
+    shouldExistInDOM: false,
+    shouldExistViaHTTP: false,
+    title: "__Host: Non-secure origin: 'Secure; Path=/cookies/resources/list.py'"
+  });
+</script>
+
diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.document-cookie.non-secure.html b/tests/wpt/web-platform-tests/cookies/prefix/__secure.document-cookie.non-secure.html
new file mode 100644
index 000000000000..bf898f4cebc0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/prefix/__secure.document-cookie.non-secure.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  ["", "domain="+document.location.hostname, "MaxAge=10", "HttpOnly"].forEach(extraParams => {
+    // Without 'secure'
+    set_prefixed_cookie_via_dom_test({
+      prefix: "__Secure-",
+      params: "Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Secure: Non-secure origin: 'Path=/;" + extraParams + "'"
+    });
+
+    // With 'secure'
+    set_prefixed_cookie_via_dom_test({
+      prefix: "__Secure-",
+      params: "Secure; Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Secure: Non-secure origin: 'Secure; Path=/;" + extraParams + "'"
+    });
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.http.non-secure.html b/tests/wpt/web-platform-tests/cookies/prefix/__secure.http.non-secure.html
new file mode 100644
index 000000000000..af844a9587fd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/prefix/__secure.http.non-secure.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  ["", "domain="+document.location.hostname, "MaxAge=10", "HttpOnly"].forEach(extraParams => {
+    // Without 'secure'
+    set_prefixed_cookie_via_http_test({
+      prefix: "__Secure-",
+      params: "Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Secure: Non-secure origin: 'Path=/;" + extraParams + "'"
+    });
+
+    // With 'secure'
+    set_prefixed_cookie_via_http_test({
+      prefix: "__Secure-",
+      params: "Secure; Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Secure: Non-secure origin: 'Secure; Path=/;" + extraParams + "'"
+    });
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/prefix/__secure.http.secure.html b/tests/wpt/web-platform-tests/cookies/prefix/__secure.http.secure.html
new file mode 100644
index 000000000000..4b413e9ce3ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/prefix/__secure.http.secure.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  ["", "domain="+CROSS_SITE_HOST, "MaxAge=10", "HttpOnly"].forEach(extraParams => {
+    // Without 'secure'
+    set_prefixed_cookie_via_http_test({
+      origin: SECURE_CROSS_SITE_ORIGIN,
+      prefix: "__Secure-",
+      params: "Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: false,
+      title: "__Secure: secure origin: 'Path=/;" + extraParams + "'"
+    });
+
+    // With 'secure'
+    set_prefixed_cookie_via_http_test({
+      origin: SECURE_CROSS_SITE_ORIGIN,
+      prefix: "__Secure-",
+      params: "Secure;Path=/;" + extraParams,
+      shouldExistInDOM: false,
+      shouldExistViaHTTP: true,
+      title: "__Secure: secure origin: 'Secure;Path=/;" + extraParams + "'"
+    });
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/prefix/document-cookie.non-secure.html b/tests/wpt/web-platform-tests/cookies/prefix/document-cookie.non-secure.html
new file mode 100644
index 000000000000..bc6832b15ea8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/prefix/document-cookie.non-secure.html
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(prefix, params, shouldExistInDOM, shouldExistViaHTTP, title) {
+    promise_test(t => {
+      var name = prefix + "prefixtestcookie";
+      erase_cookie_from_js(name);
+      var value = "" + Math.random();
+      document.cookie = name + "=" + value + ";" + params;
+
+      assert_dom_cookie(name, value, shouldExistInDOM);
+
+      return credFetch("/cookies/rfx6265bis/resources/list.py")
+        .then(r => r.json())
+        .then(cookies => assert_equals(cookies[name], shouldExistViaHTTP ? value : undefined));
+    }, title);
+  }
+
+  // No prefix
+  create_test("", "path=/", true, true, "No prefix, root path, no special behavior");
+  create_test("", "path=/;domain=" + document.location.hostname, true, true, "No prefix, domain, no special behavior");
+
+  // `__Secure-` Prefix
+  ["", "domain="+document.location.hostname, "MaxAge=10", "HttpOnly"].forEach(params => {
+    create_test("__Secure-", "Path=/;" + params, false, false, "__Secure: Non-secure origin: 'Path=/;" + params + "'");
+    create_test("__Secure-", "Secure; Path=/;" + params, false, false, "__Secure: Non-secure origin: 'Secure; Path=/;" + params + "'");
+  });
+
+  // `__Host-` Prefix
+  ["", "domain="+document.location.hostname, "MaxAge=10", "HttpOnly"].forEach(params => {
+    create_test("__Secure-", "Path=/;" + params, false, false, "__Host: Non-secure origin: 'Path=/; " + params + "'");
+    create_test("__Secure-", "Secure; Path=/;" + params, false, false, "__Host: Non-secure origin: 'Secure; Path=/; " + params + "'");
+  });
+  create_test("__Secure-", "Path=/cookies/resources/list.py;Secure", false, false, "__Host: Non-secure origin: 'Path=/cookies/resources/list.py;Secure'");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js b/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
new file mode 100644
index 000000000000..852fbb6bb647
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/cookie-helper.sub.js
@@ -0,0 +1,206 @@
+// Set up exciting global variables for cookie tests.
+(_ => {
+  var HOST = "{{host}}";
+  var SECURE_PORT = ":{{ports[https][0]}}";
+  var PORT = ":{{ports[http][0]}}";
+  var CROSS_ORIGIN_HOST = "{{hosts[alt][]}}";
+  var SECURE_CROSS_ORIGIN_HOST = "{{hosts[alt][]}}";
+
+  //For secure cookie verification
+  window.SECURE_ORIGIN = "https://" + HOST + SECURE_PORT;
+  window.INSECURE_ORIGIN = "http://" + HOST + PORT;
+
+  //standard references
+  window.ORIGIN = "http://" + HOST + PORT;
+  window.WWW_ORIGIN = "http://{{domains[www]}}" + PORT;
+  window.SUBDOMAIN_ORIGIN = "http://{{domains[www1]}}" + PORT;
+  window.CROSS_SITE_ORIGIN = "http://" + CROSS_ORIGIN_HOST + PORT;
+  window.SECURE_CROSS_SITE_ORIGIN = "https://" + SECURE_CROSS_ORIGIN_HOST + SECURE_PORT;
+  window.CROSS_SITE_HOST = SECURE_CROSS_ORIGIN_HOST;
+
+  // Set the global cookie name.
+  window.HTTP_COOKIE = "cookie_via_http";
+
+  // If we're not on |HOST|, move ourselves there:
+  if (window.location.hostname != HOST)
+    window.location.hostname = HOST;
+})();
+
+// A tiny helper which returns the result of fetching |url| with credentials.
+function credFetch(url) {
+  return fetch(url, {"credentials": "include"});
+}
+
+// Returns a URL on |origin| which redirects to a given absolute URL.
+function redirectTo(origin, url) {
+  return origin + "/cookies/resources/redirectWithCORSHeaders.py?status=307&location=" + encodeURIComponent(url);
+}
+
+// Asserts that `document.cookie` contains or does not contain (according to
+// the value of |present|) a cookie named |name| with a value of |value|.
+function assert_dom_cookie(name, value, present) {
+  var re = new RegExp("(?:^|; )" + name + "=" + value + "(?:$|;)");
+  assert_equals(re.test(document.cookie), present, "`" + name + "=" + value + "` in `document.cookie`");
+}
+
+function assert_cookie(origin, obj, name, value, present) {
+  assert_equals(obj[name], present ? value : undefined, "`" + name + "=" + value + "` in request to `" + origin + "`.");
+}
+
+// Remove the cookie named |name| from |origin|, then set it on |origin| anew.
+// If |origin| matches `document.origin`, also assert (via `document.cookie`) that
+// the cookie was correctly removed and reset.
+function create_cookie(origin, name, value, extras) {
+  alert("Create_cookie: " + origin + "/cookies/resources/drop.py?name=" + name);
+  return credFetch(origin + "/cookies/resources/drop.py?name=" + name)
+    .then(_ => {
+      if (origin == document.origin)
+        assert_dom_cookie(name, value, false);
+    })
+    .then(_ => {
+      return credFetch(origin + "/cookies/resources/set.py?" + name + "=" + value + ";path=/;" + extras)
+        .then(_ => {
+          if (origin == document.origin)
+            assert_dom_cookie(name, value, true);
+        });
+    });
+}
+
+//
+// Prefix-specific test helpers
+//
+function set_prefixed_cookie_via_dom_test(options) {
+  promise_test(t => {
+    var name = options.prefix + "prefixtestcookie";
+    erase_cookie_from_js(name);
+    var value = "" + Math.random();
+    document.cookie = name + "=" + value + ";" + options.params;
+
+    assert_dom_cookie(name, value, options.shouldExistInDOM);
+
+    return credFetch("/cookies/resources/list.py")
+      .then(r => r.json())
+      .then(cookies => assert_equals(cookies[name], options.shouldExistViaHTTP ? value : undefined));
+  }, options.title);
+}
+
+function set_prefixed_cookie_via_http_test(options) {
+  promise_test(t => {
+    var postDelete = _ => {
+      var value = "" + Math.random();
+      return credFetch(options.origin + "/cookies/resources/set.py?" + name + "=" + value + ";" + options.params)
+        .then(_ => credFetch(options.origin + "/cookies/resources/list.py"))
+        .then(r => r.json())
+        .then(cookies => assert_equals(cookies[name], options.shouldExistViaHTTP ? value : undefined));
+    };
+
+    var name = options.prefix + "prefixtestcookie";
+    if (!options.origin) {
+      options.origin = document.origin;
+      erase_cookie_from_js(name);
+      return postDelete;
+    } else {
+      return credFetch(options.origin + "/cookies/resources/drop.py?name=" + name)
+        .then(_ => postDelete());
+    }
+  }, options.title);
+}
+
+//
+// SameSite-specific test helpers:
+//
+
+window.SameSiteStatus = {
+  CROSS_SITE: "cross-site",
+  LAX: "lax",
+  STRICT: "strict"
+};
+
+// Reset SameSite test cookies on |origin|. If |origin| matches `document.origin`, assert
+// (via `document.cookie`) that they were properly removed and reset.
+function resetSameSiteCookies(origin, value) {
+  return credFetch(origin + "/cookies/resources/dropSameSite.py")
+    .then(_ => {
+      if (origin == document.origin) {
+        assert_dom_cookie("samesite_strict", value, false);
+        assert_dom_cookie("samesite_lax", value, false);
+        assert_dom_cookie("samesite_none", value, false);
+      }
+    })
+    .then(_ => {
+      return credFetch(origin + "/cookies/resources/setSameSite.py?" + value)
+        .then(_ => {
+          if (origin == document.origin) {
+            assert_dom_cookie("samesite_strict", value, true);
+            assert_dom_cookie("samesite_lax", value, true);
+            assert_dom_cookie("samesite_none", value, true);
+          }
+        })
+    })
+}
+
+// Given an |expectedStatus| and |expectedValue|, assert the |cookies| contains the
+// proper set of cookie names and values.
+function verifySameSiteCookieState(expectedStatus, expectedValue, cookies) {
+    assert_equals(cookies["samesite_none"], expectedValue, "Non-SameSite cookies are always sent.");
+    if (expectedStatus == SameSiteStatus.CROSS_SITE) {
+      assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with cross-site requests.");
+      assert_not_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are not sent with cross-site requests.");
+    } else if (expectedStatus == SameSiteStatus.LAX) {
+      assert_not_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are not sent with lax requests.");
+      assert_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are sent with lax requests.");
+    } else if (expectedStatus == SameSiteStatus.STRICT) {
+      assert_equals(cookies["samesite_strict"], expectedValue, "SameSite=Strict cookies are sent with strict requests.");
+      assert_equals(cookies["samesite_lax"], expectedValue, "SameSite=Lax cookies are sent with strict requests.");
+    }
+}
+
+//
+// LeaveSecureCookiesAlone-specific test helpers:
+//
+
+window.SecureStatus = {
+  INSECURE_COOKIE_ONLY: "1",
+  BOTH_COOKIES: "2",
+};
+
+//Reset SameSite test cookies on |origin|. If |origin| matches `document.origin`, assert
+//(via `document.cookie`) that they were properly removed and reset.
+function resetSecureCookies(origin, value) {
+return credFetch(origin + "/cookies/resources/dropSecure.py")
+ .then(_ => {
+   if (origin == document.origin) {
+     assert_dom_cookie("alone_secure", value, false);
+     assert_dom_cookie("alone_insecure", value, false);
+   }
+ })
+ .then(_ => {
+     return credFetch(origin + "/cookie/resources/setSecure.py?" + value)
+ })
+}
+
+//
+// DOM based cookie manipulation API's
+//
+
+// borrowed from http://www.quirksmode.org/js/cookies.html
+function create_cookie_from_js(name, value, days, secure_flag) {
+  if (days) {
+    var date = new Date();
+    date.setTime(date.getTime()+(days*24*60*60*1000));
+    var expires = "; expires="+date.toGMTString();
+  }
+  else var expires = "";
+
+  var secure = "";
+  if (secure_flag == true) {
+    secure = "secure; ";
+  }
+  document.cookie = name+"="+value+expires+"; "+secure+"path=/";
+}
+
+// erase cookie value and set for expiration
+function erase_cookie_from_js(name) {
+  create_cookie_from_js(name,"",-1);
+  assert_dom_cookie(name, "", false);
+}
diff --git a/tests/wpt/web-platform-tests/cookies/resources/drop.py b/tests/wpt/web-platform-tests/cookies/resources/drop.py
new file mode 100644
index 000000000000..7491dad2fb52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/drop.py
@@ -0,0 +1,15 @@
+from helpers import makeDropCookie, readParameter, setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Respond to `/cookie/drop?name={name}` by expiring the cookie named `{name}`."""
+    headers = setNoCacheAndCORSHeaders(request, response)
+    try:
+        # Expire the named cookie, and return a JSON-encoded success code.
+        name = readParameter(request, paramName="name", requireValue=True)
+        scheme = request.url_parts.scheme
+        headers.append(makeDropCookie(name,  "https" == scheme))
+        return headers, '{"success": true}'
+    except:
+        return 500, headers, '{"error" : "Empty or missing name parameter."}'
+
+
diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py b/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py
new file mode 100644
index 000000000000..803dbeb82cda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/dropSameSite.py
@@ -0,0 +1,12 @@
+from helpers import makeDropCookie, readParameter, setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Respond to `/cookie/same-site/resources/dropSameSite.py by dropping the
+    three cookies set by setSameSiteCookies.py"""
+    headers = setNoCacheAndCORSHeaders(request, response)
+
+    # Expire the cookies, and return a JSON-encoded success code.
+    headers.append(makeDropCookie("samesite_strict", False))
+    headers.append(makeDropCookie("samesite_lax", False))
+    headers.append(makeDropCookie("samesite_none", False))
+    return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/resources/dropSecure.py b/tests/wpt/web-platform-tests/cookies/resources/dropSecure.py
new file mode 100644
index 000000000000..f95e9a9b604d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/dropSecure.py
@@ -0,0 +1,11 @@
+from helpers import makeDropCookie, readParameter, setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Respond to `/cookie/drop/secure` by dropping the two cookie set by
+    `setSecureTestCookies()`"""
+    headers = setNoCacheAndCORSHeaders(request, response)
+
+    # Expire the cookies, and return a JSON-encoded success code.
+    headers.append(makeDropCookie("alone_secure", False))
+    headers.append(makeDropCookie("alone_insecure", False))
+    return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/resources/helpers.py b/tests/wpt/web-platform-tests/cookies/resources/helpers.py
new file mode 100644
index 000000000000..145f2fea1a12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/helpers.py
@@ -0,0 +1,55 @@
+import urlparse
+
+def setNoCacheAndCORSHeaders(request, response):
+    """Set Cache-Control, CORS and Content-Type headers appropriate for the cookie tests."""
+    headers = [("Content-Type", "application/json"),
+               ("Access-Control-Allow-Credentials", "true")]
+
+    origin = "*"
+    if "origin" in request.headers:
+        origin = request.headers["origin"]
+
+    headers.append(("Access-Control-Allow-Origin", origin))
+    #headers.append(("Access-Control-Allow-Credentials", "true"))
+    headers.append(("Cache-Control", "no-cache"))
+    headers.append(("Expires", "Fri, 01 Jan 1990 00:00:00 GMT"))
+
+    return headers
+
+def makeCookieHeader(name, value, otherAttrs):
+    """Make a Set-Cookie header for a cookie with the name, value and attributes provided."""
+    def makeAV(a, v):
+        if None == v or "" == v:
+            return a
+        return "%s=%s" % (a, v)
+
+    # ensure cookie name is always first
+    attrs = ["%s=%s" % (name, value)]
+    attrs.extend(makeAV(a, v) for (a,v) in otherAttrs.iteritems())
+    return ("Set-Cookie", "; ".join(attrs))
+
+def makeDropCookie(name, secure):
+    attrs = {"MaxAge": 0, "path": "/"}
+    if secure:
+        attrs["secure"] = ""
+    return makeCookieHeader(name, "", attrs)
+
+def readParameter(request, paramName, requireValue):
+    """Read a parameter from the request. Raise if requireValue is set and the
+    parameter has an empty value or is not present."""
+    params = urlparse.parse_qs(request.url_parts.query)
+    param = params[paramName][0].strip()
+    if len(param) == 0:
+        raise Exception("Empty or missing name parameter.")
+    return param
+
+def readCookies(request):
+    """Read the cookies from the client present in the request."""
+    cookies = {}
+    for key in request.cookies:
+        for cookie in request.cookies.get_list(key):
+            # do we care we'll clobber cookies here? If so, do we
+            # need to modify the test to take cookie names and value lists?
+            cookies[key] = cookie.value
+    return cookies
+
diff --git a/tests/wpt/web-platform-tests/cookies/resources/imgIfMatch.py b/tests/wpt/web-platform-tests/cookies/resources/imgIfMatch.py
new file mode 100644
index 000000000000..08664415e6a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/imgIfMatch.py
@@ -0,0 +1,16 @@
+import helpers
+
+def main(request, response):
+    """Respond to `/cookie/imgIfMatch?name={name}&value={value}` with a 404 if
+       the cookie isn't present, and a transparent GIF otherwise."""
+    headers = helpers.setNoCacheAndCORSHeaders(request, response)
+    name = helpers.readParameter(request, paramName="name", requireValue=True)
+    value = helpers.readParameter(request, paramName="value", requireValue=True)
+    cookiesWithMatchingNames = request.cookies.get_list(name)
+    for cookie in cookiesWithMatchingNames:
+        if cookie.value == value:
+            # From https://github.com/mathiasbynens/small/blob/master/gif-transparent.gif
+            headers.append(("Content-Type","image/gif"))
+            gif = "\x47\x49\x46\x38\x39\x61\x01\x00\x01\x00\x80\x00\x00\xFF\xFF\xFF\x00\x00\x00\x21\xF9\x04\x01\x00\x00\x00\x00\x2C\x00\x00\x00\x00\x01\x00\x01\x00\x00\x02\x02\x44\x01\x00\x3B"
+            return headers, gif
+    return 500, headers, '{"error": {"message": "The cookie\'s value did not match the given value."}}'
diff --git a/tests/wpt/web-platform-tests/cookies/resources/list.py b/tests/wpt/web-platform-tests/cookies/resources/list.py
new file mode 100644
index 000000000000..3fe7dd6ae0d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/list.py
@@ -0,0 +1,7 @@
+import json
+import helpers
+
+def main(request, response):
+    headers = helpers.setNoCacheAndCORSHeaders(request, response)
+    cookies = helpers.readCookies(request)
+    return headers, json.dumps(cookies)
diff --git a/tests/wpt/web-platform-tests/cookies/resources/postToParent.py b/tests/wpt/web-platform-tests/cookies/resources/postToParent.py
new file mode 100644
index 000000000000..68e85d3f5f19
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/postToParent.py
@@ -0,0 +1,27 @@
+import json
+import helpers
+
+def main(request, response):
+    headers = helpers.setNoCacheAndCORSHeaders(request, response)
+    cookies = helpers.readCookies(request)
+    headers.append(("Content-Type", "text/html; charset=utf-8"))
+
+    tmpl = """
+<!DOCTYPE html>
+<script>
+  var data = %s;
+
+  if (window.parent != window)
+    window.parent.postMessage(data, "*");
+
+  if (window.opener)
+    window.opener.postMessage(data, "*");
+
+  window.addEventListener("message", e => {
+    console.log(e);
+    if (e.data == "reload")
+      window.location.reload();
+  });
+</script>
+"""
+    return headers, tmpl % json.dumps(cookies)
diff --git a/tests/wpt/web-platform-tests/cookies/resources/redirectWithCORSHeaders.py b/tests/wpt/web-platform-tests/cookies/resources/redirectWithCORSHeaders.py
new file mode 100644
index 000000000000..89ca1af9d80b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/redirectWithCORSHeaders.py
@@ -0,0 +1,22 @@
+from helpers import setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Simple handler that causes redirection.
+
+    The request should typically have two query parameters:
+    status - The status to use for the redirection. Defaults to 302.
+    location - The resource to redirect to.
+    """
+    status = 302
+    if "status" in request.GET:
+        try:
+            status = int(request.GET.first("status"))
+        except ValueError:
+            pass
+    headers = setNoCacheAndCORSHeaders(request, response)
+
+    location = request.GET.first("location")
+
+    headers.append(("Location", location))
+
+    return status, headers, ""
diff --git a/tests/wpt/web-platform-tests/cookies/resources/set.py b/tests/wpt/web-platform-tests/cookies/resources/set.py
new file mode 100644
index 000000000000..abfb8c8d40d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/set.py
@@ -0,0 +1,7 @@
+import helpers
+
+def main(request, response):
+    """Respond to `/cookie/set?{cookie}` by echoing `{cookie}` as a `Set-Cookie` header."""
+    headers = helpers.setNoCacheAndCORSHeaders(request, response)
+    headers.append(("Set-Cookie", request.url_parts.query))
+    return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py b/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py
new file mode 100644
index 000000000000..8ae177607e07
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/setSameSite.py
@@ -0,0 +1,14 @@
+from helpers import makeCookieHeader, readParameter, setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Respond to `/cookie/set/samesite?{value}` by setting three cookies:
+    1. `samesite_strict={value};SameSite=Strict;path=/`
+    2. `samesite_lax={value};SameSite=Lax;path=/`
+    3. `samesite_none={value};path=/`"""
+    headers = setNoCacheAndCORSHeaders(request, response)
+    value = request.url_parts.query
+
+    headers.append(makeCookieHeader("samesite_strict", value, {"SameSite":"Strict","path":"/"}))
+    headers.append(makeCookieHeader("samesite_lax", value, {"SameSite":"Lax","path":"/"}))
+    headers.append(makeCookieHeader("samesite_none", value, {"path":"/"}))
+    return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/resources/setSecure.py b/tests/wpt/web-platform-tests/cookies/resources/setSecure.py
new file mode 100644
index 000000000000..c8ec017627aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/resources/setSecure.py
@@ -0,0 +1,12 @@
+from helpers import makeCookieHeader, readParameter, setNoCacheAndCORSHeaders
+
+def main(request, response):
+    """Respond to `/cookie/set/secure?{value}` by setting two cookies:
+    alone_secure={value};secure;path=/`
+    alone_insecure={value};path=/"""
+    headers = setNoCacheAndCORSHeaders(request, response)
+    value = request.url_parts.query
+
+    headers.append(makeCookieHeader("alone_secure", value, {"secure": "","path": "/"}))
+    headers.append(makeCookieHeader("alone_insecure", value, {"path": "/"}))
+    return headers, '{"success": true}'
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/fetch.html b/tests/wpt/web-platform-tests/cookies/samesite/fetch.html
new file mode 100644
index 000000000000..734462a3c539
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/fetch.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return credFetch(target + "/cookies/resources/list.py")
+
+            .then(r => r.json())
+            .then(cookies => verifySameSiteCookieState(expectedStatus, value, cookies));
+        });
+    }, title);
+  }
+
+  // No redirect:
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Same-host fetches are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Subdomain fetches are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.CROSS_SITE, "Cross-site fetches are cross-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(ORIGIN, redirectTo(ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to same-host fetches are strictly same-site");
+  create_test(ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to same-host fetches are strictly same-site");
+  create_test(ORIGIN, redirectTo(CROSS_SITE_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to same-host fetches are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to subdomain fetches are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to subdomain fetches are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to subdomain fetches are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to cross-site:
+  create_test(CROSS_SITE_ORIGIN, redirectTo(ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Same-host redirecting to cross-site fetches are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Subdomain redirecting to cross-site fetches are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Cross-site redirecting to cross-site fetches are cross-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.html
new file mode 100644
index 000000000000..09f3ee91a21c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank-reload.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var f = document.createElement('form');
+            f.action = target + "/cookies/resources/postToParent.py";
+            f.target = "_blank";
+            f.method = "GET";
+
+            // If |target| contains a `redir` parameter, extract it, and add it
+            // to the form so it doesn't get dropped in the submission.
+            var url = new URL(f.action);
+            if (url.pathname = "/cookies/rfc6265/resources/redirectWithCORSHeaders.py") {
+              var i = document.createElement("input");
+              i.name = "location";
+              i.value = url.searchParams.get("location");
+              i.type = "hidden";
+              f.appendChild(i);
+            }
+            var reloaded = false;
+            var msgHandler = e => {
+              try {
+                verifySameSiteCookieState(expectedStatus, value, e.data);
+              } catch (e) {
+                reject(e);
+              }
+
+              if (reloaded) {
+                window.removeEventListener("message", msgHandler);
+                e.source.close();
+                resolve("Popup received the cookie.");
+              } else {
+                reloaded = true;
+                e.source.postMessage("reload", "*");
+              }
+            };
+            window.addEventListener("message", msgHandler);
+            document.body.appendChild(f);
+
+            f.submit();
+          });
+        });
+    }, title);
+  }
+
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Reloaded same-host top-level form GETs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Reloaded subdomain top-level form GETs are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.LAX, "Reloaded cross-site top-level form GETs are laxly same-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.html b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.html
new file mode 100644
index 000000000000..a86f34b0fb4a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-get-blank.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var f = document.createElement('form');
+            f.action = target + "/cookies/resources/postToParent.py";
+            f.target = "_blank";
+            f.method = "GET";
+
+            // If |target| contains a `redir` parameter, extract it, and add it
+            // to the form so it doesn't get dropped in the submission.
+            var url = new URL(f.action);
+            if (url.pathname == "/cookies/resources/redirectWithCORSHeaders.py") {
+              var i = document.createElement("input");
+              i.name = "location";
+              i.type="hidden";
+              i.value = url.searchParams.get("location");
+              f.appendChild(i);
+            }
+
+            var msgHandler = e => {
+              window.removeEventListener("message", msgHandler);
+              e.source.close();
+              try {
+                verifySameSiteCookieState(expectedStatus, value, e.data);
+                resolve("Popup received the cookie.");
+              } catch (e) {
+                reject(e);
+              }
+            };
+            window.addEventListener("message", msgHandler);
+            document.body.appendChild(f);
+            f.submit();
+          });
+        });
+    }, title);
+  }
+
+  // No redirect:
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Same-host top-level form GETs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Subdomain top-level form GETs are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.LAX, "Cross-site top-level form GETs are laxly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(ORIGIN, redirectTo(ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to same-host top-level form GETs are strictly same-site");
+  create_test(ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to same-host top-level form GETs are strictly same-site");
+  create_test(ORIGIN, redirectTo(CROSS_SITE_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to same-host top-level form GETs are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to subdomain top-level form GETs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to subdomain top-level form GETs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to subdomain top-level form GETs are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to cross-site:
+  create_test(CROSS_SITE_ORIGIN, redirectTo(ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.LAX, "Same-host redirecting to cross-site top-level form GETs are laxly same-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.LAX, "Subdomain redirecting to cross-site top-level form GETs are laxly same-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.LAX, "Cross-site redirecting to cross-site top-level form GETs are laxly same-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.html
new file mode 100644
index 000000000000..f9449bf46c92
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank-reload.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var f = document.createElement('form');
+            f.action = target + "/cookies/resources/postToParent.py";
+            f.target = "_blank";
+            f.method = "POST";
+
+            var reloaded = false;
+            var msgHandler = e => {
+              try {
+                verifySameSiteCookieState(expectedStatus, value, e.data);
+              } catch (e) {
+                reject(e);
+              }
+
+              if (reloaded) {
+                window.removeEventListener("message", msgHandler);
+                e.source.close();
+                resolve("Popup received the cookie.");
+              } else {
+                reloaded = true;
+                e.source.postMessage("reload", "*");
+              }
+            };
+            window.addEventListener("message", msgHandler);
+
+            document.body.appendChild(f);
+            f.submit();
+          });
+        });
+    }, title);
+  }
+
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Reloaded same-host top-level form POSTs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Reloaded subdomain top-level form POSTs are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.CROSS_SITE, "Reloaded cross-site top-level form POSTs are not same-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.html b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.html
new file mode 100644
index 000000000000..115c6a157a00
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/form-post-blank.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var f = document.createElement('form');
+            f.action = target + "/cookies/resources/postToParent.py";
+            f.target = "_blank";
+            f.method = "POST";
+
+            var msgHandler = e => {
+              window.removeEventListener("message", msgHandler);
+              e.source.close();
+              try {
+                verifySameSiteCookieState(expectedStatus, value, e.data);
+                resolve("Popup received the cookie.");
+              } catch (e) {
+                reject(e);
+              }
+            };
+            window.addEventListener("message", msgHandler);
+            document.body.appendChild(f);
+            f.submit();
+          });
+        });
+    }, title);
+  }
+
+  // No redirect:
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Same-host top-level form POSTs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Subdomain top-level form POSTs are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.CROSS_SITE, "Cross-site top-level form POSTs are cross-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(ORIGIN, redirectTo(ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to same-host top-level form POSTs are strictly same-site");
+  create_test(ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to same-host top-level form POSTs are strictly same-site");
+  create_test(ORIGIN, redirectTo(CROSS_SITE_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to same-host top-level form POSTs are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to subdomain top-level form POSTs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to subdomain top-level form POSTs are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to subdomain top-level form POSTs are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to cross-site:
+  create_test(CROSS_SITE_ORIGIN, redirectTo(ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Same-host redirecting to cross-site top-level form POSTs are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Subdomain redirecting to cross-site top-level form POSTs are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Cross-site redirecting to cross-site top-level form POSTs are cross-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.html
new file mode 100644
index 000000000000..759fc7b03c3c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/iframe-reload.html
@@ -0,0 +1,47 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<!-- We're appending an <iframe> to the document's body, so execute tests after we have a body -->
+<body>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var iframe = document.createElement("iframe");
+            iframe.onerror = _ => reject("IFrame could not be loaded.");
+
+            var reloaded = false;
+            var msgHandler = e => {
+              try {
+                verifySameSiteCookieState(expectedStatus, value, e.data);
+              } catch (e) {
+                reject(e);
+              }
+
+              if (reloaded) {
+                window.removeEventListener("message", msgHandler);
+                document.body.removeChild(iframe);
+                resolve("IFrame received the cookie.");
+              } else {
+                reloaded = true;
+                e.source.postMessage("reload", "*");
+              }
+            };
+            window.addEventListener("message", msgHandler);
+
+            iframe.src = target + "/cookies/resources/postToParent.py";
+            document.body.appendChild(iframe);
+          });
+        });
+    }, title);
+  }
+
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Reloaded same-host fetches are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Reloaded subdomain fetches are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.CROSS_SITE, "Reloaded cross-site fetches are cross-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/iframe.html b/tests/wpt/web-platform-tests/cookies/samesite/iframe.html
new file mode 100644
index 000000000000..38a7701bf8a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/iframe.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<!-- We're appending an <iframe> to the document's body, so execute tests after we have a body -->
+<body>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var iframe = document.createElement("iframe");
+            iframe.onerror = _ => reject("IFrame could not be loaded.");
+
+            var msgHandler = e => {
+              if (e.source == iframe.contentWindow) {
+                // Cleanup, then verify cookie state:
+                document.body.removeChild(iframe);
+                window.removeEventListener("message", msgHandler);
+                try {
+                  verifySameSiteCookieState(expectedStatus, value, e.data);
+                  resolve();
+                } catch(e) {
+                  reject(e);
+                }
+              }
+            };
+            window.addEventListener("message", msgHandler);
+
+            iframe.src = target + "/cookies/resources/postToParent.py";
+            document.body.appendChild(iframe);
+          });
+        });
+    }, title);
+  }
+
+  // No redirect:
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Same-host fetches are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Subdomain fetches are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.CROSS_SITE, "Cross-site fetches are cross-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(ORIGIN, redirectTo(ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to same-host fetches are strictly same-site");
+  create_test(ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to same-host fetches are strictly same-site");
+  create_test(ORIGIN, redirectTo(CROSS_SITE_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to same-host fetches are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to subdomain fetches are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to subdomain fetches are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to subdomain fetches are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to cross-site:
+  create_test(CROSS_SITE_ORIGIN, redirectTo(ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Same-host redirecting to cross-site fetches are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Subdomain redirecting to cross-site fetches are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Cross-site redirecting to cross-site fetches are cross-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/img.html b/tests/wpt/web-platform-tests/cookies/samesite/img.html
new file mode 100644
index 000000000000..b1b04340b796
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/img.html
@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function assert_cookie_present(origin, name, value) {
+    return new Promise((resolve, reject) => {
+      var img = document.createElement("img");
+      img.onload = _ => resolve("'" + name + "=" + value + "' present on " + origin);
+      img.onerror = _ => reject("'" + name + "=" + value + "' not present on " + origin);
+
+      // We need to URL encode the destination path/query if we're redirecting:
+      if (origin.match(/\/redir/))
+        img.src = origin + encodeURIComponent("/cookies/resources/imgIfMatch.py?name=" + name + "&value=" + value);
+      else
+        img.src = origin + "/cookies/resources/imgIfMatch.py?name=" + name + "&value=" + value;
+    });
+  }
+
+  function assert_cookie_absent(origin, name, value) {
+    return new Promise((resolve, reject) => {
+      var img = document.createElement("img");
+      img.onload = _ => reject("'" + name + "=" + value + "' present on " + origin);
+      img.onerror = _ => resolve("'" + name + "=" + value + "' not present on " + origin);
+
+      // We need to URL encode the destination path/query if we're redirecting:
+      if (origin.match(/\/redir/))
+        img.src = origin + encodeURIComponent("/cookies/resources/imgIfMatch.py?name=" + name + "&value=" + value);
+      else
+        img.src = origin + "/cookies/resources/imgIfMatch.py?name=" + name + "&value=" + value;
+    });
+  }
+
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return Promise.all([
+            assert_cookie_present(target, "samesite_none", value),
+            expectedStatus == SameSiteStatus.STRICT ?
+              assert_cookie_present(target, "samesite_strict", value) :
+              assert_cookie_absent(target, "samesite_strict", value),
+            expectedStatus == SameSiteStatus.CROSS_SITE ?
+              assert_cookie_absent(target, "samesite_lax", value) :
+              assert_cookie_present(target, "samesite_lax", value)
+          ]);
+        });
+    }, title);
+  }
+
+  // No redirect:
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Same-host images are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Subdomain images are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.CROSS_SITE, "Cross-site images are cross-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(ORIGIN, redirectTo(ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to same-host images are strictly same-site");
+  create_test(ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to same-host images are strictly same-site");
+  create_test(ORIGIN, redirectTo(CROSS_SITE_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to same-host images are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to subdomain images are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to subdomain images are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to subdomain images are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to cross-site:
+  create_test(CROSS_SITE_ORIGIN, redirectTo(ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Same-host redirecting to cross-site images are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Subdomain redirecting to cross-site images are cross-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.CROSS_SITE, "Cross-site redirecting to cross-site images are cross-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.html b/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.html
new file mode 100644
index 000000000000..b37cff8286a1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/window-open-reload.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var w = window.open(origin + "/cookies/resources/postToParent.py");
+
+            var reloaded = false;
+            var msgHandler = e => {
+              try {
+                verifySameSiteCookieState(expectedStatus, value, e.data);
+              } catch (e) {
+                reject(e);
+              }
+
+              if (reloaded) {
+                window.removeEventListener("message", msgHandler);
+                w.close();
+                resolve("Popup received the cookie.");
+              } else {
+                reloaded = true;
+                w.postMessage("reload", "*");
+              }
+            };
+            window.addEventListener("message", msgHandler);
+
+            if (!w)
+              reject("Popup could not be opened (did you whitelist the test site in your popup blocker?).");
+          });
+        });
+    }, title);
+  }
+
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Reloaded same-host auxiliary navigations are strictly same-site.");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Reloaded subdomain auxiliary navigations are strictly same-site.");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.LAX, "Reloaded ross-site auxiliary navigations are laxly same-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/samesite/window-open.html b/tests/wpt/web-platform-tests/cookies/samesite/window-open.html
new file mode 100644
index 000000000000..1aa8e5e80bbf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/samesite/window-open.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html>
+<meta charset="utf-8"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSameSiteCookies(origin, value)
+        .then(_ => {
+          return new Promise((resolve, reject) => {
+            var w = window.open(origin + "/cookies/resources/postToParent.py");
+
+            var msgHandler = e => {
+              window.removeEventListener("message", msgHandler);
+              w.close();
+              try {
+                verifySameSiteCookieState(expectedStatus, value, e.data);
+                resolve("Popup received the cookie.");
+              } catch (e) {
+                reject(e);
+              }
+            };
+            window.addEventListener("message", msgHandler);
+
+            if (!w)
+              reject("Popup could not be opened (did you whitelist the test site in your popup blocker?).");
+          });
+        });
+    }, title);
+  }
+
+  // No redirect:
+  create_test(ORIGIN, ORIGIN, SameSiteStatus.STRICT, "Same-host auxiliary navigations are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN, SameSiteStatus.STRICT, "Subdomain auxiliary navigations are strictly same-site");
+  create_test(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN, SameSiteStatus.LAX, "Cross-site auxiliary navigations are laxly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(ORIGIN, redirectTo(ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to same-host auxiliary navigations are strictly same-site");
+  create_test(ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to same-host auxiliary navigations are strictly same-site");
+  create_test(ORIGIN, redirectTo(CROSS_SITE_ORIGIN, ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to same-host auxiliary navigations are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to same-host:
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Same-host redirecting to subdomain auxiliary navigations are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Subdomain redirecting to subdomain auxiliary navigations are strictly same-site");
+  create_test(SUBDOMAIN_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, SUBDOMAIN_ORIGIN), SameSiteStatus.STRICT, "Cross-site redirecting to subdomain auxiliary navigations are strictly same-site");
+
+  // Redirect from {same-host,subdomain,cross-site} to cross-site:
+  create_test(CROSS_SITE_ORIGIN, redirectTo(ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.LAX, "Same-host redirecting to cross-site auxiliary navigations are laxly same-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(SUBDOMAIN_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.LAX, "Subdomain redirecting to cross-site auxiliary navigations are laxly same-site");
+  create_test(CROSS_SITE_ORIGIN, redirectTo(CROSS_SITE_ORIGIN, CROSS_SITE_ORIGIN), SameSiteStatus.LAX, "Cross-site redirecting to cross-site auxiliary navigations are laxly same-site");
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/secure/cookie-forcing.html b/tests/wpt/web-platform-tests/cookies/secure/cookie-forcing.html
new file mode 100644
index 000000000000..3ea59e1369d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/secure/cookie-forcing.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  function cookie_force_test(secure_origin, secure_cookie, present, title) {
+    var counter = 0;
+    promise_test(t => {
+
+      var testCookieValue = "" + Math.random();
+      var markerCookieName = "marker";
+      var markerCookieValue = "markerVal";
+
+      var brakes = 5000; //limit cookie setting limit in case browers are magic
+
+      // Set an initial cookie as a marker
+      create_cookie_from_js(markerCookieName, markerCookieValue, 10, secure_cookie);
+      //TODO we cant trust document.cookie to set secure cookies. Need a round trip to a secure origin.
+      assert_dom_cookie(markerCookieName, markerCookieValue, true);
+
+      // Set new cookies until marker is gone
+      try {
+        for (i = 0; i < brakes; i++) {
+          create_cookie_from_js(markerCookieName + counter++, markerCookieValue, 10, secure_cookie);
+          assert_dom_cookie(markerCookieName, markerCookieValue, true);
+        }
+      } catch(err) {
+        //shame on me, just fiddling for now
+      }
+
+      assert_dom_cookie(markerCookieName, markerCookieValue, present);
+
+      if (present == false) {
+        alert("It took " + counter + " cookies to force out the marker cookie");
+      } else {
+        alert("Even after " + counter + " cookies the marker cookie was not forced out. Try incresing the current limit of " + brakes);
+      }
+
+    }, title);
+  }
+
+
+  //actual tests to verify that non-secure origins should "leave secure cookies alone"
+  cookie_force_test(false, false, false, "non-secure origins should be able to force out insecure cookies.");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/cookies/secure/create-cookie-http.html b/tests/wpt/web-platform-tests/cookies/secure/create-cookie-http.html
new file mode 100644
index 000000000000..425f66fde5cb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cookies/secure/create-cookie-http.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cookies/resources/cookie-helper.sub.js"></script>
+<script>
+  //origin is who sets the cookie
+  //target is who tries to send cookie
+  function create_test(origin, target, expectedStatus, title) {
+    promise_test(t => {
+      var value = "" + Math.random();
+      return resetSecureCookies(origin, value)
+        .then(_ => {
+          return credFetch(target + "/cookies/resources/list.py")
+            .then(r => r.json())
+            .then(cookies => verifySecureCookieState(expectedStatus, value, cookies));
+        });
+    }, title);
+  }
+
+  //Given an |expectedStatus| and |expectedValue|, assert the |cookies| contains the
+  //proper set of cookie names and values.
+  function verifySecureCookieState(expectedStatus, expectedValue, cookies) {
+    assert_equals(cookies["alone_insecure"], expectedValue, "Insecure cookies are always present");
+    if (expectedStatus == SecureStatus.INSECURE_COOKIE_ONLY) {
+    	assert_equals(cookies["alone_secure"], undefined, "Secure cookies are not present");
+    } else if (expectedStatus == SecureStatus.BOTH_COOKIES) {
+    	assert_equals(cookies["alone_secure"], expectedValue, "Secure cookies are present");
+    }
+  }
+
+  //cookies set by insecure origins
+  create_test(INSECURE_ORIGIN, INSECURE_ORIGIN, SecureStatus.INSECURE_COOKIE_ONLY, "Secure cookies cannot be set by insecure origins");
+  //create_test(INSECURE_ORIGIN, SECURE_ORIGIN, SecureStatus.INSECURE_COOKIE_ONLY, "Secure cookies cannot be set by insecure origins, even if read from a secure origin");
+
+  //This test should set the secure cookie right but not be able to read it from the secure origin
+  //create_test(SECURE_ORIGIN, INSECURE_ORIGIN, SecureStatus.INSECURE_COOKIE_ONLY, "Secure cookies should not be read by insecure origins");
+  //create_test(SECURE_ORIGIN, SECURE_ORIGIN, SecureStatus.BOTH_COOKIES, "Secure cookies should be set and read by secure domains")
+</script>
diff --git a/tests/wpt/web-platform-tests/core-aam/alert-manual.html b/tests/wpt/web-platform-tests/core-aam/alert-manual.html
index 938da4349393..0177ffb66cb2 100644
--- a/tests/wpt/web-platform-tests/core-aam/alert-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/alert-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>alert</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/alertdialog-manual.html b/tests/wpt/web-platform-tests/core-aam/alertdialog-manual.html
index 98d3b1acb0fd..eacdde32514a 100644
--- a/tests/wpt/web-platform-tests/core-aam/alertdialog-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/alertdialog-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>alertdialog</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/application-manual.html b/tests/wpt/web-platform-tests/core-aam/application-manual.html
index 3d22162eba27..1fe0577810b8 100644
--- a/tests/wpt/web-platform-tests/core-aam/application-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/application-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>application</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-atomic_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-atomic_false-manual.html
index 61b7b00c4b66..d1ab0b65f921 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-atomic_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-atomic_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-atomic=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-atomic_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-atomic_true-manual.html
index 9462c0acd9ab..74353a611994 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-atomic_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-atomic_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-atomic=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_both-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_both-manual.html
index 6fea23024cc8..9b028467794b 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_both-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_both-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-autocomplete=both</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_inline-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_inline-manual.html
index 32e45dd3af87..e4b985df8c8a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_inline-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_inline-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-autocomplete=inline</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_list-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_list-manual.html
index b74f39670f24..4ba6d68cb17b 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_list-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-autocomplete_list-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-autocomplete=list</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-busy_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-busy_false-manual.html
index 0601b60e644b..70a25082c69a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-busy_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-busy_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-busy=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-busy_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-busy_true-manual.html
index 1d0781caabce..ce5a5413c6fa 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-busy_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-busy_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-busy=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-busy_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-busy_value_changes-manual.html
index d39fd2fdb623..ff7c679b501f 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-busy_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-busy_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-busy value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_checkbox-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_checkbox-manual.html
index 657e4b0229cc..e508c5b654bc 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_checkbox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_checkbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-checked=false on checkbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_menuitemradio-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_menuitemradio-manual.html
index 3b9cceddae57..a977d4c2da48 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_menuitemradio-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-checked_false_on_menuitemradio-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-checked=false on menuitemradio</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_mixed-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-checked_mixed-manual.html
index cb876d76c90f..c685b8bc288e 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-checked_mixed-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-checked_mixed-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-checked=mixed</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_checkbox-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_checkbox-manual.html
index 72c45db5edf6..440731c86420 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_checkbox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_checkbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-checked=true on checkbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_menuitemradio-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_menuitemradio-manual.html
index 224bc0912a89..0d22a08bc30a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_menuitemradio-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-checked_true_on_menuitemradio-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-checked=true on menuitemradio</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-checked_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-checked_value_changes-manual.html
index 5de5e8a11117..f90ac2fc6258 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-checked_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-checked_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-checked value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-colcount_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-colcount_new-manual.html
index 60b797b3b57a..9ab005f9be70 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-colcount_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-colcount_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-colcount NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-colindex_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-colindex_new-manual.html
index 3a0cead8ca67..0f48509a82db 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-colindex_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-colindex_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-colindex NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-colspan_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-colspan_new-manual.html
index d9148f6a598f..bd99cde04dbd 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-colspan_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-colspan_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-colspan NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-controls-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-controls-manual.html
index 29355eba68f2..e903d21fe8ec 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-controls-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-controls-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-controls</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-current_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-current_value_changes-manual.html
index 57c65cbfe668..14a5aaeab94a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-current_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-current_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-current_with_non-false_allowed_value_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-current_with_non-false_allowed_value_new-manual.html
index 23f79265ac05..da9e2bedbd05 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-current_with_non-false_allowed_value_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-current_with_non-false_allowed_value_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with non-false allowed value NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-current_with_unrecognized_value_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-current_with_unrecognized_value_new-manual.html
index ad1e7f6bf66b..a01f73091759 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-current_with_unrecognized_value_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-current_with_unrecognized_value_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with unrecognized value NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-describedby-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-describedby-manual.html
index 473b5554915d..4cffe6fcb057 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-describedby-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-describedby-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-describedby</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-details_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-details_new-manual.html
index cbce3c931591..1b182fcda54a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-details_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-details_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-details NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-disabled_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-disabled_false-manual.html
index 078271ce1285..e755d8ed0395 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-disabled_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-disabled_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-disabled=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-disabled_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-disabled_true-manual.html
index bc469f7c7112..f373faff371e 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-disabled_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-disabled_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-disabled=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-disabled_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-disabled_value_changes-manual.html
index 93249342629a..41236f106c14 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-disabled_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-disabled_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-disabled value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_copy-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_copy-manual.html
index 8848d17faa4c..6122d126fc42 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_copy-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_copy-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-dropeffect=copy</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_execute-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_execute-manual.html
index ec3432bbe519..54578f73da90 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_execute-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_execute-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-dropeffect=execute</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_link-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_link-manual.html
index 2dbbd1781636..1dd86a30f7d1 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_link-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_link-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-dropeffect=link</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_move-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_move-manual.html
index 332b838d9b56..eeee18e680de 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_move-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_move-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-dropeffect=move</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_none-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_none-manual.html
index 41cd08074b66..344349c8bd26 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_none-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_none-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-dropeffect=none</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_popup-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_popup-manual.html
index 8f1b84fa32a6..2e00ae2827fd 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_popup-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_popup-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-dropeffect=popup</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_value_changes-manual.html
index 9302b3b1f782..6e623c0cb6cb 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-dropeffect_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-dropeffect value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-errormessage-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-errormessage-manual.html
index 128d93f6c073..fada768e740c 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-errormessage-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-errormessage-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-errormessage</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-expanded_false-manual.html
index c0b8bd68a703..256099868bb0 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-expanded_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-expanded_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-expanded=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-expanded_true-manual.html
index 0cbdffaeb7c7..30f0c6a0f5d9 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-expanded_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-expanded_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-expanded=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-expanded_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-expanded_value_changes-manual.html
index e8f58d2dec08..f6767b185788 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-expanded_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-expanded_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-expanded value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-flowto-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-flowto-manual.html
index 23816319bc61..0902551df7cd 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-flowto-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-flowto-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-flowto</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-grabbed_false-manual.html
index 006914e32a1a..7b6404c2346f 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-grabbed_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-grabbed=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-grabbed_true-manual.html
index aaec8e150e28..5ef11ce286d4 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-grabbed_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-grabbed=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-grabbed_value_changes-manual.html
index 645d80dc22a9..795a0e88c520 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-grabbed_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-grabbed_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-grabbed value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_dialog_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_dialog_new-manual.html
index 747113fbe580..e2111a8d30cd 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_dialog_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_dialog_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-haspopup=dialog NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_false-manual.html
index 2eb81ee0199a..50b0fad435d5 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-haspopup=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_listbox_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_listbox_new-manual.html
index 4311592bbd38..70d126829098 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_listbox_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_listbox_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-haspopup=listbox NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_menu_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_menu_new-manual.html
index 966a5bcce37e..95fde1472fec 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_menu_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_menu_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-haspopup=menu NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_tree_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_tree_new-manual.html
index 7a048fbbf55f..cc3e33c72ffd 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_tree_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_tree_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-haspopup=tree NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_true-manual.html
index 8ee14bf1a342..57b5ad4b8a55 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-haspopup_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-haspopup_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-haspopup=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-hidden_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-hidden_true-manual.html
index f9ffcf9adfce..fd597f337b41 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-hidden_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-hidden_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-hidden=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event_new-manual.html
index 81f19f1fc0bd..4d47e89520ee 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-hidden_true_when_element_is_focused_or_fires_event_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-hidden=true when element is focused or fires event NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-hidden_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-hidden_value_changes-manual.html
index 445a942025e4..aa43a9a99c82 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-hidden_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-hidden_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-hidden value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-invalid_false-manual.html
index c7fbb2c4475f..86c43bbbfff9 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-invalid_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-invalid_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-invalid=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_grammar-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-invalid_grammar-manual.html
index 60bc5d7a6f0d..ee8be2dd2f08 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-invalid_grammar-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-invalid_grammar-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-invalid=grammar</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_spelling-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-invalid_spelling-manual.html
index a176221b239f..53e9f9852a8e 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-invalid_spelling-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-invalid_spelling-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-invalid=spelling</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-invalid_true-manual.html
index 196af9ba7c80..84b966f76c2a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-invalid_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-invalid_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-invalid=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-invalid_value_changes-manual.html
index 96b33260aa7c..c34109f2cd1a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-invalid_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-invalid_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-invalid value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-invalid_with_unrecognized_value_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-invalid_with_unrecognized_value_new-manual.html
index dd10bafe70e9..38a433046d22 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-invalid_with_unrecognized_value_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-invalid_with_unrecognized_value_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-invalid with unrecognized value NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-keyshortcuts_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-keyshortcuts_new-manual.html
index f8dbdb0b55e2..47f18e615f3f 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-keyshortcuts_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-keyshortcuts_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-keyshortcuts NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-label-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-label-manual.html
index 00c7e1e0d958..ec3fa2593e25 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-label-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-label-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-label</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-labelledby-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-labelledby-manual.html
index 557bba949270..8e1446931b55 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-labelledby-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-labelledby-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-labelledby</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-level_on_heading-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-level_on_heading-manual.html
index 950c406cf61b..92afe8e1f9cc 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-level_on_heading-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-level_on_heading-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-level on heading</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-level_on_non-heading-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-level_on_non-heading-manual.html
index 2698040bb74d..0dbcf0e843b1 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-level_on_non-heading-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-level_on_non-heading-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-level on non-heading</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-live_assertive-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-live_assertive-manual.html
index 3e6ebae3eebb..1f46482bb216 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-live_assertive-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-live_assertive-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-live=assertive</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-live_off-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-live_off-manual.html
index 958ecad4fa83..6badb3fbe3f5 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-live_off-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-live_off-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-live=off</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-live_polite-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-live_polite-manual.html
index 95d672be8110..77d2563dbfa6 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-live_polite-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-live_polite-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-live=polite</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-modal_false_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-modal_false_new-manual.html
index f32b5c1fb109..b1e481782416 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-modal_false_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-modal_false_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-modal=false NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-modal_true_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-modal_true_new-manual.html
index 5eb8e893ad76..39ff6a62c5d6 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-modal_true_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-modal_true_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-modal=true NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiline_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-multiline_false-manual.html
index cf4750e3e149..32f384c07c3c 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-multiline_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-multiline_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-multiline=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiline_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-multiline_true-manual.html
index d3af0a3d90b9..92a5a3f30b0a 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-multiline_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-multiline_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-multiline=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_false-manual.html
index d8ef9a36b4cb..724ea0f2e376 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-multiselectable=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_true-manual.html
index a87cf5296dc7..75dbe2b62a4c 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-multiselectable_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-multiselectable=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-orientation_horizontal-manual.html
index e12292d94088..903b4a56845e 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-orientation=horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-orientation_undefined_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-orientation_undefined_new-manual.html
index 2fa22c93e73d..63321cf6b43f 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-orientation_undefined_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-orientation_undefined_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-orientation=undefined NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-orientation_vertical-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-orientation_vertical-manual.html
index bf6f41d9db21..53a4e490b41b 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-orientation=vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-owns_may_need_manual_verification-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-owns_may_need_manual_verification-manual.html
index b7752c3d6e4d..3a02f4aa9f12 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-owns_may_need_manual_verification-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-owns_may_need_manual_verification-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-owns may need manual verification</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-placeholder_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-placeholder_new-manual.html
index 69f8cf945756..253eed07a175 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-placeholder_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-placeholder_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-placeholder NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-posinset-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-posinset-manual.html
index 14d46b042ded..d72b97ff41c0 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-posinset-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-posinset-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-posinset</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-pressed_false-manual.html
index 4d2c9dc0f98f..30878971f141 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-pressed_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-pressed_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-pressed=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_mixed-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-pressed_mixed-manual.html
index 09ed8c85ff08..1bc5083dca00 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-pressed_mixed-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-pressed_mixed-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-pressed=mixed</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-pressed_true-manual.html
index 3345977d18b0..532c7f32f3bb 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-pressed_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-pressed_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-pressed=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-pressed_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-pressed_value_changes-manual.html
index e8c88b5da9c3..82f12b9ac6cc 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-pressed_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-pressed_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-pressed value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-readonly_false-manual.html
index 44675b66ce32..7be1a70e4733 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-readonly=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_is_unspecified_on_gridcell_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-readonly_is_unspecified_on_gridcell_new-manual.html
index 721a6644a79d..fafa8abca032 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-readonly_is_unspecified_on_gridcell_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-readonly_is_unspecified_on_gridcell_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-readonly is unspecified on gridcell NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_checkbox-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_checkbox-manual.html
index 8b01a2001740..d5999e1adcc7 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_checkbox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_checkbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-readonly=true on checkbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_radiogroup-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_radiogroup-manual.html
index bb4fbc47ee29..ef976971ae43 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_radiogroup-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_radiogroup-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-readonly=true on radiogroup</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_textbox-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_textbox-manual.html
index 3b9663118b19..0dabdd88fddc 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_textbox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-readonly_true_on_textbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-readonly=true on textbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-readonly_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-readonly_value_changes-manual.html
index d9cac765cfce..8296d5996500 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-readonly_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-readonly_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-readonly value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-relevant-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-relevant-manual.html
index be0d29211848..c9ad1acc37a8 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-relevant-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-relevant-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-relevant</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-required_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-required_true-manual.html
index 052395b31d9e..6b44ba40dedd 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-required_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-required_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-required=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-required_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-required_value_changes-manual.html
index c38eb91d0606..588b6cf3e677 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-required_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-required_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-required value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html
index 88fb7a8ea80a..a146dff0ed12 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-roledescription_is_empty_or_whitespace_characters_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-roledescription is empty or whitespace characters NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-roledescription_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-roledescription_new-manual.html
index b137f4e1615c..48fc75e1e0d3 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-roledescription_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-roledescription_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-roledescription NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-rowcount_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-rowcount_new-manual.html
index 12ab12a04e0e..8be77d628421 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-rowcount_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-rowcount_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-rowcount NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-rowindex_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-rowindex_new-manual.html
index f3310e90179d..c89a5f78de0c 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-rowindex_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-rowindex_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-rowindex NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-rowspan_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-rowspan_new-manual.html
index 199cccdb1035..65b73a07c7f2 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-rowspan_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-rowspan_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-rowspan NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-selected_false-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-selected_false-manual.html
index 1d8d88f5f49a..b948ace42701 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-selected_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-selected_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-selected=false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-selected_true-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-selected_true-manual.html
index 64c609ad3116..a40ba05929c6 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-selected_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-selected_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-selected=true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-setsize_-1_new-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-setsize_-1_new-manual.html
index 35e7d8512286..aed565921730 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-setsize_-1_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-setsize_-1_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-setsize=-1 NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-setsize_3-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-setsize_3-manual.html
index 54730724b22f..643821b74ae5 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-setsize_3-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-setsize_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-setsize=3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_ascending-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-sort_ascending-manual.html
index 9d13defbaad4..7194ba020a05 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-sort_ascending-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-sort_ascending-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-sort=ascending</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_descending-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-sort_descending-manual.html
index 423dc9b3ec2a..8bf419f62652 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-sort_descending-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-sort_descending-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-sort=descending</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_none-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-sort_none-manual.html
index cbc0c87b0d41..7969c8ac9d86 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-sort_none-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-sort_none-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-sort=none</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-sort_other-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-sort_other-manual.html
index bd7d09282776..81dc3554b805 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-sort_other-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-sort_other-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-sort=other</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuemax-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-valuemax-manual.html
index f92332cfeeb7..3369b5769d4c 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-valuemax-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-valuemax-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-valuemax</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuemin-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-valuemin-manual.html
index 2f5fd07d3000..4f92726447e5 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-valuemin-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-valuemin-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-valuemin</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuenow-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-valuenow-manual.html
index 5aa9b94d7dba..183feaf594a5 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-valuenow-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-valuenow-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-valuenow</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuenow_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-valuenow_value_changes-manual.html
index 6ef4f522e9aa..36f9ec5b5ae8 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-valuenow_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-valuenow_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-valuenow value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuetext-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-valuetext-manual.html
index 031fc60f3f7b..364a9fb63e88 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-valuetext-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-valuetext-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-valuetext</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/aria-valuetext_value_changes-manual.html b/tests/wpt/web-platform-tests/core-aam/aria-valuetext_value_changes-manual.html
index bf601714d7c5..5362ee4d853b 100644
--- a/tests/wpt/web-platform-tests/core-aam/aria-valuetext_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/aria-valuetext_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-valuetext value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/article-manual.html b/tests/wpt/web-platform-tests/core-aam/article-manual.html
index f60a7bd50f33..413f7ca77b78 100644
--- a/tests/wpt/web-platform-tests/core-aam/article-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/article-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>article</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/banner-manual.html b/tests/wpt/web-platform-tests/core-aam/banner-manual.html
index 4c8ad33da45c..634ac11efadb 100644
--- a/tests/wpt/web-platform-tests/core-aam/banner-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/banner-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>banner</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_dialog_new-manual.html b/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_dialog_new-manual.html
index 7ef0a2e6dd2d..f68e35118f0b 100644
--- a/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_dialog_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_dialog_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button with aria-haspopup="dialog" NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_true-manual.html b/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_true-manual.html
index 682179a0cf6a..c21d0e96062f 100644
--- a/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/button_with_aria-haspopup_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button with aria-haspopup="true"</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html b/tests/wpt/web-platform-tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html
index b36bb46822f7..fe9ca7bda993 100644
--- a/tests/wpt/web-platform-tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/button_with_default_values_for_aria-pressed_and_aria-haspopup-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button with default values for aria-pressed and aria-haspopup</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html b/tests/wpt/web-platform-tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html
index 20c9287ee12a..6088fcb1a296 100644
--- a/tests/wpt/web-platform-tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/button_with_defined_value_for_aria-pressed-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button with defined value for aria-pressed</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/cell_new-manual.html b/tests/wpt/web-platform-tests/core-aam/cell_new-manual.html
index c6992e8ba655..8ff93f10c810 100644
--- a/tests/wpt/web-platform-tests/core-aam/cell_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/cell_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/checkbox-manual.html b/tests/wpt/web-platform-tests/core-aam/checkbox-manual.html
index f92ab4889212..e9db3f3defab 100644
--- a/tests/wpt/web-platform-tests/core-aam/checkbox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/checkbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>checkbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/columnheader-manual.html b/tests/wpt/web-platform-tests/core-aam/columnheader-manual.html
index 017ebe92aa42..f4ce817f94a3 100644
--- a/tests/wpt/web-platform-tests/core-aam/columnheader-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/columnheader-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/combobox-manual.html b/tests/wpt/web-platform-tests/core-aam/combobox-manual.html
index 9d5b08c8438b..44a11242efc3 100644
--- a/tests/wpt/web-platform-tests/core-aam/combobox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/complementary-manual.html b/tests/wpt/web-platform-tests/core-aam/complementary-manual.html
index a7e79c25fb4a..db9b8acd7e50 100644
--- a/tests/wpt/web-platform-tests/core-aam/complementary-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/complementary-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>complementary</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/contentinfo-manual.html b/tests/wpt/web-platform-tests/core-aam/contentinfo-manual.html
index 6288c8ffa401..50b5269eb743 100644
--- a/tests/wpt/web-platform-tests/core-aam/contentinfo-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/contentinfo-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>contentinfo</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/definition-manual.html b/tests/wpt/web-platform-tests/core-aam/definition-manual.html
index 5564542db511..4997caac37f9 100644
--- a/tests/wpt/web-platform-tests/core-aam/definition-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/definition-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>definition</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/dialog-manual.html b/tests/wpt/web-platform-tests/core-aam/dialog-manual.html
index f7aa26c69fa4..24dd180aef41 100644
--- a/tests/wpt/web-platform-tests/core-aam/dialog-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/dialog-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>dialog</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/directory-manual.html b/tests/wpt/web-platform-tests/core-aam/directory-manual.html
index 1dcc0ed8614b..6c9b46b6f470 100644
--- a/tests/wpt/web-platform-tests/core-aam/directory-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/directory-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>directory</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/document-manual.html b/tests/wpt/web-platform-tests/core-aam/document-manual.html
index 6c37547c8990..5b9c27525748 100644
--- a/tests/wpt/web-platform-tests/core-aam/document-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/document-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>document</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html
index 2c6a355ea10d..5cae26ef65b6 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_display_none-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude element hidden with CSS display:none</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html
index 0ebf066e9cb1..4bfa6cf83069 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_css_visibility_hidden-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude element hidden with CSS visibility:hidden</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html
index 6d3723112d54..c3394717728a 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_element_hidden_with_html5_hidden-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude element hidden with HTML5 hidden</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_button-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_button-manual.html
index 27c218eac1a7..63ea33452478 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_button-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_button-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of button</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_checkbox_new-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_checkbox_new-manual.html
index 0bea0e6367a2..83997f4dd7e2 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_checkbox_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_checkbox_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of checkbox NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_img-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_img-manual.html
index 24c95828bf76..85c19ad92c8c 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_img-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_img-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of img</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_math-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_math-manual.html
index e2b86bc529e6..cf93519cea33 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_math-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_math-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of math</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemcheckbox_new-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemcheckbox_new-manual.html
index 3c69d07f063c..e43f61498139 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemcheckbox_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemcheckbox_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of menuitemcheckbox NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemradio_new-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemradio_new-manual.html
index 78b408c7c2ee..083af605ad82 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemradio_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_menuitemradio_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of menuitemradio NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_option_new-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_option_new-manual.html
index e6aafc7b7350..f880addb15f7 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_option_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_option_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of option NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_progressbar-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_progressbar-manual.html
index 553d0cf3abd7..02ade3683630 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_progressbar-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_progressbar-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of progressbar</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_radio_new-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_radio_new-manual.html
index 856b1e8f0d07..05e408625dcc 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_radio_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_radio_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of radio NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_scrollbar-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_scrollbar-manual.html
index 71d5ca5b5210..e6d2b22c24d5 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_scrollbar-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_scrollbar-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of scrollbar</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_separator-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_separator-manual.html
index a5ce33499683..d1c924e09efb 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_separator-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_separator-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of separator</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_slider-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_slider-manual.html
index 59637656faba..2c85f9d61a4e 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_slider-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_slider-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of slider</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_switch_new-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_switch_new-manual.html
index 89db6be0ac2a..489519bc6318 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_switch_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_switch_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of switch NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_tab_new-manual.html b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_tab_new-manual.html
index 5424288fcb4c..0ec68c6a3823 100644
--- a/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_tab_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/exclude_presentational_children_of_tab_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Exclude presentational children of tab NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/feed_new-manual.html b/tests/wpt/web-platform-tests/core-aam/feed_new-manual.html
index 71f8c9045ada..f00a737b30f6 100644
--- a/tests/wpt/web-platform-tests/core-aam/feed_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/feed_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>feed NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/figure_new-manual.html b/tests/wpt/web-platform-tests/core-aam/figure_new-manual.html
index c2bbd39a7ca5..ce3dfefaea74 100644
--- a/tests/wpt/web-platform-tests/core-aam/figure_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/figure_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>figure NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/form-manual.html b/tests/wpt/web-platform-tests/core-aam/form-manual.html
index 0664713d67fc..64969c7031f5 100644
--- a/tests/wpt/web-platform-tests/core-aam/form-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/form-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>form</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/grid-manual.html b/tests/wpt/web-platform-tests/core-aam/grid-manual.html
index 829f3d8614ce..8754bb29104a 100644
--- a/tests/wpt/web-platform-tests/core-aam/grid-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/grid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/gridcell-manual.html b/tests/wpt/web-platform-tests/core-aam/gridcell-manual.html
index c698032a4b59..ae147a9b3d47 100644
--- a/tests/wpt/web-platform-tests/core-aam/gridcell-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/gridcell-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>gridcell</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/group-manual.html b/tests/wpt/web-platform-tests/core-aam/group-manual.html
index da8251766496..06e2e587f369 100644
--- a/tests/wpt/web-platform-tests/core-aam/group-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/group-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>group</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/heading-manual.html b/tests/wpt/web-platform-tests/core-aam/heading-manual.html
index d68bb5325ed9..894e6a0564e6 100644
--- a/tests/wpt/web-platform-tests/core-aam/heading-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/heading-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>heading</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/img-manual.html b/tests/wpt/web-platform-tests/core-aam/img-manual.html
index baa4f177af3a..bcb81183624f 100644
--- a/tests/wpt/web-platform-tests/core-aam/img-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/img-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>img</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html
index 127fcb771746..7eebef462c7f 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-controls-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element referenced by global aria-controls</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html
index 9cf18620d675..55be3789af9e 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-describedby-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element referenced by global aria-describedby</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-details_new-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-details_new-manual.html
index 397ded19f324..ec8cd0915a7d 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-details_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-details_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element referenced by global aria-details NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-errormessage_new-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-errormessage_new-manual.html
index f279cddde2f2..67d9beb3a39e 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-errormessage_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-errormessage_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element referenced by global aria-errormessage NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html
index 173d702564e2..9847a81a0235 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-flowto-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element referenced by global aria-flowto</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html
index 86a09cb7f209..c7cdd0e37fd6 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-labelledby-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element referenced by global aria-labelledby</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html
index baf2c17b3bcd..540690d97067 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_referenced_by_global_aria-owns-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element referenced by global aria-owns</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_that_is_focusable-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_that_is_focusable-manual.html
index c3e95405f12e..88f8c1d3d6cc 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_that_is_focusable-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_that_is_focusable-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element that is focusable</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html b/tests/wpt/web-platform-tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html
index cbae28e60032..fc0b65495765 100644
--- a/tests/wpt/web-platform-tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/include_element_with_id_inside_element_with_aria-activedescendant-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>Include element with ID inside element with aria-activedescendant</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/link-manual.html b/tests/wpt/web-platform-tests/core-aam/link-manual.html
index d83d0cf1a6ce..a5ff107ea3f2 100644
--- a/tests/wpt/web-platform-tests/core-aam/link-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/link-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>link</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/list-manual.html b/tests/wpt/web-platform-tests/core-aam/list-manual.html
index 81e8b2dc153f..aac0d200076f 100644
--- a/tests/wpt/web-platform-tests/core-aam/list-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/list-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>list</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html b/tests/wpt/web-platform-tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html
index 58b302139f47..8e1db61a798c 100644
--- a/tests/wpt/web-platform-tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/listbox_not_owned_by_or_child_of_combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox not owned by or child of combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html b/tests/wpt/web-platform-tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html
index 62a233ab73bc..7cabaa984e52 100644
--- a/tests/wpt/web-platform-tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/listbox_owned_by_or_child_of_combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox owned by or child of combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/listitem-manual.html b/tests/wpt/web-platform-tests/core-aam/listitem-manual.html
index 14dbec9230d8..8b11eb4a8d39 100644
--- a/tests/wpt/web-platform-tests/core-aam/listitem-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/listitem-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listitem</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/log-manual.html b/tests/wpt/web-platform-tests/core-aam/log-manual.html
index d997b95940e5..a2156e2a71a1 100644
--- a/tests/wpt/web-platform-tests/core-aam/log-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/log-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>log</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/main-manual.html b/tests/wpt/web-platform-tests/core-aam/main-manual.html
index 8d8e6ff7ee16..2ec25f134032 100644
--- a/tests/wpt/web-platform-tests/core-aam/main-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/main-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>main</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/marquee-manual.html b/tests/wpt/web-platform-tests/core-aam/marquee-manual.html
index 064c8d256844..522887bebcc6 100644
--- a/tests/wpt/web-platform-tests/core-aam/marquee-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/marquee-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>marquee</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/math-manual.html b/tests/wpt/web-platform-tests/core-aam/math-manual.html
index 5fc96729a950..f15e8f8b1bd3 100644
--- a/tests/wpt/web-platform-tests/core-aam/math-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/math-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>math</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/menu-manual.html b/tests/wpt/web-platform-tests/core-aam/menu-manual.html
index 0407d3ad5080..43ec797e7d40 100644
--- a/tests/wpt/web-platform-tests/core-aam/menu-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/menu_child_of_menu_item-manual.html b/tests/wpt/web-platform-tests/core-aam/menu_child_of_menu_item-manual.html
index 723d2dfa1037..d3d37cecc52e 100644
--- a/tests/wpt/web-platform-tests/core-aam/menu_child_of_menu_item-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/menu_child_of_menu_item-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menu child of menu item</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/menubar-manual.html b/tests/wpt/web-platform-tests/core-aam/menubar-manual.html
index 88f323894e09..878f1da2df23 100644
--- a/tests/wpt/web-platform-tests/core-aam/menubar-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/menubar-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menubar</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/menuitem_not_owned_by_or_child_of_group-manual.html b/tests/wpt/web-platform-tests/core-aam/menuitem_not_owned_by_or_child_of_group-manual.html
index f42d81fa05e9..8f1cfbf4850c 100644
--- a/tests/wpt/web-platform-tests/core-aam/menuitem_not_owned_by_or_child_of_group-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/menuitem_not_owned_by_or_child_of_group-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitem not owned by or child of group</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/menuitem_owned_by_or_child_of_group-manual.html b/tests/wpt/web-platform-tests/core-aam/menuitem_owned_by_or_child_of_group-manual.html
index 11d216fb514f..c5d4c41c2be1 100644
--- a/tests/wpt/web-platform-tests/core-aam/menuitem_owned_by_or_child_of_group-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/menuitem_owned_by_or_child_of_group-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitem owned by or child of group</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/menuitemcheckbox-manual.html b/tests/wpt/web-platform-tests/core-aam/menuitemcheckbox-manual.html
index 1e13e5ae86c1..6aa512877671 100644
--- a/tests/wpt/web-platform-tests/core-aam/menuitemcheckbox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/menuitemcheckbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemcheckbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/menuitemradio-manual.html b/tests/wpt/web-platform-tests/core-aam/menuitemradio-manual.html
index 6d0832191df0..7fa58d61ae97 100644
--- a/tests/wpt/web-platform-tests/core-aam/menuitemradio-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/menuitemradio-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemradio</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/navigation-manual.html b/tests/wpt/web-platform-tests/core-aam/navigation-manual.html
index 23994824662b..18941196f394 100644
--- a/tests/wpt/web-platform-tests/core-aam/navigation-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/navigation-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>navigation</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/none_new-manual.html b/tests/wpt/web-platform-tests/core-aam/none_new-manual.html
index deef5fb1ab6e..afde9b9d1edc 100644
--- a/tests/wpt/web-platform-tests/core-aam/none_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/none_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>none NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html b/tests/wpt/web-platform-tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html
index 06a3b078fc2b..9b7705756506 100644
--- a/tests/wpt/web-platform-tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/none_used_on_element_that_is_focused_or_fires_event-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>none used on element that is focused or fires event</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/none_used_on_table_element_with_td_children_new-manual.html b/tests/wpt/web-platform-tests/core-aam/none_used_on_table_element_with_td_children_new-manual.html
index 9004348b76ec..94200b84557b 100644
--- a/tests/wpt/web-platform-tests/core-aam/none_used_on_table_element_with_td_children_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/none_used_on_table_element_with_td_children_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>none used on table element with td children NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/none_used_on_ul_element_with_li_children_new-manual.html b/tests/wpt/web-platform-tests/core-aam/none_used_on_ul_element_with_li_children_new-manual.html
index c6fdaf791e78..ac5a04a58969 100644
--- a/tests/wpt/web-platform-tests/core-aam/none_used_on_ul_element_with_li_children_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/none_used_on_ul_element_with_li_children_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>none used on ul element with li children NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/note-manual.html b/tests/wpt/web-platform-tests/core-aam/note-manual.html
index 37504d765408..8959e087f8fd 100644
--- a/tests/wpt/web-platform-tests/core-aam/note-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/note-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>note</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/option_inside_combobox-manual.html b/tests/wpt/web-platform-tests/core-aam/option_inside_combobox-manual.html
index e692d9fcab38..3023051c8a45 100644
--- a/tests/wpt/web-platform-tests/core-aam/option_inside_combobox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/option_inside_combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>option inside combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/option_not_inside_combobox-manual.html b/tests/wpt/web-platform-tests/core-aam/option_not_inside_combobox-manual.html
index 15f966b45887..cf9205481510 100644
--- a/tests/wpt/web-platform-tests/core-aam/option_not_inside_combobox-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/option_not_inside_combobox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>option not inside combobox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/presentation-manual.html b/tests/wpt/web-platform-tests/core-aam/presentation-manual.html
index 4abbe8382948..c0cfa825497e 100644
--- a/tests/wpt/web-platform-tests/core-aam/presentation-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/presentation-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>presentation</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html b/tests/wpt/web-platform-tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html
index f7021f8117bb..ac8c1ba0373e 100644
--- a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/presentation_used_on_element_that_is_focused_or_fires_event-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>presentation used on element that is focused or fires event</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_table_element_with_td_children_new-manual.html b/tests/wpt/web-platform-tests/core-aam/presentation_used_on_table_element_with_td_children_new-manual.html
index cd0b19d620af..0f7134d049bc 100644
--- a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_table_element_with_td_children_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/presentation_used_on_table_element_with_td_children_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>presentation used on table element with td children NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_ul_element_with_li_children_new-manual.html b/tests/wpt/web-platform-tests/core-aam/presentation_used_on_ul_element_with_li_children_new-manual.html
index b00e183204fb..c2735712e236 100644
--- a/tests/wpt/web-platform-tests/core-aam/presentation_used_on_ul_element_with_li_children_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/presentation_used_on_ul_element_with_li_children_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>presentation used on ul element with li children NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/progressbar-manual.html b/tests/wpt/web-platform-tests/core-aam/progressbar-manual.html
index 3d3639254ab0..f3b402b7b7fc 100644
--- a/tests/wpt/web-platform-tests/core-aam/progressbar-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/progressbar-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>progressbar</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/radio-manual.html b/tests/wpt/web-platform-tests/core-aam/radio-manual.html
index 9f191a4b0bad..3d5e660bc5f6 100644
--- a/tests/wpt/web-platform-tests/core-aam/radio-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/radio-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radio</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/radiogroup-manual.html b/tests/wpt/web-platform-tests/core-aam/radiogroup-manual.html
index b91cf469732a..f217fb195485 100644
--- a/tests/wpt/web-platform-tests/core-aam/radiogroup-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/radiogroup-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radiogroup</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/region_with_an_accessible_name_new-manual.html b/tests/wpt/web-platform-tests/core-aam/region_with_an_accessible_name_new-manual.html
index f09e4ff21224..daaa5cbe1962 100644
--- a/tests/wpt/web-platform-tests/core-aam/region_with_an_accessible_name_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/region_with_an_accessible_name_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>region with an accessible name NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/region_without_an_accessible_name_new-manual.html b/tests/wpt/web-platform-tests/core-aam/region_without_an_accessible_name_new-manual.html
index f3b41f0ab582..9a19fb818663 100644
--- a/tests/wpt/web-platform-tests/core-aam/region_without_an_accessible_name_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/region_without_an_accessible_name_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>region without an accessible name NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/row_inside_treegrid-manual.html b/tests/wpt/web-platform-tests/core-aam/row_inside_treegrid-manual.html
index 8add16b431cd..2a708c5d26fc 100644
--- a/tests/wpt/web-platform-tests/core-aam/row_inside_treegrid-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/row_inside_treegrid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>row inside treegrid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/row_not_inside_treegrid-manual.html b/tests/wpt/web-platform-tests/core-aam/row_not_inside_treegrid-manual.html
index eb0cdff17c28..c6ec4f4622bf 100644
--- a/tests/wpt/web-platform-tests/core-aam/row_not_inside_treegrid-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/row_not_inside_treegrid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>row not inside treegrid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/rowgroup-manual.html b/tests/wpt/web-platform-tests/core-aam/rowgroup-manual.html
index 556647f34bfc..83efba879906 100644
--- a/tests/wpt/web-platform-tests/core-aam/rowgroup-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/rowgroup-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowgroup</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/rowheader-manual.html b/tests/wpt/web-platform-tests/core-aam/rowheader-manual.html
index 324d92c28a64..7705ead08041 100644
--- a/tests/wpt/web-platform-tests/core-aam/rowheader-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/rowheader-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowheader</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/scrollbar-manual.html b/tests/wpt/web-platform-tests/core-aam/scrollbar-manual.html
index 2d1e400b1795..9dc61e52567a 100644
--- a/tests/wpt/web-platform-tests/core-aam/scrollbar-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/scrollbar-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>scrollbar</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/search-manual.html b/tests/wpt/web-platform-tests/core-aam/search-manual.html
index dee7fb31e844..067ebfdec74f 100644
--- a/tests/wpt/web-platform-tests/core-aam/search-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/search-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>search</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/searchbox_new-manual.html b/tests/wpt/web-platform-tests/core-aam/searchbox_new-manual.html
index ba59e7395619..34dd391d7725 100644
--- a/tests/wpt/web-platform-tests/core-aam/searchbox_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/searchbox_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/separator_focusable_new-manual.html b/tests/wpt/web-platform-tests/core-aam/separator_focusable_new-manual.html
index d94c06d76529..9afc08f1b14f 100644
--- a/tests/wpt/web-platform-tests/core-aam/separator_focusable_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/separator_focusable_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator focusable NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/separator_non-focusable-manual.html b/tests/wpt/web-platform-tests/core-aam/separator_non-focusable-manual.html
index 78c21ae62ee9..aeee369cd6d1 100644
--- a/tests/wpt/web-platform-tests/core-aam/separator_non-focusable-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/separator_non-focusable-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator non-focusable</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/slider-manual.html b/tests/wpt/web-platform-tests/core-aam/slider-manual.html
index 687ae799e3ca..7adea5a2c8bf 100644
--- a/tests/wpt/web-platform-tests/core-aam/slider-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/slider-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>slider</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/spinbutton-manual.html b/tests/wpt/web-platform-tests/core-aam/spinbutton-manual.html
index 568faf3135d2..e61f4ea85de3 100644
--- a/tests/wpt/web-platform-tests/core-aam/spinbutton-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/spinbutton-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>spinbutton</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/status-manual.html b/tests/wpt/web-platform-tests/core-aam/status-manual.html
index 25803645436b..a4f53593a584 100644
--- a/tests/wpt/web-platform-tests/core-aam/status-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/status-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>status</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/switch_new-manual.html b/tests/wpt/web-platform-tests/core-aam/switch_new-manual.html
index b7c6d33743e1..f57f9928e1d5 100644
--- a/tests/wpt/web-platform-tests/core-aam/switch_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/switch_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/tab-manual.html b/tests/wpt/web-platform-tests/core-aam/tab-manual.html
index 7b749e842b2d..625ccedc4156 100644
--- a/tests/wpt/web-platform-tests/core-aam/tab-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/tab-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tab</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/table_new-manual.html b/tests/wpt/web-platform-tests/core-aam/table_new-manual.html
index 463c4707595f..97bd0a88b2ac 100644
--- a/tests/wpt/web-platform-tests/core-aam/table_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/table_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>table NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/tablist-manual.html b/tests/wpt/web-platform-tests/core-aam/tablist-manual.html
index 71c7f3fb1d85..93b8e17a8894 100644
--- a/tests/wpt/web-platform-tests/core-aam/tablist-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/tablist-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tablist</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/tabpanel-manual.html b/tests/wpt/web-platform-tests/core-aam/tabpanel-manual.html
index dd00381761b1..684177890baa 100644
--- a/tests/wpt/web-platform-tests/core-aam/tabpanel-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/tabpanel-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tabpanel</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/term_new-manual.html b/tests/wpt/web-platform-tests/core-aam/term_new-manual.html
index a09cc8c51758..d369be924e7b 100644
--- a/tests/wpt/web-platform-tests/core-aam/term_new-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/term_new-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>term NEW</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_false-manual.html b/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_false-manual.html
index 662dfab377b0..f4c6aa144ce6 100644
--- a/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_false-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>textbox when aria-multiline is false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_true-manual.html b/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_true-manual.html
index 766a886b9dc1..e56910ea9a97 100644
--- a/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_true-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/textbox_when_aria-multiline_is_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>textbox when aria-multiline is true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/timer-manual.html b/tests/wpt/web-platform-tests/core-aam/timer-manual.html
index bea805201214..8a1f93dc092f 100644
--- a/tests/wpt/web-platform-tests/core-aam/timer-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/timer-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>timer</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/toolbar-manual.html b/tests/wpt/web-platform-tests/core-aam/toolbar-manual.html
index b0e8a46abf5b..c93e531e741d 100644
--- a/tests/wpt/web-platform-tests/core-aam/toolbar-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/toolbar-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>toolbar</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/tooltip-manual.html b/tests/wpt/web-platform-tests/core-aam/tooltip-manual.html
index 066f30d223af..b815d380e263 100644
--- a/tests/wpt/web-platform-tests/core-aam/tooltip-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/tooltip-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tooltip</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/tree-manual.html b/tests/wpt/web-platform-tests/core-aam/tree-manual.html
index ba347dcc0b5d..5a15b46e4f8f 100644
--- a/tests/wpt/web-platform-tests/core-aam/tree-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/tree-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tree</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/treegrid-manual.html b/tests/wpt/web-platform-tests/core-aam/treegrid-manual.html
index 44440b4f033c..2d144aaf9e89 100644
--- a/tests/wpt/web-platform-tests/core-aam/treegrid-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/treegrid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treegrid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/core-aam/treeitem-manual.html b/tests/wpt/web-platform-tests/core-aam/treeitem-manual.html
index 64d738b55894..1b1654561af3 100644
--- a/tests/wpt/web-platform-tests/core-aam/treeitem-manual.html
+++ b/tests/wpt/web-platform-tests/core-aam/treeitem-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treeitem</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/cors/client-hint-request-headers.htm b/tests/wpt/web-platform-tests/cors/client-hint-request-headers.htm
new file mode 100644
index 000000000000..ee6c7ea7e86f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/cors/client-hint-request-headers.htm
@@ -0,0 +1,77 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>CORS - client hint request headers - Access-Control-Allow-Headers</title>
+
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src=support.js?pipe=sub></script>
+
+<h1>Request headers</h1>
+<div id=log></div>
+<script>
+
+test(function() {
+    var client = new XMLHttpRequest()
+    client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print,', false)
+    client.setRequestHeader('x-print', 'unicorn')
+    client.setRequestHeader('content-type', 'text/plain')
+    client.setRequestHeader('accept', 'test')
+    client.setRequestHeader('accept-language', 'nn')
+    client.setRequestHeader('content-language', 'nn')
+    client.setRequestHeader('save-data', 'on')
+    client.setRequestHeader('device-memory', '1.0')
+    client.setRequestHeader('dpr', '2.0')
+    client.setRequestHeader('width', '35')
+    client.setRequestHeader('viewport-width', '42')
+    client.send(null)
+
+    const res = JSON.parse(client.response)
+    assert_equals(res['x-print'], 'unicorn')
+    assert_equals(res['content-type'], 'text/plain')
+    assert_equals(res['accept'], 'test')
+    assert_equals(res['accept-language'], 'nn')
+    assert_equals(res['content-language'], 'nn')
+    assert_equals(res['save-data'], 'on')
+    assert_equals(res['device-memory'], '1.0')
+    assert_equals(res['dpr'], '2.0')
+    assert_equals(res['width'], '35')
+    assert_equals(res['viewport-width'], '42')
+}, 'Client hint headers are simple headers')
+
+test(function() {
+    var client = new XMLHttpRequest()
+    client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
+    client.setRequestHeader('x-print', 'unicorn')
+    client.setRequestHeader('y-print', 'unicorn')
+    assert_throws("NetworkError", function() { client.send(null) })
+}, 'Unspecified request headers are disallowed')
+
+test(function() {
+    var client = new XMLHttpRequest()
+    client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
+    client.setRequestHeader('device-memory', '')
+    assert_throws("NetworkError", function() { client.send(null) })
+}, 'Unextractable device-memory client hint header is disallowed')
+
+test(function() {
+    var client = new XMLHttpRequest()
+    client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
+    client.setRequestHeader('dpr', '')
+    assert_throws("NetworkError", function() { client.send(null) })
+}, 'Unextractable DPR client hint header is disallowed')
+
+test(function() {
+    var client = new XMLHttpRequest()
+    client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
+    client.setRequestHeader('width', '')
+    assert_throws("NetworkError", function() { client.send(null) })
+}, 'Unextractable width client hint header is disallowed')
+
+test(function() {
+    var client = new XMLHttpRequest()
+    client.open('GET', CROSSDOMAIN + 'resources/cors-makeheader.py?headers=x-print', false)
+    client.setRequestHeader('viewport-width', '')
+    assert_throws("NetworkError", function() { client.send(null) })
+}, 'Unextractable viewport-width client hint header is disallowed')
+
+</script>
diff --git a/tests/wpt/web-platform-tests/cors/simple-requests.htm b/tests/wpt/web-platform-tests/cors/simple-requests.htm
index 441a8c1ace28..77ed8ee22e70 100644
--- a/tests/wpt/web-platform-tests/cors/simple-requests.htm
+++ b/tests/wpt/web-platform-tests/cors/simple-requests.htm
@@ -61,10 +61,17 @@ <h1>Simple requests</h1>
                         'content-type': 'text/plain; parameter=whatever'
                      })
 
+check_simple_headers({
+                        'save-data': 'on',
+                        'device-memory': '2.0',
+                        'dpr': '3.0',
+                        'width': '1200',
+                        'viewport-width': '1300'
+                     })
+
 check_simple('Get', {'content-type': 'text/plain; parameter=extra_bonus'})
 check_simple('post', {'content-type': 'text/plain'})
 
-
 /* Extra async test */
 
 var simple_async = async_test("Check simple headers (async)")
diff --git a/tests/wpt/web-platform-tests/credential-management/OWNERS b/tests/wpt/web-platform-tests/credential-management/OWNERS
new file mode 100644
index 000000000000..12f907ceb418
--- /dev/null
+++ b/tests/wpt/web-platform-tests/credential-management/OWNERS
@@ -0,0 +1 @@
+@mikewest
diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-is-containing-block-001.html b/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-is-containing-block-001.html
new file mode 100644
index 000000000000..32ac681781c6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-is-containing-block-001.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="David Grogan" href="dgrogan@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#model">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="flags" content="" />
+<meta name="assert" content="relpos caption is containing block for abspos child" />
+<title>
+Captions and abspos descendants
+</title>
+
+<style>
+caption, div {
+  height:100px;
+  width:50px;
+  background:green;
+}
+#redSquare {
+  height: 100px;
+  width: 100px;
+  background-color: red;
+  position: absolute;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="redSquare"></div>
+
+<table>
+  <caption style="position:relative">
+    <div style="position:absolute; left:50px;">
+    </div>
+  </caption>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-passes-abspos-up-001.html b/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-passes-abspos-up-001.html
new file mode 100644
index 000000000000..51b0d6951bff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/abspos/table-caption-passes-abspos-up-001.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="David Grogan" href="dgrogan@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#model">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<meta name="flags" content="" />
+<meta name="assert" content="non-containing block caption passes abspos child to its parent" />
+<title>
+Captions and abspos descendants
+</title>
+
+<style>
+caption, div {
+  height:100px;
+  width:50px;
+  background:green;
+}
+#redSquare {
+  height: 100px;
+  width: 100px;
+  background-color: red;
+  position: absolute;
+  z-index: -1;
+}
+</style>
+
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="redSquare"></div>
+
+<table style="position:relative">
+  <caption>
+    <div style="position:absolute; left:50px;">
+    </div>
+  </caption>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-new-fc.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-new-fc.html
new file mode 100644
index 000000000000..587bbf51b7da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/adjoining-float-new-fc.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<title>New formatting context next to adjoining float</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="help" href="https://www.w3.org/TR/CSS22/box.html#collapsing-margins" title="8.3.1 Collapsing margins">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht" />
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:100px; overflow:hidden; background:red;">
+  <div>
+    <div style="float:left; width:100px; height:50px; background:green;"></div>
+    <div style="margin-top:300px; clear:left; overflow:hidden; width:100px; height:50px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-after-top-margin.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-after-top-margin.html
new file mode 100644
index 000000000000..95b445657cc4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/clear-after-top-margin.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Clearance inside block with top margin</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="help" href="https://www.w3.org/TR/CSS22/box.html#collapsing-margins" title="8.3.1 Collapsing margins">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="float:right; width:100px; height:100px;"></div>
+<!-- Using padding to prevent the child margin from pulling the block down. -->
+<div style="padding-top:10px; width:100px; background:green;">
+  <div style="margin-top:80px;">
+    <div style="clear:right;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143-ref.xht
index 49d1fe5b8ff6..2fcdc134cacf 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143-ref.xht
@@ -9,6 +9,8 @@
   <link rel="author" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" />
 
   <style type="text/css"><![CDATA[
+  /* Disable kerning because kerning may differ for different node tree. */
+  html { font-kerning: none; font-feature-settings: "kern" off; }
   div
   {
   background-color: green;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143.xht b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143.xht
index 84acecc0bb31..6eb7e7107e24 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/floats-143.xht
@@ -9,6 +9,8 @@
   <link rel="match" href="floats-143-ref.xht" />
 
   <style type="text/css">
+   /* Disable kerning because kerning may differ for different node tree. */
+   html { font-kerning: none; font-feature-settings: "kern" off; }
    .float { float: left; background: red; padding: 0; margin: 0; list-style: none; }
    .text { font: 900 2em/1 sans-serif; background: green; color: white; }
   </style>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html
new file mode 100644
index 000000000000..5e43b2506708
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/nested-clearance-new-formatting-context.html
@@ -0,0 +1,15 @@
+<!DOCTYPE html>
+<title>Nested clearance on new formatting context</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="match" href="../../reference/ref-filled-green-200px-square.html">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="width:200px; height:200px; background:red;">
+  <div style="width:500px;">
+    <div style="float:left; width:200px; height:100px; background:green;"></div>
+    <div style="clear:left; margin-top:40px;">
+      <div style="float:left; width:200px; height:80px; background:green;"></div>
+      <div style="overflow:hidden; clear:left; margin-top:50px; width:200px; height:20px; background:green;"></div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html
new file mode 100644
index 000000000000..01a457ee1fb6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-adjoining-opposite-float.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>No clearance due to large top margin that takes us past the float</title>
+<meta name="assert" content="Check that we don't apply clearance when the top margin of the clearance candidate takes it past the relevant float, and that a preceding empty block with a right float that's adjoining to the clearance candidate doesn't cause confusion">
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="match" href="../../reference/nothing.html">
+<p>There should be nothing below.</p>
+<div style="float:left; width:10px; height:100px;"></div>
+<div>
+  <div>
+    <div style="float:right; width:10px; height:200px;"></div>
+  </div>
+  <div style="background:red;">
+    <div style="margin-top:150px; clear:left; background:hotpink;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html
new file mode 100644
index 000000000000..bc459d06cde5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin-after-left-right.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<title>No clearance due to large top margin inside clear:right inside clear:left that takes us past the floats</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="float:left; width:50px; height:50px;"></div>
+<div style="float:right; width:50px; height:100px;"></div>
+<div style="width:100px; height:100px; background:green;">
+  <div style="height:15px; margin-bottom:20px;"></div>
+  <div style="background:red;">
+    <div style="clear:left; background:red;">
+      <div style="clear:right; background:red;">
+        <div style="margin-top:185px; background:red;"></div>
+      </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html
new file mode 100644
index 000000000000..cabb1ac85043
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/no-clearance-due-to-large-margin.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<title>No clearance due to large top margin that takes us past the float</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="match" href="../../reference/ref-filled-green-100px-square.xht">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="float:left; width:100px; height:100px; background:green;"></div>
+<div style="padding-top:1px;">
+  <div style="background:red;">
+    <div style="clear:left; background:white; margin-top:150px;"><br></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html
new file mode 100644
index 000000000000..ee8bebc53b6b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block-after-margin.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Float separated from float inside empty cleared block, margin before clearance</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="help" href="https://www.w3.org/TR/CSS22/box.html#collapsing-margins" title="8.3.1 Collapsing margins">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="float:left; width:100px; height:50px; background:green;"></div>
+<div style="height:1px;"></div>
+<div style="margin-top:20px;">
+  <div style="clear:left;">
+    <div style="float:left; width:100px; height:50px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html
new file mode 100644
index 000000000000..a383e9a6a21e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats-clear/second-float-inside-empty-cleared-block.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<title>Float separated from float inside empty cleared block</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<link rel="help" href="https://www.w3.org/TR/CSS22/box.html#collapsing-margins" title="8.3.1 Collapsing margins">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<p>Test passes if there is a filled green square.</p>
+<div style="float:left; width:100px; height:50px; background:green;"></div>
+<div style="height:1px;"></div>
+<div>
+  <div style="clear:left;">
+    <div style="float:left; width:100px; height:50px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001-ref.html b/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001-ref.html
new file mode 100644
index 000000000000..bf02b993c455
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001-ref.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="David Grogan" href="dgrogan@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#model">
+<meta name="flags" content="" />
+<title>
+Caption block containers are rendered same as normal block boxes
+</title>
+
+<p>
+The words floated and inline should be legible below, with inline appearing just
+to the right of the border surrounding floated.
+</p>
+
+<div style="float:left; border: 1px solid black;">
+  floated
+</div>
+inline
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001.html b/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001.html
new file mode 100644
index 000000000000..2bc985020a60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats/floats-in-table-caption-001.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="David Grogan" href="dgrogan@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#model">
+<link rel="match" href="floats-in-table-caption-001-ref.html">
+<meta name="flags" content="" />
+<meta name="assert" content="Basic floats are honored inside a caption" />
+<title>
+Caption block containers are rendered same as normal block boxes
+</title>
+
+<p>
+The words floated and inline should be legible below, with inline appearing just
+to the right of the border surrounding floated.
+</p>
+
+<table>
+  <!-- 200px allows floated and inline to not wrap -->
+  <caption style="text-align:left; width:200px">
+    <div style="float:left; border: 1px solid black;">
+      floated
+    </div>
+    inline
+  </caption>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-adjoining-float-2.html b/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-adjoining-float-2.html
new file mode 100644
index 000000000000..2d27a28a0533
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-beside-adjoining-float-2.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>A new formatting context that fits beside an adjoining float, and thus pulls down the float with its top margin</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#bfc-next-to-float" title="9.5 Floats">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<meta name="assert" content="The float is adjoining with the box that establishes a new formatting context when it fits beside it, and will therefore be affected by its margin">
+<link rel="match" href="../../reference/ref-filled-green-200px-square.html">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="overflow:hidden; width:200px; height:200px; background:red;">
+  <div style="margin-top:190px;">
+    <div>
+      <div style="float:left; width:100px; height:200px; background:green;"></div>
+    </div>
+    <div style="margin-top:-190px; overflow:hidden; width:100px; height:200px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-2.html b/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-2.html
new file mode 100644
index 000000000000..fd0deab18e0e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/floats/new-fc-separates-from-float-2.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<title>A new formatting context that doesn't fit beside a float make the float non-adjoining</title>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#bfc-next-to-float" title="9.5 Floats">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#flow-control" title="9.5.2 Controlling flow next to floats: the 'clear' property">
+<meta name="assert" content="Although the 'clear' property isn't specified in this test, a new formatting context that doesn't fit below a float that would otherwise be adjoining will need to separate its margin from the float, so that it doesn't affect the float. This is very similar to clearance.">
+<link rel="match" href="../../reference/ref-filled-green-200px-square.html">
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div style="overflow:hidden; width:200px; height:200px; background:red;">
+  <div style="margin-top:-50px;">
+    <div>
+      <div style="float:left; width:200px; height:150px; background:green;"></div>
+    </div>
+    <div style="margin-top:12345px; overflow:hidden; width:200px; height:100px; background:green;"></div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html
new file mode 100644
index 000000000000..c06d73724282
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-001.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="David Grogan" href="dgrogan@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#model">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="flags" content="" />
+<meta name="assert" content="margins between sibling blocks are collapsed inside caption" />
+<title>
+Caption block containers are rendered same as normal block boxes
+</title>
+
+<style>
+div {
+  margin: 10px;
+  height: 35px;
+}
+</style>
+
+<p>Test passes if there is a filled green square.</p>
+
+<table>
+  <caption style="width:100px; background:green">
+    <div></div>
+    <div></div>
+  </caption>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html
new file mode 100644
index 000000000000..18903303e35a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/normal-flow/margin-collapsing-in-table-caption-002.html
@@ -0,0 +1,26 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<link rel="author" title="David Grogan" href="dgrogan@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/tables.html#model">
+<link rel="match" href="../../reference/ref-filled-green-100px-square-only.html">
+<meta name="flags" content="" />
+<meta name="assert" content="margins between parent and child block collapse inside caption" />
+<title>
+Caption block containers are rendered same as normal block boxes
+</title>
+
+<style>
+div {
+  margin-top: 100px;
+}
+</style>
+
+<p>Test passes if there is a filled green square.</p>
+
+<table>
+  <caption style="width:100px; background:green">
+    <div>
+      <div></div>
+    </div>
+  </caption>
+</table>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht
index 7f285bcf8a6e..f3aeb9994ddf 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001-ref.xht
@@ -4,7 +4,7 @@
  <head>
   <title>CSS Test: Valid control characters in identifiers</title>
 
-  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org/" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
 
   <style type="text/css">
     div p::before {content: counter(item, lower-latin) ". "}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001.xht b/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001.xht
index e6da93796012..40a7ad939c36 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/syntax/characters-0080-009F-001.xht
@@ -8,7 +8,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.4.1.3d" />
   <link rel="match" href="characters-0080-009F-001-ref.xht" />
   <meta name="assert" content="identifiers [...] can contain only the characters [a-zA-Z0-9] and ISO 10646 characters U+0080 and higher, [...]" />
-  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org/" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
 
   <style type="text/css">
     /* Warning: the next lines contain control characters \201..\237 */
diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001-ref.xht
index b6370d74487b..2df64b591a1f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001-ref.xht
@@ -4,7 +4,7 @@
  <head>
   <title>CSS Test: Escapes in a URI token</title>
 
-  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org/" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
 
   <style type="text/css">
     div {width: 5em; height: 1em; background: url(support/1x1-green.png)}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001.xht b/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001.xht
index f2e0e4644a45..caaa644a95b8 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/syntax/escaped-url-001.xht
@@ -9,7 +9,7 @@
   <link rel="match" href="escaped-url-001-ref.xht" />
   <meta name="assert" content="URI   {U}{R}{L}\({w}{string}{w}\)|
  {U}{R}{L}\({w}([!#$%&amp;*-\[\]-~]|{nonascii}|{escape})*{w}\)" />
-  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org/" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
 
   <style type="text/css">
     div {background: red; width: 5em; height: 1em}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001-ref.xht
new file mode 100644
index 000000000000..f2dddb2040e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001-ref.xht
@@ -0,0 +1,23 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     All the <span>words</span> are aligned on the same baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001.xht
new file mode 100644
index 000000000000..f75682330096
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-001.xht
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an 'inline-block’ whose ‘overflow’ property has a computed value of ‘visible’ is the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case the baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-001-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: visible}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     All the <span>words</span> are aligned on the same baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-002.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-002.xht
new file mode 100644
index 000000000000..c1f6996622cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-002.xht
@@ -0,0 +1,28 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an 'inline-block’ whose ‘overflow’ property has a computed value of ‘visible’ is the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case the baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-001-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: visible; line-height: 1}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     All the <span>&nbsp;<br />words</span> are aligned on the same baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-003.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-003.xht
new file mode 100644
index 000000000000..b499e09ceda3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-003.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an inline-block whose ‘overflow’ property has a computed value not equal to ‘visible’ is the higher of either its bottom margin edge or the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case its baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-001-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: auto;
+    /* The last line box of the inline-block is above its bottom margin edge */
+    line-height: 1; height: 2em; margin-bottom: 0.2em}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     All the <span>words</span> are aligned on the same baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-004.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-004.xht
new file mode 100644
index 000000000000..cdf6c558b4dd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-004.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an inline-block whose ‘overflow’ property has a computed value not equal to ‘visible’ is the higher of either its bottom margin edge or the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case its baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-001-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: hidden;
+    /* The last line box of the inline-block is above its bottom margin edge */
+    line-height: 1; height: 2em; margin-bottom: 0.2em}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     All the <span>words</span> are aligned on the same baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-005.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-005.xht
new file mode 100644
index 000000000000..1ef69f658212
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-005.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an inline-block whose ‘overflow’ property has a computed value not equal to ‘visible’ is the higher of either its bottom margin edge or the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case its baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-001-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: auto;
+    /* The last line box of the inline-block is above its bottom margin edge */
+    line-height: 1; height: 2.5em; margin-bottom: 0.2em}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     All the <span>&nbsp;<br />words</span> are aligned on the same baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-006.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-006.xht
new file mode 100644
index 000000000000..9f9d051c76ef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-006.xht
@@ -0,0 +1,30 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an inline-block whose ‘overflow’ property has a computed value not equal to ‘visible’ is the higher of either its bottom margin edge or the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case its baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-001-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: hidden;
+    /* The last line box of the inline-block is above its bottom margin edge */
+    line-height: 1; height: 2.5em; margin-bottom: 0.2em}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     All the <span>&nbsp;<br />words</span> are aligned on the same baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010-ref.xht
new file mode 100644
index 000000000000..81ffd5e48bb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010-ref.xht
@@ -0,0 +1,26 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  img {height: 1em; width: 1em}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     A blue square
+     <img src="support/swatch-blue.png" alt="[blue square]" />
+     sits on the baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010.xht
new file mode 100644
index 000000000000..600cdd77a28a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-010.xht
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an 'inline-block’ whose ‘overflow’ property has a computed value of ‘visible’ is the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case the baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-010-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: visible;
+    /* This inline-block has no line boxes, it's aligned at the bottom margin */
+    height: 1em; width: 1em; background: blue}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     A blue square
+     <span></span>
+     sits on the baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-011.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-011.xht
new file mode 100644
index 000000000000..157420d30eaf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-011.xht
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an 'inline-block’ whose ‘overflow’ property has a computed value of ‘visible’ is the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case the baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-010-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: visible;
+    /* This inline-block has no line boxes, it's aligned at the bottom margin */
+    vertical-align: -0.5em; margin-bottom: 0.5em;
+    height: 1em; width: 1em; background: blue}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     A blue square
+     <span></span>
+     sits on the baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-012.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-012.xht
new file mode 100644
index 000000000000..ca37545c2fa6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-012.xht
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an inline-block whose ‘overflow’ property has a computed value not equal to ‘visible’ is the higher of either its bottom margin edge or the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case its baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-010-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: auto;
+    /* This inline-block has no line boxes, it's aligned at the bottom margin */
+    height: 1em; width: 1em; background: blue}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     A blue square
+     <span></span>
+     sits on the baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-013.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-013.xht
new file mode 100644
index 000000000000..4dcaad4629d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-013.xht
@@ -0,0 +1,32 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an inline-block whose ‘overflow’ property has a computed value not equal to ‘visible’ is the higher of either its bottom margin edge or the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case its baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-010-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: hidden;
+    /* This inline-block has no line boxes, it's aligned at the bottom margin */
+    height: 1em; width: 1em; background: blue}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     A blue square
+     <span></span>
+     sits on the baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-014.xht b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-014.xht
new file mode 100644
index 000000000000..b087caa47404
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/visudet/inline-block-baseline-014.xht
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+ <head>
+  <title>Vertical-align: baseline of an inline-block depends on 'overflow'</title>
+
+  <link rel="help" href="http://www.w3.org/TR/CSS22/visudet.html#leading" title="10.8.1 Leading and half-leading" />
+  <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.10.8.1" title="C.1 Changes since the Recommendation of 7 June 2011" />
+  <meta name="assert" content="The baseline of an inline-block whose ‘overflow’ property has a computed value not equal to ‘visible’ is the higher of either its bottom margin edge or the baseline of its last line box in the normal flow, unless it has no in-flow line boxes, in which case its baseline is the bottom margin edge." />
+  <link rel="match" href="inline-block-baseline-010-ref.xht" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
+
+  <meta name="flags" content="" />
+
+  <style type="text/css"><![CDATA[
+  body {background: white; color: black; font-size: 15px}
+  p {white-space: nowrap; line-height: 5}
+  span {display: inline-block; overflow: hidden;
+    /* This inline-block has no line boxes, it's aligned at the bottom margin */
+    vertical-align: -0.5em; margin-bottom: 0.5em;
+    height: 1em; width: 1em; background: blue}
+  ]]></style>
+ </head>
+
+ <body>
+   <p>
+     A blue square
+     <span></span>
+     sits on the baseline.
+   </p>
+ </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht
index 2a89acf56fb0..a8c54ab6d62a 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/visufx/overflow-applies-to-001-ref.xht
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Reference File</title>
-  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org/" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
 
   <style type="text/css">
   #container {width: 20em; background: green; text-align: center;
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht b/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht
index 2090c116d8df..42f12fe4bc3f 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001-ref.xht
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
  <head>
   <title>CSS Reference File</title>
-  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org/" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
 
   <style type="text/css"><![CDATA[
   #block {display: block; min-width: 25em}
diff --git a/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001.xht b/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001.xht
index 43cec46a19e2..e6917a26b545 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/visuren/inline-formatting-context-001.xht
@@ -7,7 +7,7 @@
   <link rel="help" href="http://www.w3.org/TR/CSS22/visuren.html#inline-formatting" />
   <link rel="help" href="http://www.w3.org/TR/CSS22/changes.html#s.9.4.2" />
   <link rel="match" href="inline-formatting-context-001-ref.xht" />
-  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org/" />
+  <link rel="author" title="Bert Bos" href="mailto:bert@w3.org" />
   <meta name="assert" content="An inline formatting context is established by a block container box that contains no block-level boxes. In an inline formatting context, boxes are laid out horizontally, one after the other, beginning at the top of a containing block." />
 
   <style type="text/css"><![CDATA[
diff --git a/tests/wpt/web-platform-tests/css/README.md b/tests/wpt/web-platform-tests/css/README.md
index 4967f8cf479d..959bab67d65d 100644
--- a/tests/wpt/web-platform-tests/css/README.md
+++ b/tests/wpt/web-platform-tests/css/README.md
@@ -67,5 +67,5 @@ complicated:
 
 
 [harness]: https://test.csswg.org/harness/
-[spec-link]: http://web-platform-tests.org/writing-tests/css-metadata.html#specification-links
+[spec-link]: https://web-platform-tests.org/writing-tests/css-metadata.html#specification-links
 [hg-patch-to-git-patch]: https://raw.githubusercontent.com/mozilla/moz-git-tools/master/hg-patch-to-git-patch
diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.js b/tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.js
index 7aee234eb435..56d30a4a3777 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.js
+++ b/tests/wpt/web-platform-tests/css/css-animations/animationevent-interface.js
@@ -68,6 +68,11 @@
     assert_equals(event.elapsedTime, 0.0);
   }, "animationEventInit argument is empty dictionary");
 
+  test(function() {
+    var event = new AnimationEvent("test", {pseudoElement: "::testPseudo"});
+    assert_equals(event.pseudoElement, "::testPseudo");
+  }, "AnimationEvent.pseudoElement initialized from the dictionary");
+
   test(function() {
     var event = new AnimationEvent("test", {animationName: "sample"});
     assert_equals(event.animationName, "sample");
diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-pseudoelement.html b/tests/wpt/web-platform-tests/css/css-animations/animationevent-pseudoelement.html
new file mode 100644
index 000000000000..8de41cc613b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-animations/animationevent-pseudoelement.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Animations Test: AnimationEvent pseudoElement</title>
+<link rel="help" href="https://drafts.csswg.org/css-animations/#interface-animationevent">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  #target::before {
+    content: "";
+    animation: move 1s;
+  }
+
+  @keyframes move {
+    to { transform: translate(100px); }
+  }
+</style>
+<div id='target'></div>
+<script>
+  async_test(function(t) {
+    var target = document.getElementById('target');
+    target.addEventListener("animationstart", t.step_func(function(evt) {
+      assert_true(evt instanceof window.AnimationEvent);
+      assert_equals(evt.pseudoElement, "::before");
+
+      t.done();
+    }), true);
+  }, "AnimationEvent should have the correct pseudoElement memeber");
+</script>
+
diff --git a/tests/wpt/web-platform-tests/css/css-animations/animationevent-types.html b/tests/wpt/web-platform-tests/css/css-animations/animationevent-types.html
index d1cb91448816..77f514a297bf 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/animationevent-types.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/animationevent-types.html
@@ -39,9 +39,11 @@
 
       assert_idl_attribute(evt, "animationName", "animationstart has animationName property");
       assert_idl_attribute(evt, "elapsedTime", "animationstart has elapsedTime property");
+      assert_idl_attribute(evt, "pseudoElement", "animationstart has pseudoElement property");
 
       assert_equals(evt.animationName, "sample", "animationstart has animationName value");
       assert_equals(evt.elapsedTime, 1, "animationstart has elapsedTime value");
+      assert_equals(evt.pseudoElement, "", "animaitonstart has correct pseudoElement value");
 
       t.done();
     }), true);
@@ -53,9 +55,11 @@
 
       assert_idl_attribute(evt, "animationName", "animationend has animationName property");
       assert_idl_attribute(evt, "elapsedTime", "animationend has elapsedTime property");
+      assert_idl_attribute(evt, "pseudoElement", "animationstart has pseudoElement property");
 
       assert_equals(evt.animationName, "sample", "animationend has animationName value");
       assert_equals(evt.elapsedTime, 4, "animationend has elapsedTime value");
+      assert_equals(evt.pseudoElement, "", "animaitonstart has correct pseudoElement value");
 
       t.done();
     }), true);
@@ -67,9 +71,11 @@
 
       assert_idl_attribute(evt, "animationName", "animationiteration has animationName property");
       assert_idl_attribute(evt, "elapsedTime", "animationiteration has elapsedTime property");
+      assert_idl_attribute(evt, "pseudoElement", "animationstart has pseudoElement property");
 
       assert_equals(evt.animationName, "sample", "animationiteration has animationName value");
       assert_equals(evt.elapsedTime, 2, "animationiteration has elapsedTime value");
+      assert_equals(evt.pseudoElement, "", "animaitonstart has correct pseudoElement value");
 
       t.done();
     }), true);
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-001.html b/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-001.html
index a3b8436a7ac0..f0777e88c222 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-001.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-clip-content-box-001.html
@@ -1,36 +1,25 @@
 <!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Backgrounds and Borders Test: background-clip Reference</title>
-    <link rel="author" title="James Wang" href="mailto:wangjian@ucweb.com">
-	<link rel="help" href="http://www.w3.org/TR/css3-background/#the-background-clip" />
-    <meta name="flags" content="">
-    <meta name="assert" content="background-clip with content-box means paint the background within the content box">
-
-    <link rel="match" href="reference/background-clip-content-box-ref.html">
-
-    <style type="text/css">
-    	* { padding: 0; margin: 0; }
-    	#test-color-blue {
-    		background-color: blue;
-    		height: 200px;
-            position: absolute;
-    		width: 200px;
-    	}
-    	#test-color-green {
-    		background-clip: content-box;
-    		background-color: rgba(0, 255, 0, 1);
-    		height: 180px;
-    		padding: 10px;
-            position: absolute;
-    		width: 180px;
-    	}
-    </style>
-</head>
-<body>
-    <p>Test pass if the green box has a 10px width blue edge</p>
-    <!-- background -->
-    <div id="test-color-blue"></div>
-    <div id="test-color-green"></div>
-</body>
-</html>
+<title>CSS Backgrounds and Borders Test: background-clip Reference</title>
+<link rel="author" title="James Wang" href="mailto:wangjian@ucweb.com">
+<link rel="help" href="https://www.w3.org/TR/css-backgrounds-3/#the-background-clip">
+<link rel="match" href="reference/background-clip-content-box-ref.html">
+<style>
+#test-color-blue {
+  background-color: blue;
+  height: 200px;
+  position: absolute;
+  width: 200px;
+}
+#test-color-orange {
+  background-clip: content-box;
+  background-color: rgba(255, 165, 0, 1);
+  height: 180px;
+  padding: 10px;
+  position: absolute;
+  width: 180px;
+}
+</style>
+<p>Test passes if the orange box has a 10px width blue edge.</p>
+<!-- background -->
+<div id="test-color-blue"></div>
+<div id="test-color-orange"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip.html b/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip.html
new file mode 100644
index 000000000000..1179ba549969
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/background-rounded-image-clip.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Background Clip Follows Rounded Corner</title>
+<link rel="match" href="reference/background-rounded-image-clip.html">
+<link rel="help" href="https://drafts.csswg.org/css-backgrounds-3/#corner-clipping">
+<style>
+    html {
+        background-color: green;
+    }
+    #a {
+        top: 20px;
+        left: 20px;
+        position: absolute;
+        width: 20px;
+        height: 20px;
+        background-color: black;
+    }
+
+    #b {
+        position: absolute;
+        width: 300px;
+        height: 200px;
+        background-image: linear-gradient(green, green);
+        background-clip: content-box;
+        border-top-left-radius: 90px;
+        border-width: 10px;
+        border-style: solid;
+        border-color: transparent;
+    }
+</style>
+<div id="a"></div>
+<div id="b"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-syntax-001.html b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-syntax-001.html
index a66c3b60c2b3..e7c83b3ec227 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-syntax-001.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/box-shadow-syntax-001.html
@@ -5,7 +5,7 @@
 <meta name="assert" content="Box shadow color, inset, and length parameters can be mixed in any order, but lengths must stay adjacent." />
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
-<script src="resources/parsing-testcommon.js"></script>
+<script src="parsing/resources/parsing-testcommon.js"></script>
 <script>
   // color only
   test_valid_value("box-shadow", "4px 4px green", "green 4px 4px");
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/resources/parsing-testcommon.js
index 9427f53d81bc..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/parsing/resources/parsing-testcommon.js
@@ -12,18 +12,18 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "", "property should be set");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
+        var readValue = div.style.getPropertyValue(property);
         if (serializedValue instanceof Array)
-            assert_true(serializedValue.includes(readValue), "serialization should be sound");
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
             assert_equals(readValue, serializedValue, "serialization should be canonical");
 
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue, "serialization should round-trip");
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
 
     }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
@@ -34,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-content-box-ref.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-content-box-ref.html
index 133e57a2d246..dc6d9a00d534 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-content-box-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-clip-content-box-ref.html
@@ -1,22 +1,15 @@
 <!DOCTYPE html>
-<html>
-<head>
-    <title>CSS Backgrounds and Borders Test: background-clip Reference</title>
-    <link rel="author" title="James Wang" href="mailto:wangjian@ucweb.com">
-    <style type="text/css">
-    	* { padding: 0; margin: 0; }
-    	#test-color-box {
-            position: absolute;
-    		width: 180px;
-    		height: 180px;
-    		background-color: rgba(0, 255, 0, 1);
-            border: 10px solid blue;
-    	}
-    </style>
-</head>
-<body>
-    <p>Test pass if the green box has a 10px width blue edge</p>
-    <!-- background -->
-    <div id="test-color-box"></div>
-</body>
-</html>
+<title>CSS Backgrounds and Borders Test: background-clip Reference</title>
+<link rel="author" title="James Wang" href="mailto:wangjian@ucweb.com">
+<style>
+#test-color-box {
+  position: absolute;
+  width: 180px;
+  height: 180px;
+  background-color: rgba(255, 165, 0, 1);
+  border: 10px solid blue;
+}
+</style>
+<p>Test passes if the orange box has a 10px width blue edge.</p>
+<!-- background -->
+<div id="test-color-box"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html
new file mode 100644
index 000000000000..2436bedad502
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-backgrounds/reference/background-rounded-image-clip.html
@@ -0,0 +1,17 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Corner Clipped Background Color</title>
+<style>
+    html {
+        background-color: green;
+    }
+    #a {
+        top: 20px;
+        left: 20px;
+        position: absolute;
+        width: 20px;
+        height: 20px;
+        background-color: black;
+    }
+</style>
+<div id="a"></div>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html
new file mode 100644
index 000000000000..1919ab4e4f6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-004-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .match { color: rgb(75.62% 30.45% 47.56%)} /* lab(50 50 0) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if the two lines of filler text are the same color.</p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-004.html b/tests/wpt/web-platform-tests/css/css-color/lab-004.html
index 0037a1e7653e..2cd327f2699c 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-004.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-004-ref.html">
 <meta name="assert" content="lab() with no alpha, positive a axis">
 <style>
     .test { color: red; }
     .test { color: lab(50 50 0)}
-    .match { color: rgb(75.62%, 30.45%, 47.56%)} /* lab(50,0,0) converted to sRGB */
+    .match { color: rgb(75.62%, 30.45%, 47.56%)} /* lab(50 50 0) converted to sRGB */
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html
new file mode 100644
index 000000000000..207973e38ebc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-005-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lab(70 -45 0) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if the two lines of filler text are the same color.</p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-005.html b/tests/wpt/web-platform-tests/css/css-color/lab-005.html
index 366cd1bc304e..846430f8360b 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-005.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-005-ref.html">
 <meta name="assert" content="lab() with no alpha, negative a axis">
 <style>
     .test { color: red; }
     .test { color: lab(70 -45 0)}
-    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lab(70,-45,0) converted to sRGB */
+    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lab(70 -45 0) converted to sRGB */
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html
new file mode 100644
index 000000000000..8747c97bbfb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-006-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lab(70 0 70) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if the two lines of filler text are the same color.</p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-006.html b/tests/wpt/web-platform-tests/css/css-color/lab-006.html
index 079c37978f43..926c1f08236a 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-006.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-006-ref.html">
 <meta name="assert" content="lab() with no alpha, positive b axis">
 <style>
     .test { color: red; }
     .test { color: lab(70 0 70)}
-    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lab(70,0,70) converted to sRGB */
+    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lab(70 0 70) converted to sRGB */
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html b/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html
new file mode 100644
index 000000000000..00bdb09d4f6e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-007-ref.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Color 4: Specifying Lab and LCH</title>
+<style>
+    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lab(55 0 -60) converted to sRGB */
+</style>
+<body>
+    <p>Test passes if the two lines of filler text are the same color.</p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+    <p class="match">Filler text. Filler text. Filler text. </p>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lab-007.html b/tests/wpt/web-platform-tests/css/css-color/lab-007.html
index 4cdb35788d4d..917bc1a399fd 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lab-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lab-007.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-007-ref.html">
 <meta name="assert" content="lab() with no alpha, negative b axis">
 <style>
     .test { color: red; }
     .test { color: lab(55 0 -60)}
-    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lab(55,0,-60) converted to sRGB */
+    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lab(55 0 -60) converted to sRGB */
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-001.html b/tests/wpt/web-platform-tests/css/css-color/lch-001.html
index 966e1fd40550..3b0b5af0a55e 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-001.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-001.html
@@ -6,7 +6,7 @@
 <link rel="match" href="greentext-ref.html">
 <meta name="assert" content="lch() with no alpha">
 <style>
-    .test {color: lab(46.277 -67.989 134.391)} /* green (sRGB #008000) converted to LCH */
+    .test {color: lch(46.277 67.945 134.427)} /* green (sRGB #008000) converted to LCH */
 </style>
 <body>
     <p class="test">Test passes if this text is green</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-004.html b/tests/wpt/web-platform-tests/css/css-color/lch-004.html
index 46ac7d3988e0..0db243c91833 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-004.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-004.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-004-ref.html">
 <meta name="assert" content="lch() with no alpha, positive a axis">
 <style>
     .test { color: red; }
     .test { color: lch(50 50 0)}
-    .match { color: rgb(75.62%, 30.45%, 47.56%)} /* lch(50,0,0) converted to sRGB */
+    .match { color: rgb(75.62%, 30.45%, 47.56%)} /* lch(50 50 0) converted to sRGB (happens to be the same as lab(50 50 0)*/
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-005.html b/tests/wpt/web-platform-tests/css/css-color/lch-005.html
index 789d4b23fefe..c16d02b335c1 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-005.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-005.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-005-ref.html">
 <meta name="assert" content="lch() with no alpha, negative a axis">
 <style>
     .test { color: red; }
-    .test { color: lab(70 45 180)}
-    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lch(70,45,180) converted to sRGB */
+    .test { color: lch(70 45 -180)}
+    .match { color: rgb(10.79%, 75.55%, 66.40%)} /* lch(70 45 180) converted to sRGB */
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-006.html b/tests/wpt/web-platform-tests/css/css-color/lch-006.html
index 760362cbf93a..c3bbd14f5078 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-006.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-006.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-006-ref.html">
 <meta name="assert" content="lch() with no alpha, positive b axis">
 <style>
     .test { color: red; }
-    .test { color: lab(70 70 90)}
-    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lch(70,70,90) converted to sRGB */
+    .test { color: lch(70 70 90)}
+    .match { color: rgb(76.62%, 66.36%, 5.58%)} /* lch(70 70 90) converted to sRGB */
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-color/lch-007.html b/tests/wpt/web-platform-tests/css/css-color/lch-007.html
index 7b8c41fa9c75..4646bc9a3243 100644
--- a/tests/wpt/web-platform-tests/css/css-color/lch-007.html
+++ b/tests/wpt/web-platform-tests/css/css-color/lch-007.html
@@ -3,12 +3,12 @@
 <title>CSS Color 4: Specifying Lab and LCH</title>
 <link rel="author" title="Chris Lilley" href="mailto:chris@w3.org">
 <link rel="help" href="https://drafts.csswg.org/css-color-4/#specifying-lab-lch">
-<link rel="match" href="blacktext-ref.html">
+<link rel="match" href="lab-007-ref.html">
 <meta name="assert" content="lab() with no alpha, negative b axis">
 <style>
     .test { color: red; }
-    .test { color: lch(55 60 270)}
-    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lch(55,60,270) converted to sRGB */
+    .test { color: lch(56 58 275)}
+    .match { color: rgb(12.81%, 53.10%, 92.76%)} /* lch(56 58 275) converted to sRGB */
 </style>
 <body>
     <p>Test passes if the two lines of filler text are the same color.</p>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-001.html
index ab3328e78c12..decea3b249c9 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment does not apply to non atomic inlines">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 span {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-002.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-002.html
index 578893d04b05..8bbf95146e31 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-002.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-002.html
@@ -6,7 +6,7 @@
   <meta name=flags content="ahem">
   <meta name=assert content="layout containment does not apply to ruby-base">
   <link rel="match" href="reference/contain-layout-002-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rb {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-003.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-003.html
index b4d06723202c..2d59bd8a85f2 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-003.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-003.html
@@ -6,7 +6,7 @@
   <meta name=flags content="ahem">
   <meta name=assert content="layout containment does not apply to ruby-base-container">
   <link rel="match" href="reference/contain-layout-002-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rbc {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-004.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-004.html
index 0287b4a95f4d..ef74af91caf4 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-004.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-004.html
@@ -6,7 +6,7 @@
   <meta name=flags content="ahem">
   <meta name=assert content="layout containment does not apply to ruby-text-container">
   <link rel="match" href="reference/contain-layout-004-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rtc {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-005.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-005.html
index 3a6a3daf01bd..a12aef53c64d 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-005.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-005.html
@@ -6,7 +6,7 @@
   <meta name=flags content="ahem">
   <meta name=assert content="layout containment does not apply to ruby-text">
   <link rel="match" href="reference/contain-layout-005-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rt {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-006.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-006.html
new file mode 100644
index 000000000000..57dc518a65b3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-006.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Layout containment absolutely positioned descendants</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name=assert content="Layout containment makes an element to act as containing block for absolutely positioned descendants.">
+<style>
+#contain-layout {
+  contain: layout;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+#abspos {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  background: green;
+  width: 100px;
+  height: 100px;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="contain-layout">
+  <div id="abspos"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-007.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-007.html
new file mode 100644
index 000000000000..39be5fe7fd06
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-007.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Layout containment fixed positioned descendants</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-layout">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name=assert content="Layout containment makes an element to act as containing block for fixed positioned descendants.">
+<style>
+#contain-layout {
+  contain: layout;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+#fixed {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  background: green;
+  width: 100px;
+  height: 100px;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="contain-layout">
+  <div id="fixed"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-001.html
index 35999898404a..a85cf2c6c8e0 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="layout containment allows forced breaks.">
   <link rel="match" href="reference/contain-style-breaks-004-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-layout">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-layout">
   <link rel=help href="https://drafts.csswg.org/css-break-3/#forced-break">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-002.html b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-002.html
index d45b40ccb749..4398387f26ca 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-002.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-layout-breaks-002.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="forced breaks within layout containment do not propagate to the parent.">
   <link rel="match" href="reference/contain-layout-breaks-002-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-layout">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-layout">
   <link rel=help href="https://drafts.csswg.org/css-break-3/#forced-break">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-001.html
index e0c17c411821..37609e616dec 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment clips at the padding edge, not content edge, and takes corner clipping into account">
   <link rel="match" href="reference/contain-paint-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 div {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-002.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-002.html
index 6ea647823c27..ff59a234327e 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-002.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-002.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment does not apply to non atomic inlines">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 span {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-003.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-003.html
index 9ab7270cf95b..7db9c20ef00c 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-003.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-003.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment applies to the principal box, which is the table wrapper box for tables">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 table { contain: paint; }
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-004.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-004.html
index 7567c92babc6..a3941b3f7fd3 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-004.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-004.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment applies to the principal box, which for list items excludes the list marker">
   <link rel="match" href="reference/contain-paint-004-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 li { contain: paint; }
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-005.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-005.html
index ce565e170958..71ceae4f0250 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-005.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-005.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment does not apply to ruby-base">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rb {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-006.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-006.html
index 54149fabbe56..1349c186e962 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-006.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-006.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment does not apply to ruby-base-container">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rbc {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-007.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-007.html
index fb76defd3ad1..b02bd535b787 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-007.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-007.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment does not apply to ruby-text-container">
   <link rel="match" href="reference/contain-paint-007-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rtc {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-008.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-008.html
index 8dd628b7342e..8fd7ca25c2b1 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-008.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-008.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="paint containment does not apply to ruby-text">
   <link rel="match" href="reference/contain-paint-008-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-paint">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-paint">
 
 <style>
 rt {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-009.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-009.html
new file mode 100644
index 000000000000..34ca8d72b599
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-009.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Paint containment absolutely positioned descendants</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-paint">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name=assert content="Paint containment makes an element to act as containing block for absolutely positioned descendants.">
+<style>
+#contain-paint {
+  contain: paint;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+#abspos {
+  position: absolute;
+  bottom: 0;
+  right: 0;
+  background: green;
+  width: 100px;
+  height: 100px;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="contain-paint">
+  <div id="abspos"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-paint-010.html b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-010.html
new file mode 100644
index 000000000000..a05ce58f8bc4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-paint-010.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Containment Test: Paint containment fixed positioned descendants</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-paint">
+<link rel="match" href="../reference/ref-filled-green-100px-square.xht">
+<meta name=assert content="Paint containment makes an element to act as containing block for fixed positioned descendants.">
+<style>
+#contain-paint {
+  contain: paint;
+  width: 100px;
+  height: 100px;
+  background: red;
+}
+
+#fixed {
+  position: fixed;
+  bottom: 0;
+  right: 0;
+  background: green;
+  width: 100px;
+  height: 100px;
+}
+</style>
+<p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
+<div id="contain-paint">
+  <div id="fixed"></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-001.html
index f5491a7804d6..5ed871b3cdbc 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="size containment does not apply to non atomic inlines">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-size">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-size">
 
 <style>
 div { overflow: hidden; }
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-002.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-002.html
index fe30aa264e62..e844c67ffbca 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-002.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-002.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="size containment does not to apply ruby-base, which is an internatl ruby element">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-size">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-size">
   <link rel=help href="https://drafts.csswg.org/css-display-3/#internal-ruby-element">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-003.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-003.html
index 4f3cb960869c..95827dc86e20 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-003.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-003.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="size containment does not to apply ruby-base-container, which is an internatl ruby element">
   <link rel="match" href="reference/contain-size-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-size">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-size">
   <link rel=help href="https://drafts.csswg.org/css-display-3/#internal-ruby-element">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-004.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-004.html
index 43691bcca9b4..b04331060d68 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-004.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-004.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="size containment does not to apply ruby-text-container, which is an internatl ruby element">
   <link rel="match" href="reference/contain-size-004-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-size">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-size">
   <link rel=help href="https://drafts.csswg.org/css-display-3/#internal-ruby-element">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-005.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-005.html
index 3687d4ad3088..9e35a85a15f8 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-005.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-005.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="size containment does not to apply ruby-text, which is an internatl ruby element">
   <link rel="match" href="reference/contain-size-005-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-size">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-size">
   <link rel=help href="https://drafts.csswg.org/css-display-3/#internal-ruby-element">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-size-breaks-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-size-breaks-001.html
index b3284f5f9017..d8538f65d876 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-size-breaks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-size-breaks-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="ahem">
   <meta name=assert content="size containment makes element monolithic">
   <link rel="match" href="reference/contain-size-breaks-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
   <link rel=help href="https://drafts.csswg.org/css-break-3/#monolithic">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-001.html b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-001.html
index 22ae3a573f46..9e5c27a075ed 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment is (no longer) supposed to have any effect on the break-inside property">
   <link rel="match" href="reference/contain-style-breaks-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 article {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-002.html b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-002.html
index eabbf5ba718d..1b089c84a2d8 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-002.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-002.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment is not (any longer) supposed to have any effect on the break-inside property. Same as -001, applying containment on the parent.">
   <link rel="match" href="reference/contain-style-breaks-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 article {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-003.html b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-003.html
index 9668c49bafde..2cfd5900c13d 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-003.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-003.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment is not (any longer) supposed to have any effect on the break-inside property. Same as -001, applying break-inside on the parent.">
   <link rel="match" href="reference/contain-style-breaks-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 article {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-004.html b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-004.html
index c2998f9c63f3..98e79a6dba3e 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-004.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-004.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment is not (any longer) supposed to have any effect on the break-before property.">
   <link rel="match" href="reference/contain-style-breaks-004-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 article {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-005.html b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-005.html
index 89fb82944c27..bfcd1fbd9169 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-005.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-style-breaks-005.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment is not (any longer) supposed to have any effect on the break-after property.">
   <link rel="match" href="reference/contain-style-breaks-004-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 article {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters.html b/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters.html
index 73de6dc96046..55bf97f9f2a2 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/contain-style-counters.html
@@ -1,6 +1,6 @@
 <!DOCTYPE html>
 <title>CSS Containment Test: contain:style for counters</title>
-<link rel="help" href="https://drafts.csswg.org/css-contain/#containment-style">
+<link rel="help" href="https://drafts.csswg.org/css-contain-1/#containment-style">
 <link rel="match" href="contain-style-counters-ref.html">
 <style>
     #t1 { contain: style }
diff --git a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-001.html b/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-001.html
index 92b075eacafc..f7d40dc5a085 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="counter-increment is scoped to the subtree and creates a new counter at the root of the subtree">
   <link rel="match" href="reference/counter-scoping-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 div {
diff --git a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-002.html b/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-002.html
index 4dde5cdcc457..0af148cd5e6e 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-002.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-002.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="counter-set is scoped to the subtree and creates a new counter at the root of the subtree">
   <link rel="match" href="reference/counter-scoping-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
   <link rel=help href="https://drafts.csswg.org/css-lists-3/#propdef-counter-set">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-003.html b/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-003.html
index 5d52401e5e43..c4a004ff18ca 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-003.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/counter-scoping-003.html
@@ -5,7 +5,7 @@
   <link rel="author" title="Florian Rivoal" href="https://florian.rivoal.net">
   <meta name=flags content="">
   <meta name=assert content="When considering the effects of the scoped property on elements inside the subtree, the element at the base of the subtree is treated as if it was the root of the document">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
   <link rel="match" href="reference/counter-scoping-003-ref.html">
 
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-001.html b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-001.html
index cc6c4d464115..b440fdcd8dde 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-001.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-001.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment cause the open-quote value of the content property are scoped to the element's subtree">
   <link rel="match" href="reference/quote-scoping-001-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-002.html b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-002.html
index 6d699dbd275d..d79ec2d7f3ae 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-002.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-002.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment cause the close-quote value of the content property are scoped to the element's subtree">
   <link rel="match" href="reference/quote-scoping-002-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-003.html b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-003.html
index dceee59c9b47..ee0420ee1a42 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-003.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-003.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment cause the no-open-quote value of the content property are scoped to the element's subtree">
   <link rel="match" href="reference/quote-scoping-003-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-004.html b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-004.html
index 8c75578a9986..b31437003365 100644
--- a/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-004.html
+++ b/tests/wpt/web-platform-tests/css/css-contain/quote-scoping-004.html
@@ -6,7 +6,7 @@
   <meta name=flags content="">
   <meta name=assert content="style containment cause the no-close-quote value of the content property are scoped to the element's subtree">
   <link rel="match" href="reference/quote-scoping-003-ref.html">
-  <link rel=help href="https://drafts.csswg.org/css-contain/#containment-style">
+  <link rel=help href="https://drafts.csswg.org/css-contain-1/#containment-style">
 
 <style>
 
diff --git a/tests/wpt/web-platform-tests/css/css-content/OWNERS b/tests/wpt/web-platform-tests/css/css-content/OWNERS
new file mode 100644
index 000000000000..ae23ef8876e7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-content/OWNERS
@@ -0,0 +1 @@
+@dauwhe
diff --git a/tests/wpt/web-platform-tests/css/css-display/display-list-item-height-after-dom-change.html b/tests/wpt/web-platform-tests/css/css-display/display-list-item-height-after-dom-change.html
new file mode 100644
index 000000000000..f8d6e85cee23
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-display/display-list-item-height-after-dom-change.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Display: reflowing a display:list-item on dom changes - non-zero height</title>
+<link rel="author" title="Rune Lillesveen" href="mailto:futhark@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-display-3/#list-items">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<ul>
+  <li id="item" style="background:green">
+    <div id="content" style="overflow:hidden">Text<div>
+  </li>
+</ul>
+<script>
+  test(function() {
+    document.body.offsetTop; // force layout
+    item.insertBefore(document.createTextNode("This text should have a green background"), item.firstChild);
+    content.innerHTML = "";
+    assert_not_equals(item.clientHeight, 0, "The height of the LI should not be 0px.");
+  }, "List item height after DOM change.");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-fill-stroke/OWNERS b/tests/wpt/web-platform-tests/css/css-fill-stroke/OWNERS
new file mode 100644
index 000000000000..4d8fac449153
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fill-stroke/OWNERS
@@ -0,0 +1 @@
+@tabatkins
diff --git a/tests/wpt/web-platform-tests/css/css-filter/filtered-block-is-container-ref.html b/tests/wpt/web-platform-tests/css/css-filter/filtered-block-is-container-ref.html
new file mode 100644
index 000000000000..fc9467f8717d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-filter/filtered-block-is-container-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Filter: Filtered block establishes a containing block reference.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+
+<style>
+#scroller {
+  width: 500px;
+  height: 500px;
+  overflow: scroll
+}
+.spacer {
+  width: 1000px;
+  height: 500px;
+  background-color: lightgreen;
+}
+#transform {
+  /* no-op transform */
+  transform: translateX(0px);
+  width: 100px;
+  height: 50px;
+  background-color: lightblue;
+}
+#fixed, #absolute {
+  width: 100px;
+  height: 100px;
+}
+#fixed {
+  position: fixed;
+  top: 100px;
+  left: 150px;
+  background-color: green;
+}
+#absolute {
+  position: absolute;
+  top: 200px;
+  left: 300px;
+  background-color: blue;
+}
+</style>
+
+<div id="scroller">
+  <div class="spacer">
+  </div>
+  <div id="transform">
+    <div id="fixed"></div>
+    <div id="absolute"></div>
+  </div>
+  <div class="spacer">
+  </div>
+</div>
+
+<script>
+window.onload = function() {
+  document.getElementById("scroller").scrollTo(50, 250);
+}
+</script>
+
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-filter/filtered-block-is-container.html b/tests/wpt/web-platform-tests/css/css-filter/filtered-block-is-container.html
new file mode 100644
index 000000000000..6f99f364e638
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-filter/filtered-block-is-container.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Filter: Filtered block establishes a containing block.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-1/#FilterProperty">
+<link rel="match" href="filtered-block-is-container-ref.html">
+
+<style>
+#scroller {
+  width: 500px;
+  height: 500px;
+  overflow: scroll
+}
+.spacer {
+  width: 1000px;
+  height: 500px;
+  background-color: lightgreen;
+}
+#filter {
+  /* no-op filter */
+  filter: blur(0px);
+  width: 100px;
+  height: 50px;
+  background-color: lightblue;
+}
+#fixed, #absolute {
+  width: 100px;
+  height: 100px;
+}
+#fixed {
+  position: fixed;
+  top: 100px;
+  left: 150px;
+  background-color: green;
+}
+#absolute {
+  position: absolute;
+  top: 200px;
+  left: 300px;
+  background-color: blue;
+}
+</style>
+
+<div id="scroller">
+  <div class="spacer">
+  </div>
+  <div id="filter">
+    <div id="fixed"></div>
+    <div id="absolute"></div>
+  </div>
+  <div class="spacer">
+  </div>
+</div>
+
+<script>
+window.onload = function() {
+  document.getElementById("scroller").scrollTo(50, 250);
+}
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-filter/filtered-html-is-not-container-ref.html b/tests/wpt/web-platform-tests/css/css-filter/filtered-html-is-not-container-ref.html
new file mode 100644
index 000000000000..c1f179a676a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-filter/filtered-html-is-not-container-ref.html
@@ -0,0 +1,38 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Filter: Filtered html element does not establish a containing block.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+
+<style>
+#spacer {
+  width: 2000px;
+  height: 2000px;
+  background-color: lightgreen;
+}
+#fixed, #absolute {
+  width: 100px;
+  height: 100px;
+}
+#fixed {
+  position: fixed;
+  top: 100px;
+  left: 150px;
+  background-color: green;
+}
+#absolute {
+  position: absolute;
+  top: 200px;
+  left: 300px;
+  background-color: blue;
+}
+</style>
+
+<div id="fixed"></div>
+<div id="absolute"></div>
+<div id="spacer"></div>
+
+<script>
+window.onload = function() { window.scrollTo(50, 100); };
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-filter/filtered-html-is-not-container.html b/tests/wpt/web-platform-tests/css/css-filter/filtered-html-is-not-container.html
new file mode 100644
index 000000000000..8adc302f31cf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-filter/filtered-html-is-not-container.html
@@ -0,0 +1,43 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Filter: Filtered html element does not establish a containing block.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-1/#FilterProperty">
+<link rel="match" href="filtered-html-is-not-container-ref.html">
+
+<style>
+html {
+  filter: blur(0px);
+}
+#spacer {
+  width: 2000px;
+  height: 2000px;
+  background-color: lightgreen;
+}
+#fixed, #absolute {
+  width: 100px;
+  height: 100px;
+}
+#fixed {
+  position: fixed;
+  top: 100px;
+  left: 150px;
+  background-color: green;
+}
+#absolute {
+  position: absolute;
+  top: 200px;
+  left: 300px;
+  background-color: blue;
+}
+</style>
+
+<div id="fixed"></div>
+<div id="absolute"></div>
+<div id="spacer"></div>
+
+<script>
+window.onload = function() { window.scrollTo(50, 100); };
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-filter/filtered-inline-is-container-ref.html b/tests/wpt/web-platform-tests/css/css-filter/filtered-inline-is-container-ref.html
new file mode 100644
index 000000000000..aa6c12e33b5b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-filter/filtered-inline-is-container-ref.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Filter: Filtered inline establishes a containing block.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+
+<style>
+#scroller {
+  width: 500px;
+  height: 500px;
+  overflow: scroll
+}
+.spacer {
+  width: 1000px;
+  height: 500px;
+  background-color: lightgreen;
+}
+#transform {
+  /* no-op filter */
+  transform: translateX(0px);
+}
+#fixed, #absolute {
+  width: 100px;
+  height: 100px;
+}
+#fixed {
+  position: fixed;
+  top: 100px;
+  left: 150px;
+  background-color: green;
+}
+#absolute {
+  position: absolute;
+  top: 200px;
+  left: 300px;
+  background-color: blue;
+}
+</style>
+
+<div id="scroller">
+  <div class="spacer">
+  </div>
+  <div id="transform">
+    a
+    <div id="fixed"></div>
+    <div id="absolute"></div>
+  </div>
+  <div class="spacer">
+  </div>
+</div>
+
+<script>
+window.onload = function() {
+  document.getElementById("scroller").scrollTo(50, 250);
+}
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-filter/filtered-inline-is-container.html b/tests/wpt/web-platform-tests/css/css-filter/filtered-inline-is-container.html
new file mode 100644
index 000000000000..56f1d91ff900
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-filter/filtered-inline-is-container.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Filter: Filtered inline establishes a containing block reference.</title>
+<link rel="author" title="Vladimir Levin" href="mailto:vmpstr@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/filter-effects-1/#FilterProperty">
+<link rel="match" href="filtered-inline-is-container-ref.html">
+
+<style>
+#scroller {
+  width: 500px;
+  height: 500px;
+  overflow: scroll
+}
+.spacer {
+  width: 1000px;
+  height: 500px;
+  background-color: lightgreen;
+}
+#filter {
+  /* no-op filter */
+  filter: blur(0px);
+  display: inline;
+}
+#fixed, #absolute {
+  width: 100px;
+  height: 100px;
+}
+#fixed {
+  position: fixed;
+  top: 100px;
+  left: 150px;
+  background-color: green;
+}
+#absolute {
+  position: absolute;
+  top: 200px;
+  left: 300px;
+  background-color: blue;
+}
+</style>
+
+<div id="scroller">
+  <div class="spacer">
+  </div>
+  <div id="filter">
+    a
+    <div id="fixed"></div>
+    <div id="absolute"></div>
+  </div>
+  <div class="spacer">
+  </div>
+</div>
+
+<script>
+window.onload = function() {
+  document.getElementById("scroller").scrollTo(50, 250);
+}
+</script>
+
+
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-letter.html b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-letter.html
new file mode 100644
index 000000000000..dbbb03d524e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flexbox_first-letter.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<title>flexbox | first-letter</title>
+<meta name="assert" content="This test is ensures that flexbox placement does not apply to ::first-letter psuedo-content">
+<link rel="author" title="Vince Falconi" href="vince.falconi@gmail.com">
+<link rel="help" href="https://drafts.csswg.org/css-flexbox-1/#placement">
+<style>
+  div { display: flex; }
+  div::first-letter { order: 2 }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+
+<div>Triceratops</div>
+
+<script>
+  test(function() {
+    let order = getComputedStyle(document.querySelector('div'), '::first-letter').order;
+    assert_not_equals(order, '2');
+  });
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-font-loading/OWNERS b/tests/wpt/web-platform-tests/css/css-font-loading/OWNERS
new file mode 100644
index 000000000000..404d8d1153db
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-font-loading/OWNERS
@@ -0,0 +1,2 @@
+@tabatkins
+@svgeesus
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/alternates-order-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/alternates-order-ref.html
index ed53a2723b44..fdb477fe168c 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/alternates-order-ref.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/alternates-order-ref.html
@@ -19,6 +19,9 @@
   font-feature-settings: "ss05"; /* crossed W */
 }
 
+/* tests that should NOT use the feature, due to case-sensitivity of font-feature-values names */
+#test2, #test3 { font-feature-settings: "ss05" off; }
+
 </style>
 </head>
 <body lang="en">
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/alternates-order.html b/tests/wpt/web-platform-tests/css/css-fonts/alternates-order.html
index e5310b3aadf6..d47cbce32bb3 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/alternates-order.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/alternates-order.html
@@ -65,13 +65,13 @@
 }
 
 #test2 {
-  /* testing case-insensitivity of styleset name */
+  /* testing case-sensitivity of styleset name */
   font-family: fontB;
   font-variant-alternates: styleset(altW);
 }
 
 #test3 {
-  /* testing case-insensitivity of styleset name */
+  /* testing case-sensitivity of styleset name */
   font-family: fontB;
   font-variant-alternates: styleset(ALTW);
 }
@@ -79,7 +79,7 @@
 #test4 {
   /* testing escapes in styleset name */
   font-family: fontB;
-  font-variant-alternates: styleset(\41 ltW);
+  font-variant-alternates: styleset(\41 lTw);
 }
 
 #test5 {
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2-ref.html
new file mode 100644
index 000000000000..ff53ab6e6754
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2-ref.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Reference: font-face unicode-range</title>
+<style>
+  @font-face {
+    font-family: base;
+    src: url(support/fonts/LigatureSymbolsWithSpaces.woff);
+  }
+  @font-face {
+    font-family: swoosh;
+    src: url(support/fonts/Rochester.otf);
+  }
+  .ref {
+    font-family: base;
+  }
+  .ref .amp {
+	  font-family: swoosh;
+  }
+  div {
+	  font-size: 5em;
+  }
+</style>
+<body>
+  <p>Test passes if the two lines look the same, with just the ampersand in italic</p>
+  <div class="ref">This <span class="amp">&amp;</span> That</div>
+  <div class="ref">This <span class="amp">&amp;</span> That</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2.html b/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2.html
index 9be431b1871d..83eab754bb33 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-face-unicode-range-2.html
@@ -3,6 +3,7 @@
 <title>CSS Test: font-face unicode-range</title>
 <link rel="author" title="Chris Lilley" href="chris@w3.org">
 <link rel="help" href="http://www.w3.org/TR/css-fonts-3/#unicode-range-desc">
+<link rel="match" href="font-face-unicode-range-2-ref.html">
 <meta name="flags" content="">
 <meta name="assert" content="Check that font-face unicode-range restrics use of glyphs outside that range">
 <style>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01-ref.html
new file mode 100644
index 000000000000..4a1723e69088
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01-ref.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test: font-feature-settings descriptor</title>
+<style>
+  @font-face {
+    font-family: fwf;
+    src: url(support/fonts/FontWithFancyFeatures.otf);
+  }
+  .test {
+	  font-family: fwf;
+	  font-size: 2.4em;
+	  line-height: 1.1;
+  }
+</style>
+
+<body>
+<p>Test passes if the three lines below are identical, with eight check marks (✓). </p>
+<section class="test">
+    <p class="ref">AAAAAAAA</p>
+    <p class="ref">AAAAAAAA</p>
+    <p class="ref">AAAAAAAA</p>
+</section>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01.html b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01.html
new file mode 100644
index 000000000000..8f7c50661a7a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-feature-settings-descriptor-01.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html lang="en">
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
+<title>CSS Test: font-feature-settings descriptor</title>
+<link rel="author" title="Chris Lilley" href="chris@w3.org">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-rend-desc">
+<link rel="help" href="https://www.w3.org/TR/css-fonts-3/#font-feature-settings-prop">
+<link rel="match" href="font-feature-settings-descriptor-01-ref.html">
+<meta name="assert" content="These descriptors define initial settings that apply when the font defined by an @font-face rule is rendered">
+<style>
+  @font-face {
+    font-family: fwf;
+    src: url(support/fonts/FontWithFancyFeatures.otf);
+  }
+  @font-face {
+    font-family: fwf2;
+    src: url(support/fonts/FontWithFancyFeatures.otf);
+    font-feature-settings: "liga" on, "clig" on, "calt" on, "hlig" on, "dlig" on, "onum" on, "smcp" on, "jp90" on;
+  }
+  .test {
+	  font-family: fwf;
+	  font-size: 2.4em;
+	  line-height: 1.1;
+  }
+  .test>p.descriptor {
+      font-family: fwf2;
+  }
+  .property {
+    font-feature-settings: "liga" on, "clig" on, "calt" on, "hlig" on, "dlig" on, "onum" on, "smcp" on, "jp90" on;
+  }
+</style>
+
+<body>
+<p>Test passes if the three lines below are identical, with eight check marks (✓). </p>
+<section class="test">
+    <p class="descriptor">CDGFEJQa</p>
+	<p class="property">CDGFEJQa</p>
+	<p class="ref">AAAAAAAA</p>
+</section>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001-ref.html
new file mode 100644
index 000000000000..b608c09c50ca
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Fonts Reference: font-size-adjust - greater than aspect value of font</title>
+<style>
+  div {
+    position: absolute;
+    font: 40px/40px Ahem;
+    color: orange;
+  }
+  #test {
+    color: blue;
+    font-size: 45px;
+  }
+</style>
+<body>
+  <p>Test passes if the size of the blue rectangle is greater than the orange rectangle.</p>
+  <div id="test">FillerText</div>
+  <div>FillerText</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001.html b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001.html
index d2d1241b97f7..b4b1c75bff24 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-001.html
@@ -9,8 +9,9 @@
 is greater than the aspect value of font">
 <style>
   div {
-    font-family: Ahem;
-    font-size: 40px;
+    position: absolute;
+    font: 40px/40px Ahem;
+    color: orange;
   }
   #test {
     color: blue;
@@ -18,7 +19,7 @@
   }
 </style>
 <body>
-  <p>Test passes if the size of blue rectangle is greater than the black rectangle.</p>
-  <div>FillerText</div>
+  <p>Test passes if the size of the blue rectangle is greater than the orange rectangle.</p>
   <div id="test">FillerText</div>
+  <div>FillerText</div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002-ref.html b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002-ref.html
new file mode 100644
index 000000000000..175802cd7bb9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002-ref.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Fonts Reference: font-size-adjust - less than aspect value of font</title>
+<style>
+  div {
+    position: absolute;
+    font: 40px/40px Ahem;
+    color: blue;
+  }
+  #test {
+    color: orange;
+    font-size: 10px;
+  }
+</style>
+<body>
+  <p>Test passes if the size of the blue rectangle is greater than the orange rectangle.</p>
+  <div>FillerText</div>
+  <div id="test">FillerText</div>
+</body>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002.html b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002.html
index d157f1350c21..e1e4768ed47f 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/font-size-adjust-002.html
@@ -4,21 +4,23 @@
 <link rel="author" title="Intel" href="http://www.intel.com/">
 <link rel="author" title="Shiyou Tan" href="mailto:shiyoux.tan@intel.com">
 <link rel="help" title="3.6 Relative sizing: the font-size-adjust property" href="http://www.w3.org/TR/css-fonts-3/#font-size-adjust-prop">
+<link rel="match" href="font-size-adjust-002-ref.html">
 <meta name="flags" content="Ahem">
 <meta name="assert" content="Test checks that the actual font size is less than the specified size when the value of font-size-adjust
 is less than the aspect value of font">
 <style>
   div {
-    font-family: Ahem;
-    font-size: 40px;
+    position: absolute;
+    font: 40px/40px Ahem;
+    color: blue;
   }
   #test {
-    color: blue;
+    color: orange;
     font-size-adjust: 0.2;
   }
 </style>
 <body>
-  <p>Test passes if the size of blue rectangle is less than the black rectangle.</p>
+  <p>Test passes if the size of the blue rectangle is greater than the orange rectangle.</p>
   <div>FillerText</div>
   <div id="test">FillerText</div>
 </body>
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/matching/README.md b/tests/wpt/web-platform-tests/css/css-fonts/matching/README.md
index 0d760752059e..653f4d933cd0 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/matching/README.md
+++ b/tests/wpt/web-platform-tests/css/css-fonts/matching/README.md
@@ -23,7 +23,7 @@ The **Variable Test Axis Matching** font contains reference glyphs 0-9 to match
 
 ### Building reference tests
 
-Using the **Variable Test Axis Matching** font, [reference tests](http://web-platform-tests.org/writing-tests/reftests.html) in this directory are created as follows:
+Using the **Variable Test Axis Matching** font, [reference tests](https://web-platform-tests.org/writing-tests/reftests.html) in this directory are created as follows:
 
  1. Define `@font-face`s with range expressions, which trigger variation axes to be applied to the variable font.
  2. Use CSS style definitions to request font faces from the set of declared `@font-face`s and use blocks of the glyph sequence MNOP.
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/font-feature-settings-rendering-2-expected.html b/tests/wpt/web-platform-tests/css/css-fonts/support/fonts/font-feature-settings-rendering-2-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/css/css-fonts/support/fonts/font-feature-settings-rendering-2-expected.html
rename to tests/wpt/web-platform-tests/css/css-fonts/support/fonts/font-feature-settings-rendering-2-ref.html
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-descriptors.html b/tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-descriptors.html
index 9a70d1d8b8b0..ece5b4be9b93 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-descriptors.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/variations/at-font-face-descriptors.html
@@ -118,8 +118,8 @@
             // Single value, calc
             { value: "calc(200.5%)",            isValid: true,  expectedValue: "200.5%", description: "Simple calc value" },
             { value: "calc(50%*2 - 20%)",       isValid: true,  expectedValue: "80%", description: "Valid calc expression" },
-            { value: "calc(-100%)",             isValid: false, description: "Negative calc value" },
-            { value: "calc(50% - 50%*2)",       isValid: false, description: "Negative calc expression" },
+            { value: "calc(-100%)",             isValid: true,  description: "Negative calc value (to be clamped)" },
+            { value: "calc(50% - 50%*2)",       isValid: true,  expectedValue: "calc(-50%)", description: "Negative calc expression (to be clamped)" },
             { value: "calc(100)",               isValid: false, description: "Unit-less calc value" },
             { value: "calc(100px)",             isValid: false, description: "Calc value with units" },
 
diff --git a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html b/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html
index 9d08d5b472ea..e00e3172c662 100644
--- a/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html
+++ b/tests/wpt/web-platform-tests/css/css-fonts/variations/font-weight-matching-installed-fonts.html
@@ -4,7 +4,6 @@
     <title>Testing new font-matching algorithm for font-weight values introduced in CSS Fonts level 4 (for system fonts)</title>
     <link rel="help" href="https://www.w3.org/TR/css-fonts-4/#font-matching-algorithm" />
     <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <!-- THIS TEST REQUIRES THAT YOU INSTALL THE [csstest-*.ttf] FONTS OF THE [resources] FOLDER -->
     <meta name="flags" content="font" />
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html
new file mode 100644
index 000000000000..2c21c8c13dc6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001-ref.html
@@ -0,0 +1,92 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Refttest Reference: Percentage size on child of a grid item with margin, border, padding and scrollbar</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<style>
+.grid {
+  display: inline-block;
+  border: solid 5px black;
+  width: 150px;
+  height: 100px;
+  margin: 10px;
+  vertical-align: top;
+}
+
+.item {
+  overflow: scroll;
+  border: solid magenta;
+  border-width: 12px 9px 6px 3px;
+  margin: 1px 2px 3px 4px;
+  padding: 5px 15px 10px 20px;
+  background: cyan;
+  width: calc(100% - 6px);
+  height: calc(100% - 4px);
+  box-sizing: border-box;
+}
+
+img {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+
+.horizontalTB { writing-mode: horizontal-tb; }
+.verticalLR { writing-mode: vertical-lr; }
+.verticalRL {  writing-mode: vertical-rl; }
+</style>
+
+<p>The test passes if in the different examples you see scrollbars but there's no overflow, so you cannot actually scroll.</p>
+
+<div class="grid">
+  <div class="item horizontalTB">
+    <img src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item horizontalTB">
+    <img class="verticalLR" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item horizontalTB">
+    <img class="verticalRL" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalLR">
+    <img src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalLR">
+    <img class="horizontalTB" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalLR">
+    <img class="verticalRL" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalRL">
+    <img src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalRL">
+    <img class="horizontalTB" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalRL">
+    <img class="verticalRL" src="support/100x100-green.png" />
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html b/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html
new file mode 100644
index 000000000000..190277a1ed1e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/grid-items/percentage-size-replaced-subitems-001.html
@@ -0,0 +1,91 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Test: Percentage size on replaced child of a grid item with margin, border, padding and scrollbar</title>
+<link rel="author" title="Manuel Rego Casasnovas" href="mailto:rego@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#grid-items">
+<link rel="match" href="percentage-size-replaced-subitems-001-ref.html">
+<meta name="assert" content="Checks that grid items replaced children resolve properly their percentage sizes, even when the grid item has margin, border, padding and scrollbar.">
+<style>
+.grid {
+  display: inline-grid;
+  border: solid 5px black;
+  grid: 100px / 150px;
+  margin: 10px;
+  vertical-align: top;
+}
+
+.item {
+  overflow: scroll;
+  border: solid magenta;
+  border-width: 12px 9px 6px 3px;
+  margin: 1px 2px 3px 4px;
+  padding: 5px 15px 10px 20px;
+  background: cyan;
+}
+
+img {
+  width: 100%;
+  height: 100%;
+  display: block;
+}
+
+.horizontalTB { writing-mode: horizontal-tb; }
+.verticalLR { writing-mode: vertical-lr; }
+.verticalRL {  writing-mode: vertical-rl; }
+</style>
+
+<p>The test passes if in the different examples you see scrollbars but there's no overflow, so you cannot actually scroll.</p>
+
+<div class="grid">
+  <div class="item horizontalTB">
+    <img src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item horizontalTB">
+    <img class="verticalLR" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item horizontalTB">
+    <img class="verticalRL" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalLR">
+    <img src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalLR">
+    <img class="horizontalTB" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalLR">
+    <img class="verticalRL" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalRL">
+    <img src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalRL">
+    <img class="horizontalTB" src="support/100x100-green.png" />
+  </div>
+</div>
+
+<div class="grid">
+  <div class="item verticalRL">
+    <img class="verticalRL" src="support/100x100-green.png" />
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html
new file mode 100644
index 000000000000..9fb0f4ffa1c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-grid/layout-algorithm/grid-intrinsic-size-with-orthogonal-items.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>CSS Grid Layout Test: Compute the grid's intrinsic size when there are orthogonal items</title>
+<link rel="author" title="Javier Fernandez Garcia-Boente" href="mailto:jfernandez@igalia.com">
+<link rel="help" href="https://drafts.csswg.org/css-grid-1/#algo-overview">
+<link rel="help" href="https://drafts.csswg.org/css-writing-modes-4/#establish-an-orthogonal-flow">
+<meta name="assert" content="The test checks that using track's max sizing function to estimate orthogonal items' block-axis size to compute the grid's intrinsic size may lead to content overflow.">
+<style>
+.grid {
+    display: inline-grid;
+    font: 25px/1 Ahem;
+    background: green;
+    height: 150px;
+}
+
+.item { writing-mode: vertical-lr; }
+
+.minmax-100-200 { grid: minmax(100px, 200px) / auto; }
+.minmax-auto-200 { grid: minmax(100px, 200px) / auto; }
+.minmax-auto-100 { grid: minmax(auto, 100px) / auto; }
+.minmax-100-auto { grid: minmax(100px, auto) / auto; }
+.minmax-100-fitcontent { grid: minmax(100px, fit-content) / auto; }
+.minmax-100-1fr { grid: minmax(100px, 1fr) / auto; }
+</style>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<body onload="checkLayout('.grid')">
+
+<pre>rows: auto</pre>
+
+<div class="grid" data-expected-width="25" data-expected-height="150">
+    <div class="item" data-expected-width="75" data-expected-height="150">XXX XX X XXX XX X</div>
+</div>
+
+<pre>rows: minmax(100px, 200px)</pre>
+
+<div class="grid minmax-100-200" data-expected-width="50" data-expected-height="150">
+    <div class="item" data-expected-width="75" data-expected-height="150">XXX XX X XXX XX X</div>
+</div>
+
+<pre>rows: minmax(auto, 200px)</pre>
+
+<div class="grid minmax-auto-200" data-expected-width="50" data-expected-height="150">
+    <div class="item" data-expected-width="75" data-expected-height="150">XXX XX X XXX XX X</div>
+</div>
+
+<pre>rows: minmax(100px, auto)</pre>
+
+<div class="grid minmax-100-auto" data-expected-width="25" data-expected-height="150">
+    <div class="item" data-expected-width="75" data-expected-height="150">XXX XX X XXX XX X</div>
+</div>
+
+<pre>rows: minmax(auto, 100px)</pre>
+
+<div class="grid minmax-auto-100" data-expected-width="100" data-expected-height="150">
+    <div class="item" data-expected-width="100" data-expected-height="100">XXX XX X XXX XX X</div>
+</div>
+
+<pre>rows: minmax(100px, fit-content)</pre>
+
+<div class="grid minmax-auto-fitcontent" data-expected-width="25" data-expected-height="150">
+    <div class="item" data-expected-width="75" data-expected-height="150">XXX XX X XXX XX X</div>
+</div>
+
+<pre>rows: minmax(100px, 1fr)</pre>
+
+<div class="grid minmax-auto-1fr" data-expected-width="25" data-expected-height="150">
+    <div class="item" data-expected-width="75" data-expected-height="150">XXX XX X XXX XX X</div>
+</div>
+
diff --git a/tests/wpt/web-platform-tests/css/css-images/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/css-images/parsing/resources/parsing-testcommon.js
index 9427f53d81bc..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/css-images/parsing/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/css-images/parsing/resources/parsing-testcommon.js
@@ -12,18 +12,18 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "", "property should be set");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
+        var readValue = div.style.getPropertyValue(property);
         if (serializedValue instanceof Array)
-            assert_true(serializedValue.includes(readValue), "serialization should be sound");
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
             assert_equals(readValue, serializedValue, "serialization should be canonical");
 
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue, "serialization should round-trip");
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
 
     }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
@@ -34,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/css-masking/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/css-masking/parsing/resources/parsing-testcommon.js
index 9427f53d81bc..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/css-masking/parsing/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/css-masking/parsing/resources/parsing-testcommon.js
@@ -12,18 +12,18 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "", "property should be set");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
+        var readValue = div.style.getPropertyValue(property);
         if (serializedValue instanceof Array)
-            assert_true(serializedValue.includes(readValue), "serialization should be sound");
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
             assert_equals(readValue, serializedValue, "serialization should be canonical");
 
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue, "serialization should round-trip");
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
 
     }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
@@ -34,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/css-properties-values-api/OWNERS b/tests/wpt/web-platform-tests/css/css-properties-values-api/OWNERS
new file mode 100644
index 000000000000..00afa92246e8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-properties-values-api/OWNERS
@@ -0,0 +1,2 @@
+@tabatkins
+@astearns
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-001.html b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-001.html
new file mode 100644
index 000000000000..b0a95ac68656
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-001.html
@@ -0,0 +1,42 @@
+<!doctype html>
+<title>CSS Test: @keyframes applies in the shadow tree.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#selectors-data-model">
+<!--
+  Beware of https://github.com/w3c/csswg-drafts/issues/1995 potentially, but
+  unlikely, changing the expected result of this test.
+-->
+<style>
+#in-document {
+  width: 100px;
+  height: 100px;
+  background: blue;
+  animation: myanim 10s infinite;
+}
+</style>
+<div id="host"><div id="in-document"></div></div>
+<script>
+test(function() {
+  host.attachShadow({ mode: "open" }).innerHTML = `
+    <style>
+      @keyframes myanim {
+        from { background: red; }
+        to { background: green; }
+      }
+      #in-shadow {
+        width: 100px;
+        height: 100px;
+        background: blue;
+        animation: myanim 10s infinite;
+      }
+    </style>
+    <slot></slot>
+    <div id="in-shadow"></div>
+  `;
+
+  assert_equals(document.getElementById('in-document').getAnimations().length, 0);
+  assert_equals(host.shadowRoot.getElementById('in-shadow').getAnimations().length, 1);
+}, "@keyframes applies in the shadow tree")
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/keyframes-002.html b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-002.html
new file mode 100644
index 000000000000..b80b250460be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/keyframes-002.html
@@ -0,0 +1,34 @@
+<!doctype html>
+<title>CSS Test: @keyframes from the document don't apply in the shadow tree.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-scoping/#selectors-data-model">
+<!--
+  Beware of https://github.com/w3c/csswg-drafts/issues/1995 potentially, but
+  unlikely, changing the expected result of this test.
+-->
+<style>
+@keyframes myanim {
+  from { background: red; }
+  to { background: red; }
+}
+</style>
+<div id="host"></div>
+<script>
+test(function() {
+  host.attachShadow({ mode: "open" }).innerHTML = `
+    <style>
+      #in-shadow {
+        width: 100px;
+        height: 100px;
+        background: blue;
+        animation: myanim 10s infinite;
+      }
+    </style>
+    <div id="in-shadow"></div>
+  `;
+
+  assert_equals(host.shadowRoot.getElementById('in-shadow').getAnimations().length, 0);
+}, "@keyframes from the document don't apply in the shadow tree");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-001.html b/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-001.html
new file mode 100644
index 000000000000..a91fca8ce132
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-001.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: title attribute in stylesheets not in the document tree is ignored</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/cssom/#preferred-css-style-sheet-set-name">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-style-title">
+<link rel="help" href="https://github.com/w3c/webcomponents/issues/535">
+<link rel="match" href="reference/green-box.html">
+<p>Test passes if you see a single 100px by 100px green box below.</p>
+<div id="host"></div>
+<script>
+  host.attachShadow({ mode: "open" }).innerHTML = `
+    <style>
+      div { width: 100px; height: 100px; }
+    </style>
+    <style title="Foo">
+      div { background: purple }
+    </style>
+    <style title="Bar">
+      div { background: green }
+    </style>
+    <div></div>
+  `;
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-002.html b/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-002.html
new file mode 100644
index 000000000000..2843ada3eead
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scoping/stylesheet-title-002.html
@@ -0,0 +1,36 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: title attribute in stylesheets not in the document tree is ignored</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/cssom/#preferred-css-style-sheet-set-name">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-style-title">
+<link rel="help" href="https://github.com/w3c/webcomponents/issues/535">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="host"></div>
+<script>
+test(function() {
+  host.attachShadow({ mode: "open" }).innerHTML = `
+    <style>
+      div { width: 100px; height: 100px; }
+    </style>
+    <style title="Foo">
+      div { background: purple }
+    </style>
+    <style title="Bar">
+      div { background: green }
+    </style>
+    <div></div>
+  `;
+  assert_equals(host.shadowRoot.styleSheets.length, 3);
+  for (let sheet of host.shadowRoot.styleSheets) {
+    assert_equals(sheet.title, null, "Sheet outside of the document generates no setter");
+    sheet.title = "Foo";
+    assert_equals(sheet.title, null, "Mutation doesn't change the sheet title");
+  }
+  for (let element of host.shadowRoot.querySelectorAll("style")) {
+    element.setAttribute("title", "Foo");
+    assert_equals(element.sheet.title, null, "Attribute mutation doesn't change the sheet title");
+  }
+}, "Title attribute in stylesheets not in the document tree is ignored");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-anchoring/OWNERS b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/OWNERS
new file mode 100644
index 000000000000..4d8fac449153
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-anchoring/OWNERS
@@ -0,0 +1 @@
+@tabatkins
diff --git a/tests/wpt/web-platform-tests/css/css-scroll-snap/OWNERS b/tests/wpt/web-platform-tests/css/css-scroll-snap/OWNERS
new file mode 100644
index 000000000000..4d8fac449153
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-scroll-snap/OWNERS
@@ -0,0 +1 @@
+@tabatkins
diff --git a/tests/wpt/web-platform-tests/css/css-shadow-parts/OWNERS b/tests/wpt/web-platform-tests/css/css-shadow-parts/OWNERS
new file mode 100644
index 000000000000..4d8fac449153
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shadow-parts/OWNERS
@@ -0,0 +1 @@
+@tabatkins
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/css-shapes/parsing/resources/parsing-testcommon.js
index 9427f53d81bc..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/parsing/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/css-shapes/parsing/resources/parsing-testcommon.js
@@ -12,18 +12,18 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "", "property should be set");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
+        var readValue = div.style.getPropertyValue(property);
         if (serializedValue instanceof Array)
-            assert_true(serializedValue.includes(readValue), "serialization should be sound");
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
             assert_equals(readValue, serializedValue, "serialization should be canonical");
 
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue, "serialization should round-trip");
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
 
     }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
@@ -34,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html
new file mode 100644
index 000000000000..eb04734cd5da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-009.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: vertical-rl and text-orientation: sideways</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient under vertical-rl and text-orientation: sideways."/>
+    <style type="text/css">
+    .container {
+      writing-mode: vertical-rl;
+      text-orientation: sideways;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the top. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 50%, transparent 50%);
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the bottom. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 50%, transparent 50%);
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html
new file mode 100644
index 000000000000..26335a6b5278
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-010.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: vertical-lr and text-orientation: sideways</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient under vertical-lr and text-orientation: sideways."/>
+    <style type="text/css">
+    .container {
+      writing-mode: vertical-lr;
+      text-orientation: sideways;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the top. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 50%, transparent 50%);
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the bottom. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 50%, transparent 50%);
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html
new file mode 100644
index 000000000000..3daa63c497a5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-011.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: vertical-rl</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient with shape-margin under vertical-rl."/>
+    <style type="text/css">
+    .container {
+      writing-mode: vertical-rl;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the top. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 25%, transparent 25%);
+      shape-margin: 25%;
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the bottom. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 5%, transparent 5%);
+      shape-margin: 45%
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html
new file mode 100644
index 000000000000..52f5e8a8a271
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-012.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: vertical-lr</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient with shape-margin under vertical-lr."/>
+    <style type="text/css">
+    .container {
+      writing-mode: vertical-lr;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the top. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 25%, transparent 25%);
+      shape-margin: 25%;
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the bottom. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 5%, transparent 5%);
+      shape-margin: 45%
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html
new file mode 100644
index 000000000000..66a285006406
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-013.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: sideways-rl</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient with shape-margin under sideways-rl."/>
+    <style type="text/css">
+    .container {
+      writing-mode: sideways-rl;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the top. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 25%, transparent 25%);
+      shape-margin: 25%;
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the bottom. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 5%, transparent 5%);
+      shape-margin: 45%
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html
new file mode 100644
index 000000000000..91ba3efa08a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-014.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: sideways-lr</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient with shape-margin under sideways-lr."/>
+    <style type="text/css">
+    .container {
+      writing-mode: sideways-lr;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the bottom. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 25%, transparent 25%);
+      shape-margin: 25%;
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the top. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 5%, transparent 5%);
+      shape-margin: 45%
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html
new file mode 100644
index 000000000000..382586a9dca6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-015.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: vertical-rl and text-orientation: sideways</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient with shape-margin under vertical-rl and text-orientation: sideways."/>
+    <style type="text/css">
+    .container {
+      writing-mode: vertical-rl;
+      text-orientation: sideways;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the top. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 25%, transparent 25%);
+      shape-margin: 25%;
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the bottom. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 5%, transparent 5%);
+      shape-margin: 45%
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html
new file mode 100644
index 000000000000..fe4524236b1c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/gradients/shape-outside-linear-gradient-016.html
@@ -0,0 +1,62 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>CSS Test: Test float with linear gradient under writing-mode: vertical-lr and text-orientation: sideways</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="author" title="Mozilla" href="http://www.mozilla.org/">
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin"/>
+    <link rel="match" href="reference/shape-outside-linear-gradient-001-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that shape-outside respects a simple linear gradient with shape-margin under vertical-lr and text-orientation: sideways."/>
+    <style type="text/css">
+    .container {
+      writing-mode: vertical-lr;
+      text-orientation: sideways;
+      inline-size: 100px;
+      block-size: 200px;
+      background-color: red;
+      font-family: Ahem;
+      font-size: 50px;
+      line-height: 1;
+    }
+    #test {
+      color: green;
+    }
+    #float-left {
+      /* Note: In .container's writing-mode, "float: left" actually floats
+         us towards the top. */
+      float: left;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to bottom, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to bottom, green 25%, transparent 25%);
+      shape-margin: 25%;
+    }
+    #float-right {
+      /* Note: In .container's writing-mode, "float: right" actually floats
+         us towards the bottom. */
+      float: right;
+      inline-size: 100px;
+      block-size: 200px;
+      background: linear-gradient(to top, green 50%, transparent 50%);
+      shape-outside: linear-gradient(to top, green 5%, transparent 5%);
+      shape-margin: 45%
+    }
+    </style>
+  </head>
+  <body>
+    <p>
+      The test passes if you see a green square. There should be no red.
+    </p>
+    <div id="test" class="container">
+      <div id="float-left"></div>
+      x x x x
+    </div>
+    <div id="test" class="container" style="direction: rtl;">
+      <div id="float-right"></div>
+      x x x x
+    </div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html
new file mode 100644
index 000000000000..40482f8b9702
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/shape-image/shape-image-026.html
@@ -0,0 +1,69 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>CSS Test: left float, url(png), real offset image + shape-margin (px)</title>
+    <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shapes-from-image"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property"/>
+    <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property"/>
+    <link rel="match" href="reference/shape-image-006-ref.html"/>
+    <meta name="flags" content="ahem"/>
+    <meta name="assert" content="This test verifies that content wraps around all the image pixels
+                                 + the shape-margin when shape-outside is given a png file.
+                                 Additionally, the shape-outside: image element is offset from its
+                                 containing block."/>
+    <style type="text/css">
+        body {
+            margin: 0;
+        }
+        .container {
+          font: 50px/1 Ahem;
+          padding: 50px;
+          position: absolute;
+          top: 20px;
+          left: -40px;
+        }
+        #test {
+            width: 200px;
+            color: rgb(0,100,0);
+        }
+        #image {
+            float: left;
+            shape-outside: url("support/left-half-rectangle.png");
+            shape-margin: 10px;
+        }
+        .blue {
+            width: 2px;
+            height: 100px;
+            background-color: blue;
+        }
+        .left-line { left: 65px; }
+        .right-line { left: 125px; }
+
+        .failure {
+            left: 70px;
+            width: 50px;
+            height: 100px;
+            background-color: red;
+            z-index: -1;
+        }
+        .blue, .failure {
+            position: absolute;
+            top: 70px;
+        }
+    </style>
+</head>
+<body>
+    <p>
+        The test passes if the green rectangle on the right is completely between the two blue lines.
+        There should be no red.
+    </p>
+    <div id="test" class="container">
+        <img id="image" src="support/left-half-rectangle.png"/>
+        X<br/>X
+    </div>
+    <div class="blue left-line"></div>
+    <div class="blue right-line"></div>
+    <div class="failure"></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html
index fe30d4371f7a..fdf226ee09cc 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-029.html
@@ -30,7 +30,6 @@
             float: right;
             width: 200px;
             height: 200px;
-            background-color: green;
             shape-margin: 10px;
             shape-outside: inset(60px 10px 60px 110px round 70px 0px 0px 10px / 10px 0px 0px 20px);
         }
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html
new file mode 100644
index 000000000000..0daa382f1544
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-shapes/shape-outside/supported-shapes/inset/shape-outside-inset-030.html
@@ -0,0 +1,67 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: left float, offset inset, px units</title>
+        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-inset">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
+        <link rel="match" href="reference/shape-outside-inset-010-ref.html"/>
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="The test verfies that text flows around a
+                                     right float with a shape-outside defined as
+                                     an inset irregular elliptically rounded
+                                     rectangle in px units with a shape-margin.
+                                     Additionally, the shape-outside: inset element is
+                                     offset from its containing block.">
+    </head>
+    <style>
+        #container {
+            position: relative;
+            margin-left: 25px;
+        }
+        #red {
+            position: absolute;
+            width: 200px;
+            height: 200px;
+            background-color: red;
+        }
+        #test-container {
+            width: 200px;
+            height: 200px;
+            font: 25px/1 Ahem;
+            color: green;
+            text-align: right;
+            padding: 50px;
+            position: absolute;
+            top: -50px;
+            left: -50px;
+        }
+        #test-shape {
+            float: right;
+            width: 200px;
+            height: 200px;
+            shape-margin: 10px;
+            shape-outside: inset(60px 10px 60px 110px round 70px 0px 0px 10px / 10px 0px 0px 20px);
+        }
+        #static-shape {
+            position: absolute;
+            left: 100px;
+            width: 100px;
+            height: 100px;
+            top: 50px;
+            background-color: green;
+        }
+    </style>
+    <body>
+        <p>The test passes if there is a green square and no red.</p>
+        <div id="container">
+            <div id="red"></div>
+            <div id="test-container">
+                <div id="test-shape"></div>
+                XXXXXXXX XXXXXXXX XXXX XXXX XXXX XXXX XXXXXXXX XXXXXXXX
+            </div>
+            <div id="static-shape"></div>
+        </div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-010.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-010.html
index 4c4ce48d0c66..e85e74d6b067 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-010.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-010.html
@@ -30,8 +30,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [182, 199, 201, 199, 182, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the circle,
         the long green bar is beneath the circle, and no bars intersect the circle. There
@@ -47,8 +52,5 @@
         <span id="line-5">XXXXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [182, 199, 201, 199, 182, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-011.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-011.html
index eb4c19d60519..84defc554f1b 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-011.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-011.html
@@ -30,8 +30,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [218, 236, 238, 236, 218, 160]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the green horizontal bars are to the right of the circle,
         and no bars intersect the circle's shadow. There should be no red.
@@ -46,8 +51,5 @@
         <span id="line-5">XXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [218, 236, 238, 236, 218, 160]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-012.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-012.html
index 1d0b052e909e..1adf86e5832c 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-012.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-012.html
@@ -32,8 +32,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [181, 199, 201, 199, 181, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the circle, all
         intersect the shadow, none intersect the circle and the long green bar is beneath the
@@ -49,8 +54,5 @@
         <span id="line-5">XXXXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [181, 199, 201, 199, 181, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-013.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-013.html
index 35e4499b5309..a5945473b6fc 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-013.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-013.html
@@ -40,8 +40,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [200, 214, 216, 214, 200, 158, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the circle,
         the long green bar is beneath the circle, and no bars intersect the circle. There
@@ -59,8 +64,5 @@
         <span id="line-6">XXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [200, 214, 216, 214, 200, 158, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-014.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-014.html
index 91be9649adaf..307046bb685d 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-014.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-014.html
@@ -44,8 +44,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 3, [182, 198, 200, 198, 182, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the shape,
         the long green bar is beneath it, and no bars intersect it. There should be no red.
@@ -61,8 +66,5 @@
         <span id="line-5">XXXXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 3, [182, 198, 200, 198, 182, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-015.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-015.html
index 7f4a6f70b738..96c48f2bc021 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-015.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-015.html
@@ -32,8 +32,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [185, 199, 200, 199, 185, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the shape,
         the long green bar is beneath it, and no bars intersect it. There should be no red.
@@ -48,8 +53,5 @@
         <span id="line-5">XXXXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [185, 199, 200, 199, 185, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-016.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-016.html
index d3b82f629163..f34b5c4fa4fd 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-016.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-016.html
@@ -32,8 +32,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [185, 199, 200, 199, 185, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the shape,
         the long green bar is beneath it, and no bars intersect it. There should be no red.
@@ -48,8 +53,5 @@
         <span id="line-5">XXXXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [185, 199, 200, 199, 185, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-017.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-017.html
index ae28284c6353..160671c81eee 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-017.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-017.html
@@ -31,8 +31,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [185, 199, 200, 199, 185, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the shape,
         the long green bar is beneath it, and no bars intersect it. There should be no red.
@@ -47,8 +52,5 @@
         <span id="line-5">XXXXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [185, 199, 200, 199, 185, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-018.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-018.html
index ba2c3ffce85e..b95cfd1ce11b 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-018.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-018.html
@@ -37,8 +37,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [48, 88, 128, 168, 180, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the longest green horizontal bar is beneath the triangle and the
         rest of them are to its right and none intersect it. There should be no red.
@@ -54,8 +59,5 @@
         <span id="line-5">XXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [48, 88, 128, 168, 180, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-019.html b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-019.html
index 3ef311f4a1a6..5d19b35ad96b 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-019.html
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/shape-outside-019.html
@@ -39,8 +39,13 @@
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
     <script src="support/spec-example-utils.js"></script>
+    <script>
+    function checkFloats() {
+      approxShapeTest('test', 'line-', 2, [242, 256, 258, 256, 242, 204, 0]);
+    }
+    </script>
 </head>
-<body>
+<body onload="checkFloats();">
     <p>
         The test passes if the short green horizontal bars are the right of the black edge
         of circle, the long green bar is beneath it, and no bars intersect the black.
@@ -58,8 +63,5 @@
         <span id="line-6">XXXXXXXXXXXXXXX</span>
     </div>
     <div id="log"></div>
-    <script>
-        approxShapeTest('test', 'line-', 2, [242, 256, 258, 256, 242, 204, 0]);
-    </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/spec-example-utils.js b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/spec-example-utils.js
index 9f4a19e4c6d2..c5b0411ca270 100644
--- a/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/spec-example-utils.js
+++ b/tests/wpt/web-platform-tests/css/css-shapes/spec-examples/support/spec-example-utils.js
@@ -1,20 +1,11 @@
 function approxShapeTest(testId, linePrefix, epsilon, lineOffsets) {
     var isPositioned = { 'relative': true, 'fixed': true, 'absolute': true, 'sticky': true },
-        loops = 0,
         testDiv = document.getElementById(testId),
         testOffset = isPositioned[getComputedStyle(testDiv).position] ? 0 : testDiv.offsetLeft,
         firstLine = document.getElementById(linePrefix + '0');
 
     function runTest() {
-        if (firstLine.offsetLeft == testOffset) {
-            // wait for the shape image to load and layout to happen
-            if (loops > 100)
-                assert_unreached("Giving up waiting for shape layout to happen!");
-            else
-                loops++;
-            window.setTimeout(runTest, 5);
-            return;
-        }
+        assert_not_equals(firstLine.offsetLeft, testOffset, "Shape layout should have happened already.");
 
         for (var i = 0; i < lineOffsets.length; i++) {
             var line = document.getElementById(linePrefix + i);
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html
new file mode 100644
index 000000000000..aa735cffdbbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004-ref.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<title>Reference</title>
+
+<style>
+  /* establish context */
+  .container {
+    clear: both;
+    padding: 10px;
+    width: 0;
+  }
+
+  span {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background-color: blue;
+  }
+
+  /* visualize size contribution */
+  .container > div {
+    float: left;
+    border: solid orange 20px;
+    border-style: none solid;
+  }
+  .container > div > div {
+    border-right: solid 20px aqua;
+    writing-mode: vertical-rl;
+    width: 40px;
+    height: 20px;
+  }
+
+  /* controls for min-width */
+  /* content = 100% = 80px = 4ch + border */
+  /* choose sizes that are larger than content to see if how they take effect */
+  .container > div > .raw-percent {
+    width: 120px;
+  }
+  .container > div > .calc-percent,
+  .container > div > .no-percent {
+    width: 160px;
+  }
+</style>
+
+<!-- calculating min-content widths -->
+<div class='container'>
+  <div><div class="control"><span></span></div></div>
+</div>
+<div class='container'>
+  <div style='width: 60px;'><div class="raw-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div style='width: 60px;'><div class="calc-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="no-percent"><span></span></div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004.html
new file mode 100644
index 000000000000..6fc061abff4d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-004.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<title>Percentages of width on non-replaced blocks are ignored for intrinsic sizing and resolved afterwards</title>
+<link rel="help" href="https://www.w3.org/TR/css-sizing-3/#intrinsic-contribution">
+<link rel="match" href="intrinsic-percent-non-replaced-004-ref.html">
+
+<style>
+  /* establish context */
+  .container {
+    clear: both;
+    padding: 10px;
+    width: 0;
+  }
+
+  span {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background-color: blue;
+  }
+
+  /* visualize size contribution */
+  .container > div {
+    float: left;
+    border: solid orange 20px;
+    border-style: none solid;
+  }
+  .container > div > div {
+    border-right: solid 20px aqua;
+    writing-mode: vertical-rl;
+    width: 40px;
+    height: 20px;
+  }
+
+  /* test width */
+  /* content = 100% = 60px = 40px + border */
+  /* choose sizes that are different than content to see if how they take effect */
+  .raw-percent {
+    min-width: 200%;
+  }
+  .calc-percent {
+    min-width: calc(160px + 0%);
+  }
+  .no-percent {
+    min-width: 160px;
+  }
+</style>
+
+<!-- calculating min-content widths -->
+<div class='container'>
+  <div><div class="control"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="raw-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="calc-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="no-percent"><span></span></div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html
new file mode 100644
index 000000000000..38f480c0acdb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005-ref.html
@@ -0,0 +1,56 @@
+<!DOCTYPE html>
+<title>Reference</title>
+
+<style>
+  /* establish context */
+  .container {
+    clear: both;
+    padding: 10px;
+    width: 0;
+  }
+
+  span {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background-color: blue;
+  }
+
+  /* visualize size contribution */
+  .container > div {
+    float: left;
+    border: solid orange 20px;
+    border-style: none solid;
+  }
+  .container > div > div {
+    border-right: solid 20px aqua;
+    writing-mode: vertical-rl;
+    width: 80px;
+    height: 20px;
+  }
+
+  /* test width */
+  /* content = 100% = 100px = 80px + border */
+  /* choose sizes that are different than content to see if how they take effect */
+  .container > div > .raw-percent {
+    width: 50px;
+  }
+  .container > div > .calc-percent,
+  .container > div > .no-percent {
+    width: 40px;
+  }
+</style>
+
+<!-- calculating min-content widths -->
+<div class='container'>
+  <div><div class="control"><span></span></div></div>
+</div>
+<div class='container'>
+  <div style='width: 100px;'><div class="raw-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div style='width: 100px;'><div class="calc-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="no-percent"><span></span></div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005.html b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005.html
new file mode 100644
index 000000000000..f105d942043c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-sizing/intrinsic-percent-non-replaced-005.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<title>Percentages of width on non-replaced blocks are ignored for intrinsic sizing and resolved afterwards</title>
+<link rel="help" href="https://www.w3.org/TR/css-sizing-3/#intrinsic-contribution">
+<link rel="match" href="intrinsic-percent-non-replaced-005-ref.html">
+
+<style>
+  /* establish context */
+  .container {
+    clear: both;
+    padding: 10px;
+    width: 0;
+  }
+
+  span {
+    display: inline-block;
+    width: 20px;
+    height: 20px;
+    background-color: blue;
+  }
+
+  /* visualize size contribution */
+  .container > div {
+    float: left;
+    border: solid orange 20px;
+    border-style: none solid;
+  }
+  .container > div > div {
+    border-right: solid 20px aqua;
+    writing-mode: vertical-rl;
+    width: 80px;
+    height: 20px;
+  }
+
+  /* test width */
+  /* content = 100% = 100px = 80px + border */
+  /* choose sizes that are different than content to see if how they take effect */
+  .raw-percent {
+    max-width: 50%;
+  }
+  .calc-percent {
+    max-width: calc(40px + 0%);
+  }
+  .no-percent {
+    max-width: 40px;
+  }
+</style>
+
+<!-- calculating min-content widths -->
+<div class='container'>
+  <div><div class="control"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="raw-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="calc-percent"><span></span></div></div>
+</div>
+<div class='container'>
+  <div><div class="no-percent"><span></span></div></div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/css-syntax/unicode-range-selector.html b/tests/wpt/web-platform-tests/css/css-syntax/unicode-range-selector.html
new file mode 100644
index 000000000000..db09540bb08c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-syntax/unicode-range-selector.html
@@ -0,0 +1,20 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>Unicode range is not a token, and doesn't cause confusion in selectors</title>
+<link name="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/css-syntax/#urange">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style>
+  a { color: red }
+  u+a { color: green }
+</style>
+<u></u><a></a>
+<script>
+  test(function() {
+    assert_equals(
+      getComputedStyle(document.querySelector("a")).color,
+      "rgb(0, 128, 0)"
+    );
+  }, "Unicode range is not a token, and doesn't cause confusion in selectors");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-js.html b/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-js.html
index 3dcfa8c925db..11597fb31995 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-js.html
+++ b/tests/wpt/web-platform-tests/css/css-transforms/2d-rotate-js.html
@@ -3,11 +3,12 @@
 	<head>
 		<title>JS test: Rotate via javascript must show the correct computed rotation</title>
 		<link rel="author" title="Rick Hurst" href="http://mrkn.co/axegs">
-		<link rel="help" href="http://www.w3.org/TR/css-transforms-1/#transform-property">
+		<link rel="help" href="https://drafts.csswg.org/css-transforms-1/#serialization-of-the-computed-value">
+		<link rel="help" href="https://drafts.csswg.org/css-transforms-1/#serialization-of-transform-functions">
 		<script src="/resources/testharness.js"></script>
 		<script src="/resources/testharnessreport.js"></script>
 		<meta name="flags" content="svg">
-		<meta name="assert" content="Asserting that you can rotate an element with JS and it show up in CSS computed values not as a matrix but as the rotation">
+		<meta name="assert" content="Asserting that you can rotate an element with JS and it show up in CSS computed values as a matrix">
 		<style>
 			#box{
 				margin-top:30px;
@@ -26,8 +27,9 @@ <h1>Rotate via JS</h1>
 			test(function() {
 				var box = document.getElementById("box");
 				box.style.transform = "rotate(30deg)";
+				assert_equals(box.style.transform, "rotate(30deg)");
 				assert_equals(window.getComputedStyle(box).getPropertyValue("transform"),
-				              "rotate(30deg)");
+				              "matrix(0.866025, 0.5, -0.5, 0.866025, 0, 0)");
 			});
 		</script>
     </body>
diff --git a/tests/wpt/web-platform-tests/css/css-transforms/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/css-transforms/parsing/resources/parsing-testcommon.js
index 9427f53d81bc..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/css-transforms/parsing/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/css-transforms/parsing/resources/parsing-testcommon.js
@@ -12,18 +12,18 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "", "property should be set");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
+        var readValue = div.style.getPropertyValue(property);
         if (serializedValue instanceof Array)
-            assert_true(serializedValue.includes(readValue), "serialization should be sound");
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
             assert_equals(readValue, serializedValue, "serialization should be canonical");
 
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue, "serialization should round-trip");
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
 
     }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
@@ -34,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-invalid.html
new file mode 100644
index 000000000000..90bb5a1c8fb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-invalid.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing box-sizing with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#box-sizing">
+<meta name="assert" content="box-sizing supports only the grammar 'content-box | border-box'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("box-sizing", "auto");
+test_invalid_value("box-sizing", "content-box border-box");
+test_invalid_value("box-sizing", "fill-box");
+test_invalid_value("box-sizing", "margin-box");
+test_invalid_value("box-sizing", "padding-box");
+test_invalid_value("box-sizing", "view-box");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-valid.html
new file mode 100644
index 000000000000..3d23d473d83b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/box-sizing-valid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing box-sizing with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#box-sizing">
+<meta name="assert" content="box-sizing supports the full grammar 'content-box | border-box'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("box-sizing", "content-box");
+test_valid_value("box-sizing", "border-box");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-invalid.html
new file mode 100644
index 000000000000..9751b9b9d221
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-invalid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing caret-color with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#caret-color">
+<meta name="assert" content="caret-color supports only the grammar 'auto | <color>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("caret-color", "none");
+test_invalid_value("caret-color", "invert");
+test_invalid_value("caret-color", "50%");
+test_invalid_value("caret-color", "red green");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-valid.html
new file mode 100644
index 000000000000..81cfe25782a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/caret-color-valid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing caret-color with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#caret-color">
+<meta name="assert" content="caret-color supports the full grammar 'auto | <color>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("caret-color", "auto");
+test_valid_value("caret-color", "rgba(10, 20, 30, 0.4)");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-invalid.html
new file mode 100644
index 000000000000..bd055307135a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-invalid.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing cursor with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#cursor">
+<meta name="assert" content="cursor supports only the grammar.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("cursor", "en-resize");
+test_invalid_value("cursor", 'url("https://example.com/") alias');
+test_invalid_value("cursor", '1 2 url("https://example.com/"), copy');
+test_invalid_value("cursor", 'url("https://example.com/"), url("https://example.com/") 3, move');
+
+test_invalid_value("cursor", 'url("https://example.com/") 1px 2px, copy');
+test_invalid_value("cursor", 'url("https://example.com/"), url("https://example.com/") 3% 4%, move');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-valid.html
new file mode 100644
index 000000000000..20ea26754c60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/cursor-valid.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing cursor with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#cursor">
+<meta name="assert" content="cursor supports the full grammar.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("cursor", "auto");
+test_valid_value("cursor", "default");
+test_valid_value("cursor", "none");
+test_valid_value("cursor", "context-menu");
+test_valid_value("cursor", "help");
+test_valid_value("cursor", "pointer");
+test_valid_value("cursor", "progress");
+test_valid_value("cursor", "wait");
+test_valid_value("cursor", "cell");
+test_valid_value("cursor", "crosshair");
+test_valid_value("cursor", "text");
+test_valid_value("cursor", "vertical-text");
+test_valid_value("cursor", "alias");
+test_valid_value("cursor", "copy");
+test_valid_value("cursor", "move");
+test_valid_value("cursor", "no-drop");
+test_valid_value("cursor", "not-allowed");
+test_valid_value("cursor", "grab");
+test_valid_value("cursor", "grabbing");
+test_valid_value("cursor", "e-resize");
+test_valid_value("cursor", "n-resize");
+test_valid_value("cursor", "ne-resize");
+test_valid_value("cursor", "nw-resize");
+test_valid_value("cursor", "s-resize");
+test_valid_value("cursor", "se-resize");
+test_valid_value("cursor", "sw-resize");
+test_valid_value("cursor", "w-resize");
+test_valid_value("cursor", "ew-resize");
+test_valid_value("cursor", "ns-resize");
+test_valid_value("cursor", "nesw-resize");
+test_valid_value("cursor", "nwse-resize");
+test_valid_value("cursor", "col-resize");
+test_valid_value("cursor", "row-resize");
+test_valid_value("cursor", "all-scroll");
+test_valid_value("cursor", "zoom-in");
+test_valid_value("cursor", "zoom-out");
+
+test_valid_value("cursor", 'url("https://example.com/"), alias', ['url("https://example.com/"), alias', 'url(https://example.com/), alias']);
+test_valid_value("cursor", 'url("https://example.com/") 1 calc(2 + 0), copy', ['url("https://example.com/") 1 calc(2), copy', 'url("https://example.com/") 1 2, copy', 'url(https://example.com/) 1 2, copy']);
+test_valid_value("cursor", 'url("https://example.com/"), url("https://example.com/") 3 -4, move', ['url("https://example.com/"), url("https://example.com/") 3 -4, move', 'url(https://example.com/), url(https://example.com/) 3 -4, move']);
+test_valid_value("cursor", 'url("https://example.com/") 5 6, grab', ['url("https://example.com/") 5 6, grab', 'url(https://example.com/) 5 6, grab']);
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-invalid.html
new file mode 100644
index 000000000000..029c1e98dbf0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline-color with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-color">
+<meta name="assert" content="outline-color supports only the grammar '<color> | invert'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("outline-color", "auto");
+test_invalid_value("outline-color", "none");
+test_invalid_value("outline-color", "50%");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-mandatory.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-mandatory.html
new file mode 100644
index 000000000000..891bbc00a44b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-mandatory.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline-color with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-color">
+<meta name="assert" content="outline-color supports '<color>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("outline-color", "rgba(10, 20, 30, 0.4)");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-optional.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-optional.html
new file mode 100644
index 000000000000..bd3b9e6be67a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-color-valid-optional.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline-color with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-color">
+<meta name="assert" content="outline-color supports 'invert'.">
+<meta name="flags" content="may">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+// Conformant UAs may ignore the invert value on platforms that do not support color inversion of the pixels on the screen.
+test_valid_value("outline-color", "invert");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-invalid.html
new file mode 100644
index 000000000000..ea8d88b57d94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline">
+<meta name="assert" content="outline supports only the grammar '<outline-color> || <outline> || <outline>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("outline", "invert solid rgba(10, 20, 30, 0.4)");
+test_invalid_value("outline", "double invert groove");
+test_invalid_value("outline", "thin outset thick");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-invalid.html
new file mode 100644
index 000000000000..f5471600cc36
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline-offset with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-offset">
+<meta name="assert" content="outline-offset supports only the grammar '<length>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("outline-offset", "auto");
+test_invalid_value("outline-offset", "1%");
+test_invalid_value("outline-offset", "2px 3px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-valid.html
new file mode 100644
index 000000000000..a7064e552cf4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-offset-valid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline-offset with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline-offset">
+<meta name="assert" content="outline-offset supports the full grammar '<length>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("outline-offset", "0", "0px");
+test_valid_value("outline-offset", "1px");
+test_valid_value("outline-offset", "2em");
+test_valid_value("outline-offset", "calc(3rem + 4vw)");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-invalid.html
new file mode 100644
index 000000000000..1ea6230af7d6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 4: parsing outline-style with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui/#outline-style">
+<meta name="assert" content="outline-style supports only the grammar 'auto | <outline-line-style>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("outline-style", "hidden");
+test_invalid_value("outline-style", "dotted dashed");
+test_invalid_value("outline-style", "solid double groove ridge");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-valid.html
new file mode 100644
index 000000000000..cebf614508d1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-style-valid.html
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 4: parsing outline-style with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui/#outline-style">
+<meta name="assert" content="outline-style supports the full grammar 'auto | <outline-line-style>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("outline-style", "auto");
+test_valid_value("outline-style", "none");
+test_valid_value("outline-style", "dotted");
+test_valid_value("outline-style", "dashed");
+test_valid_value("outline-style", "solid");
+test_valid_value("outline-style", "double");
+test_valid_value("outline-style", "groove");
+test_valid_value("outline-style", "ridge");
+test_valid_value("outline-style", "inset");
+test_valid_value("outline-style", "outset");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-mandatory.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-mandatory.html
new file mode 100644
index 000000000000..f4cfe2cfd321
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-mandatory.html
@@ -0,0 +1,42 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline">
+<link rel="help" href="https://drafts.csswg.org/cssom/#serializing-css-values">
+<meta name="assert" content="outline supports the full grammar '<outline-color> || <outline> || <outline>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("outline", "rgba(10, 20, 30, 0.4)");
+
+test_valid_value("outline", "auto");
+test_valid_value("outline", "none"); // Edge serializes as "invert"
+test_valid_value("outline", "dotted");
+test_valid_value("outline", "dashed");
+test_valid_value("outline", "solid");
+test_valid_value("outline", "double");
+test_valid_value("outline", "groove");
+test_valid_value("outline", "ridge");
+test_valid_value("outline", "inset");
+test_valid_value("outline", "outset");
+
+test_valid_value("outline", "0", "0px");
+test_valid_value("outline", "1px");
+test_valid_value("outline", "calc(2em + 3ex)");
+test_valid_value("outline", "thin");
+test_valid_value("outline", "medium"); // Edge serializes as "invert"
+test_valid_value("outline", "thick");
+
+test_valid_value("outline", "dashed thin");
+test_valid_value("outline", "medium rgba(10, 20, 30, 0.4)", ["rgba(10, 20, 30, 0.4) medium", "rgba(10, 20, 30, 0.4)"]);
+
+test_valid_value("outline", "3px ridge rgba(10, 20, 30, 0.4)", "rgba(10, 20, 30, 0.4) ridge 3px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-optional.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-optional.html
new file mode 100644
index 000000000000..66ec8973e252
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-valid-optional.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing outline with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#outline">
+<link rel="help" href="https://drafts.csswg.org/cssom/#serializing-css-values">
+<meta name="assert" content="outline supports the full grammar '<outline-color> || <outline> || <outline>'.">
+<meta name="assert" content="outline serializes in canonical order, with shortest possible serialization.">
+<meta name="flags" content="may">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+// Conformant UAs may ignore the invert value on platforms that do not support color inversion of the pixels on the screen.
+test_valid_value("outline", "invert");
+test_valid_value("outline", "invert dotted 1px");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-invalid.html
new file mode 100644
index 000000000000..71cb53375495
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 4: parsing outline-width with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui/#outline-width">
+<meta name="assert" content="outline-width supports only the grammar '<border-width>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("outline-width", "auto");
+test_invalid_value("outline-width", "1%");
+test_invalid_value("outline-width", "thin medium thick medium thin");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-valid.html
new file mode 100644
index 000000000000..f68399150cbd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/outline-width-valid.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 4: parsing outline-width with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui/#outline-width">
+<meta name="assert" content="outline-width supports the full grammar '<border-width>'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("outline-width", "0", "0px");
+test_valid_value("outline-width", "1px");
+test_valid_value("outline-width", "2em");
+test_valid_value("outline-width", "calc(2em + 3ex)");
+test_valid_value("outline-width", "thin");
+test_valid_value("outline-width", "medium");
+test_valid_value("outline-width", "thick");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-invalid.html
new file mode 100644
index 000000000000..5fdb8ee71af5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-invalid.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing resize with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#resize">
+<meta name="assert" content="resize supports only the grammar 'none | both | horizontal | vertical'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("resize", "auto");
+test_invalid_value("resize", "horizontal vertical");
+test_invalid_value("resize", "both 0");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-valid.html
new file mode 100644
index 000000000000..e9f03d999496
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/resize-valid.html
@@ -0,0 +1,21 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing resize with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#resize">
+<meta name="assert" content="resize supports the full grammar 'none | both | horizontal | vertical'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("resize", "none");
+test_valid_value("resize", "both");
+test_valid_value("resize", "horizontal");
+test_valid_value("resize", "vertical");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/css-ui/parsing/resources/parsing-testcommon.js
similarity index 73%
rename from tests/wpt/web-platform-tests/css/css-backgrounds/resources/parsing-testcommon.js
rename to tests/wpt/web-platform-tests/css/css-ui/parsing/resources/parsing-testcommon.js
index 9427f53d81bc..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/css-backgrounds/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/resources/parsing-testcommon.js
@@ -12,18 +12,18 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "", "property should be set");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
+        var readValue = div.style.getPropertyValue(property);
         if (serializedValue instanceof Array)
-            assert_true(serializedValue.includes(readValue), "serialization should be sound");
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
             assert_equals(readValue, serializedValue, "serialization should be canonical");
 
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue, "serialization should round-trip");
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
 
     }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
@@ -34,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-invalid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-invalid.html
new file mode 100644
index 000000000000..f39748160a26
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-invalid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing text-overflow with invalid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#text-overflow">
+<meta name="assert" content="text-overflow supports only the grammar 'clip | ellipsis'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_invalid_value("text-overflow", "auto");
+test_invalid_value("text-overflow", "clip ellipsis clip");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-valid.html b/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-valid.html
new file mode 100644
index 000000000000..80f267eab770
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-ui/parsing/text-overflow-valid.html
@@ -0,0 +1,19 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>CSS UI Level 3: parsing text-overflow with valid values</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.csswg.org/css-ui-3/#text-overflow">
+<meta name="assert" content="text-overflow supports the full grammar 'clip | ellipsis'.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="resources/parsing-testcommon.js"></script>
+</head>
+<body>
+<script>
+test_valid_value("text-overflow", "clip");
+test_valid_value("text-overflow", "ellipsis");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/elementScroll-002.html b/tests/wpt/web-platform-tests/css/cssom-view/elementScroll-002.html
new file mode 100644
index 000000000000..a1a28aab9e53
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom-view/elementScroll-002.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>cssom-view - elementScroll - 002</title>
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrolltop">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-element-scrollleft">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="scroller1" style="height: 100px; width: 100px; overflow: scroll; background: red;">
+    <div style="background: green; margin-top: 100px; margin-left: 100px; width: 100px; height: 100px;"></div>
+</div>
+<div id="scroller2" style="height: 100px; width: 100px; overflow: hidden; background: red;">
+    <div style="background: green; margin-top: 100px; padding-left: 100px; width: 100px; height: 100px;"></div>
+</div>
+<div id="scroller3" style="height: 100px; width: 100px; overflow: scroll; background: red;">
+    <div style="background: green; padding-top: 100px; margin-left: 100px; width: 100px; height: 100px;"></div>
+</div>
+<div id="scroller4" style="height: 100px; width: 100px; overflow: hidden; background: red;">
+    <div style="background: green; padding-top: 100px; padding-left: 100px; width: 100px; height: 100px;"></div>
+</div>
+<script>
+    test(function () {
+        var scroller1 = document.getElementById("scroller1");
+
+        scroller1.scrollTop = 100;
+        scroller1.scrollLeft = 100;
+        assert_equals(scroller1.scrollTop, 100, "changed scrollTop should be 100");
+        assert_equals(scroller1.scrollLeft, 100, "changed scrollLeft should be 100");
+
+    }, "simple scroll with style: 'margin' and 'overflow: scroll'");
+    test(function () {
+        var scroller2 = document.getElementById("scroller2");
+
+        scroller2.scrollTop = 100;
+        scroller2.scrollLeft = 100;
+        assert_equals(scroller2.scrollTop, 100, "changed scrollTop should be 100");
+        assert_equals(scroller2.scrollLeft, 100, "changed scrollLeft should be 100");
+
+    }, "simple scroll with style: 'margin' and 'overflow: hidden'");
+    test(function () {
+        var scroller3 = document.getElementById("scroller3");
+
+        scroller3.scrollTop = 100;
+        scroller3.scrollLeft = 100;
+        assert_equals(scroller3.scrollTop, 100, "changed scrollTop should be 100");
+        assert_equals(scroller3.scrollLeft, 100, "changed scrollLeft should be 100");
+
+    }, "simple scroll with style: 'padding' and 'overflow: scroll'");
+    test(function () {
+        var scroller4 = document.getElementById("scroller4");
+
+        scroller4.scrollTop = 100;
+        scroller4.scrollLeft = 100;
+        assert_equals(scroller4.scrollTop, 100, "changed scrollTop should be 100");
+        assert_equals(scroller4.scrollLeft, 100, "changed scrollLeft should be 100");
+
+    }, "simple scroll with style: 'padding' and 'overflow: hidden'");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/interfaces.html b/tests/wpt/web-platform-tests/css/cssom-view/interfaces.html
index 366d275417ee..38de8dc6a440 100644
--- a/tests/wpt/web-platform-tests/css/cssom-view/interfaces.html
+++ b/tests/wpt/web-platform-tests/css/cssom-view/interfaces.html
@@ -3,7 +3,7 @@
 <!-- WARNING: These tests are preliminary and probably partly incorrect.  -->
 <title>CSSOM View automated IDL tests</title>
 <link rel="author" title="Ms2ger" href="mailto:Ms2ger@gmail.com">
-<link rel="help" href="https://drafts.csswg.org/cssom-1/#idl-index">
+<link rel="help" href="https://drafts.csswg.org/cssom-view-1/#idl-index">
 <script src=/resources/testharness.js></script>
 <script src=/resources/testharnessreport.js></script>
 <script src=/resources/WebIDLParser.js></script>
@@ -17,11 +17,11 @@ <h1>CSSOM View IDL tests</h1>
 <script>
 "use strict";
 
-function doTest([html, dom, uievents, cssom, geometry, cssom_view]) {
+function doTest([html, dom, uievents, cssom, cssom_view]) {
 
   var idlArray = new IdlArray();
   var svg = "interface SVGElement : Element {};";
-  idlArray.add_untested_idls(html + dom + svg + cssom + geometry);
+  idlArray.add_untested_idls(html + dom + svg + cssom);
   idlArray.add_untested_idls(uievents, { only: [
     'UIEvent',
     'UIEventInit',
@@ -45,7 +45,6 @@ <h1>CSSOM View IDL tests</h1>
     // "MouseEvent": ["new MouseEvent('foo')"],
     "Text": ["document.createTextNode('x')"],
     // "CSSPseudoElement": [],
-    "Document": ["document"],
   });
   idlArray.test();
 };
@@ -66,7 +65,6 @@ <h1>CSSOM View IDL tests</h1>
                       fetchData("/interfaces/dom.idl"),
                       fetchData("/interfaces/uievents.idl"),
                       fetchData("/interfaces/cssom.idl"),
-                      fetchData("/interfaces/geometry.idl"),
                       fetchData("/interfaces/cssom-view.idl"),
                       waitForLoad()])
                 .then(doTest);
diff --git a/tests/wpt/web-platform-tests/css/cssom/cssom-setProperty-shorthand.html b/tests/wpt/web-platform-tests/css/cssom/cssom-setProperty-shorthand.html
index fe2ad4731a1e..4c0f9a2f9392 100644
--- a/tests/wpt/web-platform-tests/css/cssom/cssom-setProperty-shorthand.html
+++ b/tests/wpt/web-platform-tests/css/cssom/cssom-setProperty-shorthand.html
@@ -42,8 +42,8 @@
 
             element = document.createElement('span');
 
-            function canSetProperty(propertyName) {
-                element.style.setProperty(propertyName, 'initial');
+            function canSetProperty(propertyName, priority) {
+                element.style.setProperty(propertyName, 'initial', priority);
                 return element.style.getPropertyValue(propertyName) == 'initial';
             }
 
@@ -56,13 +56,21 @@
                 var propertyName = shorthandProperties[i];
 
                 test(function(){
-                    assert_true(canSetProperty(propertyName), 'can setPropertyValue with shorthand');
+                    assert_true(canSetProperty(propertyName, ''), 'can setPropertyValue with shorthand');
                 }, 'shorthand ' + propertyName + ' can be set with setProperty');
 
                 test(function(){
                     assert_true(canRemoveProperty(propertyName), 'can setPropertyValue with shorthand');
                 }, 'shorthand ' + propertyName + ' can be removed with removeProperty');
 
+                test(function(){
+                    assert_true(canSetProperty(propertyName, 'important'), 'can setPropertyValue with shorthand');
+                }, 'shorthand ' + propertyName + ' can be set with setProperty and priority !important');
+
+                test(function(){
+                    assert_true(canRemoveProperty(propertyName), 'can setPropertyValue with shorthand');
+                }, 'shorthand ' + propertyName + ' can be removed with removeProperty even when set with !important');
+
             }
         </script>
     </body>
diff --git a/tests/wpt/web-platform-tests/css/cssom/historical.html b/tests/wpt/web-platform-tests/css/cssom/historical.html
index d956f1410dc8..ddd264c89195 100644
--- a/tests/wpt/web-platform-tests/css/cssom/historical.html
+++ b/tests/wpt/web-platform-tests/css/cssom/historical.html
@@ -11,6 +11,8 @@
   "preferredStyleSheetSet",
   "styleSheetSets",
   "enableStyleSheetsForSet",
+  "selectedStylesheetSet",
+  "preferredStylesheetSet",
 ].forEach(function(name) {
   test(function() {
     assert_false(name in document);
diff --git a/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-order.html b/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-order.html
new file mode 100644
index 000000000000..dc990131ab39
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-order.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/cssom/#add-a-css-style-sheet">
+<link rel="help" href="https://drafts.csswg.org/cssom/#create-a-css-style-sheet">
+<link rel="help" href="https://html.spec.whatwg.org/#update-a-style-block">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="t1">This text should be green</div>
+<script>
+function createStyleElement(text, title) {
+    var elm = document.createElement("style");
+    elm.setAttribute("title", title);
+    elm.appendChild(document.createTextNode(text));
+    return elm;
+}
+
+test(function() {
+    document.head.appendChild(createStyleElement("#t1 {color:green}", "preferred"));
+    document.head.appendChild(createStyleElement("#t1 {color:red}", "notpreferred"));
+
+    assert_equals(getComputedStyle(t1).color, "rgb(0, 128, 0)");
+}, "Preferred stylesheet where insertion order is reversed tree order");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-reversed-order.html b/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-reversed-order.html
new file mode 100644
index 000000000000..ff3a8b09010c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/preferred-stylesheet-reversed-order.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/cssom/#add-a-css-style-sheet">
+<link rel="help" href="https://drafts.csswg.org/cssom/#create-a-css-style-sheet">
+<link rel="help" href="https://html.spec.whatwg.org/#update-a-style-block">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="t1">This text should be green</div>
+<script>
+function createStyleElement(text, title) {
+    var elm = document.createElement("style");
+    elm.setAttribute("title", title);
+    elm.appendChild(document.createTextNode(text));
+    return elm;
+}
+
+test(function() {
+    document.head.insertBefore(createStyleElement("#t1 {color:green}", "preferred"), document.head.firstChild);
+    document.head.insertBefore(createStyleElement("#t1 {color:red}", "notpreferred"), document.head.firstChild);
+
+    assert_equals(getComputedStyle(t1).color, "rgb(0, 128, 0)");
+}, "Preferred stylesheet where insertion order is tree order");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/stylesheet-title.html b/tests/wpt/web-platform-tests/css/cssom/stylesheet-title.html
new file mode 100644
index 000000000000..77b1df9677a8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom/stylesheet-title.html
@@ -0,0 +1,39 @@
+<!doctype html>
+<meta charset="utf-8">
+<title>CSS Test: StyleSheet's title attribute</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="help" href="https://drafts.csswg.org/cssom/#preferred-css-style-sheet-set-name">
+<link rel="help" href="https://html.spec.whatwg.org/multipage/#attr-style-title">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<style></style>
+<style title=""></style>
+<style title="Preferred">
+  p { color: green; }
+</style>
+<style title="Not preferred">
+  p { color: red; }
+</style>
+<p id="test-element">Should be green</p>
+<script>
+test(function() {
+  assert_equals(
+    getComputedStyle(document.getElementById("test-element")).color,
+    "rgb(0, 128, 0)",
+    "Preferred style should apply"
+  );
+}, "Preferred style sheet name");
+
+test(function() {
+  let sheets = document.styleSheets;
+  let styleElements = Array.from(document.querySelectorAll("style"));
+  assert_equals(sheets.length, styleElements.length);
+  for (let i = 0; i < sheets.length; ++i) {
+    let titleAttr = styleElements[i].getAttribute("title");
+    if (titleAttr === null || titleAttr === "")
+      assert_equals(sheets[i].title, null, "Empty title returns null");
+    else
+      assert_equals(sheets[i].title, titleAttr, "Selected title is properly reflected");
+  }
+}, "StyleSheet.title");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/filter-effects/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/filter-effects/parsing/resources/parsing-testcommon.js
index 70a1c38fb38c..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/filter-effects/parsing/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/filter-effects/parsing/resources/parsing-testcommon.js
@@ -1,5 +1,8 @@
 'use strict';
 
+// serializedValue can be the expected serialization of value,
+// or an array of permitted serializations,
+// or omitted if value should serialize as value.
 function test_valid_value(property, value, serializedValue) {
     if (arguments.length < 3)
         serializedValue = value;
@@ -9,21 +12,20 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "");
-    }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
-    test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
-
-        if (Array.isArray(serializedValue))
-            assert_true(serializedValue.indexOf(readValue) >= 0, '"' + readValue + '" in ' + JSON.stringify(serializedValue));
+        var readValue = div.style.getPropertyValue(property);
+        if (serializedValue instanceof Array)
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
         else
-            assert_equals(readValue, serializedValue);
+            assert_equals(readValue, serializedValue, "serialization should be canonical");
+
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue);
-    }, "Serialization should round-trip after setting e.style['" + property + "'] = " + stringifiedValue);
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
+
+    }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
 
 function test_invalid_value(property, value) {
@@ -32,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/mediaqueries/test_media_queries.html b/tests/wpt/web-platform-tests/css/mediaqueries/test_media_queries.html
index c7b651d96c3e..57830f4d47fd 100644
--- a/tests/wpt/web-platform-tests/css/mediaqueries/test_media_queries.html
+++ b/tests/wpt/web-platform-tests/css/mediaqueries/test_media_queries.html
@@ -348,8 +348,16 @@
       expression_should_be_parseable(feature + ": 3.0dpi");
       expression_should_be_parseable(feature + ": 3.4dpi");
       expression_should_be_parseable(feature + "\t: 120dpcm");
+      expression_should_be_parseable(feature + ": 1dppx");
+      expression_should_be_parseable(feature + ": 1x");
+      expression_should_be_parseable(feature + ": 1.5dppx");
+      expression_should_be_parseable(feature + ": 1.5x");
+      expression_should_be_parseable(feature + ": 2.0dppx");
+      // TODO(emilio): Doesn't seem right to exclude 0 here.
       expression_should_not_be_parseable(feature + ": 0dpi");
       expression_should_not_be_parseable(feature + ": -3dpi");
+      expression_should_not_be_parseable(feature + ": 0dppx");
+      expression_should_not_be_parseable(feature + ": 0x");
     }
 
     // Find the resolution using max-resolution
@@ -370,6 +378,8 @@
     if (query_applies("(min-resolution: " + resolution + "dpi)")) {
       // It's exact!
       should_apply("(resolution: " + resolution + "dpi)");
+      should_apply("(resolution: " + Math.floor(resolution/96) + "dppx)");
+      should_apply("(resolution: " + Math.floor(resolution/96) + "x)");
       should_not_apply("(resolution: " + (resolution + 1) + "dpi)");
       should_not_apply("(resolution: " + (resolution - 1) + "dpi)");
       dpi_high = resolution + 1;
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/resources/parsing-testcommon.js b/tests/wpt/web-platform-tests/css/motion/parsing/resources/parsing-testcommon.js
index 688356bd0f9d..b075882f89aa 100644
--- a/tests/wpt/web-platform-tests/css/motion/parsing/resources/parsing-testcommon.js
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/resources/parsing-testcommon.js
@@ -1,5 +1,8 @@
 'use strict';
 
+// serializedValue can be the expected serialization of value,
+// or an array of permitted serializations,
+// or omitted if value should serialize as value.
 function test_valid_value(property, value, serializedValue) {
     if (arguments.length < 3)
         serializedValue = value;
@@ -9,17 +12,20 @@ function test_valid_value(property, value, serializedValue) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_not_equals(div.style[property], "");
-    }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
+        assert_not_equals(div.style.getPropertyValue(property), "", "property should be set");
 
-    test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        var readValue = div.style[property];
-        assert_equals(readValue, serializedValue);
+        var readValue = div.style.getPropertyValue(property);
+        if (serializedValue instanceof Array)
+            assert_in_array(readValue, serializedValue, "serialization should be sound");
+        else
+            assert_equals(readValue, serializedValue, "serialization should be canonical");
+
         div.style[property] = readValue;
-        assert_equals(div.style[property], readValue);
-    }, "Serialization should round-trip after setting e.style['" + property + "'] = " + stringifiedValue);
+        assert_equals(div.style.getPropertyValue(property), readValue, "serialization should round-trip");
+
+    }, "e.style['" + property + "'] = " + stringifiedValue + " should set the property value");
 }
 
 function test_invalid_value(property, value) {
@@ -28,6 +34,6 @@ function test_invalid_value(property, value) {
     test(function(){
         var div = document.createElement('div');
         div.style[property] = value;
-        assert_equals(div.style[property], "");
+        assert_equals(div.style.getPropertyValue(property), "");
     }, "e.style['" + property + "'] = " + stringifiedValue + " should not set the property value");
 }
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
index eb4d7f498156..fbee28923a48 100644
--- a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/reftest.list
@@ -60,6 +60,7 @@
 == shape-outside-circle-053.html shape-outside-circle-053-ref.html
 == shape-outside-circle-054.html shape-outside-circle-054-ref.html
 == shape-outside-circle-055.html shape-outside-circle-055-ref.html
+== shape-outside-circle-056.html shape-outside-circle-056-ref.html
 
 # Basic shape: ellipse()
 == shape-outside-ellipse-032.html shape-outside-ellipse-032-ref.html
@@ -82,6 +83,7 @@
 == shape-outside-ellipse-049.html shape-outside-ellipse-049-ref.html
 == shape-outside-ellipse-050.html shape-outside-ellipse-050-ref.html
 == shape-outside-ellipse-051.html shape-outside-ellipse-051-ref.html
+== shape-outside-ellipse-052.html shape-outside-ellipse-052-ref.html
 
 # Basic shape: inset()
 == shape-outside-inset-016.html shape-outside-inset-016-ref.html
@@ -112,3 +114,4 @@
 == shape-outside-polygon-029.html shape-outside-polygon-027-ref.html
 == shape-outside-polygon-030.html shape-outside-polygon-030-ref.html
 == shape-outside-polygon-031.html shape-outside-polygon-031-ref.html
+== shape-outside-polygon-032.html shape-outside-polygon-032-ref.html
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html
new file mode 100644
index 000000000000..f4f21058a666
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Reference File</title>
+        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com">
+    </head>
+    <style>
+       body {
+           margin: 0;
+       }
+       #container {
+           position: relative;
+       }
+       #line {
+           position: absolute;
+           top: 0px;
+           left: 168px;
+           width: 2px;
+           height: 200px;
+           border-left: 2px solid blue;
+       }
+       #square {
+           position: absolute;
+           top: 80px;
+           left: 170px;
+           width: 40px;
+           height: 40px;
+           background-color: green;
+       }
+    </style>
+    <body>
+        <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
+        <div id="container">
+            <div id="line"></div>
+            <div id="square"></div>
+        </div>
+    </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html
new file mode 100644
index 000000000000..056d40b257e0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-circle-056.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: left float, offset circle at top left + margin-box + shape-margin</title>
+        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-circle">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#margin-box">
+        <link rel="match" href="shape-outside-circle-056-ref.html">
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="The test verifies that text wraps around a
+                                     left float with a shape-outside defined as
+                                     a circle from the margin box and is positioned
+                                     top left with a shape-margin. Additionally, the
+                                     shape-outside: circle element is offset from
+                                     its containing block.">
+    </head>
+    <style>
+    body {
+        margin: 0;
+    }
+    #container {
+        position: relative;
+    }
+    #test-container {
+        font: 40px/1 Ahem, sans-serif;
+        width: 300px;
+        height: 200px;
+        padding: 50px;
+        position: absolute;
+        top: -50px;
+        left: -50px;
+        color: green;
+    }
+    #test-shape {
+        float: left;
+        width: 120px;
+        height: 120px;
+        margin: 10px;
+        padding: 10px;
+        border: 10px solid transparent;
+        shape-margin: 10px;
+        shape-outside: margin-box circle(99% at top left);
+    }
+    #line {
+        position: absolute;
+        top: 0px;
+        left: 168px;
+        width: 2px;
+        height: 200px;
+        border-left: 2px solid blue;
+    }
+    #failure {
+        position: absolute;
+        top: 80px;
+        left: 170px;
+        width: 40px;
+        height: 40px;
+        background-color: red;
+        z-index: -1;
+    }
+    </style>
+    <body>
+    <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
+    <div id="container">
+        <div id="test-container">
+            <div id="test-shape"></div>
+            <br/>
+            <br/>
+            X
+        </div>
+        <div id="line"></div>
+        <div id="failure"></div>
+    </div>
+    </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html
new file mode 100644
index 000000000000..f4f21058a666
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052-ref.html
@@ -0,0 +1,39 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Reference File</title>
+        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com">
+    </head>
+    <style>
+       body {
+           margin: 0;
+       }
+       #container {
+           position: relative;
+       }
+       #line {
+           position: absolute;
+           top: 0px;
+           left: 168px;
+           width: 2px;
+           height: 200px;
+           border-left: 2px solid blue;
+       }
+       #square {
+           position: absolute;
+           top: 80px;
+           left: 170px;
+           width: 40px;
+           height: 40px;
+           background-color: green;
+       }
+    </style>
+    <body>
+        <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
+        <div id="container">
+            <div id="line"></div>
+            <div id="square"></div>
+        </div>
+    </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html
new file mode 100644
index 000000000000..831b10168a4d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-ellipse-052.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: left float, offset ellipse + shape-margin in % units</title>
+        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-ellipse">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
+        <link rel="match" href="shape-outside-ellipse-052-ref.html">
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="The test verifies that text wraps around a
+                                     left float with a shape-outside defined as
+                                     a ellipse with a shape-margin in pixel units.
+                                     Additionally, the shape-outside: ellipse element
+                                     is offset from its containing block.">
+    </head>
+    <style>
+    body {
+        margin: 0;
+    }
+    #container {
+        position: relative;
+    }
+    #test-container {
+        font: 40px/1 Ahem, sans-serif;
+        width: 300px;
+        height: 200px;
+        color: green;
+        padding: 50px;
+        position: absolute;
+        top: -50px;
+        left: -50px;
+    }
+    #test-shape {
+        float: left;
+        width: 140px;
+        height: 140px;
+        margin: 10px;
+        padding: 10px;
+        border: 10px solid transparent;
+        shape-margin: 30px;
+        shape-outside: ellipse(40px 28px);
+    }
+    #line {
+        position: absolute;
+        top: 0px;
+        left: 168px;
+        width: 2px;
+        height: 200px;
+        border-left: 2px solid blue;
+    }
+    #failure {
+        position: absolute;
+        top: 80px;
+        left: 170px;
+        width: 40px;
+        height: 40px;
+        background-color: red;
+        z-index: -1;
+    }
+    </style>
+    <body>
+    <p>The test passes if there is a green square to the right of the blue line. There should be no red.</p>
+    <div id="container">
+        <div id="test-container">
+            <div id="test-shape"></div>
+            <br/>
+            <br/>
+            X
+        </div>
+        <div id="line"></div>
+        <div id="failure"></div>
+    </div>
+    </body>
+</html>
+
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html
new file mode 100644
index 000000000000..f1fcdf40d719
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032-ref.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Reference File</title>
+        <link rel="author" title="Rebecca Hauck" href="mailto:rhauck@adobe.com">
+    </head>
+    <style>
+       body {
+            margin: 0;
+        }
+       #green-square {
+          position: absolute;
+          top: 50px;
+          left: 10px;
+          width: 240px;
+          height: 240px;
+          background-color: green;
+      }
+    </style>
+    <body>
+        <p>The test passes if there is green square and no red.</p>
+        <div id="green-square"></div>
+    </body>
+</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html
new file mode 100644
index 000000000000..126e0b90ae1b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/vendor-imports/mozilla/mozilla-central-reftests/shapes1/shape-outside-polygon-032.html
@@ -0,0 +1,86 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <title>CSS Test: right float, offset polygon + margin-box + shape-margin</title>
+        <link rel="author" title="Brad Werth" href="mailto:bwerth@mozilla.com">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#funcdef-polygon">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-outside-property">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#shape-margin-property">
+        <link rel="help" href="http://www.w3.org/TR/css-shapes-1/#margin-box">
+        <link rel="match" href="shape-outside-polygon-032-ref.html">
+        <meta name="flags" content="ahem" />
+        <meta name="assert" content="The test verifies that text wraps around a
+                                     right float with a shape-outside defined as
+                                     an polygon from the margin box with a shape margin.
+                                     Additionally, the shape-outside: polygon element is
+                                     offset from its containing block.">
+    </head>
+    <style>
+        body {
+            margin: 0;
+        }
+        #red {
+            position: absolute;
+            top: 50px;
+            left: 10px;
+            width: 240px;
+            height: 240px;
+            background-color: red;
+        }
+        #container {
+            position: absolute;
+            top: 0px;
+            left: -40px;
+            font-size: 20px;
+            font-family: Ahem;
+            line-height: 20px;
+            width: 240px;
+            height: 240px;
+            padding: 50px;
+            color: green;
+        }
+        #test-shape {
+            float: right;
+            width: 120px;
+            height: 120px;
+            margin: 10px;
+            border: 10px solid transparent;
+            padding: 10px;
+            shape-margin: 20px;
+            shape-outside: margin-box polygon(20% 20%, 90% 20%, 90% 80%, 50% 80%, 50% 70%, 70% 70%, 70% 40%, 20% 40%);
+        }
+        .ref-shape {
+            position: absolute;
+            background-color: green;
+        }
+        #ref-1 {
+            top: 70px;
+            left: 70px;
+            width: 180px;
+            height: 80px;
+        }
+        #ref-2 {
+            top: 150px;
+            left: 150px;
+            width: 100px;
+            height: 20px;
+        }
+        #ref-3 {
+            top: 170px;
+            left: 130px;
+            width: 120px;
+            height: 60px;
+        }
+    </style>
+    <body>
+    <p>The test passes if there is green square and no red.</p>
+    <div id="red"></div>
+    <div id="container">
+        <div id="test-shape"></div>
+        XXXXXXXXXXXX XXX XXX XXX XXX XXXXXXX XXXXXX XXXXXX XXXXXX XXXXXXXXXXXX XXXXXXXXXXXX XXXXXXXXXXXX
+    </div>
+    <div id="ref-1" class="ref-shape"></div>
+    <div id="ref-2" class="ref-shape"></div>
+    <div id="ref-3" class="ref-shape"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/device-memory/OWNERS b/tests/wpt/web-platform-tests/device-memory/OWNERS
new file mode 100644
index 000000000000..3e7089cf2ccc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/device-memory/OWNERS
@@ -0,0 +1,2 @@
+@tdresser
+@npm1
diff --git a/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md b/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md
index 1785a8dd610f..8af8aaed580d 100644
--- a/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md
+++ b/tests/wpt/web-platform-tests/docs/_running-tests/chrome_android.md
@@ -19,7 +19,6 @@ Until we find a better way, we need to root the Android device and update the
 127.0.0.1   www2.web-platform.test
 127.0.0.1   xn--n8j6ds53lwwkrqhv28a.web-platform.test
 127.0.0.1   xn--lve-6lad.web-platform.test
-0.0.0.0     nonexistent-origin.web-platform.test
 ```
 
 ## CA certificate
diff --git a/tests/wpt/web-platform-tests/docs/_writing-tests/server-features.md b/tests/wpt/web-platform-tests/docs/_writing-tests/server-features.md
index 495426a8e2ac..a3cd4174d271 100644
--- a/tests/wpt/web-platform-tests/docs/_writing-tests/server-features.md
+++ b/tests/wpt/web-platform-tests/docs/_writing-tests/server-features.md
@@ -14,15 +14,18 @@ generation. This is supported through the
 
 ### Tests Involving Multiple Origins
 
-In the test environment, five subdomains are available: `www`, `www1`,
-`www2`, `天気の良い日`, and `élève`; there is also
-`nonexistent-origin` which is guaranteed not to resolve. In addition,
-the HTTP server listens on two ports, and the WebSockets server on
-one. These subdomains and ports must be used for cross-origin
-tests. Tests must not hardcode the hostname of the server that they
-expect to be running on or the port numbers, as these are not
-guaranteed by the test environment. Instead they can get this
-information in one of two ways:
+Our test servers are guaranteed to be accessible through two domains
+and five subdomains under each. The 'main' domain is unnamed; the
+other is called 'alt'. These subdomains are: `www`, `www1`, `www2`,
+`天気の良い日`, and `élève`; there is also `nonexistent` which is
+guaranteed not to resolve. In addition, the HTTP server listens on two
+ports, and the WebSockets server on one. These subdomains and ports
+must be used for cross-origin tests.
+
+Tests must not hardcode the hostname of the server that they expect to
+be running on or the port numbers, as these are not guaranteed by the
+test environment. Instead they can get this information in one of two
+ways:
 
 * From script, using the `location` API.
 
@@ -33,15 +36,19 @@ form `{name}.sub.{ext}` e.g. `example-test.sub.html` or be referenced
 through a URL containing `pipe=sub` in the query string
 e.g. `example-test.html?pipe=sub`. The substitution syntax uses `{%
 raw %}{{ }}{% endraw %}` to delimit items for substitution. For
-example to substitute in the host name on which the tests are running,
-one would write: `{% raw %}{{host}}{% endraw %}`.
-
-
-As well as the host, one can get full domains, including subdomains
-using the `domains` dictionary. For example, `{% raw
-%}{{domains[www]}}{% endraw %}` or `{% raw %}{{domains[élève]}}{%
-endraw %}` would be replaced by the full qualified domain name of the
-respective subdomains.
+example to substitute in the main host name, one would write:
+`{% raw %}{{host}}{% endraw %}`.
+
+To get full domains, including subdomains, there is the `hosts`
+dictionary, where the first dimension is the name of the domain, and
+the second the subdomain. For example, `{% raw %}{{hosts[][www]}}{%
+endraw %}` would give the `www` subdomain under the main (unnamed)
+domain, and `{% raw %}{{hosts[alt][élève]}}{% endraw %}` would give
+the `élève` subdomain under the alt domain.
+
+For mostly historic reasons, the subdomains of the main domain are
+also available under the `domains` dictionary; this is identical to
+`hosts[]`.
 
 Ports are also available on a per-protocol basis. For example, `{% raw
 %}{{ports[ws][0]}}{% endraw %}` is replaced with the first (and only)
diff --git a/tests/wpt/web-platform-tests/docs/_writing-tests/testdriver-tutorial.md b/tests/wpt/web-platform-tests/docs/_writing-tests/testdriver-tutorial.md
new file mode 100644
index 000000000000..0b2165cb1e47
--- /dev/null
+++ b/tests/wpt/web-platform-tests/docs/_writing-tests/testdriver-tutorial.md
@@ -0,0 +1,317 @@
+# Adding new commands to testdriver.js
+
+## Assumptions
+We assume the following in this writeup:
+ - You know what web-platform-tests is and you have a working checkout and can run tests
+ - You know what WebDriver or Selenium is
+ - Familiarity with JavaScript and Python
+
+## Introduction!
+
+Let's implement window resizing. We can do this via the [Set Window Rect](https://w3c.github.io/webdriver/webdriver-spec.html#dfn-set-window-rect) command in WebDriver.
+
+First, we need to think of what the API will look like a little. We will be using Selenium and Marionette for this, so we can look and see that they take in x, y coordinates, width and height integers.
+
+The first part of this will be browser agnostic, but later we will need to implement a specific layer for each browser (here we will do Firefox and Chrome).
+
+## Code!
+
+### [resources/testdriver.js](resources/testdriver.js)
+
+This is the main entry point the tests get. Here we need to add a function to the `test_driver` object that will call the `test_driver_internal` object.
+
+```javascript
+window.test_driver = {
+
+    // other commands...
+
+    /**
+    * Triggers browser window to be resized and relocated
+    *
+    * This matches the behaviour of the {@link
+    * https://w3c.github.io/webdriver/webdriver-spec.html#dfn-set-window-rect|WebDriver
+    * Set Window Rect command}.
+    *
+    * @param {Integer} x - The x coordinate of the top left of the window
+    * @param {Integer} y - The x coordinate of the top left of the window
+    * @param {Integer} width - The width of the window
+    * @param {Integer} height - The width of the window
+    * @returns {Promise} fulfilled after window rect is set occurs, or rejected in
+    *                    the cases the WebDriver command errors
+    */
+    set_window_rect: function(x, y, width, height) {
+        return window.test_driver_internal.set_element_rect(x, y, width, height);
+    }
+```
+
+In the same file, lets add to the internal object. ( do we need to do this?) (make sure to do this if the internal call has different arguments than the external call, especially if it calls multiple internal calls)
+
+```javascript
+window.test_driver_internal = {
+
+    // other commands...
+
+    /**
+     * Triggers browser window to be resized and relocated
+     *
+     * This matches the behaviour of the {@link
+     * https://w3c.github.io/webdriver/webdriver-spec.html#dfn-set-window-rect|WebDriver
+     * Set Window Rect command}.
+     *
+     * @param {Integer} x - The x coordinate of the top left of the window
+     * @param {Integer} y - The x coordinate of the top left of the window
+     * @param {Integer} width - The width of the window
+     * @param {Integer} height - The width of the window
+     * @returns {Promise} fulfilled after window rect is set occurs, or rejected in
+     *                    the cases the WebDriver command errors
+     */
+    set_window_rect: function(x, y, width, height) {
+        return Promise.reject(new Error("unimplemented"))
+    }
+```
+We will leave this unimplemented and override it in another file. Lets do that now!
+
+### [wptrunner/wptrunner/testdriver-extra.js](tools/wptrunner/wptrunner/testdriver-extra.js)
+
+This will be the default function called when invoking the test driver commands (sometimes it is overridden by testdriver-vendor.js, but this is outside the scope of this writeup).
+
+```javascript
+window.test_driver_internal.set_element_rect = function(x, y, width, height) {
+    const pending_promise = new Promise(function(resolve, reject) {
+        pending_resolve = resolve;
+        pending_reject = reject;
+    });
+    window.opener.postMessage(
+        {"type": "action", "action": "set_window_rect", "x": x, "y": y, "width": width, "height": height}, "*");
+    return pending_promise;
+};
+```
+The main thing here is the `postMessage` argument. The first argument is an object with properties
+ - `type`: this always has to be the string `"action"`
+ - `action`: the name of the testdriver command this defines (in this case, `set_window_rect`)
+ - any other things you want to pass to the next point of execution (in this case, the x, y coordinates and the width and height)
+
+<!-- The pending promise needs to be there as it is resolved when the window recieves a completion message from the executor. -->
+The pending promise is out of scope of this function and is resolved when the window recieves a completion message from the executor.
+This happens here in the same file:
+
+```javascript
+    let pending_resolve = null;
+    let pending_reject = null;
+    window.addEventListener("message", function(event) {
+        const data = event.data;
+
+        if (typeof data !== "object" && data !== null) {
+            return;
+        }
+
+        if (data.type !== "testdriver-complete") {
+            return;
+        }
+
+        if (data.status === "success") {
+            pending_resolve();
+        } else {
+            pending_reject();
+        }
+    });
+```
+
+One limitation this introduces is that only one testdriver call can be made at one time since the `pending_resolve` and `pending_reject` variables are in an outer scope.
+
+Next, this is passed to the executor and protocol in wptrunner. Time to switch to Python!
+
+[tools/wptrunner/wptrunner/executors/protocol.py](tools/wptrunner/wptrunner/executors/protocol.py)
+
+```python
+class SetWindowRectProtocolPart(ProtocolPart):
+    """Protocol part for resizing and changing location of window"""
+    __metaclass__ = ABCMeta
+
+    name = "set_window_rect"
+
+    @abstractmethod
+    def set_window_rect(self, x, y, width, height):
+        """Change the window rect
+
+        :param x: The x coordinate of the top left of the window.
+        :param y: The y coordinate of the top left of the window.
+        :param width: The width of the window.
+        :param height: The height of the window."""
+        pass
+```
+
+Next we change the base executor.
+
+[tools/wptrunner/wptrunner/executors/base.py](tools/wptrunner/wptrunner/executors/base.py)
+
+```python
+class CallbackHandler(object):
+    """Handle callbacks from testdriver-using tests.
+
+    The default implementation here makes sense for things that are roughly like
+    WebDriver. Things that are more different to WebDriver may need to create a
+    fully custom implementation."""
+
+    def __init__(self, logger, protocol, test_window):
+        self.protocol = protocol
+        self.test_window = test_window
+        self.logger = logger
+        self.callbacks = {
+            "action": self.process_action,
+            "complete": self.process_complete
+        }
+
+        self.actions = {
+            "click": ClickAction(self.logger, self.protocol),
+            "send_keys": SendKeysAction(self.logger, self.protocol),
+            {other actions},
+            "set_window_rect": SetWindowRectAction(self.logger, self.protocol) # add this!
+        }
+```
+
+```python
+class SetWindowRectAction(object):
+    def __init__(self, logger, protocol):
+        self.logger = logger
+        self.protocol = protocol
+
+    def __call__(self, payload):
+        x, y, width, height = payload["x"], payload["y"], payload["width"], payload["height"]
+        self.logger.debug("Setting window rect to be: x=%s, y=%s, width=%s, height=%s"
+                          .format(x, y, width, height))
+        self.protocol.set_window_rect.set_window_rect(x, y, width, height)
+```
+
+Don't forget to write docs in ```testdriver.md```.
+Now we write the browser specific implementations.
+
+### Chrome
+
+We will use [executorselenium](tools/wptrunner/wptrunner/executors/executorselenium.py) and use the Selenium API (in the future there are plans to use the WebDriver API directly).
+
+There isn't too much work to do here, we just need to define a subclass of the protocol part we defined earlier.
+
+```python
+class SeleniumSetWindowRectProtocolPart(SetWindowRectProtocolPart):
+    def setup(self):
+        self.webdriver = self.parent.webdriver
+
+    def set_window_rect(self, x, y, width, height):
+        return self.webdriver.set_window_rect(x, y, width, height)
+```
+
+Make sure to import the protocol part too!
+
+```python
+from .protocol import (BaseProtocolPart,
+                       TestharnessProtocolPart,
+                       Protocol,
+                       SelectorProtocolPart,
+                       ClickProtocolPart,
+                       SendKeysProtocolPart,
+                       {... other protocol parts}
+                       SetWindowRectProtocolPart, # add this!
+                       TestDriverProtocolPart)
+```
+
+Here we have the setup method which just redefines the webdriver object at this level. The important part is the `set_window_rect` function (and it's important it is named that since we called it that earlier). This will be call the Selenium API for [set window rect](http://selenium-python.readthedocs.io/api.html#selenium.webdriver.remote.webdriver.WebDriver.set_window_rect) (`self.webdriver` is a Selenium WebDriver instance here).
+
+Finally, we just need to tell the SeleniumProtocol to implement this part.
+
+```python
+class SeleniumProtocol(Protocol):
+    implements = [SeleniumBaseProtocolPart,
+                  SeleniumTestharnessProtocolPart,
+                  SeleniumSelectorProtocolPart,
+                  SeleniumClickProtocolPart,
+                  SeleniumSendKeysProtocolPart,
+                  {... other protocol parts}
+                  SeleniumSetWindowRectProtocolPart,
+                  SeleniumTestDriverProtocolPart]
+```
+
+
+### Firefox
+We use the [set window rect](http://marionette-client.readthedocs.io/en/master/reference.html#marionette_driver.marionette.Marionette.set_window_rect) Marionette command.
+
+We will use [executormarionette](tools/wptrunner/wptrunner/executors/executormarionette.py) and use the Marionette Python API.
+
+We have little actual work to do here! We just need to define a subclass of the protocol part we defined earlier.
+
+```python
+class MarionetteSetWindowRectProtocolPart(SetWindowRectProtocolPart):
+    def setup(self):
+        self.marionette = self.parent.marionette
+
+    def set_window_rect(self, x, y, width, height):
+        return self.marionette.set_window_rect(x, y, width, height)
+```
+
+Make sure to import the protocol part too!
+
+```python
+from .protocol import (BaseProtocolPart,
+                       TestharnessProtocolPart,
+                       Protocol,
+                       SelectorProtocolPart,
+                       ClickProtocolPart,
+                       SendKeysProtocolPart,
+                       {... other protocol parts}
+                       SetWindowRectProtocolPart, # add this!
+                       TestDriverProtocolPart)
+```
+
+Here we have the setup method which just redefines the webdriver object at this level. The important part is the `set_window_rect` function (and it's important it is named that since we called it that earlier). This will be call the Marionette API for [set window rect](http://marionette-client.readthedocs.io/en/master/reference.html#marionette_driver.marionette.Marionette.set_window_rect) (`self.marionette` is a marionette instance here).
+
+Finally, we just need to tell the SeleniumProtocol to implement this part.
+
+```python
+class MarionetteProtocol(Protocol):
+    implements = [MarionetteBaseProtocolPart,
+                  MarionetteTestharnessProtocolPart,
+                  MarionettePrefsProtocolPart,
+                  MarionetteStorageProtocolPart,
+                  MarionetteSelectorProtocolPart,
+                  MarionetteClickProtocolPart,
+                  MarionetteSendKeysProtocolPart,
+                  {... other protocol parts}
+                  MarionetteSetWindowRectProtocolPart # add this
+                  MarionetteTestDriverProtocolPart]
+```
+
+### Other Browsers
+
+Other browsers may also use executorselenium (such as safari), or a completely new executor (such as servo). For these, you must change the executor in the same way as we did with chrome and firefox.
+
+### Write an infra test
+
+Make sure to add a test to `infrastructure/testdriver` :)
+
+Here is some template code!
+
+```html
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>TestDriver set window rect method</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>
+
+<script>
+promise_test(async t => {
+  await test_driver.set_window_rect(100, 100, 100, 100);
+  // do something
+}
+</script>
+```
+### What about testdriver-vendor.js?
+
+The file [testdriver-vendor.js](resources/testdriver-vendor.js) is the equivalent to testdriver-extra.js above, except is
+run instead of testdriver-extra.js in browser specific test environments. For example, in [Chromium LayoutTests](https://cs.chromium.org/chromium/src/third_party/WebKit/LayoutTests/?q=LayoutTests&sq=package:chromium&dr).
+
+### What if I need to return a value from my testdriver API?
+
+We currently don't have this capability, but it is coming soon and will be documented. The bug is [here](https://github.com/w3c/web-platform-tests/issues/10716)
+
diff --git a/tests/wpt/web-platform-tests/docs/_writing-tests/testharness-api.md b/tests/wpt/web-platform-tests/docs/_writing-tests/testharness-api.md
index d750086c6a3a..baa8772b8146 100644
--- a/tests/wpt/web-platform-tests/docs/_writing-tests/testharness-api.md
+++ b/tests/wpt/web-platform-tests/docs/_writing-tests/testharness-api.md
@@ -668,6 +668,17 @@ or a [`ServiceWorker`](https://slightlyoff.github.io/ServiceWorker/spec/service_
 Once called, the containing document fetches all the tests from the worker and
 behaves as if those tests were running in the containing document itself.
 
+`fetch_tests_from_worker` returns a promise that resolves once all the remote
+tests have completed. This is useful if you're importing tests from multiple
+workers and want to ensure they run in series:
+
+```js
+(async function() {
+  await fetch_tests_from_worker(new Worker("worker-1.js"));
+  await fetch_tests_from_worker(new Worker("worker-2.js"));
+})();
+```
+
 ## List of Assertions ##
 
 ### `assert_true(actual, description)`
diff --git a/tests/wpt/web-platform-tests/docs/_writing-tests/testharness.md b/tests/wpt/web-platform-tests/docs/_writing-tests/testharness.md
index e76d8bdad869..652cf63d7e35 100644
--- a/tests/wpt/web-platform-tests/docs/_writing-tests/testharness.md
+++ b/tests/wpt/web-platform-tests/docs/_writing-tests/testharness.md
@@ -19,6 +19,44 @@ documented in two sections:
 See [server features][] for advanced testing features that are commonly used
 with testharness.js. See also the [general guidelines][] for all test types.
 
+## Variants
+
+A test file can have multiple variants by including `meta` elements,
+for example:
+
+```
+<meta name="variant" content="">
+<meta name="variant" content="?wss">
+```
+
+The test can then do different things based on the URL.
+
+There is a utility script in `/common/subset-tests.js` that works
+well together with variants, where a test that would otherwise have
+too many tests to be useful can be split up in ranges of subtests.
+For example:
+
+```
+<!doctype html>
+<title>Testing variants</title>
+<meta name="variant" content="?1-1000">
+<meta name="variant" content="?1001-2000">
+<meta name="variant" content="?2001-last">
+<script src="/resources/testharness.js">
+<script src="/resources/testharnessreport.js">
+<script src="/common/subset-tests.js">
+<script>
+ const tests = [
+                 { fn: t => { ... }, name: "..." },
+                 ... lots of tests ...
+               ];
+ for (const test of tests) {
+   subsetTest(async_test, test.fn, test.name);
+ }
+</script>
+```
+
+
 ## Auto-generated test boilerplate
 
 While most JavaScript tests require a certain amount of HTML
@@ -121,7 +159,7 @@ can be used to include both the global and a local `utils.js` in a test.
 
 Use `// META: timeout=long` at the beginning of the resource.
 
-### Specifying test variants in auto-generated boilerplate tests
+### Specifying test [variants](#variants) in auto-generated boilerplate tests
 
 Use `// META: variant=url-suffix` at the beginning of the resource. For example,
 
diff --git a/tests/wpt/web-platform-tests/docs/introduction.md b/tests/wpt/web-platform-tests/docs/introduction.md
index 4e4932e21b2f..d021663224b6 100644
--- a/tests/wpt/web-platform-tests/docs/introduction.md
+++ b/tests/wpt/web-platform-tests/docs/introduction.md
@@ -114,10 +114,10 @@ For example, on most UNIX-like systems, you can setup the hosts file with:
 ./wpt make-hosts-file | sudo tee -a /etc/hosts
 ```
 
-And on Windows (note this requires an Administrator privileged shell):
+And on Windows (this must be run in a PowerShell session with Administrator privileges):
 
 ```bash
-python wpt make-hosts-file >> %SystemRoot%\System32\drivers\etc\hosts
+python wpt make-hosts-file | Out-File %SystemRoot%\System32\drivers\etc\hosts -Encoding ascii -Append
 ```
 
 If you are behind a proxy, you also need to make sure the domains above are
@@ -130,20 +130,17 @@ The test environment can then be started using
 This will start HTTP servers on two ports and a websockets server on
 one port. By default the web servers start on ports 8000 and 8443 and the other
 ports are randomly-chosen free ports. Tests must be loaded from the
-*first* HTTP server in the output. To change the ports, copy the
-`config.default.json` file to `config.json` and edit the new file,
-replacing the part that reads:
+*first* HTTP server in the output. To change the ports,
+create a `config.json` file in the wpt root directory, and add
+port definitions of your choice e.g.:
 
 ```
-"http": [8000, "auto"],
-"https":[8443]
-```
-
-to some ports of your choice e.g.
-
-```
-"http": [1234, "auto"],
-"https":[5678]
+{
+  "ports": {
+    "http": [1234, "auto"],
+    "https":[5678]
+  }
+}
 ```
 
 After your `hosts` file is configured, the servers will be locally accessible at:
diff --git a/tests/wpt/web-platform-tests/dom/OWNERS b/tests/wpt/web-platform-tests/dom/OWNERS
index 487f8ddbc0e3..9e0a739c373d 100644
--- a/tests/wpt/web-platform-tests/dom/OWNERS
+++ b/tests/wpt/web-platform-tests/dom/OWNERS
@@ -1,3 +1,4 @@
 @ayg
 @jdm
 @zqzhang
+@annevk
diff --git a/tests/wpt/web-platform-tests/dom/events/relatedTarget.window.js b/tests/wpt/web-platform-tests/dom/events/relatedTarget.window.js
index d3632bb9e040..ebc83ceb209a 100644
--- a/tests/wpt/web-platform-tests/dom/events/relatedTarget.window.js
+++ b/tests/wpt/web-platform-tests/dom/events/relatedTarget.window.js
@@ -21,13 +21,13 @@ test(() => {
     for (target of [new XMLHttpRequest(), self, host]) {
       const event = new FocusEvent("demo", { relatedTarget: relatedTarget });
       target.dispatchEvent(event);
-      assert_equals(event.target, null);
-      assert_equals(event.relatedTarget, null);
+      assert_equals(event.target, target);
+      assert_equals(event.relatedTarget, host);
     }
   }
-}, "Reset if relatedTarget pointed to a shadow tree");
+}, "Retarget a shadow-tree relatedTarget");
 
-async_test(t => {
+test(t => {
   const shadowChild = shadow.appendChild(document.createElement("div"));
   shadowChild.addEventListener("demo", t.step_func(() => document.body.appendChild(shadowChild)));
   const event = new FocusEvent("demo", { relatedTarget: new XMLHttpRequest() });
@@ -36,22 +36,20 @@ async_test(t => {
   assert_equals(event.target, null);
   assert_equals(event.relatedTarget, null);
   shadowChild.remove();
-  t.done();
 }, "Reset if target pointed to a shadow tree pre-dispatch");
 
-async_test(t => {
+test(t => {
   const shadowChild = shadow.appendChild(document.createElement("div"));
-  shadowChild.addEventListener("demo", t.step_func(() => document.body.appendChild(shadowChild)));
+  document.body.addEventListener("demo", t.step_func(() => document.body.appendChild(shadowChild)));
   const event = new FocusEvent("demo", { relatedTarget: shadowChild });
   document.body.dispatchEvent(event);
   assert_equals(shadowChild.parentNode, document.body);
-  assert_equals(event.target, null);
-  assert_equals(event.relatedTarget, null);
+  assert_equals(event.target, document.body);
+  assert_equals(event.relatedTarget, host);
   shadowChild.remove();
-  t.done();
-}, "Reset if relatedTarget pointed to a shadow tree pre-dispatch");
+}, "Retarget a shadow-tree relatedTarget, part 2");
 
-async_test(t => {
+test(t => {
   const event = new FocusEvent("heya", { relatedTarget: shadow, cancelable: true }),
         callback = t.unreached_func();
   host.addEventListener("heya", callback);
@@ -64,10 +62,9 @@ async_test(t => {
   // Check that the dispatch flag is cleared
   event.initEvent("x");
   assert_equals(event.type, "x");
-  t.done();
 }, "Reset targets on early return");
 
-async_test(t => {
+test(t => {
   const input = document.body.appendChild(document.createElement("input")),
         event = new MouseEvent("click", { relatedTarget: shadow });
   let seen = false;
@@ -81,5 +78,4 @@ async_test(t => {
   });
   assert_true(input.dispatchEvent(event));
   assert_true(seen);
-  t.done();
 }, "Reset targets before activation behavior");
diff --git a/tests/wpt/web-platform-tests/dom/nodes/Node-normalize.html b/tests/wpt/web-platform-tests/dom/nodes/Node-normalize.html
index 7598852e60a9..4d455996e553 100644
--- a/tests/wpt/web-platform-tests/dom/nodes/Node-normalize.html
+++ b/tests/wpt/web-platform-tests/dom/nodes/Node-normalize.html
@@ -51,4 +51,33 @@
   div.normalize();
   assert_array_equals(div.childNodes, [])
 }, "Empty text nodes")
+
+// The specification for normalize is clear that only "exclusive Text
+// nodes" are to be modified. This excludes CDATASection nodes, which
+// derive from Text. Naïve implementations may fail to skip
+// CDATASection nodes, or even worse, try to test textContent or
+// nodeValue without taking care to check the node type. They will
+// fail this test.
+test(function() {
+  // We create an XML document so that we can create CDATASection.
+  // Except for the CDATASection the result should be the same for
+  // an HTML document. (No non-Text node should be touched.)
+  var doc = new DOMParser().parseFromString("<div/>", "text/xml")
+  var div = doc.documentElement
+  var t1 = div.appendChild(doc.createTextNode("a"))
+  // The first parameter is the "target" of the processing
+  // instruction, and the 2nd is the text content.
+  var t2 = div.appendChild(doc.createProcessingInstruction("pi", ""))
+  var t3 = div.appendChild(doc.createTextNode("b"))
+  var t4 = div.appendChild(doc.createCDATASection(""))
+  var t5 = div.appendChild(doc.createTextNode("c"))
+  var t6 = div.appendChild(doc.createComment(""))
+  var t7 = div.appendChild(doc.createTextNode("d"))
+  var t8 = div.appendChild(doc.createElement("el"))
+  var t9 = div.appendChild(doc.createTextNode("e"))
+  var expected = [t1, t2, t3, t4, t5, t6, t7, t8, t9]
+  assert_array_equals(div.childNodes, expected)
+  div.normalize()
+  assert_array_equals(div.childNodes, expected)
+}, "Non-text nodes with empty textContent values.")
 </script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-abstract-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-abstract-manual.html
index c8b39bda0351..b67c7fa424b3 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-abstract-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-abstract-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-abstract</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-acknowledgments-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-acknowledgments-manual.html
index e45c462727a5..fad68aea0fde 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-acknowledgments-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-acknowledgments-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-acknowledgments</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-afterword-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-afterword-manual.html
index 94cd2d8e9731..2a1f84b19cb2 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-afterword-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-afterword-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-afterword</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-appendix-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-appendix-manual.html
index da4bf3c6cf42..c0ec8c815f79 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-appendix-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-appendix-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-appendix</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-backlink-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-backlink-manual.html
index 51eb6acc7ca0..fc4b4fac7aef 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-backlink-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-backlink-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-backlink</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-biblioentry-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-biblioentry-manual.html
index d97ec2a70c3a..160bf10568ee 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-biblioentry-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-biblioentry-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-biblioentry</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-bibliography-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-bibliography-manual.html
index c69a17aa294c..b5eedf1c4477 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-bibliography-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-bibliography-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-bibliography</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-biblioref-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-biblioref-manual.html
index 29ea65fe2162..860f1efc4c90 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-biblioref-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-biblioref-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-biblioref</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-chapter-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-chapter-manual.html
index 3a080ae755cf..1a4e95e87bbc 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-chapter-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-chapter-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-chapter</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-colophon-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-colophon-manual.html
index b7cdb5ad9f4b..78ae8edae7cb 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-colophon-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-colophon-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-colophon</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-conclusion-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-conclusion-manual.html
index c1786c8dbfb4..6ad672ef0030 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-conclusion-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-conclusion-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-conclusion</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-cover-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-cover-manual.html
index c09931fbde6a..4c2da2f9bdae 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-cover-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-cover-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-cover</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-credit-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-credit-manual.html
index f23baa5bc64d..a3774d39edf4 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-credit-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-credit-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-credit</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-credits-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-credits-manual.html
index 5562c5d9dab8..f0eb11109e34 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-credits-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-credits-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-credits</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-dedication-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-dedication-manual.html
index 9c95d9298907..20d83487cd04 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-dedication-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-dedication-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-dedication</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-endnote-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-endnote-manual.html
index 63320c96cad8..43dd4b529ba1 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-endnote-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-endnote-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-endnote</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-endnotes-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-endnotes-manual.html
index 040b6e9c56c8..11365c0645ad 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-endnotes-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-endnotes-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-endnotes</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-epigraph-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-epigraph-manual.html
index 26b5d638bbb4..7e1e0386494b 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-epigraph-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-epigraph-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-epigraph</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-epilogue-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-epilogue-manual.html
index 059e7c3cea8d..f00613c64116 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-epilogue-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-epilogue-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-epilogue</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-errata-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-errata-manual.html
index 759fb6ca6e45..e37fe92bdb80 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-errata-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-errata-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-errata</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-example-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-example-manual.html
index df11392abff9..32c32d812cc8 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-example-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-example-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-example</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-footnote-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-footnote-manual.html
index ad5f1f7116e4..c865fa101613 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-footnote-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-footnote-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-footnote</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-foreword-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-foreword-manual.html
index c56d31446223..2774b50ef979 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-foreword-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-foreword-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-foreword</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-glossary-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-glossary-manual.html
index b22e3be66c5e..8a5baeef63ba 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-glossary-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-glossary-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-glossary</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-glossref-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-glossref-manual.html
index 6a03b871c329..99b8edd2172b 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-glossref-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-glossref-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-glossref</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-index-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-index-manual.html
index b24abfa29385..39491e031341 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-index-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-index-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-index</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-introduction-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-introduction-manual.html
index e720f74c48ea..fadf2d97f5b9 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-introduction-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-introduction-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-introduction</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-noteref-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-noteref-manual.html
index f78af805eafa..3f053bce693a 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-noteref-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-noteref-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-noteref</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-notice-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-notice-manual.html
index d3135a763166..0656b539d661 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-notice-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-notice-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-notice</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-pagebreak-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-pagebreak-manual.html
index 1bafd77cbeb2..239094831814 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-pagebreak-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-pagebreak-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-pagebreak</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-pagelist-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-pagelist-manual.html
index 24bd42e0c24f..33993fe84776 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-pagelist-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-pagelist-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-pagelist</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-part-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-part-manual.html
index bc06f0ef43a8..997be1e4a8ee 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-part-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-part-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-part</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-preface-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-preface-manual.html
index 0a2bdbfe6a00..8ed5d3b15371 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-preface-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-preface-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-preface</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-prologue-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-prologue-manual.html
index 077cfb832e0d..b806c2e9650f 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-prologue-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-prologue-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-prologue</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-pullquote-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-pullquote-manual.html
index 543c4ed90356..b52c970df76c 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-pullquote-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-pullquote-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-pullquote</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-qna-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-qna-manual.html
index 8b9c4666d148..a334d64939ae 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-qna-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-qna-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-qna</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-subtitle-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-subtitle-manual.html
index 551891983d5e..217f61284c76 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-subtitle-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-subtitle-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-subtitle</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-tip-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-tip-manual.html
index ec59b0f0b5c0..dda02b679859 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-tip-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-tip-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-tip</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aam/doc-toc-manual.html b/tests/wpt/web-platform-tests/dpub-aam/doc-toc-manual.html
index c3969e232205..a06a58dfa654 100644
--- a/tests/wpt/web-platform-tests/dpub-aam/doc-toc-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aam/doc-toc-manual.html
@@ -2,7 +2,6 @@
 <html>
   <head>
     <title>doc-toc</title>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/dpub-aria/inuse-manual.html b/tests/wpt/web-platform-tests/dpub-aria/inuse-manual.html
index 1609337468ad..cd6af1e7358b 100644
--- a/tests/wpt/web-platform-tests/dpub-aria/inuse-manual.html
+++ b/tests/wpt/web-platform-tests/dpub-aria/inuse-manual.html
@@ -2,7 +2,6 @@
 <html>
 <head>
   <title>Check for Dpub Vocabulary Role Usage</title>
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script>
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-touch-action.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-touch-action.html
new file mode 100644
index 000000000000..51b715f30a60
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/resources/vertical-scroll-touch-action.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<style>
+  body, html {
+    height: 100%;
+    width: 100%;
+    overflow: hidden;
+  }
+  body {
+    touch-action: none;
+  }
+</style>
+<body>
+  <p>This page blocks all 'touch-action'.</p>
+</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html b/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html
new file mode 100644
index 000000000000..761c0d759e37
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/experimental-features/vertical-scroll-touch-action-manual.tentative.html
@@ -0,0 +1,102 @@
+<!doctype html>
+<title>vertical-scroll test for touch-action</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/feature-policy/experimental-features/resources/vertical-scroll.js"></script>
+<style>
+html, body {
+  height: 100%;
+  width: 100%;
+}
+
+iframe {
+  width: 90%;
+  height: 90%;
+  margin: 0;
+  padding: 0;
+}
+
+.spacer {
+  width: 100%;
+  height: 100%;
+  margin: 100%;
+}
+</style>
+<iframe></iframe>
+<br/>
+<p>Spacers below to make page scrollable</p>
+<br/>
+<div class="spacer"></div>
+<div class="spacer"></div>
+<p> EOF </p>
+
+<script>
+  "use strict";
+
+  let url = url_base + "vertical-scroll-touch-action.html";
+  let iframeElement = document.querySelector("iframe");
+
+  // Wait for the helper scripts to load.
+  promise_test(async() => {
+    if (window.touch_scroll_api_ready)
+      return Promise.resolve();
+    await new Promise( (r) => {
+      window.resolve_on_touch_scroll_api_ready = r;
+    });
+
+  }, "Make sure input injection API is ready.");
+
+  // Sanity-check: Verify we can scroll using the test-API (empty <iframe>).
+  promise_test(async() => {
+    window.scrollTo(0, 0);
+
+    await inject_input("down");
+    assert_greater_than(window.scrollY, 0, "Page must have scrolled down.");
+
+    await inject_input("right");
+    assert_greater_than(window.scrollX, 0, "Page must have scrolled right.");
+  }, "Verify that the page normally scrolls.");
+
+  // Enable 'vertical-scroll': "touch-action" should be able to block scroll.
+  promise_test(async() => {
+    // Make sure <window> can scroll both towards right and bottom.
+    window.scrollTo(0, 0);
+
+    await loadUrlInIframe(iframeElement, url);
+
+    // Apply the scroll gesture.
+    await inject_input("down");
+
+    // The scroll should normally bubble and affect this page, but the <iframe>
+    // is allowed to block it.
+    assert_equals(window.scrollY,
+                  0,
+                  "Main frame must not scroll vertically");
+  }, "Vertical scrolling through 'touch-action' can normally be blocked if" +
+     " 'pan-y' is not present.");
+
+  // Disable 'vertical-scroll': "touch-action" should not be able to block
+  // scroll.
+  promise_test(async() => {
+    window.scrollTo(0, 0);
+
+    // Disallow vertical scroll and reload the <iframe>.
+    iframeElement.setAttribute("allow", "vertical-scroll 'none';");
+    await loadUrlInIframe(iframeElement, url);
+
+    // Apply the scroll gesture. Main frame should scroll vertically.
+    await inject_input("down");
+
+    assert_greater_than(window.scrollY,
+                        0,
+                        "Main frame must scroll vertically.");
+    window.scrollTo(0, 0);
+
+    await inject_input("right");
+    assert_equals(
+        window.scrollX,
+        0,
+        "'pan-x' can be blocked even when 'vertical-scroll' is disabled");
+  }, "Vertical scrolling (and only vertical scrolling) through 'touch-action'" +
+     " cannot be blocked by a disabled frame.");
+</script>
diff --git a/tests/wpt/web-platform-tests/feature-policy/resources/picture-in-picture.js b/tests/wpt/web-platform-tests/feature-policy/resources/picture-in-picture.js
index 7ccd0f8837fa..6bdb7e5e49f5 100644
--- a/tests/wpt/web-platform-tests/feature-policy/resources/picture-in-picture.js
+++ b/tests/wpt/web-platform-tests/feature-policy/resources/picture-in-picture.js
@@ -1,13 +1,16 @@
 function isPictureInPictureAllowed() {
-  return new Promise((resolve, reject) => {
-    const video = document.createElement('video');
-    video.requestPictureInPicture()
-    .then(() => resolve(document.pictureInPictureEnabled))
-    .catch(e => {
-      if (e.name == 'NotAllowedError')
-        resolve(document.pictureInPictureEnabled);
-      else
-        resolve(false);
-    });
+  return new Promise(resolve => {
+    let video = document.createElement('video');
+    video.src = '/media/movie_5.ogv';
+    video.onloadedmetadata = () => {
+      video.requestPictureInPicture()
+      .then(() => resolve(document.pictureInPictureEnabled))
+      .catch(e => {
+        if (e.name == 'NotAllowedError')
+          resolve(document.pictureInPictureEnabled);
+        else
+          resolve(false);
+      });
+    };
   });
 }
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html b/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html
index 6df6aef2cdaa..623036d46639 100644
--- a/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html
+++ b/tests/wpt/web-platform-tests/fetch/api/abort/serviceworker-intercepted.https.html
@@ -13,25 +13,18 @@
   const SCOPE = '../resources/basic.html';
   const BODY_METHODS = ['arrayBuffer', 'blob', 'formData', 'json', 'text'];
 
-  async function cleanup() {
-    for (const iframe of document.querySelectorAll('.test-iframe')) {
-      iframe.parentNode.removeChild(iframe);
-    }
-
-    const reg = await navigator.serviceWorker.getRegistration(SCOPE);
-    if (reg) await reg.unregister();
-  }
-
-  async function setupRegistration(t) {
-    await cleanup();
-    const reg = await navigator.serviceWorker.register('../resources/sw-intercept.js', { scope: SCOPE });
+  async function setupRegistration(t, scope) {
+    const reg = await navigator.serviceWorker.register('../resources/sw-intercept.js', { scope });
     await wait_for_state(t, reg.installing, 'activated');
+    add_completion_callback(_ => reg.unregister());
     return reg;
   }
 
   promise_test(async t => {
-    await setupRegistration(t);
-    const iframe = await with_iframe(SCOPE);
+    const scope = SCOPE + "?q=aborted-not-intercepted";
+    await setupRegistration(t, scope);
+    const iframe = await with_iframe(scope);
+    add_completion_callback(_ => iframe.remove());
     const w = iframe.contentWindow;
 
     const controller = new w.AbortController();
@@ -56,8 +49,10 @@
 
   for (const bodyMethod of BODY_METHODS) {
     promise_test(async t => {
-      await setupRegistration(t);
-      const iframe = await with_iframe(SCOPE);
+      const scope = SCOPE + "?q=aborted-" + bodyMethod + "-rejects";
+      await setupRegistration(t, scope);
+      const iframe = await with_iframe(scope);
+      add_completion_callback(_ => iframe.remove());
       const w = iframe.contentWindow;
 
       const controller = new w.AbortController();
@@ -82,8 +77,10 @@
   }
 
   promise_test(async t => {
-    await setupRegistration(t);
-    const iframe = await with_iframe(SCOPE);
+    const scope = SCOPE + "?q=aborted-stream-errors";
+    await setupRegistration(t, scope);
+    const iframe = await with_iframe(scope);
+    add_completion_callback(_ => iframe.remove());
     const w = iframe.contentWindow;
 
     const controller = new w.AbortController();
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star-worker.html b/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star-worker.html
deleted file mode 100644
index db9b94320cfe..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star-worker.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: Access-Control-Expose-Headers: *</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("cors-expose-star.js?pipe=sub"));
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.html b/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.html
deleted file mode 100644
index 37223bdaaa64..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: Access-Control-Expose-Headers: *</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="../resources/utils.js"></script>
-    <script src="cors-expose-star.js?pipe=sub"></script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.js b/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.sub.any.js
similarity index 93%
rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.js
rename to tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.sub.any.js
index edf4d4241796..340e99ab5f99 100644
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.js
+++ b/tests/wpt/web-platform-tests/fetch/api/cors/cors-expose-star.sub.any.js
@@ -1,7 +1,4 @@
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-}
+// META: script=../resources/utils.js
 
 const url = "http://{{host}}:{{ports[http][1]}}" + dirname(location.pathname) + RESOURCES_DIR + "top.txt",
       sharedHeaders = "?pipe=header(Access-Control-Expose-Headers,*)|header(Test,X)|header(Set-Cookie,X)|header(*,whoa)|"
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering-worker.html b/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering-worker.html
deleted file mode 100644
index f15566fc509d..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering-worker.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: filtered headers in CORS response</title>
-    <meta name="help" href="https://fetch.spec.whatwg.org/#main-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-cors-protocol">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#concept-filtered-response-cors">
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("cors-filtering.js?pipe=sub"));
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.html b/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.html
deleted file mode 100644
index b7500ad16d44..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: filtered headers in CORS response</title>
-    <meta name="help" href="https://fetch.spec.whatwg.org/#main-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-cors-protocol">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#concept-filtered-response-cors">
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="../resources/utils.js"></script>
-    <script src="cors-filtering.js?pipe=sub"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.js b/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.sub.any.js
similarity index 92%
rename from tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.js
rename to tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.sub.any.js
index 1feaa5924f6a..a26eaccf2a5c 100644
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.js
+++ b/tests/wpt/web-platform-tests/fetch/api/cors/cors-filtering.sub.any.js
@@ -1,7 +1,4 @@
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-}
+// META: script=../resources/utils.js
 
 function corsFilter(corsUrl, headerName, headerValue, isFiltered) {
   var url = corsUrl + "?pipe=header(" + headerName + "," + encodeURIComponent(headerValue) +")|header(Access-Control-Allow-Origin,*)";
@@ -52,18 +49,17 @@ corsFilter(url, "Content-Type", "text/html", false);
 corsFilter(url, "Expires","04 May 1988 22:22:22 GMT" , false);
 corsFilter(url, "Last-Modified", "04 May 1988 22:22:22 GMT", false);
 corsFilter(url, "Pragma", "no-cache", false);
+corsFilter(url, "Content-Length", "3" , false); // top.txt contains "top"
 
 corsFilter(url, "Age", "27", true);
 corsFilter(url, "Server", "wptServe" , true);
 corsFilter(url, "Warning", "Mind the gap" , true);
-corsFilter(url, "Content-Length", "3" , true); // top.txt contains "top"
 corsFilter(url, "Set-Cookie", "name=value" , true);
 corsFilter(url, "Set-Cookie2", "name=value" , true);
 
 corsExposeFilter(url, "Age", "27", false);
 corsExposeFilter(url, "Server", "wptServe" , false);
 corsExposeFilter(url, "Warning", "Mind the gap" , false);
-corsExposeFilter(url, "Content-Length", "3" , false);
 
 corsExposeFilter(url, "Set-Cookie", "name=value" , true);
 corsExposeFilter(url, "Set-Cookie2", "name=value" , true);
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins-worker.html b/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins-worker.html
deleted file mode 100644
index a8e50573278d..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins-worker.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: check multiple Access-Control-Allow-Origin header management</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-cors-protocol">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#main-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#cors-check">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("cors-multiple-origins.js?pipe=sub"));
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.html b/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.html
deleted file mode 100644
index 9b12b05064b0..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: check multiple Access-Control-Allow-Origin header management</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-cors-protocol">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#main-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#cors-check">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="../resources/utils.js"></script>
-    <script src="cors-multiple-origins.js?pipe=sub"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.js b/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.js
deleted file mode 100644
index e4cf7245dcfa..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.js
+++ /dev/null
@@ -1,32 +0,0 @@
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-}
-
-function corsMultipleOrigins(desc, originList, shouldPass) {
-  var urlParameters = "?origin=" + encodeURIComponent(originList.join(", "));
-  var url = "http://{{host}}:{{ports[http][1]}}" + dirname(location.pathname) + RESOURCES_DIR + "preflight.py";
-
-  if (shouldPass) {
-    promise_test(function(test) {
-      return fetch(url + urlParameters).then(function(resp) {
-        assert_equals(resp.status, 200, "Response's status is 200");
-      });
-    }, desc);
-  } else {
-    promise_test(function(test) {
-      return promise_rejects(test, new TypeError(), fetch(url + urlParameters));
-    }, desc);
-  }
-}
-/* Actual origin */
-var origin = "http://{{host}}:{{ports[http][0]}}";
-
-corsMultipleOrigins("3 origins allowed, match the 3rd (" + origin + ")", ["\"\"", "http://example.com", origin], true);
-corsMultipleOrigins("3 origins allowed, match the 3rd (\"*\")", ["\"\"", "http://example.com", "*"], true);
-corsMultipleOrigins("3 origins allowed, match twice (" + origin + ")", ["\"\"", origin, origin], true);
-corsMultipleOrigins("3 origins allowed, match twice (\"*\")", ["*", "http://example.com", "*"], true);
-corsMultipleOrigins("3 origins allowed, match twice (\"*\" and " + origin + ")", ["*", "http://example.com", origin], true);
-corsMultipleOrigins("3 origins allowed, no match", ["", "http://example.com", "https://example2.com"], false);
-
-done();
diff --git a/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.sub.any.js b/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.sub.any.js
new file mode 100644
index 000000000000..f32b387022be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/cors/cors-multiple-origins.sub.any.js
@@ -0,0 +1,21 @@
+// META: script=../resources/utils.js
+
+function corsMultipleOrigins(originList) {
+  var urlParameters = "?origin=" + encodeURIComponent(originList.join(", "));
+  var url = "http://{{host}}:{{ports[http][1]}}" + dirname(location.pathname) + RESOURCES_DIR + "preflight.py";
+
+  promise_test(function(test) {
+    return promise_rejects(test, new TypeError(), fetch(url + urlParameters));
+  }, "Listing multiple origins is illegal: " + originList);
+}
+/* Actual origin */
+var origin = "http://{{host}}:{{ports[http][0]}}";
+
+corsMultipleOrigins(["\"\"", "http://example.com", origin]);
+corsMultipleOrigins(["\"\"", "http://example.com", "*"]);
+corsMultipleOrigins(["\"\"", origin, origin]);
+corsMultipleOrigins(["*", "http://example.com", "*"]);
+corsMultipleOrigins(["*", "http://example.com", origin]);
+corsMultipleOrigins(["", "http://example.com", "https://example2.com"]);
+
+done();
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count-worker.html
deleted file mode 100644
index 0f624e82626a..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count-worker.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: rediraction loop</title>
-    <meta name="timeout" content="long">
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-count.js"));
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.any.js
similarity index 89%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.any.js
index 0103280f6e23..7fa6dd1d0ed5 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.any.js
@@ -1,8 +1,5 @@
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-  importScripts("/common/utils.js");
-}
+// META: script=../resources/utils.js
+// META: script=/common/utils.js
 
 function redirectCount(desc, redirectUrl, redirectLocation, redirectStatus, maxCount, shouldPass) {
   var uuid_token = token();
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.html
deleted file mode 100644
index d6a66e6eb9e2..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-count.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: redirection loop</title>
-    <meta name="timeout" content="long">
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="/common/utils.js"></script>
-    <script src="../resources/utils.js"></script>
-    <script src="redirect-count.js"></script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location-worker.html
deleted file mode 100644
index 7dce98cad0c3..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location-worker.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: handling empty Location header during redirection</title>
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-empty-location.js"));
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.any.js
similarity index 81%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.any.js
index a9d03c5ca6e9..ace8f221c09a 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.any.js
@@ -1,11 +1,8 @@
+// META: script=../resources/utils.js
+
 // Tests receiving a redirect response with a Location header with an empty
 // value.
 
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-}
-
 const url = RESOURCES_DIR + 'redirect-empty-location.py';
 
 promise_test(t => {
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.html
deleted file mode 100644
index afb033bdf9de..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-empty-location.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: handling empty Location header during redirection</title>
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="../resources/utils.js"></script>
-    <script src="redirect-empty-location.js"></script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location-worker.html
deleted file mode 100644
index e2970811c071..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location-worker.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: handling Location header during redirection</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-location.js"));
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.any.js
similarity index 95%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.any.js
index 5b9a4fe454ab..27baefc91587 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.any.js
@@ -1,7 +1,4 @@
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-}
+// META: script=../resources/utils.js
 
 function redirectLocation(desc, redirectUrl, redirectLocation, redirectStatus, redirectMode, shouldPass) {
   var url = redirectUrl;
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html
deleted file mode 100644
index ac35dea54c47..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-location.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: handling Location header during redirection</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="../resources/utils.js"></script>
-    <script src="redirect-location.js"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method-worker.html
deleted file mode 100644
index fc0bc5e529dd..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method-worker.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: request method handling when redirected</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-method.js"));
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.any.js
similarity index 96%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.any.js
index 0a7f2df2c2bd..056ccf847bbe 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.any.js
@@ -1,7 +1,4 @@
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-}
+// META: script=../resources/utils.js
 
 // Creates a promise_test that fetches a URL that returns a redirect response.
 //
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.html
deleted file mode 100644
index 028842dbe07d..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-method.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: request method handling when redirected</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="../resources/utils.js"></script>
-    <script src="redirect-method.js"></script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode-worker.html
deleted file mode 100644
index 32d219f7678d..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode-worker.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: redirect mode handling</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque-redirect">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-mode.js"));
-    </script>
-  </body>
-</html>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.any.js
similarity index 94%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.any.js
index 969047d96c2e..7d34fa61a96b 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.any.js
@@ -1,7 +1,4 @@
-if (this.document === undefined) {
-  importScripts("/resources/testharness.js");
-  importScripts("/common/get-host-info.sub.js")
-}
+// META: script=/common/get-host-info.sub.js
 
 var redirectLocation = "cors-top.txt";
 
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.html
deleted file mode 100644
index 20a0cd68a6cf..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-mode.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: redirect mode handling</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque-redirect">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="redirect-mode.js"></script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin-worker.html
deleted file mode 100644
index fdb542237d9d..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin-worker.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: redirect mode handling</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque-redirect">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-origin.js"));
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.any.js
similarity index 90%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.any.js
index 77f841e94b58..3edb1bd03e89 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.any.js
@@ -1,9 +1,6 @@
-if (this.document === undefined) {
-    importScripts("/common/utils.js");
-    importScripts("/resources/testharness.js");
-    importScripts("../resources/utils.js");
-    importScripts("/common/get-host-info.sub.js");
-}
+// META: script=/common/utils.js
+// META: script=../resources/utils.js
+// META: script=/common/get-host-info.sub.js
 
 function testOriginAfterRedirection(desc, redirectUrl, redirectLocation, redirectStatus, expectedOrigin) {
     var uuid_token = token();
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.html
deleted file mode 100644
index 4cbe1c07d002..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-origin.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: redirect mode handling</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#concept-filtered-response-opaque-redirect">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-network-or-cache-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="/common/utils.js"></script>
-    <script src="../resources/utils.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="redirect-origin.js"></script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer-worker.html
deleted file mode 100644
index 6e5cd45b85ae..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer-worker.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: redirect referrer handling</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#main-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-redirect-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-referrer.js"));
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.any.js
similarity index 96%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.any.js
index fabeceaef4f9..92f0b9be515b 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.any.js
@@ -1,9 +1,6 @@
-if (this.document === undefined) {
-  importScripts("/common/utils.js");
-  importScripts("/resources/testharness.js");
-  importScripts("../resources/utils.js");
-  importScripts("/common/get-host-info.sub.js");
-}
+// META: script=/common/utils.js
+// META: script=../resources/utils.js
+// META: script=/common/get-host-info.sub.js
 
 function testReferrerAfterRedirection(desc, redirectUrl, redirectLocation, referrerPolicy, redirectReferrerPolicy, expectedReferrer) {
   var url = redirectUrl;
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.html
deleted file mode 100644
index 473b5e6471bc..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-referrer.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: redirect referrer handling</title>
-    <meta name="author" title="Canon Research France" href="https://www.crf.canon.fr">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#main-fetch">
-    <meta name="help" href="https://fetch.spec.whatwg.org/#http-redirect-fetch">
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="/common/utils.js"></script>
-    <script src="../resources/utils.js"></script>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="redirect-referrer.js"></script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl-worker.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl-worker.html
deleted file mode 100644
index 428f5135e948..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl-worker.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch in worker: data URL loading after redirections</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script>
-      fetch_tests_from_worker(new Worker("redirect-to-dataurl.js"));
-    </script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.js b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.any.js
similarity index 89%
rename from tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.js
rename to tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.any.js
index c3bae3f6bb08..68ff2c5bcf2d 100644
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.js
+++ b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.any.js
@@ -1,7 +1,4 @@
-if (this.document === undefined) {
-  importScripts("/common/get-host-info.sub.js")
-  importScripts("/resources/testharness.js");
-}
+// META: script=/common/get-host-info.sub.js
 
 var dataURL = "data:text/plain;base64,cmVzcG9uc2UncyBib2R5";
 var body = "response's body";
diff --git a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.html b/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.html
deleted file mode 100644
index ed7159f4121c..000000000000
--- a/tests/wpt/web-platform-tests/fetch/api/redirect/redirect-to-dataurl.html
+++ /dev/null
@@ -1,13 +0,0 @@
-<!doctype html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Fetch: data URL loading after redirections</title>
-    <script src="/resources/testharness.js"></script>
-    <script src="/resources/testharnessreport.js"></script>
-  </head>
-  <body>
-    <script src="/common/get-host-info.sub.js"></script>
-    <script src="redirect-to-dataurl.js"></script>
-  </body>
-</html>
diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-6.html b/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-6.html
index 15c8dfd477d7..30492d472fee 100644
--- a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-6.html
+++ b/tests/wpt/web-platform-tests/fetch/api/response/response-stream-disturbed-6.html
@@ -65,7 +65,7 @@
   const reader = stream.getReader();
   assert_false(response.bodyUsed, "After getting a reader");
 
-  reader.read();
+  reader.read().then(() => { }, () => { });
   assert_true(response.bodyUsed, "After calling stream.read()");
 }, "An errored stream on which read() has been called");
 
@@ -81,7 +81,7 @@
   const reader = stream.getReader();
   assert_false(response.bodyUsed, "After getting a reader");
 
-  reader.cancel();
+  reader.cancel().then(() => { }, () => { });
   assert_true(response.bodyUsed, "After calling stream.cancel()");
 }, "An errored stream on which cancel() has been called");
 
diff --git a/tests/wpt/web-platform-tests/fetch/api/response/response-stream-with-broken-then.any.js b/tests/wpt/web-platform-tests/fetch/api/response/response-stream-with-broken-then.any.js
new file mode 100644
index 000000000000..35b984c9f6da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/api/response/response-stream-with-broken-then.any.js
@@ -0,0 +1,75 @@
+// META: script=../resources/utils.js
+
+promise_test(async () => {
+  add_completion_callback(() => delete Object.prototype.then);
+  const hello = new TextEncoder().encode('hello');
+  const bye = new TextEncoder().encode('bye');
+  const rs = new ReadableStream({
+    start(controller) {
+      controller.enqueue(hello);
+      controller.close();
+    }
+  });
+  const resp = new Response(rs);
+  Object.prototype.then = (onFulfilled) => {
+    delete Object.prototype.then;
+    onFulfilled({done: false, value: bye});
+  };
+  const text = await resp.text();
+  assert_equals(text, 'bye', 'The valud should be replaced with "bye".');
+}, 'Inject {done: false, value: bye} via Object.prototype.then.');
+
+promise_test(async (t) => {
+  add_completion_callback(() => delete Object.prototype.then);
+  const hello = new TextEncoder().encode('hello');
+  const rs = new ReadableStream({
+    start(controller) {
+      controller.enqueue(hello);
+      controller.close();
+    }
+  });
+  const resp = new Response(rs);
+  Object.prototype.then = (onFulfilled) => {
+    delete Object.prototype.then;
+    onFulfilled({done: false, value: undefined});
+  };
+  promise_rejects(t, TypeError(), resp.text(),
+      'The value should be replaced with undefined.');
+}, 'Inject {done: false, value: undefined} via Object.prototype.then.');
+
+promise_test(async (t) => {
+  add_completion_callback(() => delete Object.prototype.then);
+  const hello = new TextEncoder().encode('hello');
+  const rs = new ReadableStream({
+    start(controller) {
+      controller.enqueue(hello);
+      controller.close();
+    }
+  });
+  const resp = new Response(rs);
+  Object.prototype.then = (onFulfilled) => {
+    delete Object.prototype.then;
+    onFulfilled(undefined);
+  };
+  promise_rejects(t, TypeError(), resp.text(),
+      'The read result should be replaced with undefined.');
+}, 'Inject undefined via Object.prototype.then.');
+
+promise_test(async (t) => {
+  add_completion_callback(() => delete Object.prototype.then);
+  const hello = new TextEncoder().encode('hello');
+  const rs = new ReadableStream({
+    start(controller) {
+      controller.enqueue(hello);
+      controller.close();
+    }
+  });
+  const resp = new Response(rs);
+  Object.prototype.then = (onFulfilled) => {
+    delete Object.prototype.then;
+    onFulfilled(8.2);
+  };
+  promise_rejects(t, TypeError(), resp.text(),
+      'The read result should be replaced with a number.');
+}, 'Inject 8.2 via Object.prototype.then.');
+
diff --git a/tests/wpt/web-platform-tests/http/content_length.html b/tests/wpt/web-platform-tests/fetch/content-length/content-length.html
similarity index 100%
rename from tests/wpt/web-platform-tests/http/content_length.html
rename to tests/wpt/web-platform-tests/fetch/content-length/content-length.html
diff --git a/tests/wpt/web-platform-tests/http/content_length.html.headers b/tests/wpt/web-platform-tests/fetch/content-length/content-length.html.headers
similarity index 100%
rename from tests/wpt/web-platform-tests/http/content_length.html.headers
rename to tests/wpt/web-platform-tests/fetch/content-length/content-length.html.headers
diff --git a/tests/wpt/web-platform-tests/fetch/corb/README.md b/tests/wpt/web-platform-tests/fetch/corb/README.md
index 04c5b8a8f3d0..48fc4ad6871c 100644
--- a/tests/wpt/web-platform-tests/fetch/corb/README.md
+++ b/tests/wpt/web-platform-tests/fetch/corb/README.md
@@ -21,7 +21,7 @@ sure that CORB doesn't change the existing web behavior) and therefore are
 valuable independently from CORB's standardization efforts.
 
 Tests that cover behavior that is changed by CORB have to be marked as
-[tentative](http://web-platform-tests.org/writing-tests/file-names.html)
+[tentative](https://web-platform-tests.org/writing-tests/file-names.html)
 (using `.tentative` substring in their filename) until CORB
 is included in the official
 [Fetch spec](https://fetch.spec.whatwg.org/).  Such tests may fail unless
diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub-expected.html b/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub-expected.html
rename to tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub-ref.html
diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub.html b/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub.html
index b2612b43293d..78fc09f9b7fd 100644
--- a/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/corb/img-html-correctly-labeled.sub.html
@@ -6,6 +6,6 @@
 -->
 <meta charset="utf-8">
 <!-- Reference page uses same-origin resources, which are not CORB-eligible. -->
-<link rel="match" href="img-png-mislabeled-as-html.sub-expected.html">
+<link rel="match" href="img-png-mislabeled-as-html.sub-ref.html">
 <!-- www1 is cross-origin, so the HTTP response is CORB-eligible -->
 <img src="http://{{domains[www1]}}:{{ports[http][0]}}/fetch/corb/resources/html-correctly-labeled.html">
diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-mime-types-coverage.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/corb/img-mime-types-coverage.tentative.sub.html
index 7ccc41b4b5f3..65c5b846d534 100644
--- a/tests/wpt/web-platform-tests/fetch/corb/img-mime-types-coverage.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/corb/img-mime-types-coverage.tentative.sub.html
@@ -19,6 +19,7 @@
       // MIME-types not protected by CORB
       "image/gif", "image/png", "image/png;blah", "image/svg+xml",
       "application/javascript", "application/jsonp",
+      "image/gif;HI=THERE",
 
       // MIME types that may seem to be JSON or XML, but really aren't - i.e.
       // these MIME types are not covered by:
@@ -39,7 +40,8 @@
       "text/json", "application/json", "text/xml", "application/xml",
       "application/blah+json", "text/blah+json",
       "application/blah+xml", "text/blah+xml",
-      "TEXT/HTML", "TEXT/JSON", "TEXT/BLAH+JSON", "APPLICATION/BLAH+XML"]
+      "TEXT/HTML", "TEXT/JSON", "TEXT/BLAH+JSON", "APPLICATION/BLAH+XML",
+      "text/json;does=it;matter", "text/HTML;NO=it;does=NOT"]
 
   const get_url = (mime) => {
     // www1 is cross-origin, so the HTTP response is CORB-eligible -->
diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-expected.html b/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-expected.html
rename to tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub-ref.html
diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html
index 19d29b20488c..a4e519d94fc1 100644
--- a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html-nosniff.tentative.sub.html
@@ -6,6 +6,6 @@
 -->
 <meta charset="utf-8">
 <!-- Reference page uses same-origin resources, which are not CORB-eligible. -->
-<link rel="match" href="img-png-mislabeled-as-html.sub-expected.html">
+<link rel="match" href="img-png-mislabeled-as-html.sub-ref.html">
 <!-- www1 is cross-origin, so the HTTP response is CORB-eligible -->
 <img src="http://{{domains[www1]}}:{{ports[http][0]}}/fetch/corb/resources/png-mislabeled-as-html-nosniff.png">
diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub-expected.html b/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub-expected.html
rename to tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub-ref.html
diff --git a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub.html b/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub.html
index 85d444d79995..1ae4cfcaa7ca 100644
--- a/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/corb/img-png-mislabeled-as-html.sub.html
@@ -5,6 +5,6 @@
 -->
 <meta charset="utf-8">
 <!-- Reference page uses same-origin resources, which are not CORB-eligible. -->
-<link rel="match" href="img-png-mislabeled-as-html.sub-expected.html">
+<link rel="match" href="img-png-mislabeled-as-html.sub-ref.html">
 <!-- www1 is cross-origin, so the HTTP response is CORB-eligible -->
 <img src="http://{{domains[www1]}}:{{ports[http][0]}}/fetch/corb/resources/png-mislabeled-as-html.png">
diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js
new file mode 100644
index 000000000000..5b048d336443
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js
@@ -0,0 +1,9 @@
+<!--/*--><html><body><script type="text/javascript"><!--//*/
+
+// This is a regression test for https://crbug.com/839425
+// which found out that some script resources are served
+// with text/html content-type and with a body that is
+// both a valid html and a valid javascript.
+window.polyglot = "html-js-polyglot.js";
+
+//--></script></body></html>
diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js.headers b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js.headers
new file mode 100644
index 000000000000..156209f9c81f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot.js.headers
@@ -0,0 +1 @@
+Content-Type: text/html
diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js
new file mode 100644
index 000000000000..9443f8ed6c35
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js
@@ -0,0 +1,10 @@
+<!-- comment --> <script type='text/javascript'>
+//<![CDATA[
+
+// This is a regression test for https://crbug.com/839945
+// which found out that some script resources are served
+// with text/html content-type and with a body that is
+// both a valid html and a valid javascript.
+window.polyglot = "html-js-polyglot2.js";
+
+//]]>--></script>
diff --git a/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js.headers b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js.headers
new file mode 100644
index 000000000000..156209f9c81f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/corb/resources/html-js-polyglot2.js.headers
@@ -0,0 +1 @@
+Content-Type: text/html
diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html
index 76a8fadd335c..8f4d7679e3d7 100644
--- a/tests/wpt/web-platform-tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/corb/script-html-correctly-labeled.tentative.sub.html
@@ -26,5 +26,5 @@
   // www1 is cross-origin, so the HTTP response is CORB-eligible.
   script.src = 'http://{{domains[www1]}}:{{ports[http][0]}}/fetch/corb/resources/html-correctly-labeled.html';
   document.body.appendChild(script)
-});
+}, "CORB-blocked script has no syntax errors");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/corb/script-html-js-polyglot.sub.html b/tests/wpt/web-platform-tests/fetch/corb/script-html-js-polyglot.sub.html
new file mode 100644
index 000000000000..ec4103771fb2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/fetch/corb/script-html-js-polyglot.sub.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<!-- Test verifies that CORB won't block a polyglot script that is
+     both a valid HTML document and also valid Javascript.
+-->
+<meta charset="utf-8">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+["html-js-polyglot.js", "html-js-polyglot2.js"].forEach(polyglot_name => {
+  async_test(function(t) {
+    window.polyglot = "not yet set by the script";
+    var script = document.createElement("script");
+
+    script.onload = t.step_func_done(function(){
+      // Verify that the script response wasn't blocked - that script
+      // should have set window.polyglot to |polyglot_name|.
+      assert_equals(window.polyglot, polyglot_name);
+    })
+    addEventListener("error",function(e) {
+      t.step(function() {
+        assert_unreached("No errors are expected with or without CORB.");
+        t.done();
+      })
+    });
+
+    // www1 is cross-origin, so the HTTP response is CORB-eligible.
+    script.src = "http://{{domains[www1]}}:{{ports[http][0]}}/fetch/corb/resources/" + polyglot_name;
+    document.body.appendChild(script);
+  }, "CORB cannot block polyglot HTML/JS: " + polyglot_name);
+});
+</script>
diff --git a/tests/wpt/web-platform-tests/fetch/data-urls/README.md b/tests/wpt/web-platform-tests/fetch/data-urls/README.md
index 64c3d7e95215..1ce5b18b5382 100644
--- a/tests/wpt/web-platform-tests/fetch/data-urls/README.md
+++ b/tests/wpt/web-platform-tests/fetch/data-urls/README.md
@@ -1,10 +1,10 @@
-== data: URLs ==
+## data: URLs
 
 `resources/data-urls.json` contains `data:` URL tests. The tests are encoded as a JSON array. Each value in the array is an array of two or three values. The first value describes the input, the second value describes the expected MIME type, null if the input is expected to fail somehow, or the empty string if the expected value is `text/plain;charset=US-ASCII`. The third value, if present, describes the expected body as an array of integers representing bytes.
 
 These tests are used for `data:` URLs in this directory (see `processing.any.js`).
 
-== Forgiving-base64 decode ==
+## Forgiving-base64 decode
 
 `resources/base64.json` contains [forgiving-base64 decode](https://infra.spec.whatwg.org/#forgiving-base64-decode) tests. The tests are encoded as a JSON array. Each value in the array is an array of two values. The first value describes the input, the second value describes the output as an array of integers representing bytes or null if the input cannot be decoded.
 
diff --git a/tests/wpt/web-platform-tests/http/basic-auth-cache-test-ref.html b/tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/http/basic-auth-cache-test-ref.html
rename to tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test-ref.html
diff --git a/tests/wpt/web-platform-tests/http/basic-auth-cache-test.html b/tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test.html
similarity index 79%
rename from tests/wpt/web-platform-tests/http/basic-auth-cache-test.html
rename to tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test.html
index 0d3895b8048a..a8979baf548d 100644
--- a/tests/wpt/web-platform-tests/http/basic-auth-cache-test.html
+++ b/tests/wpt/web-platform-tests/fetch/http-cache/basic-auth-cache-test.html
@@ -9,12 +9,12 @@
 
   <script type="text/javascript">
     function loadAuth() {
-        var authUrl = 'http://testuser:testpass@' + window.location.host + '/http/resources/securedimage.py';
+        var authUrl = 'http://testuser:testpass@' + window.location.host + '/fetch/http-cache/resources/securedimage.py';
         document.getElementById('auth').src = authUrl;
     }
 
     function loadNoAuth() {
-        var noAuthUrl = 'http://' + window.location.host + '/http/resources/securedimage.py';
+        var noAuthUrl = 'http://' + window.location.host + '/fetch/http-cache/resources/securedimage.py';
         document.getElementById('noauth').src = noAuthUrl;
     }
 
diff --git a/tests/wpt/web-platform-tests/http/resources/securedimage.py b/tests/wpt/web-platform-tests/fetch/http-cache/resources/securedimage.py
similarity index 82%
rename from tests/wpt/web-platform-tests/http/resources/securedimage.py
rename to tests/wpt/web-platform-tests/fetch/http-cache/resources/securedimage.py
index 510ddca96e27..445b0bdd2ec9 100644
--- a/tests/wpt/web-platform-tests/http/resources/securedimage.py
+++ b/tests/wpt/web-platform-tests/fetch/http-cache/resources/securedimage.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -
 
 def main(request, response):
-    image_url = str.replace(request.url, "http/resources/securedimage.py", "images/green.png")
+    image_url = str.replace(request.url, "fetch/http-cache/resources/securedimage.py", "images/green.png")
 
     if "authorization" not in request.headers:
         response.status = 401
diff --git a/tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html b/tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html
index 3b13fccdc4b8..f27735daa1dd 100644
--- a/tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/security/dangling-markup-mitigation-data-url.tentative.sub.html
@@ -16,7 +16,8 @@
   var doubleEscapedBrace = "&amp;amp;lt;";
   var rawNewline = "&#10;";
   var escapedNewline = "&amp;#10;";
-  var doubleEscapedNewline = "&amp;amp;#10;";
+  // doubleEscapedNewline is used inside a data URI, and so must have its '#' escaped.
+  var doubleEscapedNewline = "&amp;amp;%2310;";
 
   function appendFrameAndGetElement(test, frame) {
     return new Promise((resolve, reject) => {
diff --git a/tests/wpt/web-platform-tests/generic-sensor/README.md b/tests/wpt/web-platform-tests/generic-sensor/README.md
new file mode 100644
index 000000000000..993e0c52b8ed
--- /dev/null
+++ b/tests/wpt/web-platform-tests/generic-sensor/README.md
@@ -0,0 +1,20 @@
+The `generic-sensor-tests.js` tests require an implementation of
+the `GenericSensorTest` interface, which should emulate platform
+sensor backends. The `GenericSensorTest` interface is defined as:
+
+```
+  class GenericSensorTest {
+    async initialize();  // Sets up the testing enviroment.
+    async reset(); // Frees the resources.
+  };
+```
+
+The Chromium implementation of the `GenericSensorTest` interface is located in
+[generic_sensor_mocks.js](../resources/chromium/generic_sensor_mocks.js).
+
+Other browser vendors should provide their own implementations of
+the `GenericSensorTest` interface.
+
+[Known issue](https://github.com/w3c/web-platform-tests/issues/9686): a
+WebDriver extension is a better approach for the Generic Sensor tests
+automation.
diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
index f722315cfb25..94e5347a880e 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-feature-policy-test.sub.js
@@ -17,17 +17,19 @@ const cross_origin_src =
   "https://{{domains[www]}}:{{ports[https][0]}}" + same_origin_src;
 const base_src = "/feature-policy/resources/redirect-on-load.html#";
 
-function run_fp_tests_disabled(sensorType) {
-  const sensorName = sensorType.name;
+function run_fp_tests_disabled(sensorName) {
+  const sensorType = self[sensorName];
   const featureNameList = feature_policies[sensorName];
   const header = "Feature-Policy header " + featureNameList.join(" 'none';") + " 'none'";
   const desc = "'new " + sensorName + "()'";
 
   test(() => {
+    assert_true(sensorName in self);
     assert_throws("SecurityError", () => {new sensorType()});
   }, `${sensorName}: ${header} disallows the top-level document.`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -37,6 +39,7 @@ function run_fp_tests_disabled(sensorType) {
   }, `${sensorName}: ${header} disallows same-origin iframes.`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -46,17 +49,18 @@ function run_fp_tests_disabled(sensorType) {
   }, `${sensorName}: ${header} disallows cross-origin iframes.`);
 }
 
-function run_fp_tests_enabled(sensorType) {
-  const sensorName = sensorType.name;
+function run_fp_tests_enabled(sensorName) {
+  const sensorType = self[sensorName];
   const featureNameList = feature_policies[sensorName];
   const header = "Feature-Policy header " + featureNameList.join(" *;") + " *";
   const desc = "'new " + sensorName + "()'";
 
   test(() => {
-    assert_true(sensorName in window);
+    assert_true(sensorName in self);
   }, `${sensorName}: ${header} allows the top-level document.`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -66,6 +70,7 @@ function run_fp_tests_enabled(sensorType) {
   }, `${sensorName}: ${header} allows same-origin iframes.`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -75,13 +80,14 @@ function run_fp_tests_enabled(sensorType) {
   }, `${sensorName}: ${header} allows cross-origin iframes.`);
 }
 
-function run_fp_tests_enabled_by_attribute(sensorType) {
-  const sensorName = sensorType.name;
+function run_fp_tests_enabled_by_attribute(sensorName) {
+  const sensorType = self[sensorName];
   const featureNameList = feature_policies[sensorName];
   const header = "Feature-Policy allow='" + featureNameList.join(" ") + "' attribute";
   const desc = "'new " + sensorName + "()'";
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -92,6 +98,7 @@ function run_fp_tests_enabled_by_attribute(sensorType) {
   }, `${sensorName}: ${header} allows same-origin iframe`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -102,13 +109,14 @@ function run_fp_tests_enabled_by_attribute(sensorType) {
   }, `${sensorName}: ${header} allows cross-origin iframe`);
 }
 
-function run_fp_tests_enabled_by_attribute_redirect_on_load(sensorType) {
-  const sensorName = sensorType.name;
+function run_fp_tests_enabled_by_attribute_redirect_on_load(sensorName) {
+  const sensorType = self[sensorName];
   const featureNameList = feature_policies[sensorName];
   const header = "Feature-Policy allow='" + featureNameList.join(" ") + "' attribute";
   const desc = "'new " + sensorName + "()'";
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -119,6 +127,7 @@ function run_fp_tests_enabled_by_attribute_redirect_on_load(sensorType) {
   }, `${sensorName}: ${header} allows same-origin relocation`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -129,17 +138,18 @@ function run_fp_tests_enabled_by_attribute_redirect_on_load(sensorType) {
   }, `${sensorName}: ${header} disallows cross-origin relocation`);
 }
 
-function run_fp_tests_enabled_on_self_origin(sensorType) {
-  const sensorName = sensorType.name;
+function run_fp_tests_enabled_on_self_origin(sensorName) {
+  const sensorType = self[sensorName];
   const featureNameList = feature_policies[sensorName];
   const header = "Feature-Policy header " + featureNameList.join(" 'self';") + " 'self'";
   const desc = "'new " + sensorName + "()'";
 
   test(() => {
-    assert_true(sensorName in window);
+    assert_true(sensorName in self);
   }, `${sensorName}: ${header} allows the top-level document.`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
@@ -149,6 +159,7 @@ function run_fp_tests_enabled_on_self_origin(sensorType) {
   }, `${sensorName}: ${header} allows same-origin iframes.`);
 
   async_test(t => {
+    assert_true(sensorName in self);
     test_feature_availability(
       desc,
       t,
diff --git a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
index ece481bf4c42..da2e65da5ec1 100644
--- a/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
+++ b/tests/wpt/web-platform-tests/generic-sensor/generic-sensor-tests.js
@@ -1,3 +1,54 @@
+// These tests rely on the User Agent providing an implementation of
+// platform sensor backends.
+//
+// In Chromium-based browsers this implementation is provided by a polyfill
+// in order to reduce the amount of test-only code shipped to users. To enable
+// these tests the browser must be run with these options:
+//
+//   --enable-blink-features=MojoJS,MojoJSTest
+let loadChromiumResources = Promise.resolve().then(() => {
+  if (!MojoInterfaceInterceptor) {
+    // Do nothing on non-Chromium-based browsers or when the Mojo bindings are
+    // not present in the global namespace.
+    return;
+  }
+
+  let chain = Promise.resolve();
+  [
+    '/resources/chromium/mojo_bindings.js',
+    '/resources/chromium/string16.mojom.js',
+    '/resources/chromium/sensor.mojom.js',
+    '/resources/chromium/sensor_provider.mojom.js',
+    '/resources/chromium/generic_sensor_mocks.js',
+  ].forEach(path => {
+    let script = document.createElement('script');
+    script.src = path;
+    script.async = false;
+    chain = chain.then(() => new Promise(resolve => {
+      script.onload = resolve;
+    }));
+    document.head.appendChild(script);
+  });
+
+  return chain;
+});
+
+function sensor_test(func, name, properties) {
+  promise_test(async (t) => {
+    if (typeof GenericSensorTest === 'undefined') {
+      await loadChromiumResources;
+    }
+    assert_true(typeof GenericSensorTest !== 'undefined');
+    let sensorTest = new GenericSensorTest();
+    await sensorTest.initialize();
+    try {
+      await func(t);
+    } finally {
+      await sensorTest.reset();
+    };
+  }, name, properties);
+}
+
 const properties = {
   'AmbientLightSensor' : ['timestamp', 'illuminance'],
   'Accelerometer' : ['timestamp', 'x', 'y', 'z'],
@@ -45,8 +96,11 @@ function reading_to_array(sensor) {
   return arr;
 }
 
-function runGenericSensorTests(sensorType) {
-  promise_test(async t => {
+function runGenericSensorTests(sensorName) {
+  const sensorType = self[sensorName];
+
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -58,9 +112,10 @@ function runGenericSensorTests(sensorType) {
     sensor.stop();
     assert_reading_null(sensor);
     assert_false(sensor.hasReading);
-  }, `${sensorType.name}: Test that 'onreading' is called and sensor reading is valid`);
+  }, `${sensorName}: Test that 'onreading' is called and sensor reading is valid`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor1 = new sensorType();
     const sensor2 = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor1, ["reading", "error"]);
@@ -79,9 +134,10 @@ function runGenericSensorTests(sensorType) {
     assert_reading_not_null(sensor2);
     sensor2.stop();
     assert_reading_null(sensor2);
-  }, `${sensorType.name}: sensor reading is correct`);
+  }, `${sensorName}: sensor reading is correct`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -94,9 +150,10 @@ function runGenericSensorTests(sensorType) {
 
     assert_greater_than(cachedTimeStamp2, cachedTimeStamp1);
     sensor.stop();
-  }, `${sensorType.name}: sensor timestamp is updated when time passes`);
+  }, `${sensorName}: sensor timestamp is updated when time passes`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     assert_false(sensor.activated);
@@ -108,9 +165,10 @@ function runGenericSensorTests(sensorType) {
 
     sensor.stop();
     assert_false(sensor.activated);
-  }, `${sensorType.name}: Test that sensor can be successfully created and its states are correct.`);
+  }, `${sensorName}: Test that sensor can be successfully created and its states are correct.`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     const start_return = sensor.start();
@@ -118,9 +176,10 @@ function runGenericSensorTests(sensorType) {
     await sensorWatcher.wait_for("activate");
     assert_equals(start_return, undefined);
     sensor.stop();
-  }, `${sensorType.name}: sensor.start() returns undefined`);
+  }, `${sensorName}: sensor.start() returns undefined`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     sensor.start();
@@ -129,9 +188,10 @@ function runGenericSensorTests(sensorType) {
     await sensorWatcher.wait_for("activate");
     assert_true(sensor.activated);
     sensor.stop();
-  }, `${sensorType.name}: no exception is thrown when calling start() on already started sensor`);
+  }, `${sensorName}: no exception is thrown when calling start() on already started sensor`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     sensor.start();
@@ -139,9 +199,10 @@ function runGenericSensorTests(sensorType) {
     await sensorWatcher.wait_for("activate");
     const stop_return = sensor.stop();
     assert_equals(stop_return, undefined);
-  }, `${sensorType.name}: sensor.stop() returns undefined`);
+  }, `${sensorName}: sensor.stop() returns undefined`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["activate", "error"]);
     sensor.start();
@@ -150,9 +211,10 @@ function runGenericSensorTests(sensorType) {
     sensor.stop();
     sensor.stop();
     assert_false(sensor.activated);
-  }, `${sensorType.name}: no exception is thrown when calling stop() on already stopped sensor`);
+  }, `${sensorName}: no exception is thrown when calling stop() on already stopped sensor`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -169,28 +231,30 @@ function runGenericSensorTests(sensorType) {
     assert_greater_than(timestamp, 0);
     assert_greater_than(sensor.timestamp, timestamp);
     sensor.stop();
-  }, `${sensorType.name}: Test that fresh reading is fetched on start()`);
-
-  promise_test(async t => {
-    const sensor = new sensorType();
-    const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
-    const visibilityChangeWatcher = new EventWatcher(t, document, "visibilitychange");
-    sensor.start();
-
-    await sensorWatcher.wait_for("reading");
-    assert_reading_not_null(sensor);
-    const cachedSensor1 = reading_to_array(sensor);
-
-    const win = window.open('', '_blank');
-    await visibilityChangeWatcher.wait_for("visibilitychange");
-    const cachedSensor2 = reading_to_array(sensor);
-
-    win.close();
-    sensor.stop();
-    assert_object_equals(cachedSensor1, cachedSensor2);
-  }, `${sensorType.name}: sensor readings can not be fired on the background tab`);
-
-  promise_test(async t => {
+  }, `${sensorName}: Test that fresh reading is fetched on start()`);
+
+//  TBD file a WPT issue: visibilityChangeWatcher times out.
+//  sensor_test(async t => {
+//    const sensor = new sensorType();
+//    const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
+//    const visibilityChangeWatcher = new EventWatcher(t, document, "visibilitychange");
+//    sensor.start();
+
+//    await sensorWatcher.wait_for("reading");
+//    assert_reading_not_null(sensor);
+//    const cachedSensor1 = reading_to_array(sensor);
+
+//    const win = window.open('', '_blank');
+//    await visibilityChangeWatcher.wait_for("visibilitychange");
+//    const cachedSensor2 = reading_to_array(sensor);
+
+//    win.close();
+//    sensor.stop();
+//    assert_object_equals(cachedSensor1, cachedSensor2);
+//  }, `${sensorName}: sensor readings can not be fired on the background tab`);
+
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const fastSensor = new sensorType({frequency: 30});
     const slowSensor = new sensorType({frequency: 5});
     slowSensor.start();
@@ -217,9 +281,10 @@ function runGenericSensorTests(sensorType) {
     });
     assert_greater_than(fastCounter, 2,
                         "Fast sensor overtakes the slow one");
-  }, `${sensorType.name}: frequency hint works`);
+  }, `${sensorName}: frequency hint works`);
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     // Create a focused editbox inside a cross-origin iframe,
     // sensor notification must suspend.
     const iframeSrc = 'data:text/html;charset=utf-8,<html><body>'
@@ -248,18 +313,20 @@ function runGenericSensorTests(sensorType) {
     assert_greater_than(sensor.timestamp, cachedTimestamp);
 
     sensor.stop();
-  }, `${sensorType.name}: sensor receives suspend / resume notifications when\
+  }, `${sensorName}: sensor receives suspend / resume notifications when\
   cross-origin subframe is focused`);
 
-  test(() => {
-     assert_throws("NotSupportedError", () => { new sensorType({invalid: 1}) });
-     assert_throws("NotSupportedError", () => { new sensorType({frequency: 60, invalid: 1}) });
-     if (spatialSensors.indexOf(sensorType.name) == -1) {
-       assert_throws("NotSupportedError", () => { new sensorType({referenceFrame: "screen"}) });
-     }
-  }, `${sensorType.name}: throw 'NotSupportedError' for an unsupported sensor option`);
+//  Re-enable after https://github.com/w3c/sensors/issues/361 is fixed.
+//  test(() => {
+//     assert_throws("NotSupportedError", () => { new sensorType({invalid: 1}) });
+//     assert_throws("NotSupportedError", () => { new sensorType({frequency: 60, invalid: 1}) });
+//     if (spatialSensors.indexOf(sensorName) == -1) {
+//       assert_throws("NotSupportedError", () => { new sensorType({referenceFrame: "screen"}) });
+//     }
+//  }, `${sensorName}: throw 'NotSupportedError' for an unsupported sensor option`);
 
   test(() => {
+    assert_true(sensorName in self);
     const invalidFreqs = [
       "invalid",
       NaN,
@@ -273,14 +340,15 @@ function runGenericSensorTests(sensorType) {
                     () => { new sensorType({frequency: freq}) },
                     `when freq is ${freq}`);
     });
-  }, `${sensorType.name}: throw 'TypeError' if frequency is invalid`);
+  }, `${sensorName}: throw 'TypeError' if frequency is invalid`);
 
-  if (spatialSensors.indexOf(sensorType.name) == -1) {
+  if (spatialSensors.indexOf(sensorName) == -1) {
     // The sensorType does not represent a spatial sensor.
     return;
   }
 
-  promise_test(async t => {
+  sensor_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType({referenceFrame: "screen"});
     const sensorWatcher = new EventWatcher(t, sensor, ["reading", "error"]);
     sensor.start();
@@ -291,34 +359,37 @@ function runGenericSensorTests(sensorType) {
     assert_reading_not_null(sensor);
 
     sensor.stop();
-  }, `${sensorType.name}: sensor reading is correct when options.referenceFrame is 'screen'`);
+  }, `${sensorName}: sensor reading is correct when options.referenceFrame is 'screen'`);
 
   test(() => {
+    assert_true(sensorName in self);
     const invalidRefFrames = [
       "invalid",
       null,
       123,
       {},
       "",
-      true,
-      undefined
+      true
     ];
     invalidRefFrames.map(refFrame => {
       assert_throws(new TypeError(),
                     () => { new sensorType({referenceFrame: refFrame}) },
                     `when refFrame is ${refFrame}`);
     });
-  }, `${sensorType.name}: throw 'TypeError' if referenceFrame is not one of enumeration values`);
+  }, `${sensorName}: throw 'TypeError' if referenceFrame is not one of enumeration values`);
 }
 
-function runGenericSensorInsecureContext(sensorType) {
+function runGenericSensorInsecureContext(sensorName) {
   test(() => {
-    assert_false(sensorType in window, `${sensorType} must not be exposed`);
-  }, `${sensorType} is not exposed in an insecure context`);
+    assert_false(sensorName in window, `${sensorName} must not be exposed`);
+  }, `${sensorName} is not exposed in an insecure context`);
 }
 
-function runGenericSensorOnerror(sensorType) {
+function runGenericSensorOnerror(sensorName) {
+  const sensorType = self[sensorName];
+
   promise_test(async t => {
+    assert_true(sensorName in self);
     const sensor = new sensorType();
     const sensorWatcher = new EventWatcher(t, sensor, ["error", "activate"]);
     sensor.start();
@@ -327,5 +398,5 @@ function runGenericSensorOnerror(sensorType) {
     assert_false(sensor.activated);
     assert_true(event.error.name == 'NotReadableError' ||
                 event.error.name == 'NotAllowedError');
-  }, `${sensorType.name}: 'onerror' event is fired when sensor is not supported`);
+  }, `${sensorName}: 'onerror' event is fired when sensor is not supported`);
 }
diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_html_element-manual.html b/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_html_element-manual.html
index 293ad2ea842f..cc9b4077d13d 100644
--- a/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_html_element-manual.html
+++ b/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_html_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>graphics-document on HTML element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_svg_element-manual.html b/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_svg_element-manual.html
index 4984bc353eb3..1b6144674a3c 100644
--- a/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_svg_element-manual.html
+++ b/tests/wpt/web-platform-tests/graphics-aam/graphics-document_on_svg_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>graphics-document on SVG element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_html_element-manual.html b/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_html_element-manual.html
index 19979b2f3253..074fe51939f1 100644
--- a/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_html_element-manual.html
+++ b/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_html_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>graphics-object on HTML element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_svg_element-manual.html b/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_svg_element-manual.html
index 5c2cf28e4478..d326ec5b649a 100644
--- a/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_svg_element-manual.html
+++ b/tests/wpt/web-platform-tests/graphics-aam/graphics-object_on_svg_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>graphics-object on SVG element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_html_element-manual.html b/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_html_element-manual.html
index 3b9c77fffdc4..913a7d130dc7 100644
--- a/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_html_element-manual.html
+++ b/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_html_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>graphics-symbol on HTML element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_svg_element-manual.html b/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_svg_element-manual.html
index 6663225f82cc..78848269d224 100644
--- a/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_svg_element-manual.html
+++ b/tests/wpt/web-platform-tests/graphics-aam/graphics-symbol_on_svg_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>graphics-symbol on SVG element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
index de4aee2dacc8..02cc44ec78b0 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-disabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_disabled(Gyroscope);
+run_fp_tests_disabled('Gyroscope');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index 3c831bb7c7ee..e1aa0f944a80 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute_redirect_on_load(Gyroscope);
+run_fp_tests_enabled_by_attribute_redirect_on_load('Gyroscope');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
index 46473c3a9d03..17e5b27e1ad5 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy-attribute.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute(Gyroscope);
+run_fp_tests_enabled_by_attribute('Gyroscope');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
index 95eee330b394..9bcced92b7e5 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled(Gyroscope);
+run_fp_tests_enabled('Gyroscope');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
index ae5a63d14843..76d1c5e7291a 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope-enabled-on-self-origin-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_on_self_origin(Gyroscope);
+run_fp_tests_enabled_on_self_origin('Gyroscope');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope.https.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope.https.html
index 81cdfddee7ba..0c3f08f5f47c 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope.https.html
@@ -9,6 +9,6 @@
 <div id="log"></div>
 <script>
 
-runGenericSensorTests(Gyroscope);
+runGenericSensorTests('Gyroscope');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/gyroscope/Gyroscope_onerror-manual.https.html b/tests/wpt/web-platform-tests/gyroscope/Gyroscope_onerror-manual.https.html
index f0126151a24a..b63448bfc88c 100644
--- a/tests/wpt/web-platform-tests/gyroscope/Gyroscope_onerror-manual.https.html
+++ b/tests/wpt/web-platform-tests/gyroscope/Gyroscope_onerror-manual.https.html
@@ -15,6 +15,6 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorOnerror(Gyroscope);
+runGenericSensorOnerror('Gyroscope');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md
new file mode 100644
index 000000000000..52548db65649
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/README.md
@@ -0,0 +1 @@
+See `/html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html` for more detailed parsing tests (shared with `<meta http-equiv=refresh>`).
diff --git a/tests/wpt/web-platform-tests/http/refresh/navigate.window.js b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js
similarity index 100%
rename from tests/wpt/web-platform-tests/http/refresh/navigate.window.js
rename to tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/navigate.window.js
diff --git a/tests/wpt/web-platform-tests/http/refresh/resources/multiple.asis b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis
similarity index 100%
rename from tests/wpt/web-platform-tests/http/refresh/resources/multiple.asis
rename to tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/multiple.asis
diff --git a/tests/wpt/web-platform-tests/http/refresh/resources/refresh.py b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py
similarity index 100%
rename from tests/wpt/web-platform-tests/http/refresh/resources/refresh.py
rename to tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refresh.py
diff --git a/tests/wpt/web-platform-tests/http/refresh/resources/refreshed.txt b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt
similarity index 100%
rename from tests/wpt/web-platform-tests/http/refresh/resources/refreshed.txt
rename to tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/resources/refreshed.txt
diff --git a/tests/wpt/web-platform-tests/http/refresh/subresource.any.js b/tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js
similarity index 100%
rename from tests/wpt/web-platform-tests/http/refresh/subresource.any.js
rename to tests/wpt/web-platform-tests/html/browsers/browsing-the-web/navigating-across-documents/refresh/subresource.any.js
diff --git a/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_url.html b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_url.html
new file mode 100644
index 000000000000..cfbca35bfdfb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/browsers/history/the-history-interface/history_pushstate_url.html
@@ -0,0 +1,24 @@
+<!doctype html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>History pushState sets the url</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<div id="log"></div>
+<script>
+async_test(function(t) {
+    var oldLocation = window.location.toString();
+    window.history.pushState(null, "", "#hash");
+    assert_equals(oldLocation + "#hash", window.location.toString(), "pushState updates url");
+    history.back();
+    window.onhashchange = () => {
+        assert_equals(oldLocation, window.location.toString(), 'history traversal restores old url');
+        t.done();
+    };
+}, "history pushState sets url");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/origin-of-data-document.html b/tests/wpt/web-platform-tests/html/browsers/origin/origin-of-data-document.html
index 345a3a6b73bb..d6b6d533a221 100644
--- a/tests/wpt/web-platform-tests/html/browsers/origin/origin-of-data-document.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/origin-of-data-document.html
@@ -20,16 +20,7 @@
           assert_throws("SecurityError", function () {
             var couldAccessCrossOriginProperty = e.source.location.href;
           }, "The 'data:' frame should be cross-origin: 'window.location.href'");
-
-          // Try to access contentDocument of the 'data: ' frame. Some browsers
-          // (i.e. Firefox, Safari) will return |null| and some (i.e. Chrome)
-          // will throw an exception.
-          var dataFrameContentDocument = null;
-          try {
-            dataFrameContentDocument = i.contentDocument;
-          } catch (ex) {
-          }
-          assert_equals(dataFrameContentDocument, null, "The 'data:' iframe should be unable to access its contentDocument.");
+          assert_equals(i.contentDocument, null, "The 'data:' iframe should be unable to access its contentDocument.");
         }));
 
         document.body.appendChild(i);
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html b/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html
index bf5b0bc84fd5..6ffea4fe32aa 100644
--- a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html
+++ b/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html
@@ -15,7 +15,7 @@
       var SUFFIX_HOST = ORIGINAL_HOST.substring(ORIGINAL_HOST.lastIndexOf('.') + 1); // e.g. "test"
       var PREFIX_HOST = "www1." + ORIGINAL_HOST; // e.g. "www1.web-platform.test"
       var iframe = document.getElementById("iframe");
-      var iframe_url = new URL("document_domain_setter_iframe.html", document.location);
+      var iframe_url = new URL("support/document_domain_setter_iframe.html", document.location);
       iframe_url.hostname = PREFIX_HOST;
       iframe.src = iframe_url;
       test(function() {
@@ -25,11 +25,11 @@
         assert_throws("SecurityError", function() { document.domain = "example.com"; });
       }, "failed setting of document.domain");
       async_test(function(t) {
-        iframe.addEventListener("load", t.step_func(function() {
+        iframe.addEventListener("load", t.step_func_done(function() {
           // Before setting document.domain, the iframe is not
           // same-origin-domain, so security checks fail.
           assert_equals(iframe.contentDocument, null);
-          assert_equals(iframe.contentWindow.frameElement, null);
+          assert_throws("SecurityError", () => iframe.contentWindow.frameElement);
           assert_throws("SecurityError", function() { iframe.contentWindow.location.origin; });
           assert_throws("SecurityError", function() { iframe.contentWindow.location.href; });
           assert_throws("SecurityError", function() { iframe.contentWindow.location.protocol; });
@@ -45,8 +45,8 @@
           // After setting document.domain, the iframe is
           // same-origin-domain, so security checks pass.
           assert_equals(iframe.contentDocument.domain, document.domain);
-          assert_equals(iframe.contentWindow.frameElement, iframe)
-          assert_equals(iframe.contentWindow.origin, window.origin);
+          assert_equals(iframe.contentWindow.frameElement, iframe);
+          assert_equals(iframe.contentWindow.origin, iframe_url.origin);
           assert_equals(iframe.contentWindow.location.href, iframe_url.href);
           assert_equals(iframe.contentWindow.location.protocol, iframe_url.protocol);
           assert_equals(iframe.contentWindow.location.host, iframe_url.host);
@@ -60,7 +60,6 @@
           // document.open checks for same-origin, not same-origin-domain,
           // https://github.com/whatwg/html/issues/2282
           assert_throws("SecurityError", function() { iframe.contentDocument.open(); });
-          t.done();
         }));
       }, "same-origin-domain iframe");
     </script>
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_iframe.html b/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html
similarity index 100%
rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter_iframe.html
rename to tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/support/document_domain_setter_iframe.html
diff --git a/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/document-write/contentType.window.js b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/document-write/contentType.window.js
new file mode 100644
index 000000000000..dbabb1b19b4b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/document-write/contentType.window.js
@@ -0,0 +1,28 @@
+// META: script=/common/media.js
+
+const videoURL = getVideoURI("/images/pattern"),
+      videoMIMEType = getMediaContentType(videoURL);
+
+[
+  [videoURL, videoMIMEType, "video"],
+  ["/images/red.png", "image/png", "image"],
+  ["/common/text-plain.txt", "text/plain", "text"],
+  ["/common/blank.html", "text/html", "HTML"]
+].forEach(val => {
+  async_test(t => {
+    const frame = document.body.appendChild(document.createElement("iframe"));
+    t.add_cleanup(() => frame.remove());
+    frame.src = val[0];
+    frame.onload = t.step_func_done(() => {
+      assert_equals(frame.contentDocument.contentType, val[1]);
+      frame.contentDocument.write("<b>Heya</b>");
+      assert_equals(frame.contentDocument.body.firstChild.localName, "b");
+      assert_equals(frame.contentDocument.body.firstChild.textContent, "Heya");
+      assert_equals(frame.contentDocument.contentType, val[1]);
+
+      // Make sure a load event is fired across browsers
+      // https://github.com/w3c/web-platform-tests/pull/10239
+      frame.contentDocument.close();
+    });
+  }, "document.write(): " + val[2] + " document");
+});
diff --git a/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js
new file mode 100644
index 000000000000..a610ce9e1d17
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/encoding.window.js
@@ -0,0 +1,12 @@
+async_test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe"));
+  frame.src = "resources/encoding-frame.html";
+  frame.onload = t.step_func_done(t => {
+    // Using toLowerCase() to avoid an Edge bug
+    assert_equals(frame.contentDocument.characterSet.toLowerCase(), "shift_jis", "precondition");
+    frame.contentDocument.open();
+    assert_equals(frame.contentDocument.characterSet.toLowerCase(), "shift_jis", "actual test");
+    frame.contentDocument.close();
+    assert_equals(frame.contentDocument.characterSet.toLowerCase(), "shift_jis", "might as well");
+  });
+}, "doucment.open() and the document's encoding");
diff --git a/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js
new file mode 100644
index 000000000000..97334ce1bab8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/event-listeners.window.js
@@ -0,0 +1,42 @@
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe")),
+        body = frame.contentDocument.body;
+  t.add_cleanup(() => frame.remove());
+  frame.contentDocument.addEventListener("x", t.unreached_func("document event listener not removed"));
+  body.addEventListener("x", t.unreached_func("body event listener not removed"));
+  frame.contentDocument.open();
+  frame.contentDocument.dispatchEvent(new Event("x"));
+  body.dispatchEvent(new Event("x"));
+  frame.contentDocument.close();
+}, "Event listeners are to be removed");
+
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe"));
+  t.add_cleanup(() => frame.remove());
+  let once = false;
+  frame.contentDocument.addEventListener("x", () => {
+    frame.contentDocument.open();
+    once = true;
+  });
+  frame.contentDocument.addEventListener("x", t.unreached_func("second event listener not removed"));
+  frame.contentDocument.dispatchEvent(new Event("x"));
+  assert_true(once);
+  frame.contentDocument.close();
+}, "Event listeners are to be removed with immediate effect");
+
+test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe")),
+        shadow = frame.contentDocument.body.attachShadow({ mode: "closed" }),
+        shadowChild = shadow.appendChild(document.createElement("div")),
+        shadowShadow = shadowChild.attachShadow({ mode: "open" }),
+        nodes = [shadow, shadowChild, shadowShadow];
+  t.add_cleanup(() => frame.remove());
+  nodes.forEach(node => {
+    node.addEventListener("x", t.unreached_func(node + "'s event listener not removed"));
+  });
+  frame.contentDocument.open();
+  nodes.forEach(node => {
+    node.dispatchEvent(new Event("x"));
+  });
+  frame.contentDocument.close();
+}, "Event listeners are to be removed from shadow trees as well");
diff --git a/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html
new file mode 100644
index 000000000000..843c3a2c7988
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/dom/dynamic-markup-insertion/opening-the-input-stream/resources/encoding-frame.html
@@ -0,0 +1,3 @@
+<!doctype html>
+<meta charset=ms932>
+<p>Encoded in Shift_JIS.</p>
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/015-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/datastore/015-manual.html
index 6bb3cad3aeec..604c1d43709b 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/datastore/015-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/datastore/015-manual.html
@@ -9,6 +9,7 @@
 blockquote + div { clear: left; }
     </style>
     <script type="text/javascript" src="/resources/testharness.js"></script>
+    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
     <script type="text/javascript">
 setup(function () {},{explicit_done:true,explicit_timeout:true});
 window.onload = function () {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-manual.html
index 1a07a943a7fe..9428a8776042 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-cross-document-suite-manual.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <title>drag &amp; drop - event sequence for cross-document drag</title>
 <script type="text/javascript" src="/resources/testharness.js"></script>
+<script type="text/javascript" src="/resources/testharnessreport.js"></script>
 <script>
 var events = new Array();
 </script>
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-file-suite-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-file-suite-manual.html
index 380247b8a1bc..22a66f5e9a68 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-file-suite-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-file-suite-manual.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <title>drag &amp; drop - event sequence for file drops</title>
 <script type="text/javascript" src="/resources/testharness.js"></script>
+<script type="text/javascript" src="/resources/testharnessreport.js"></script>
 <style type="text/css">
   /* use margins instead of padding to make sure the body begins at the top of the page */
   html, body {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-suite-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-suite-manual.html
index b848fa9467db..16c6583dc82a 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/events/events-suite-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/events/events-suite-manual.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <title>drag &amp; drop - event sequence for draggable elements</title>
 <script type="text/javascript" src="/resources/testharness.js"></script>
+<script type="text/javascript" src="/resources/testharnessreport.js"></script>
 <style type="text/css">
   /* use margins instead of padding to make sure the body begins at the top of the page */
   html, body {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/001.html b/tests/wpt/web-platform-tests/html/editing/dnd/file/001.html
index 07ef4dbbb779..b9119200415a 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/file/001.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/file/001.html
@@ -55,8 +55,8 @@
       fails[fails.length] = 'dataTransfer.files[0].size '+e.dataTransfer.files[0].size+' instead of '+filesize;
     }
     /*
-    if( !e.dataTransfer.files[0].lastModifiedDate ) {
-      fails[fails.length] = 'no dataTransfer.files[0].lastModifiedDate';
+    if( !e.dataTransfer.files[0].lastModified ) {
+      fails[fails.length] = 'no dataTransfer.files[0].lastModified';
     }
     */
     if( e.dataTransfer.files[0].name != filename ) {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/002.html b/tests/wpt/web-platform-tests/html/editing/dnd/file/002.html
index b029afb3ef86..c8d633d6d2ad 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/file/002.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/file/002.html
@@ -66,8 +66,8 @@
       fails[fails.length] = 'dataTransfer.files['+i0+'].size '+e.dataTransfer.files[i0].size+' instead of '+filesize1;
     }
     /*
-    if( !e.dataTransfer.files[i0].lastModifiedDate ) {
-      fails[fails.length] = 'no dataTransfer.files['+i0+'].lastModifiedDate';
+    if( !e.dataTransfer.files[i0].lastModified ) {
+      fails[fails.length] = 'no dataTransfer.files['+i0+'].lastModified';
     }
     */
     if( e.dataTransfer.files[i0].name != filename1 ) {
@@ -80,8 +80,8 @@
       fails[fails.length] = 'dataTransfer.files['+i1+'].size '+e.dataTransfer.files[i1].size+' instead of '+filesize2;
     }
     /*
-    if( !e.dataTransfer.files[i1].lastModifiedDate ) {
-      fails[fails.length] = 'no dataTransfer.files['+i1+'].lastModifiedDate';
+    if( !e.dataTransfer.files[i1].lastModified ) {
+      fails[fails.length] = 'no dataTransfer.files['+i1+'].lastModified';
     }
     */
     if( e.dataTransfer.files[i1].name != filename2 ) {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/003.html b/tests/wpt/web-platform-tests/html/editing/dnd/file/003.html
index 0c532ea5c3e3..51e5a5a79cd6 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/file/003.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/file/003.html
@@ -42,8 +42,8 @@
       fails[fails.length] = 'dataTransfer.files[0].size '+e.dataTransfer.files[0].size+' instead of '+filesize;
     }
     /*
-    if( !e.dataTransfer.files[0].lastModifiedDate ) {
-      fails[fails.length] = 'no dataTransfer.files[0].lastModifiedDate';
+    if( !e.dataTransfer.files[0].lastModified ) {
+      fails[fails.length] = 'no dataTransfer.files[0].lastModified';
     }
     */
     if( e.dataTransfer.files[0].name != filename ) {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/007.html b/tests/wpt/web-platform-tests/html/editing/dnd/file/007.html
index f3e511791c9a..099716f894fb 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/file/007.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/file/007.html
@@ -57,8 +57,8 @@
       fails[fails.length] = 'dataTransfer.files[0].size '+e.dataTransfer.files[0].size+' instead of '+filesize1+' or '+filesize2;
     }
     /*
-    if( !e.dataTransfer.files[0].lastModifiedDate ) {
-      fails[fails.length] = 'no dataTransfer.files[0].lastModifiedDate';
+    if( !e.dataTransfer.files[0].lastModified ) {
+      fails[fails.length] = 'no dataTransfer.files[0].lastModified';
     }
     */
     if( !window.FileReader ) {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/008.html b/tests/wpt/web-platform-tests/html/editing/dnd/file/008.html
index 3ba282766cbd..497515820905 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/file/008.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/file/008.html
@@ -60,8 +60,8 @@
     }
     */
     /*
-    if( !e.dataTransfer.files[0].lastModifiedDate ) {
-      fails[fails.length] = 'no dataTransfer.files[0].lastModifiedDate';
+    if( !e.dataTransfer.files[0].lastModified ) {
+      fails[fails.length] = 'no dataTransfer.files[0].lastModified';
     }
     */
     if( !window.FileReader ) {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/file/011.html b/tests/wpt/web-platform-tests/html/editing/dnd/file/011.html
index 2c12d64eceb9..a265e7b4dd18 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/file/011.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/file/011.html
@@ -45,8 +45,8 @@
       fails[fails.length] = 'dataTransfer.files[0].size '+e.dataTransfer.files[0].size+' instead of '+filesize;
     }
     /*
-    if( !e.dataTransfer.files[0].lastModifiedDate ) {
-      fails[fails.length] = 'no dataTransfer.files[0].lastModifiedDate';
+    if( !e.dataTransfer.files[0].lastModified ) {
+      fails[fails.length] = 'no dataTransfer.files[0].lastModified';
     }
     */
     if( e.dataTransfer.files[0].name != filename ) {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/005-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/005-manual.html
index f3bb221b7f2a..4e0b00dab2b0 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/005-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/005-manual.html
@@ -9,6 +9,7 @@
 blockquote + div { clear: left; }
     </style>
     <script type="text/javascript" src="/resources/testharness.js"></script>
+    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
     <script type="text/javascript">
 setup(function () {},{explicit_done:true,explicit_timeout:true});
 window.onload = function () {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/006-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/006-manual.html
index 2007116668af..e7d1677b14b3 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/006-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/synthetic/006-manual.html
@@ -9,6 +9,7 @@
 blockquote + div { clear: left; }
     </style>
     <script type="text/javascript" src="/resources/testharness.js"></script>
+    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
     <script type="text/javascript">
 setup(function () {},{explicit_done:true,explicit_timeout:true});
 window.onload = function () {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/001-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/001-manual.html
index 13c6864d8bdf..4622c76a92f1 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/001-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/001-manual.html
@@ -6,6 +6,7 @@
 blockquote { height: 100px; width: 100px; background: orange; margin: 0; padding: 0; }
     </style>
     <script type="text/javascript" src="/resources/testharness.js"></script>
+    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
     <script type="text/javascript">
 setup(function () {},{explicit_done:true});
 window.onload = function () {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/002-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/002-manual.html
index c4e8acdd9c58..d1615090660e 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/002-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/002-manual.html
@@ -9,6 +9,7 @@
 blockquote + div { clear: left; }
     </style>
     <script type="text/javascript" src="/resources/testharness.js"></script>
+    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
     <script type="text/javascript">
 setup(function () {},{explicit_done:true});
 window.onload = function () {
diff --git a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/101-manual.html b/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/101-manual.html
index e5bbd7fa3d2a..23f5cf9baf24 100644
--- a/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/101-manual.html
+++ b/tests/wpt/web-platform-tests/html/editing/dnd/target-origin/101-manual.html
@@ -10,6 +10,7 @@
     </style>
     <script type="text/javascript" src="../resources/crossorigin.sub.js"></script>
     <script type="text/javascript" src="/resources/testharness.js"></script>
+    <script type="text/javascript" src="/resources/testharnessreport.js"></script>
     <script type="text/javascript">
 setup(function () {},{explicit_done:true});
 window.onload = function () {
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
new file mode 100644
index 000000000000..b1a4d5bd8632
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/location.sub.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<meta charset={{GET[encoding]}}> <!-- ends up as <meta charset> by default which is windows-1252 -->
+<meta name=variant content="?encoding=x-cp1251">
+<meta name=variant content="?encoding=utf8">
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<div id=log></div>
+<script>
+function expected(encoding) {
+  return "?" + {
+    "UTF-8": "%C3%BF",
+    "windows-1251": "&%23255;",
+    "windows-1252": "%FF"
+  }[encoding];
+}
+
+[
+  [(win, input) => { win.location = input; }, "location [PutForwards]"],
+  [(win, input) => { win.location.assign(input); }, "location.assign()"],
+  [(win, input) => { win.location.replace(input); }, "location.replace()"],
+  [(win, input) => { win.location.href = input; }, "location.href"]
+].forEach(([callback, desc]) => {
+  async_test(t => {
+    const frame = document.body.appendChild(document.createElement("iframe")),
+          actualEncoding = document.characterSet
+    callback(frame.contentWindow, "/common/blank.html?\u00FF");
+    frame.onload = t.step_func_done(() => {
+      assert_equals(frame.contentWindow.location.search, expected(actualEncoding));
+    });
+  }, desc);
+});
+
+async_test(t => {
+  const frame = document.body.appendChild(document.createElement("iframe")),
+        actualEncoding = document.characterSet;
+  frame.src = "/common/blank.html";
+  frame.onload = t.step_func(() => {
+    frame.contentWindow.location.search = "\u00FF";
+    frame.onload = t.step_func_done(() => {
+      assert_equals(frame.contentWindow.location.search, expected(actualEncoding));
+    });
+  });
+}, "location.search");
+</script>
diff --git a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
index 769b41bcc27f..0d14fe70f073 100644
--- a/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
+++ b/tests/wpt/web-platform-tests/html/infrastructure/urls/resolving-urls/query-encoding/resources/resolve-url.js
@@ -1,3 +1,6 @@
+// NOTE: this file needs to be split up rather than expanded. See ../location.sub.html for some
+// extracted tests. Tracked by https://github.com/w3c/web-platform-tests/issues/4934.
+
 setup({explicit_done:true});
 onload = function() {
   var encoding = '{{GET[encoding]}}';
@@ -35,7 +38,7 @@ onload = function() {
                       // page and the test timing out
                       test_obj.force_timeout();
                   }
-                  step_timeout(poll, 200);
+                  test_obj.step_timeout(poll, 200);
               } else {
                   assert_equals(xhr.response, expected);
                   test_obj.done();
@@ -43,7 +46,7 @@ onload = function() {
           });
           xhr.send();
       })
-      step_timeout(poll, 200);
+      test_obj.step_timeout(poll, 200);
   }
 
   // background attribute, check with getComputedStyle
@@ -505,55 +508,6 @@ onload = function() {
   }, 'window.open()',
   {help:'https://html.spec.whatwg.org/multipage/#dom-open'});
 
-  // location
-  function test_location(func, desc) {
-    async_test(function() {
-      var iframe = document.createElement('iframe');
-      document.body.appendChild(iframe);
-      this.add_cleanup(function() {
-        document.body.removeChild(iframe);
-      });
-      func(iframe.contentWindow, input_url_html);
-      iframe.onload = this.step_func(function() {
-        var got = iframe.contentDocument.body.textContent;
-        if (got != '') {
-          assert_equals(got, expected_current);
-          this.done();
-        }
-      });
-    }, desc,
-    {help:'https://html.spec.whatwg.org/multipage/#the-location-interface'});
-  }
-  [[function(win, input) { win.location = input; }, "location [PutForwards]"],
-   [function(win, input) { win.location.assign(input); }, "location.assign()"],
-   [function(win, input) { win.location.replace(input); }, "location.replace()"],
-   [function(win, input) { win.location.href = input; }, "location.href"]].forEach(function(arr) {
-    test_location(arr[0], arr[1]);
-  });
-
-  // location.search
-  async_test(function() {
-    var iframe = document.createElement('iframe');
-    iframe.src = input_url_html;
-    document.body.appendChild(iframe);
-    this.add_cleanup(function() {
-      document.body.removeChild(iframe);
-    });
-    var i = 0;
-    iframe.onload = this.step_func(function() {
-      i++;
-      if (i == 1) {
-        iframe.contentWindow.location.search = '?' + input_url_html.split('?')[1] + '&other=foobar';
-      } else {
-        var got = iframe.contentDocument.body.textContent;
-        assert_equals(got, expected_current);
-        this.done();
-      }
-    });
-  }, 'location.search',
-  {help:['https://html.spec.whatwg.org/multipage/#the-location-interface',
-         'http://url.spec.whatwg.org/#dom-url-search']});
-
   // a.search, area.search
   function test_hyperlink_search(tag) {
     test(function() {
diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html
new file mode 100644
index 000000000000..9a2d1d064139
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode-ref.html
@@ -0,0 +1,4 @@
+<!DOCTYPE html>
+<div>
+  <video controls />
+</div>
diff --git a/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html
new file mode 100644
index 000000000000..d124396ab2c0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/rendering/replaced-elements/embedded-content/video-controls-vertical-writing-mode.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Video controls rendering in vertical-lr</title>
+<link rel="help" href="https://html.spec.whatwg.org/multipage/rendering.html#embedded-content-rendering-rules" />
+<link rel="match" href="video-controls-vertical-writing-mode-ref.html" />
+<div style="writing-mode:vertical-lr">
+  <video controls />
+</div>
diff --git a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html b/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html
index 4492f88bbb5e..14d06227ac86 100644
--- a/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html
+++ b/tests/wpt/web-platform-tests/html/semantics/document-metadata/the-link-element/link-rel-attribute.html
@@ -16,11 +16,6 @@
 </div>
 
 <script>
-var host = document.querySelector("#host");
-var shadow = host.attachShadow({ mode: "open" });
-var tmpl = document.querySelector("template#shadow-dom");
-var clone = document.importNode(tmpl.content, true);
-shadow.appendChild(clone);
 
 function testLinkRelModification(testDiv, testLink) {
   assert_equals(getComputedStyle(testDiv).color, "rgb(0, 128, 0)");
@@ -38,6 +33,11 @@
 }, "Removing stylesheet from link rel attribute should remove the stylesheet for light DOM");
 
 test (() => {
+  var host = document.querySelector("#host");
+  var shadow = host.attachShadow({ mode: "open" });
+  var tmpl = document.querySelector("template#shadow-dom");
+  var clone = document.importNode(tmpl.content, true);
+  shadow.appendChild(clone);
   testLinkRelModification(shadow.querySelector("#shadow-div"),
                           shadow.querySelector("#shadow-link"));
 }, "Removing stylesheet from link rel attribute should remove the stylesheet for shadow DOM");
diff --git a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html
index 47256487eebf..c564a5845d5d 100644
--- a/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html
+++ b/tests/wpt/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/sizes-iframed.sub.html
@@ -156,6 +156,7 @@
 <img srcset='/images/green-1x1.png?f15 50w, /images/green-16x16.png?f15 51w' sizes='0.1dpi'>
 <img srcset='/images/green-1x1.png?f16 50w, /images/green-16x16.png?f16 51w' sizes='0.1dpcm'>
 <img srcset='/images/green-1x1.png?f17 50w, /images/green-16x16.png?f17 51w' sizes='0.1dppx'>
+<img srcset='/images/green-1x1.png?f17a 50w, /images/green-16x16.png?f17a 51w' sizes='0.1x'>
 <img srcset='/images/green-1x1.png?f18 50w, /images/green-16x16.png?f18 51w' data-foo='1px' sizes='attr(data-foo, length, 1px)'>
 <img srcset='/images/green-1x1.png?f19 50w, /images/green-16x16.png?f19 51w' data-foo='1' sizes='attr(data-foo, px, 1px)'>
 <img srcset='/images/green-1x1.png?f20 50w, /images/green-16x16.png?f20 51w' sizes='toggle(1px)'>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js
new file mode 100644
index 000000000000..693bcf9a2af5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/form-submission-0/form-data-set-empty-file.window.js
@@ -0,0 +1,14 @@
+promise_test(() => {
+  const form = document.body.appendChild(document.createElement("form")),
+        input = form.appendChild(document.createElement("input"));
+  input.type = "file";
+  input.name = "hi";
+  const fd = new FormData(form),
+        value = fd.get(input.name);
+  assert_true(value instanceof File, "value is a File");
+  assert_equals(value.name, "", "name");
+  assert_equals(value.type, "application/octet-stream", "type");
+  return new Response(value).text().then(body => {
+    assert_equals(body, "", "body");
+  });
+}, "Empty <input type=file> is still serialized");
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html
index a7a59421250e..4b98851ecddc 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/execution-timing/077.html
@@ -17,12 +17,12 @@
                         var t = async_test()
 
                         function test() {
-                                var script = createScript('data:text\/javascript,log("Script #1 ran")');
+                                var script = createScript('data:text\/javascript,log("Script %231 ran")');
                                 var script2 = createScript('','log("Script #2 ran")');
                                 if(script2) {
                                     head.removeChild(script2);
                                 }
-                                var script3 = createScript('data:text\/javascript, log("Script #3 ran"); createScript(\'\', \'log("Script #4 ran")\')');
+                                var script3 = createScript('data:text\/javascript, log("Script %233 ran"); createScript(\'\', \'log("Script #4 ran")\')');
                                 if(script3) {
                                     head.removeChild(script3);
                                 }
diff --git a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html
index 3c853b22d6e8..fa1c7dee9d2a 100644
--- a/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html
+++ b/tests/wpt/web-platform-tests/html/semantics/scripting-1/the-script-element/module/import-meta/import-meta-url.html
@@ -20,4 +20,26 @@
   assert_equals(importMetaOnDependentModule.url,
                 base + "/import-meta-dependent.js");
 }, "import.meta.url in a dependent external script");
+
+import { importMetaOnRootModule as hashedImportMetaOnRootModule1,
+         importMetaOnDependentModule as hashedImportMetaOnDependentModule1 }
+       from "./import-meta-root.js#1";
+
+import { importMetaOnRootModule as hashedImportMetaOnRootModule2,
+         importMetaOnDependentModule as hashedImportMetaOnDependentModule2 }
+       from "./import-meta-root.js#2";
+
+test(() => {
+  assert_equals(hashedImportMetaOnRootModule1.url,
+                base + "/import-meta-root.js#1");
+  assert_equals(hashedImportMetaOnRootModule2.url,
+                base + "/import-meta-root.js#2");
+
+  // Must not be affected
+  assert_equals(hashedImportMetaOnDependentModule1.url,
+                base + "/import-meta-dependent.js");
+  assert_equals(hashedImportMetaOnDependentModule2.url,
+                base + "/import-meta-dependent.js");
+}, "import.meta.url when importing the module with different fragments");
+
 </script>
diff --git a/tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event-manual.html b/tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event-manual.html
new file mode 100644
index 000000000000..96d17e27c892
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/user-activation/activation-thru-contextmenu-event-manual.html
@@ -0,0 +1,58 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>User activation with 'contextmenu' event</title>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+    <link rel="author" title="Google" href="http://www.google.com "/>
+    <link rel="help" href="https://html.spec.whatwg.org/#triggered-by-user-activation">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <style>
+      #target {
+        width: 250px;
+        height: 150px;
+        float: left;
+        background-color: green;
+      }
+
+      #done {
+        float: left;
+        padding: 20px;
+        margin: 10px;
+      }
+    </style>
+    <script type="text/javascript">
+      let activation_event_fired = false;
+
+      function run() {
+        let success = false;
+        let test_contextmenu = async_test("'contextmenu' can call vibrate.");
+
+        on_event(document.getElementById("done"), "click", () => {
+          test_contextmenu.step(() => {
+            assert_true(activation_event_fired, "activation event has fired");
+          });
+          test_contextmenu.done();
+        });
+
+        on_event(document.getElementById("target"), "contextmenu", (e) => {
+            test_contextmenu.step(() => {
+              e.preventDefault();
+              assert_true(navigator.vibrate(200), "navigator.vibrate is successful");
+              activation_event_fired = true;
+            });
+        });
+      }
+    </script>
+  </head>
+  <body onload="run()">
+    <h1>User activation with 'contextmenu' event</h1>
+    <h4>Tests that a 'contextmenu' event is treated like a user activation.</h4>
+    <ol>
+      <li>Right-click or long-press on green.</li>
+      <li>Click or tap on Done.</li>
+    </ol>
+    <div id="target"></div>
+    <input type="button" id="done" value="Done" />
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js b/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js
new file mode 100644
index 000000000000..624f98344c8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js
@@ -0,0 +1,39 @@
+/**
+ * Runs a collection of tests that determine if an API implements structured clone
+ * correctly.
+ *
+ * The `runner` parameter has the following properties:
+ * - `setup()`: An optional function run once before testing starts
+ * - `teardown()`: An option function run once after all tests are done
+ * - `preTest()`: An optional, async function run before a test
+ * - `postTest()`: An optional, async function run after a test is done
+ * - `structuredClone(obj, transferList)`: Required function that somehow
+ *                                         structurally clones an object.
+ * - `noTransferTests`: When true, disables tests with transferables
+ */
+
+function runStructuredCloneBatteryOfTests(runner) {
+  const defaultRunner = {
+    setup() {},
+    preTest() {},
+    postTest() {},
+    teardown() {}
+  };
+  runner = Object.assign({}, defaultRunner, runner);
+
+  let setupPromise = runner.setup();
+  const allTests = structuredCloneBatteryOfTests.map(test => {
+
+    return new Promise(resolve => {
+      promise_test(async _ => {
+        test = await test;
+        await setupPromise;
+        await runner.preTest(test);
+        await test.f(runner)
+        await runner.postTest(test);
+        resolve();
+      }, test.description);
+    }).catch(_ => {});
+  });
+  Promise.all(allTests).then(_ => runner.teardown());
+}
diff --git a/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js b/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js
new file mode 100644
index 000000000000..744f11681960
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js
@@ -0,0 +1,22 @@
+structuredCloneBatteryOfTests.push({
+  description: 'ArrayBuffer',
+  async f(runner) {
+    const buffer = new Uint8Array([1]).buffer;
+    const copy = await runner.structuredClone(buffer, [buffer]);
+    assert_equals(buffer.byteLength, 0);
+    assert_equals(copy.byteLength, 1);
+  }
+});
+
+structuredCloneBatteryOfTests.push({
+  description: 'MessagePort',
+  async f(runner) {
+    const {port1, port2} = new MessageChannel();
+    const copy = await runner.structuredClone(port2, [port2]);
+    const msg = new Promise(resolve => port1.onmessage = resolve);
+    copy.postMessage('ohai');
+    assert_equals((await msg).data, 'ohai');
+  }
+});
+
+// TODO: ImageBitmap
diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/common.js b/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests.js
similarity index 73%
rename from tests/wpt/web-platform-tests/workers/semantics/structured-clone/common.js
rename to tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests.js
index 56c2a3004018..40bcd8031b22 100644
--- a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/common.js
+++ b/tests/wpt/web-platform-tests/html/webappapis/structured-clone/structured-clone-battery-of-tests.js
@@ -1,22 +1,23 @@
-function createWorker(msg) {
-  // `type` is defined in the test case itself
-  if (type == 'dedicated')
-    return new Worker('dedicated.js#'+encodeURIComponent(msg));
-  else if (type == 'shared')
-    return (new SharedWorker('shared.js#'+encodeURIComponent(msg))).port;
-  else
-    assert_unreached('invalid or missing `type`');
-}
-
-function check(msg, input, callback, test_obj) {
-  if (!test_obj)
-    test_obj = async_test(msg);
-  test_obj.step(function() {
-    var w = createWorker(msg);
-    if (typeof input === 'function')
-      input = this.step(input);
-    w.postMessage(input);
-    w.onmessage = this.step_func(function(ev) { callback(ev.data, input, this); });
+/* This file is mostly a remix of @zcorpan’s web worker test suite */
+
+structuredCloneBatteryOfTests = [];
+
+function check(description, input, callback) {
+  testObjMock = {
+    done() {},
+    step_func(f) {return _ => f()},
+  };
+
+  structuredCloneBatteryOfTests.push({
+    description,
+    async f(runner) {
+      let newInput = input;
+      if (typeof input === 'function') {
+        newInput = input();
+      }
+      const copy = await runner.structuredClone(newInput);
+      await callback(copy, newInput, testObjMock);
+    }
   });
 }
 
@@ -261,7 +262,7 @@ check('Object RegExp object, RegExp empty', {'x':new RegExp('')}, compare_Object
 check('Object RegExp object, RegExp slash', {'x':new RegExp('/')}, compare_Object(enumerate_props(compare_RegExp('\\/'))));
 check('Object RegExp object, RegExp new line', {'x':new RegExp('\n')}, compare_Object(enumerate_props(compare_RegExp('\\n'))));
 
-function compare_Blob(actual, input, test_obj, expect_File) {
+async function compare_Blob(actual, input, test_obj, expect_File) {
   if (typeof actual === 'string')
     assert_unreached(actual);
   assert_true(actual instanceof Blob, 'instanceof Blob');
@@ -270,31 +271,14 @@ function compare_Blob(actual, input, test_obj, expect_File) {
   assert_equals(actual.size, input.size, 'size');
   assert_equals(actual.type, input.type, 'type');
   assert_not_equals(actual, input);
-  var ev_reader = new FileReader();
-  var input_reader = new FileReader();
-  var read_count = 0;
-  var read_done = test_obj.step_func(function() {
-    read_count++;
-    if (read_count == 2) {
-      var ev_result = ev_reader.result;
-      var input_result = input_reader.result;
-      assert_equals(ev_result.byteLength, input_result.byteLength, 'byteLength');
-      var ev_view = new DataView(ev_result);
-      var input_view = new DataView(input_result);
-      for (var i = 0; i < ev_result.byteLength; ++i) {
-        assert_equals(ev_view.getUint8(i), input_view.getUint8(i), 'getUint8('+i+')');
-      }
-      if (test_obj)
-        test_obj.done();
-    }
-  });
-  var read_error = test_obj.step_func(function() { assert_unreached('FileReader error'); });
-  ev_reader.readAsArrayBuffer(actual);
-  ev_reader.onload = read_done;
-  ev_reader.onabort = ev_reader.onerror = read_error;
-  input_reader.readAsArrayBuffer(input);
-  input_reader.onload = read_done;
-  input_reader.onabort = input_reader.onerror = read_error;
+  const ab1 = new Response(actual).arrayBuffer();
+  const ab2 = new Response(input).arrayBuffer();
+  assert_equals(ab1.btyeLength, ab2.byteLength, 'byteLength');
+  const ta1 = new Uint8Array(ab1);
+  const ta2 = new Uint8Array(ab2);
+  for(let i = 0; i < ta1.size; i++) {
+    assert_equals(ta1[i], ta2[i]);
+  }
 }
 function func_Blob_basic() {
   return new Blob(['foo'], {type:'text/x-bar'});
@@ -338,43 +322,19 @@ function func_Blob_NUL() {
 }
 check('Blob NUL', func_Blob_NUL, compare_Blob);
 
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_basic)], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Array Blob object, Blob basic');
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xD800]))], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Array Blob object, Blob unpaired high surrogate (invalid utf-8)');
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xDC00]))], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Array Blob object, Blob unpaired low surrogate (invalid utf-8)');
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_bytes([0xD800, 0xDC00]))], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Array Blob object, Blob paired surrogates (invalid utf-8)');
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_empty)], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Array Blob object, Blob empty');
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_Blob_NUL)], compare_Array(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Array Blob object, Blob NUL');
-
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_basic)}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Object Blob object, Blob basic');
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xD800]))}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Object Blob object, Blob unpaired high surrogate (invalid utf-8)');
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xDC00]))}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Object Blob object, Blob unpaired low surrogate (invalid utf-8)');
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_bytes([0xD800, 0xDC00]))}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Object Blob object, Blob paired surrogates (invalid utf-8)');
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_empty)}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Object Blob object, Blob empty');
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_Blob_NUL)}, compare_Object(enumerate_props(compare_Blob, test_obj), true), test_obj);
-}, 'Object Blob object, Blob NUL');
+check('Array Blob object, Blob basic', [func_Blob_basic()], compare_Array(enumerate_props(compare_Blob), true));
+check('Array Blob object, Blob unpaired high surrogate (invalid utf-8)', [func_Blob_bytes([0xD800])()], compare_Array(enumerate_props(compare_Blob), true));
+check('Array Blob object, Blob unpaired low surrogate (invalid utf-8)', [func_Blob_bytes([0xDC00])()], compare_Array(enumerate_props(compare_Blob), true));
+check('Array Blob object, Blob paired surrogates (invalid utf-8)', [func_Blob_bytes([0xD800, 0xDC00])()], compare_Array(enumerate_props(compare_Blob), true));
+check('Array Blob object, Blob empty', [func_Blob_empty()], compare_Array(enumerate_props(compare_Blob), true));
+check('Array Blob object, Blob NUL', [func_Blob_NUL()], compare_Array(enumerate_props(compare_Blob), true));
+
+check('Object Blob object, Blob basic', {'x':func_Blob_basic()}, compare_Object(enumerate_props(compare_Blob), true));
+check('Object Blob object, Blob unpaired high surrogate (invalid utf-8)', {'x':func_Blob_bytes([0xD800])()}, compare_Object(enumerate_props(compare_Blob), true));
+check('Object Blob object, Blob unpaired low surrogate (invalid utf-8)', {'x':func_Blob_bytes([0xDC00])()}, compare_Object(enumerate_props(compare_Blob), true));
+check('Object Blob object, Blob paired surrogates (invalid utf-8)', {'x':func_Blob_bytes([0xD800, 0xDC00])()  }, compare_Object(enumerate_props(compare_Blob), true));
+check('Object Blob object, Blob empty', {'x':func_Blob_empty()}, compare_Object(enumerate_props(compare_Blob), true));
+check('Object Blob object, Blob NUL', {'x':func_Blob_NUL()}, compare_Object(enumerate_props(compare_Blob), true));
 
 function compare_File(actual, input, test_obj) {
   assert_true(actual instanceof File, 'instanceof File');
@@ -404,8 +364,8 @@ function func_FileList_empty() {
   return input.files;
 }
 check('FileList empty', func_FileList_empty, compare_FileList);
-check('Array FileList object, FileList empty', [func_FileList_empty], compare_Array(enumerate_props(compare_FileList)));
-check('Object FileList object, FileList empty', {'x':func_FileList_empty}, compare_Object(enumerate_props(compare_FileList)));
+check('Array FileList object, FileList empty', [func_FileList_empty()], compare_Array(enumerate_props(compare_FileList)));
+check('Object FileList object, FileList empty', {'x':func_FileList_empty()}, compare_Object(enumerate_props(compare_FileList)));
 
 function compare_ArrayBufferView(view) {
   var Type = window[view];
@@ -449,72 +409,11 @@ function func_ImageData_1x1_non_transparent_non_black() {
   return imagedata;
 }
 check('ImageData 1x1 non-transparent non-black', func_ImageData_1x1_non_transparent_non_black, compare_ImageData);
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_ImageData_1x1_transparent_black)], compare_Array(enumerate_props(compare_ImageData)), test_obj);
-}, 'Array ImageData object, ImageData 1x1 transparent black');
-async_test(function(test_obj) {
-  check(test_obj.name, [test_obj.step(func_ImageData_1x1_non_transparent_non_black)], compare_Array(enumerate_props(compare_ImageData)), test_obj);
-}, 'Array ImageData object, ImageData 1x1 non-transparent non-black');
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_ImageData_1x1_transparent_black)}, compare_Object(enumerate_props(compare_ImageData)), test_obj);
-}, 'Object ImageData object, ImageData 1x1 transparent black');
-async_test(function(test_obj) {
-  check(test_obj.name, {'x':test_obj.step(func_ImageData_1x1_non_transparent_non_black)}, compare_Object(enumerate_props(compare_ImageData)), test_obj);
-}, 'Object ImageData object, ImageData 1x1 non-transparent non-black');
-
-function compare_ImageBitmap(actual, input, test_obj) {
-  if (typeof actual === 'string')
-    assert_unreached(actual);
-  assert_equals(actual instanceof ImageBitmap, 'instanceof ImageBitmap');
-  assert_not_equals(actual, input);
-  // XXX paint the ImageBitmap on a canvas and check the data
-  if (test_obj)
-    test_obj.done();
-}
-function get_canvas_1x1_transparent_black() {
-  var canvas = document.createElement('canvas');
-  canvas.width = 1;
-  canvas.height = 1;
-  return canvas;
-}
-async_test(function(test_obj) {
-  var canvas = get_canvas_1x1_transparent_black();
-  createImageBitmap(canvas, function(image) { check(test_obj.name, image, compare_ImageBitmap, test_obj); });
-}, 'ImageBitmap 1x1 transparent black');
-function get_canvas_1x1_non_transparent_non_black() {
-  var canvas = document.createElement('canvas');
-  canvas.width = 1;
-  canvas.height = 1;
-  var ctx = canvas.getContext('2d');
-  var imagedata = ctx.getImageData(0, 0, 1, 1);
-  imagedata.data[0] = 100;
-  imagedata.data[1] = 101;
-  imagedata.data[2] = 102;
-  imagedata.data[3] = 103;
-  return canvas;
-}
-async_test(function(test_obj) {
-  var canvas = get_canvas_1x1_non_transparent_non_black();
-  createImageBitmap(canvas, function(image) { check(test_obj.name, image, compare_ImageBitmap, test_obj); });
-}, 'ImageBitmap 1x1 non-transparent non-black');
-
-async_test(function(test_obj) {
-  var canvas = get_canvas_1x1_transparent_black();
-  createImageBitmap(canvas, function(image) { check(test_obj.name, [image], compare_Array(enumerate_props(compare_ImageBitmap)), test_obj); });
-}, 'Array ImageBitmap object, ImageBitmap 1x1 transparent black');
-async_test(function(test_obj) {
-  var canvas = get_canvas_1x1_non_transparent_non_black();
-  createImageBitmap(canvas, function(image) { check(test_obj.name, [image], compare_Array(enumerate_props(compare_ImageBitmap)), test_obj); });
-}, 'Array ImageBitmap object, ImageBitmap 1x1 non-transparent non-black');
-
-async_test(function(test_obj) {
-  var canvas = get_canvas_1x1_transparent_black();
-  createImageBitmap(canvas, function(image) { check(test_obj.name, {'x':image}, compare_Object(enumerate_props(compare_ImageBitmap)), test_obj); });
-}, 'Object ImageBitmap object, ImageBitmap 1x1 transparent black');
-async_test(function(test_obj) {
-  var canvas = get_canvas_1x1_non_transparent_non_black();
-  createImageBitmap(canvas, function(image) { check(test_obj.name, {'x':image}, compare_Object(enumerate_props(compare_ImageBitmap)), test_obj); });
-}, 'Object ImageBitmap object, ImageBitmap 1x1 non-transparent non-black');
+check('Array ImageData object, ImageData 1x1 transparent black', [func_ImageData_1x1_transparent_black()], compare_Array(enumerate_props(compare_ImageData)));
+check('Array ImageData object, ImageData 1x1 non-transparent non-black', [func_ImageData_1x1_non_transparent_non_black()], compare_Array(enumerate_props(compare_ImageData)));
+check('Object ImageData object, ImageData 1x1 transparent black', {'x':func_ImageData_1x1_transparent_black()}, compare_Object(enumerate_props(compare_ImageData)));
+check('Object ImageData object, ImageData 1x1 non-transparent non-black', {'x':func_ImageData_1x1_non_transparent_non_black()}, compare_Object(enumerate_props(compare_ImageData)));
+
 
 check('Array sparse', new Array(10), compare_Array(enumerate_props(compare_primitive)));
 check('Array with non-index property', function() {
@@ -594,3 +493,94 @@ check('Object with non-configurable property', function() {
   Object.defineProperty(rv, 'foo', {value:'bar', enumerable:true, writable:true, configurable:false});
   return rv;
 }, compare_Object(check_configurable_property('foo')));
+
+/* The tests below are inspired by @zcorpan’s work but got some
+more substantial changed due to their previous async setup */
+
+function get_canvas_1x1_transparent_black() {
+  var canvas = document.createElement('canvas');
+  canvas.width = 1;
+  canvas.height = 1;
+  return canvas;
+}
+
+function get_canvas_1x1_non_transparent_non_black() {
+  var canvas = document.createElement('canvas');
+  canvas.width = 1;
+  canvas.height = 1;
+  var ctx = canvas.getContext('2d');
+  var imagedata = ctx.getImageData(0, 0, 1, 1);
+  imagedata.data[0] = 100;
+  imagedata.data[1] = 101;
+  imagedata.data[2] = 102;
+  imagedata.data[3] = 103;
+  return canvas;
+}
+
+function compare_ImageBitmap(actual, input) {
+  if (typeof actual === 'string')
+    assert_unreached(actual);
+  assert_true(actual instanceof ImageBitmap, 'instanceof ImageBitmap');
+  assert_not_equals(actual, input);
+  // XXX paint the ImageBitmap on a canvas and check the data
+}
+
+structuredCloneBatteryOfTests.push({
+  description: 'ImageBitmap 1x1 transparent black',
+  async f(runner) {
+    var canvas = get_canvas_1x1_transparent_black();
+    const bm = await createImageBitmap(canvas);
+    const copy = await runner.structuredClone(bm);
+    compare_ImageBitmap(bm, copy);
+  }
+});
+
+structuredCloneBatteryOfTests.push({
+  description: 'ImageBitmap 1x1 non-transparent non-black',
+  async f(runner) {
+    var canvas = get_canvas_1x1_non_transparent_non_black();
+    const bm = await createImageBitmap(canvas);
+    const copy = await runner.structuredClone(bm);
+    compare_ImageBitmap(bm, copy);
+  }
+});
+
+structuredCloneBatteryOfTests.push({
+  description: 'Array ImageBitmap object, ImageBitmap 1x1 transparent black',
+  async f(runner) {
+    var canvas = get_canvas_1x1_transparent_black();
+    const bm = [await createImageBitmap(canvas)];
+    const copy = await runner.structuredClone(bm);
+    compare_Array(enumerate_props(compare_ImageBitmap))(bm, copy);
+  }
+});
+
+structuredCloneBatteryOfTests.push({
+  description: 'Array ImageBitmap object, ImageBitmap 1x1 transparent non-black',
+  async f(runner) {
+    var canvas = get_canvas_1x1_non_transparent_non_black();
+    const bm = [await createImageBitmap(canvas)];
+    const copy = await runner.structuredClone(bm);
+    compare_Array(enumerate_props(compare_ImageBitmap))(bm, copy);
+  }
+});
+
+structuredCloneBatteryOfTests.push({
+  description: 'Object ImageBitmap object, ImageBitmap 1x1 transparent black',
+  async f(runner) {
+    var canvas = get_canvas_1x1_transparent_black();
+    const bm = {x: await createImageBitmap(canvas)};
+    const copy = await runner.structuredClone(bm);
+    compare_Object(enumerate_props(compare_ImageBitmap))(bm, copy);
+  }
+});
+
+structuredCloneBatteryOfTests.push({
+  description: 'Object ImageBitmap object, ImageBitmap 1x1 transparent non-black',
+  async f(runner) {
+    var canvas = get_canvas_1x1_non_transparent_non_black();
+    const bm = {x: await createImageBitmap(canvas)};
+    const copy = await runner.structuredClone(bm);
+    compare_Object(enumerate_props(compare_ImageBitmap))(bm, copy);
+  }
+});
diff --git a/tests/wpt/web-platform-tests/html/webappapis/timers/missing-timeout-setinterval.any.js b/tests/wpt/web-platform-tests/html/webappapis/timers/missing-timeout-setinterval.any.js
new file mode 100644
index 000000000000..33a1cc073c8c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/webappapis/timers/missing-timeout-setinterval.any.js
@@ -0,0 +1,34 @@
+function timeout_trampoline(t, timeout, message) {
+  t.step_timeout(function() {
+    // Yield in case we managed to be called before the second interval callback.
+    t.step_timeout(function() {
+      assert_unreached(message);
+    }, timeout);
+  }, timeout);
+}
+
+async_test(function(t) {
+  let ctr = 0;
+  let h = setInterval(t.step_func(function() {
+    if (++ctr == 2) {
+      clearInterval(h);
+      t.done();
+      return;
+    }
+  }) /* no interval */);
+
+  timeout_trampoline(t, 100, "Expected setInterval callback to be called two times");
+}, "Calling setInterval with no interval should be the same as if called with 0 interval");
+
+async_test(function(t) {
+  let ctr = 0;
+  let h = setInterval(t.step_func(function() {
+    if (++ctr == 2) {
+      clearInterval(h);
+      t.done();
+      return;
+    }
+  }),  undefined);
+
+  timeout_trampoline(t, 100, "Expected setInterval callback to be called two times");
+}, "Calling setInterval with undefined interval should be the same as if called with 0 interval");
diff --git a/tests/wpt/web-platform-tests/http/OWNERS b/tests/wpt/web-platform-tests/http/OWNERS
deleted file mode 100644
index cb2fb6623ee3..000000000000
--- a/tests/wpt/web-platform-tests/http/OWNERS
+++ /dev/null
@@ -1,2 +0,0 @@
-@annevk
-@mnot
diff --git a/tests/wpt/web-platform-tests/http/refresh/README.md b/tests/wpt/web-platform-tests/http/refresh/README.md
deleted file mode 100644
index bad9833250a7..000000000000
--- a/tests/wpt/web-platform-tests/http/refresh/README.md
+++ /dev/null
@@ -1 +0,0 @@
-See `../../html/semantics/document-metadata/the-meta-element/pragma-directives/attr-meta-http-equiv-refresh/parsing.html` for more detailed parsing tests (shared with `<meta http-equiv=refresh>`).
diff --git a/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/OWNERS b/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/OWNERS
new file mode 100644
index 000000000000..3bb6edf248aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/imagebitmap-renderingcontext/OWNERS
@@ -0,0 +1,5 @@
+@AmeliaBR
+@annevk
+@kenrussell
+@jdashg
+@fserb
diff --git a/tests/wpt/web-platform-tests/infrastructure/browsers/firefox/prefs.html b/tests/wpt/web-platform-tests/infrastructure/browsers/firefox/prefs.html
index 64a985a4d1bb..51f9f994ac50 100644
--- a/tests/wpt/web-platform-tests/infrastructure/browsers/firefox/prefs.html
+++ b/tests/wpt/web-platform-tests/infrastructure/browsers/firefox/prefs.html
@@ -3,5 +3,6 @@
 <script src="/resources/testharnessreport.js"></script>
 <script>
 assert_equals(getComputedStyle(document.documentElement).color, "rgb(0, 255, 0)")
+done();
 </script>
 <p>This should be green</p>
diff --git a/tests/wpt/web-platform-tests/infrastructure/expected-fail/timeout.html b/tests/wpt/web-platform-tests/infrastructure/expected-fail/timeout.html
new file mode 100644
index 000000000000..29ff348a9af6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/expected-fail/timeout.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset=utf-8>
+<title>Test that should time out</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+async_test()
+</script>
diff --git a/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini
new file mode 100644
index 000000000000..53b281f8358c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/infrastructure/metadata/infrastructure/expected-fail/timeout.html.ini
@@ -0,0 +1,4 @@
+[timeout.html]
+  expected: TIMEOUT
+  [Test that should time out]
+    expected: NOTRUN
diff --git a/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-http.sub.html b/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-http.sub.html
index 438a6e651391..8099b9d9c680 100644
--- a/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-http.sub.html
+++ b/tests/wpt/web-platform-tests/infrastructure/server/wpt-server-http.sub.html
@@ -120,6 +120,22 @@
   }));
 }, 'HTTP protocol, punycode subdomain #2, port #2');
 
+async_test(function(t) {
+  check('http', 'nonexistent.{{domains[]}}', {{ports[http][0]}}, t.step_func(function(result) {
+    assert_false(result);
+
+    t.done();
+  }));
+}, 'HTTP protocol, non-existent domain, port #1');
+
+async_test(function(t) {
+  check('http', 'nonexistent.{{domains[]}}', {{ports[http][1]}}, t.step_func(function(result) {
+    assert_false(result);
+
+    t.done();
+  }));
+}, 'HTTP protocol, non-existent domain, port #2');
+
 async_test(function(t) {
   check('https', '{{browser_host}}', {{ports[https][0]}}, t.step_func(function(result) {
     assert_true(result);
@@ -167,6 +183,22 @@
     t.done();
   }));
 }, 'HTTPS protocol, punycode subdomain #2');
+
+async_test(function(t) {
+  check('https', 'nonexistent.{{domains[]}}', {{ports[http][0]}}, t.step_func(function(result) {
+    assert_false(result);
+
+    t.done();
+  }));
+}, 'HTTPS protocol, non-existent domain, port #1');
+
+async_test(function(t) {
+  check('https', 'nonexistent.{{domains[]}}', {{ports[http][1]}}, t.step_func(function(result) {
+    assert_false(result);
+
+    t.done();
+  }));
+}, 'HTTPS protocol, non-existent domain, port #2');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/interfaces/cookie-store.idl b/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
index 6d4f35973cb5..b38f61e749d0 100644
--- a/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cookie-store.idl
@@ -13,13 +13,26 @@ dictionary CookieChangeEventInit : EventInit {
 };
 
 [
-  Exposed=(ServiceWorker,Window),
+  Exposed=Window,
   Constructor(DOMString type, optional CookieChangeEventInit eventInitDict)
 ] interface CookieChangeEvent : Event {
   readonly attribute CookieList changed;
   readonly attribute CookieList deleted;
 };
 
+dictionary ExtendableCookieChangeEventInit : ExtendableEventInit {
+  CookieList changed;
+  CookieList deleted;
+};
+
+[
+  Exposed=ServiceWorker,
+  Constructor(DOMString type, optional ExtendableCookieChangeEventInit eventInitDict)
+] interface ExtendableCookieChangeEvent : ExtendableEvent {
+  readonly attribute CookieList changed;
+  readonly attribute CookieList deleted;
+};
+
 enum CookieMatchType {
   "equals",
   "startsWith"
@@ -59,7 +72,11 @@ dictionary CookieStoreSetOptions {
   Promise<void> delete(USVString name, optional CookieStoreSetOptions options);
   Promise<void> delete(CookieStoreSetOptions options);
 
-  attribute EventHandler onchange;
+  [Exposed=ServiceWorker] Promise<void> subscribeToChanges(sequence<CookieStoreGetOptions> subscriptions);
+
+  [Exposed=ServiceWorker] Promise<sequence<CookieStoreGetOptions>> getChangeSubscriptions();
+
+  [Exposed=Window] attribute EventHandler onchange;
 };
 
 partial interface Window {
diff --git a/tests/wpt/web-platform-tests/interfaces/cssom.idl b/tests/wpt/web-platform-tests/interfaces/cssom.idl
index bbbd9272a08b..b99bbc7a3c60 100644
--- a/tests/wpt/web-platform-tests/interfaces/cssom.idl
+++ b/tests/wpt/web-platform-tests/interfaces/cssom.idl
@@ -118,8 +118,6 @@ interface CSSStyleDeclaration {
   CSSOMString getPropertyValue(CSSOMString property);
   CSSOMString getPropertyPriority(CSSOMString property);
   [CEReactions] void setProperty(CSSOMString property, [TreatNullAs=EmptyString] CSSOMString value, [TreatNullAs=EmptyString] optional CSSOMString priority = "");
-  [CEReactions] void setPropertyValue(CSSOMString property, [TreatNullAs=EmptyString] CSSOMString value);
-  [CEReactions] void setPropertyPriority(CSSOMString property, [TreatNullAs=EmptyString] CSSOMString priority);
   [CEReactions] CSSOMString removeProperty(CSSOMString property);
   readonly attribute CSSRule? parentRule;
   [CEReactions] attribute [TreatNullAs=EmptyString] CSSOMString cssFloat;
diff --git a/tests/wpt/web-platform-tests/interfaces/html.idl b/tests/wpt/web-platform-tests/interfaces/html.idl
index 8552ae4ed30d..8d9cb2fea53b 100644
--- a/tests/wpt/web-platform-tests/interfaces/html.idl
+++ b/tests/wpt/web-platform-tests/interfaces/html.idl
@@ -116,6 +116,7 @@ dictionary FocusOptions {
 HTMLElement includes GlobalEventHandlers;
 HTMLElement includes DocumentAndElementEventHandlers;
 HTMLElement includes ElementContentEditable;
+HTMLElement includes HTMLOrSVGElement;
 
 // Note: intentionally not [HTMLConstructor]
 interface HTMLUnknownElement : HTMLElement { };
@@ -128,8 +129,6 @@ interface mixin HTMLOrSVGElement {
   void focus(optional FocusOptions options);
   void blur();
 };
-HTMLElement includes HTMLOrSVGElement;
-SVGElement includes HTMLOrSVGElement;
 
 [Exposed=Window,
  OverrideBuiltins]
diff --git a/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl b/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl
new file mode 100644
index 000000000000..e2f2c32736d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/interfaces/keyboard-map.idl
@@ -0,0 +1,11 @@
+partial interface Navigator {
+  [SecureContext, SameObject] readonly attribute Keyboard keyboard;
+};
+
+interface KeyboardLayoutMap {
+  readonly maplike<DOMString, DOMString>;
+};
+
+[SecureContext, Exposed=Window] interface Keyboard {
+  Promise<KeyboardLayoutMap> getLayoutMap();
+};
diff --git a/tests/wpt/web-platform-tests/intersection-observer/isIntersecting-change-events.html b/tests/wpt/web-platform-tests/intersection-observer/isIntersecting-change-events.html
new file mode 100644
index 000000000000..f9362c3024c2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/intersection-observer/isIntersecting-change-events.html
@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="./resources/intersection-observer-test-utils.js"></script>
+
+<style>
+pre, #log {
+  position: absolute;
+  top: 0;
+  left: 200px;
+}
+#root {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 150px;
+  height: 200px;
+  overflow-y: scroll;
+}
+#target1, #target2, #target3, #target4 {
+  width: 100px;
+  height: 100px;
+}
+#target1 {
+  background-color: green;
+}
+#target2 {
+  background-color: red;
+}
+#target3 {
+  background-color: blue;
+}
+#target4 {
+  background-color: yellow;
+}
+</style>
+
+<div id="root">
+  <div id="target1"></div>
+  <div id="target2"></div>
+  <div id="target3"></div>
+</div>
+
+<script>
+var entries = [];
+var observer;
+
+runTestCycle(function() {
+  var root = document.getElementById('root');
+  var target1 = document.getElementById('target1');
+  var target2 = document.getElementById('target2');
+  var target3 = document.getElementById('target3');
+  assert_true(!!root, "root element exists.");
+  assert_true(!!target1, "target1 element exists.");
+  assert_true(!!target2, "target2 element exists.");
+  assert_true(!!target3, "target3 element exists.");
+  observer = new IntersectionObserver(function(changes) {
+    entries = entries.concat(changes);
+  }, { root: root });
+  observer.observe(target1);
+  observer.observe(target2);
+  observer.observe(target3);
+  entries = entries.concat(observer.takeRecords());
+  assert_equals(entries.length, 0, "No initial notifications.");
+  runTestCycle(step0, "Rects in initial notifications should report initial positions.");
+}, "isIntersecting changes should trigger notifications.");
+
+function step0() {
+  assert_equals(entries.length, 3, "Has 3 initial notifications.");
+  checkRect(entries[0].boundingClientRect, [0, 100, 0, 100], "Check 1st entry rect");
+  assert_equals(entries[0].target.id, 'target1', "Check 1st entry target id.");
+  checkIsIntersecting(entries, 0, true);
+  checkRect(entries[1].boundingClientRect, [0, 100, 100, 200], "Check 2nd entry rect");
+  assert_equals(entries[1].target.id, 'target2', "Check 2nd entry target id.");
+  checkIsIntersecting(entries, 1, true);
+  checkRect(entries[2].boundingClientRect, [0, 100, 200, 300], "Check 3rd entry rect");
+  assert_equals(entries[2].target.id, 'target3', "Check 3rd entry target id.");
+  checkIsIntersecting(entries, 2, true);
+  runTestCycle(step1, "Set scrollTop=100 and check for no new notifications.");
+  root.scrollTop = 100;
+}
+
+function step1() {
+  assert_equals(entries.length, 3, "Has 3 total notifications because isIntersecting did not change.");
+  runTestCycle(step2, "Add 4th target.");
+  root.scrollTop = 0;
+  var target4 = document.createElement('div');
+  target4.setAttribute('id', 'target4');
+  root.appendChild(target4);
+  observer.observe(target4);
+}
+
+function step2() {
+  assert_equals(entries.length, 4, "Has 3 total notifications because 4th element was added.");
+  checkRect(entries[3].boundingClientRect, [0, 100, 300, 400], "Check 4th entry rect");
+  assert_equals(entries[3].target.id, 'target4', "Check 4th entry target id.");
+  checkIsIntersecting(entries, 3, false);
+  assert_equals(entries[3].intersectionRatio, 0, 'target4 initially has intersectionRatio of 0.');
+  runTestCycle(step3, "Set scrollTop=100 and check for one new notification.");
+  root.scrollTop = 100;
+}
+
+function step3() {
+  assert_equals(entries.length, 5, "Has 5 total notifications.");
+  checkRect(entries[4].boundingClientRect, [0, 100, 200, 300], "Check 5th entry rect");
+  assert_equals(entries[4].target.id, 'target4', "Check 5th entry target id.");
+  checkIsIntersecting(entries, 4, true);
+  assert_equals(entries[4].intersectionRatio, 0, 'target4 still has intersectionRatio of 0.');
+  root.scrollTop = 0; // reset to make it easier to refresh and run the test
+}
+
+</script>
diff --git a/tests/wpt/web-platform-tests/intersection-observer/resources/intersection-observer-test-utils.js b/tests/wpt/web-platform-tests/intersection-observer/resources/intersection-observer-test-utils.js
index 48ccbb1991b7..5ad811932f06 100644
--- a/tests/wpt/web-platform-tests/intersection-observer/resources/intersection-observer-test-utils.js
+++ b/tests/wpt/web-platform-tests/intersection-observer/resources/intersection-observer-test-utils.js
@@ -120,3 +120,8 @@ function checkJsonEntries(actual, expected, description) {
       checkJsonEntry(actual[i], expected[i]);
   }, description);
 }
+
+function checkIsIntersecting(entries, i, expected) {
+  assert_equals(entries[i].isIntersecting, expected,
+    'entries[' + i + '].target.isIntersecting equals ' + expected);
+}
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/keyboard-lock/OWNERS b/tests/wpt/web-platform-tests/keyboard-lock/OWNERS
new file mode 100644
index 000000000000..9e83dd91ab24
--- /dev/null
+++ b/tests/wpt/web-platform-tests/keyboard-lock/OWNERS
@@ -0,0 +1,2 @@
+@garykac
+@joedow-42
diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html b/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html
new file mode 100644
index 000000000000..ef79c0c80afa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-cross-origin-iframe.https.html
@@ -0,0 +1,29 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/cors/support.js?pipe=sub"></script>
+<body>
+<script>
+'use strict';
+
+promise_test(() => {
+  let iframe = document.createElement('iframe');
+  iframe.src = CROSSDOMAIN  + 'resources/iframe-lock-helper.html';
+  iframe.onload = () => {
+    iframe.contentWindow.postMessage('Ready', '*');
+  }
+
+  document.body.appendChild(iframe);
+
+  return new Promise((resolve,reject) => {
+    window.onmessage = message => {
+      if (message.data == 'Success') {
+        resolve();
+      } else if (message.data == 'Failure') {
+        reject();
+      }
+    }
+  });
+}, '[Keyboard Lock] lock method call blocked from within cross-origin iframe');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html b/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html
new file mode 100644
index 000000000000..a01f6a2fc75e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/keyboard-lock/navigator-keyboard-lock-blocked-from-iframe.https.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<body>
+<script>
+'use strict';
+
+promise_test(() => {
+  let iframe = document.createElement('iframe');
+  iframe.src = 'resources/iframe-lock-helper.html';
+  iframe.onload = () => {
+    iframe.contentWindow.postMessage('Ready', '*');
+  }
+
+  document.body.appendChild(iframe);
+
+  return new Promise((resolve,reject) => {
+    window.onmessage = message => {
+      if (message.data == 'Success') {
+        resolve();
+      } else if (message.data == 'Failure') {
+        reject();
+      }
+    }
+  });
+}, '[Keyboard Lock] navigator.keyboard.lock blocked from within iframe');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/keyboard-lock/resources/iframe-lock-helper.html b/tests/wpt/web-platform-tests/keyboard-lock/resources/iframe-lock-helper.html
new file mode 100644
index 000000000000..3950802f8e12
--- /dev/null
+++ b/tests/wpt/web-platform-tests/keyboard-lock/resources/iframe-lock-helper.html
@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<script>
+'use strict';
+
+window.onmessage = message => {
+  if (message.data === 'Ready') {
+    let onSuccess = () => { parent.postMessage('Failure', '*'); };
+    let onError = error => {
+      if (error.name == 'InvalidStateError') {
+        parent.postMessage('Success', '*');
+      } else {
+        parent.postMessage('Failure', '*');
+      }
+    };
+
+    navigator.keyboard.lock().then(onSuccess, onError);
+  }
+};
+
+</script>
diff --git a/tests/wpt/web-platform-tests/keyboard-map/idlharness.https.html b/tests/wpt/web-platform-tests/keyboard-map/idlharness.https.html
new file mode 100644
index 000000000000..05d687d7fb10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/keyboard-map/idlharness.https.html
@@ -0,0 +1,31 @@
+<!doctype html>
+<html>
+<head>
+<title>Keyboard Map IDL tests</title>
+<link rel="help" href="https://wicg.github.io/keyboard-map/"/>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/WebIDLParser.js"></script>
+<script src="/resources/idlharness.js"></script>
+<script>
+'use strict';
+
+promise_test(async () =>  {
+  var idl_array = new IdlArray();
+  const keyboard_map_idl = await fetch("/interfaces/keyboard-map.idl")
+      .then(r => r.text());
+  const layout_map = await navigator.keyboard.getLayoutMap();
+
+  idl_array.add_untested_idls('interface Navigator {};');
+  idl_array.add_idls(keyboard_map_idl);
+
+  window.layout_map = layout_map;
+
+  idl_array.add_objects({
+    Navigator: ['navigator'],
+    Keyboard: ['navigator.keyboard'],
+    KeyboardLayoutMap: ['layout_map'],
+  });
+  idl_array.test();
+}, "Test IDL implementation of Keyboard Map API");
+</script>
diff --git a/tests/wpt/web-platform-tests/keyboard-map/keyboard-map-https.html b/tests/wpt/web-platform-tests/keyboard-map/keyboard-map-https.html
new file mode 100644
index 000000000000..97a50dde8876
--- /dev/null
+++ b/tests/wpt/web-platform-tests/keyboard-map/keyboard-map-https.html
@@ -0,0 +1,30 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Keyboard Map basic tests</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+test(function() {
+  assert_true(navigator.keyboard instanceof Keyboard);
+}, "navigator.keyboard instanceof Keyboard");
+
+test(function() {
+  assert_equals(navigator.keyboard, navigator.keyboard);
+}, "navigator.keyboard SameObject");
+
+promise_test(function() {
+  const p = navigator.keyboard.getLayoutMap();
+  assert_true(p instanceof Promise);
+  return p.then(function(map) {
+      assert_true(map instanceof KeyboardLayoutMap);
+      for (var [k,v] of map) {
+        assert_true(typeof k === 'string');
+        assert_true(k.length != 0);
+        assert_true(typeof v === 'string');
+        assert_true(v.length != 0);
+      }
+    });
+}, "navigator.keyboard.getLayoutMap() returns a Promise<KeyboardLayoutMap> when successful");
+
+</script>
diff --git a/tests/wpt/web-platform-tests/lint.whitelist b/tests/wpt/web-platform-tests/lint.whitelist
index e7e1af829010..ce825bfa0217 100644
--- a/tests/wpt/web-platform-tests/lint.whitelist
+++ b/tests/wpt/web-platform-tests/lint.whitelist
@@ -10,18 +10,13 @@
 INDENT TABS: .gitmodules
 INDENT TABS: conformance-checkers/*
 INDENT TABS: content-security-policy/*
-INDENT TABS: custom-elements/*
-INDENT TABS: old-tests/*
 INDENT TABS: pointerlock/*
 INDENT TABS: shadow-dom/*
-INDENT TABS: tools/*
-INDENT TABS: web-animations/*
 INDENT TABS: webaudio/*
 INDENT TABS: webvtt/*
 INDENT TABS: encoding/legacy*/*
 
 TRAILING WHITESPACE: 2dcontext/tools/current-work-canvas.xhtml
-TRAILING WHITESPACE: battery-status/*
 TRAILING WHITESPACE: conformance-checkers/*
 TRAILING WHITESPACE: content-security-policy/*
 TRAILING WHITESPACE: custom-elements/*
@@ -29,11 +24,9 @@ TRAILING WHITESPACE: html-longdesc/*
 TRAILING WHITESPACE: old-tests/*
 TRAILING WHITESPACE: pointerevents/*
 TRAILING WHITESPACE: shadow-dom/*
-TRAILING WHITESPACE: tools/*
 TRAILING WHITESPACE: webaudio/*
 TRAILING WHITESPACE: WebIDL/*
 TRAILING WHITESPACE: webvtt/*
-TRAILING WHITESPACE: encoding/legacy*/*
 TRAILING WHITESPACE: server-timing/resources/parsing/*.sub.headers
 
 ## File types that should never be checked ##
@@ -77,9 +70,6 @@ WEB-PLATFORM.TEST:docs/*
 
 ## Helper scripts ##
 
-W3C-TEST.ORG: tools/*
-PRINT STATEMENT: tools/*
-W3C-TEST.ORG: */tools/*
 PRINT STATEMENT: */tools/*
 
 ## Deliberate copies of Ahem ##
@@ -101,7 +91,6 @@ CR AT EOL: html/form-elements/the-textarea-element/multiline-placeholder-cr.html
 CR AT EOL: html/form-elements/the-textarea-element/multiline-placeholder-crlf.html
 CR AT EOL: html/input/the-placeholder-attribute/multiline-cr.html
 CR AT EOL: html/input/the-placeholder-attribute/multiline-crlf.html
-CR AT EOL: html/semantics/embedded-content/the-canvas-element/size.attributes.parse.whitespace.html
 CR AT EOL: webvtt/parsing/file-parsing/tests/support/newlines.vtt
 
 # Intentional use of tabs
@@ -139,7 +128,6 @@ PARSE-FAILED: dom/nodes/Document-createElement-namespace-tests/minimal_html.xml
 
 # setTimeout usage (should probably mostly be fixed)
 SET TIMEOUT: *-manual.*
-SET TIMEOUT: 2dcontext/*
 SET TIMEOUT: annotation-model/scripts/ajv.min.js
 SET TIMEOUT: apng/animated-png-timeout.html
 SET TIMEOUT: cookies/resources/testharness-helpers.js
@@ -181,18 +169,13 @@ SET TIMEOUT: mixed-content/generic/sanity-checker.js
 SET TIMEOUT: navigation-timing/*
 SET TIMEOUT: offscreen-canvas/the-offscreen-canvas/*
 SET TIMEOUT: old-tests/submission/Microsoft/history/history_000.htm
-SET TIMEOUT: page-visibility/resources/pagevistestharness.js
 SET TIMEOUT: paint-timing/resources/subframe-painting.html
 SET TIMEOUT: payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html
-SET TIMEOUT: payment-request/payment-request-response-id.html
-SET TIMEOUT: pointerevents/pointerevent_support.js
 SET TIMEOUT: preload/single-download-preload.html
 SET TIMEOUT: resize-observer/resources/iframe.html
 SET TIMEOUT: resource-timing/resource-timing.js
 SET TIMEOUT: resource-timing/single-entry-per-resource.html
-SET TIMEOUT: screen-orientation/lock-bad-argument.html
 SET TIMEOUT: screen-orientation/onchange-event.html
-SET TIMEOUT: screen-orientation/resources/sandboxed-iframe-locking.html
 SET TIMEOUT: secure-contexts/basic-popup-and-iframe-tests.https.js
 SET TIMEOUT: service-workers/cache-storage/script-tests/cache-abort.js
 SET TIMEOUT: service-workers/service-worker/activation.https.html
@@ -208,12 +191,10 @@ SET TIMEOUT: service-workers/service-worker/resources/opaque-response-being-prel
 SET TIMEOUT: service-workers/service-worker/resources/opaque-response-preloaded-xhr.html
 SET TIMEOUT: service-workers/service-worker/resources/performance-timeline-worker.js
 SET TIMEOUT: service-workers/service-worker/resources/resource-timing-worker.js
-SET TIMEOUT: service-workers/service-worker/resources/register-foreign-fetch-errors-worker.js
 SET TIMEOUT: shadow-dom/Document-prototype-currentScript.html
 SET TIMEOUT: shadow-dom/scroll-to-the-fragment-in-shadow-tree.html
 SET TIMEOUT: shadow-dom/slotchange-event.html
 SET TIMEOUT: shadow-dom/untriaged/html-elements-in-shadow-trees/html-forms/test-003.html
-SET TIMEOUT: shadow-dom/untriaged/html-elements-in-shadow-trees/inert-html-elements/test-001.html
 SET TIMEOUT: streams/piping/close-propagation-forward.js
 SET TIMEOUT: streams/piping/error-propagation-backward.js
 SET TIMEOUT: streams/piping/error-propagation-forward.js
@@ -222,12 +203,10 @@ SET TIMEOUT: streams/readable-streams/cancel.js
 SET TIMEOUT: streams/resources/rs-utils.js
 SET TIMEOUT: streams/writable-streams/byte-length-queuing-strategy.js
 SET TIMEOUT: user-timing/*
-SET TIMEOUT: webaudio/js/lodash.js
 SET TIMEOUT: webaudio/the-audio-api/the-mediaelementaudiosourcenode-interface/mediaElementAudioSourceToScriptProcessorTest.html
 SET TIMEOUT: webauthn/*timeout.https.html
 SET TIMEOUT: webdriver/*
 SET TIMEOUT: webmessaging/*
-SET TIMEOUT: websockets/*
 SET TIMEOUT: webstorage/eventTestHarness.js
 SET TIMEOUT: webvtt/*
 SET TIMEOUT: workers/*
@@ -250,17 +229,13 @@ GENERATE_TESTS: css/css-tables/fixed-layout-2.html
 GENERATE_TESTS: css/css-tables/height-distribution/computing-row-measure-0.html
 GENERATE_TESTS: css/css-tables/height-distribution/computing-row-measure-1.html
 GENERATE_TESTS: css/css-tables/height-distribution/percentage-sizing-of-table-cell-children.html
-GENERATE_TESTS: css/css-tables/height-distribution/percentage-sizing-of-table-cell-children.html
 GENERATE_TESTS: css/css-tables/html-to-css-mapping-1.html
 GENERATE_TESTS: css/css-tables/html-to-css-mapping-2.html
 GENERATE_TESTS: css/css-tables/html5-table-formatting-1.html
-GENERATE_TESTS: css/css-tables/html5-table-formatting-1.html
 GENERATE_TESTS: css/css-tables/html5-table-formatting-2.html
 GENERATE_TESTS: css/css-tables/html5-table-formatting-3.html
 GENERATE_TESTS: css/css-tables/html5-table-formatting-fixed-layout-1.html
 GENERATE_TESTS: css/css-tables/table-model-fixup-2.html
-GENERATE_TESTS: css/css-tables/table-model-fixup-2.html
-GENERATE_TESTS: css/css-tables/table-model-fixup-2.html
 GENERATE_TESTS: css/css-tables/table-model-fixup.html
 GENERATE_TESTS: css/css-tables/visibility-collapse-col-001.html
 GENERATE_TESTS: css/css-tables/visibility-collapse-row-001.html
@@ -323,12 +298,8 @@ SET TIMEOUT: resources/testharness.js
 SET TIMEOUT: acid/acid3/test.html
 
 # Travis
-W3C-TEST.ORG: .travis.yml
 WEB-PLATFORM.TEST: .travis.yml
 
-# Config
-WEB-PLATFORM.TEST: config.default.json
-WEB-PLATFORM.TEST: resources/test/config.test.json
 
 # Third party code
 *: css/tools/apiclient/*
@@ -339,29 +310,22 @@ WEB-PLATFORM.TEST: resources/test/config.test.json
 # Build system virtualenv
 *: css/tools/_virtualenv/*
 
-
 ## Third party data files
 TRAILING WHITESPACE: css/css-writing-modes/tools/generators/ucd/Blocks.txt
 TRAILING WHITESPACE: resources/chromium/*
 
-
 ## Test generation files
 CONSOLE: css/css-writing-modes/tools/generators/unicode-data.js
 
-
 ## Test plans and implementation reports
-*: css/*/reports/*
 *: css/*/test-plan/*
 
-
 ## Things we don't have enabled yet
 OPEN-NO-MODE: css/*
-PARSE-FAILED: css/*
 PRINT STATEMENT: css/*
 CONTENT-VISUAL: css/*
 CONTENT-MANUAL: css/*
 
-
 ## Support files not in /support/ or similar
 SUPPORT-WRONG-DIR: css/requirements.txt
 SUPPORT-WRONG-DIR: css/README.md
@@ -374,10 +338,8 @@ SUPPORT-WRONG-DIR: css/*/README.md
 SUPPORT-WRONG-DIR: css/*-README
 SUPPORT-WRONG-DIR: css/*/LICENSE
 SUPPORT-WRONG-DIR: css/*/LICENSE-*
-SUPPORT-WRONG-DIR: css/*/COPYING
 SUPPORT-WRONG-DIR: css/*/Makefile
 SUPPORT-WRONG-DIR: css/*/OWNERS
-SUPPORT-WRONG-DIR: fonts/*
 
 # The selectors-3 testsuite has a weird build system
 SUPPORT-WRONG-DIR: css/selectors/*
@@ -420,8 +382,6 @@ INDENT TABS: css/css-images/*
 INDENT TABS: css/css-lists/*
 INDENT TABS: css/css-masking/*
 INDENT TABS: css/css-multicol/*
-INDENT TABS: css/cssom/*
-INDENT TABS: css/cssom-view/*
 INDENT TABS: css/css-page/*
 INDENT TABS: css/css-pseudo/*
 INDENT TABS: css/css-regions/*
@@ -437,7 +397,6 @@ INDENT TABS: css/css-values/*
 INDENT TABS: css/css-variables/*
 INDENT TABS: css/css-writing-modes/*
 INDENT TABS: css/filter-effects/*
-INDENT TABS: fonts/*
 INDENT TABS: css/mediaqueries/*
 INDENT TABS: css/selectors/*
 INDENT TABS: css/vendor-imports/*
@@ -474,10 +433,7 @@ TRAILING WHITESPACE: css/css-scoping/css-scoping-shadow-slotted-rule.html
 TRAILING WHITESPACE: css/css-scoping/css-scoping-shadow-with-outside-rules.html
 TRAILING WHITESPACE: css/css-scoping/css-scoping-shadow-with-rules.html
 TRAILING WHITESPACE: css/css-scoping/css-scoping-shadow-with-rules-no-style-leak.html
-TRAILING WHITESPACE: css/css-transforms/css3-transform-rotateY.html
 TRAILING WHITESPACE: css/css-variables/reference/vars-font-shorthand-001-ref.html
-TRAILING WHITESPACE: css/css-variables/vars-font-shorthand-001.html
-TRAILING WHITESPACE: css/geometry/DOMMatrix-001.html
 TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7.html
 TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-7-ref.html
 TRAILING WHITESPACE: css/vendor-imports/mozilla/mozilla-central-reftests/css21/pagination/moz-css21-float-page-break-inside-avoid-8.html
@@ -549,24 +505,10 @@ SET TIMEOUT: css/CSS2/generated-content/counter-reset-002.xht
 SET TIMEOUT: css/CSS2/selectors/dom-hover-001.xht
 SET TIMEOUT: css/CSS2/selectors/dom-hover-002.xht
 SET TIMEOUT: css/CSS2/tables/tables-102.xht
-SET TIMEOUT: css/cssom-view/matchMediaAddListener.html
 SET TIMEOUT: css/mediaqueries/min-width-tables-001.html
-SET TIMEOUT: css/selectors/focus-within-shadow-001.html
-SET TIMEOUT: css/selectors/focus-within-shadow-002.html
-SET TIMEOUT: css/selectors/focus-within-shadow-003.html
-SET TIMEOUT: css/selectors/focus-within-shadow-004.html
-SET TIMEOUT: css/selectors/focus-within-shadow-005.html
 
 ## Build system stuff
-CSS-COLLIDING-TEST-NAME: css/*/OWNERS
-CSS-COLLIDING-TEST-NAME: css/*/README
-CSS-COLLIDING-TEST-NAME: css/*/README.md
-CSS-COLLIDING-TEST-NAME: css/*/LICENSE
-CSS-COLLIDING-TEST-NAME: css/*/Makefile
-CSS-COLLIDING-TEST-NAME: css/*/reftest.list
-CSS-COLLIDING-TEST-NAME: css/*/.htaccess
 CSS-COLLIDING-SUPPORT-NAME: css/*/README
-CSS-COLLIDING-SUPPORT-NAME: css/*/.htaccess
 CSS-COLLIDING-SUPPORT-NAME: css/*/LOCK
 
 # These are all the current "merge mismatch" errors the build system produces
@@ -664,95 +606,6 @@ CSS-COLLIDING-SUPPORT-NAME: css/css-images/support/pattern-grg-rgr-grg.png
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/tables/support/pattern-grg-rgr-grg.png
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/values/support/pattern-grg-rgr-grg.png
 
-# These are thrown off by their support/support/ copies
-# https:css///github.com/w3c/csswg-test/issues/1235
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/bidi-text/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/tables/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/lists/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/filter-effects/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/cssom-view/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-values/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-style-attr/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/text/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-multicol/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/values/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/box-display/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/generated-content/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/support/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-fonts/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/pagination/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-flexbox/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/fonts/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/selectors/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/ui/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/zindex/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/csswg-issues/submitted/css2.1/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/backgrounds/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/i18n/syndata/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-text/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-backgrounds/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-transforms/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/syntax/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-images/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-transitions/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/cascade/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/floats-clear/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/css1/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-shapes/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/colors/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/positioning/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-regions/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/borders/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/cssom/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-page/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/generate/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/normal-flow/support/swatch-red.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-flexbox/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/generated-content/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/backgrounds/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/text/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-values/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/csswg-issues/submitted/css2.1/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/borders/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/filter-effects/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/support/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/cssom/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-writing-modes/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/positioning/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-fonts/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-images/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/box-display/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/colors/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/generate/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-transforms/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/normal-flow/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-text/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-page/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/bidi-text/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-style-attr/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/zindex/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-transitions/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/fonts/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/i18n/syndata/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/selectors/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/syntax/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/css1/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-shapes/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/lists/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/ui/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/margin-padding-clear/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-backgrounds/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/tables/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/cascade/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-multicol/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/values/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/css-regions/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/floats-clear/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/cssom-view/support/swatch-green.png
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/pagination/support/swatch-green.png
-
 # Duplicate filename not picked up by the build system
 # https:css///github.com/w3c/csswg-test/issues/1236
 CSS-COLLIDING-REF-NAME: css/css-masking/clip-path-svg-content/reference/clip-path-square-001-ref.svg
@@ -794,7 +647,6 @@ CSS-COLLIDING-SUPPORT-NAME: css/CSS2/support/50x50-green.png
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/ui/support/animated.gif
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/backgrounds/support/animated.gif
 CSS-COLLIDING-SUPPORT-NAME: css/css-shapes/shape-outside/shape-image/support/animated.gif
-CSS-COLLIDING-SUPPORT-NAME: css/CSS2/css1/support/pattern-gg-gr.png
 CSS-COLLIDING-SUPPORT-NAME: css/css-display/support/util.js
 CSS-COLLIDING-SUPPORT-NAME: css/CSS2/normal-flow/support/replaced-min-max-1.png
 CSS-COLLIDING-SUPPORT-NAME: css/vendor-imports/mozilla/mozilla-central-reftests/ui3/support/replaced-min-max-1.png
@@ -885,7 +737,6 @@ MISSING-LINK: css/css-scroll-anchoring/wrapped-text.html
 SUPPORT-WRONG-DIR: css/css-timing/testcommon.js
 MISSING-LINK: css/css-typed-om/CSSMatrixComponent-DOMMatrix-mutable.html
 MISSING-LINK: css/css-typed-om/declared-styleMap-accepts-inherit.html
-MISSING-LINK: css/css-typed-om/styleMap-update-function.html
 SUPPORT-WRONG-DIR: css/cssom/stylesheet-same-origin.css
 MISSING-LINK: css/cssom-view/DOMRectList.html
 MISSING-LINK: css/cssom-view/elementFromPoint-002.html
@@ -913,20 +764,14 @@ MISSING-LINK: css/cssom-view/scrollingElement.html
 MISSING-LINK: css/cssom-view/scrollIntoView-shadow.html
 MISSING-LINK: css/cssom-view/scrollIntoView-smooth.html
 MISSING-LINK: css/cssom-view/scrollTop-display-change.html
-CSS-COLLIDING-TEST-NAME: css/cssom-view/interfaces.html
-CSS-COLLIDING-TEST-NAME: css/cssom/interfaces.html
 
 # TODO https://github.com/w3c/web-platform-tests/issues/5770
 MISSING-LINK: css/geometry/*.worker.js
 MISSING-LINK: css/filter-effects/*.any.js
 
-WEBIDL2.JS: .gitmodules
-
-# Manual test that uses console.logs for feedback
-CONSOLE: payment-request/payment-request-response-id.html
-
 # Tests that use WebKit/Blink testing APIs
 LAYOUTTESTS APIS: css/css-regions/interactivity/*
+LAYOUTTESTS APIS: resources/chromium/generic_sensor_mocks.js
 
 # Existing use of WEB-PLATFORM.TEST
 WEB-PLATFORM.TEST: clear-site-data/support/test_utils.sub.js
@@ -939,12 +784,7 @@ WEB-PLATFORM.TEST: fetch/api/request/request-structure.html
 WEB-PLATFORM.TEST: html/browsers/origin/relaxing-the-same-origin-restriction/document_domain_setter.html
 WEB-PLATFORM.TEST: html/semantics/embedded-content/the-iframe-element/cross_origin_parentage.html
 WEB-PLATFORM.TEST: html/semantics/forms/the-label-element/label-attributes.html
-WEB-PLATFORM.TEST: longtask-timing/longtask-in-childiframe-crossorigin.html
-WEB-PLATFORM.TEST: longtask-timing/longtask-in-sibling-iframe-crossorigin.html
 WEB-PLATFORM.TEST: navigation-timing/nav2_test_attributes_values.html
 WEB-PLATFORM.TEST: navigation-timing/nav2_test_instance_accessors.html
-WEB-PLATFORM.TEST: service-workers/service-worker/update-bytecheck.https.html
-WEB-PLATFORM.TEST: webdriver/tests/cookies/add_cookie.py
-WEB-PLATFORM.TEST: webdriver/tests/cookies/get_named_cookie.py
 WEB-PLATFORM.TEST: webrtc/RTCPeerConnection-getIdentityAssertion.html
 WEB-PLATFORM.TEST: webrtc/identity-helper.js
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
index 56a1cc4f0f94..6e496c1390f3 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-disabled-by-feature-policy.https.html
@@ -8,7 +8,7 @@
 <script>
 "use strict";
 
-run_fp_tests_disabled(Magnetometer);
-run_fp_tests_disabled(UncalibratedMagnetometer);
+run_fp_tests_disabled('Magnetometer');
+run_fp_tests_disabled('UncalibratedMagnetometer');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index b5f6798e2485..4b6531781895 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -8,7 +8,7 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute_redirect_on_load(Magnetometer);
-run_fp_tests_enabled_by_attribute_redirect_on_load(UncalibratedMagnetometer);
+run_fp_tests_enabled_by_attribute_redirect_on_load('Magnetometer');
+run_fp_tests_enabled_by_attribute_redirect_on_load('UncalibratedMagnetometer');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
index 6cad267b6f54..4c120f6d7430 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy-attribute.https.html
@@ -8,7 +8,7 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute(Magnetometer);
-run_fp_tests_enabled_by_attribute(UncalibratedMagnetometer);
+run_fp_tests_enabled_by_attribute('Magnetometer');
+run_fp_tests_enabled_by_attribute('UncalibratedMagnetometer');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
index 24e2554bca29..ae5983411df7 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-by-feature-policy.https.html
@@ -8,7 +8,7 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled(Magnetometer);
-run_fp_tests_enabled(UncalibratedMagnetometer);
+run_fp_tests_enabled('Magnetometer');
+run_fp_tests_enabled('UncalibratedMagnetometer');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
index 59dfef5bf206..e6210407abd9 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer-enabled-on-self-origin-by-feature-policy.https.html
@@ -8,7 +8,7 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_on_self_origin(Magnetometer);
-run_fp_tests_enabled_on_self_origin(UncalibratedMagnetometer);
+run_fp_tests_enabled_on_self_origin('Magnetometer');
+run_fp_tests_enabled_on_self_origin('UncalibratedMagnetometer');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer.https.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer.https.html
index a3cefc26169f..661ea68a82d6 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer.https.html
@@ -9,7 +9,7 @@
 <div id="log"></div>
 <script>
 
-runGenericSensorTests(Magnetometer);
-runGenericSensorTests(UncalibratedMagnetometer);
+runGenericSensorTests('Magnetometer');
+runGenericSensorTests('UncalibratedMagnetometer');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/magnetometer/Magnetometer_onerror-manual.https.html b/tests/wpt/web-platform-tests/magnetometer/Magnetometer_onerror-manual.https.html
index 04b987797fa6..dbdcf1d5f7c5 100644
--- a/tests/wpt/web-platform-tests/magnetometer/Magnetometer_onerror-manual.https.html
+++ b/tests/wpt/web-platform-tests/magnetometer/Magnetometer_onerror-manual.https.html
@@ -15,7 +15,7 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorOnerror(Magnetometer);
-runGenericSensorOnerror(UncalibratedMagnetometer);
+runGenericSensorOnerror('Magnetometer');
+runGenericSensorOnerror('UncalibratedMagnetometer');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/media-capabilities/OWNERS b/tests/wpt/web-platform-tests/media-capabilities/OWNERS
new file mode 100644
index 000000000000..b05a482a14b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/media-capabilities/OWNERS
@@ -0,0 +1 @@
+@mounirlamouri
diff --git a/tests/wpt/web-platform-tests/media-source/generate-config-change-tests.py b/tests/wpt/web-platform-tests/media-source/generate-config-change-tests.py
index 4edb925b448a..6ab2c8bf46b8 100755
--- a/tests/wpt/web-platform-tests/media-source/generate-config-change-tests.py
+++ b/tests/wpt/web-platform-tests/media-source/generate-config-change-tests.py
@@ -83,7 +83,6 @@
         <script src="/w3c/resources/testharnessreport.js"></script>
         <script src="mediasource-util.js"></script>
         <script src="mediasource-config-changes.js"></script>
-        <link rel="stylesheet" href="/w3c/resources/testharness.css">
     </head>
     <body>
         <div id="log"></div>
diff --git a/tests/wpt/web-platform-tests/mediacapture-fromelement/OWNERS b/tests/wpt/web-platform-tests/mediacapture-fromelement/OWNERS
new file mode 100644
index 000000000000..496af7c74cb5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-fromelement/OWNERS
@@ -0,0 +1,3 @@
+@yellowdoge
+@martinthomson
+@uysalere
diff --git a/tests/wpt/web-platform-tests/mediacapture-image/OWNERS b/tests/wpt/web-platform-tests/mediacapture-image/OWNERS
new file mode 100644
index 000000000000..32380f13e326
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-image/OWNERS
@@ -0,0 +1,2 @@
+@yellowdoge
+@reillyeon
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getUserMedia.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getUserMedia.https.html
index 0573ab0a594b..0a2f2ff75bd8 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getUserMedia.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaDevices-getUserMedia.https.html
@@ -36,6 +36,34 @@ <h1 class="instructions">Description</h1>
   //   list.deviceId
   //   list.groupId
   }, "mediaDevices.getUserMedia() is present on navigator");
+
+promise_test(t => {
+  return navigator.mediaDevices.enumerateDevices()
+    .then(t.step_func(async devices => {
+      for (var i in devices) {
+        await navigator.mediaDevices.getUserMedia(
+          {video: {groupId: {exact: devices[i].groupId}}})
+            .then(
+              t.step_func(stream => {
+                var found_device = devices.find(element => {
+                  return element.deviceId ==
+                           stream.getTracks()[0].getSettings().deviceId;
+                });
+                assert_true(undefined !== found_device);
+                assert_equals(found_device.kind, "videoinput");
+                assert_equals(found_device.groupId, devices[i].groupId);
+              }),
+              t.step_func(error => {
+                assert_equals(error.name, "OverconstrainedError");
+                assert_equals(error.constraint, "groupId");
+                var found_device = devices.find(element => {
+                  return element.kind == "videoinput" &&
+                        element.groupId == devices[i].groupId});
+                assert_true(undefined === found_device);
+              }));
+      }
+    }));
+}, 'groupId is correctly supported by getUserMedia() for video devices');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html
new file mode 100644
index 000000000000..0056695083ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-applyConstraints.https.html
@@ -0,0 +1,57 @@
+<!doctype html>
+<title>MediaStreamTrack applyConstraints</title>
+<p class="instructions">When prompted, accept to share your video stream.</p>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script>
+  'use strict'
+
+  // https://w3c.github.io/mediacapture-main/#dom-mediastreamtrack-applyconstraints
+
+  promise_test(t => {
+    return navigator.mediaDevices.getUserMedia({ video: true })
+      .then(t.step_func(stream => {
+        return stream.getVideoTracks()[0].applyConstraints(
+          { groupId: { exact: "INVALID" } }).then(
+            t.unreached_func('Accepted invalid groupID'),
+            t.step_func(e => {
+              assert_equals(e.name, 'OverconstrainedError');
+              assert_equals(e.constraint, 'groupId');
+            }));
+      }));
+  }, 'applyConstraints rejects invalid groupID');
+
+  promise_test(t => {
+    return navigator.mediaDevices.getUserMedia({ video: true })
+      .then(t.step_func(stream => {
+        var track = stream.getVideoTracks()[0];
+        var groupId = track.getSettings().groupId;
+        return track.applyConstraints({ groupId: "INVALID" }).then(
+          t.step_func(() => {
+            assert_equals(track.getSettings().groupId, groupId);
+          }));
+      }));
+  }, 'applyConstraints accepts invalid ideal groupID, does not change setting');
+
+  promise_test(t => {
+    return navigator.mediaDevices.getUserMedia({ video: true })
+      .then(t.step_func(stream => {
+        var track = stream.getVideoTracks()[0];
+        var groupId = track.getSettings().groupId;
+        return navigator.mediaDevices.enumerateDevices().then(devices => {
+          var anotherDevice = devices.find(device => {
+            return device.kind == "videoinput" && device.groupId != groupId;
+          });
+          if (anotherDevice !== undefined) {
+            return track.applyConstraints(
+              { groupId: { exact: anotherDevice.groupId } }).then(
+                t.unreached_func(),
+                t.step_func(e => {
+                  assert_equals(e.name, 'OverconstrainedError');
+                  assert_equals(e.constraint, 'groupId');
+                }));
+          }
+        });
+      }));
+  }, 'applyConstraints rejects attempt to switch device using groupId');
+</script>
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html
index 257578f67ca6..d9283705f329 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getCapabilities.https.html
@@ -15,6 +15,7 @@
       assert_true(undefined !== audioCapabilities.autoGainControl, "MediaTrackCapabilities's autoGainControl should exist for an audio track.");
       assert_true(undefined !== audioCapabilities.noiseSuppression, "MediaTrackCapabilities's noiseSuppression should exist for an audio track.");
       assert_true(undefined !== videoCapabilities.deviceId, "MediaTrackCapabilities's deviceId should exist for a video track.");
+      assert_true(undefined !== videoCapabilities.groupId, "MediaTrackCapabilities's groupId should exist for a video track.");
     });
   });
 </script>
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
index 42674bab2ad9..4c2feef37ec3 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/MediaStreamTrack-getSettings.https.html
@@ -57,4 +57,22 @@
       });
     });
   }, 'A device can be opened twice with different resolutions');
+
+  promise_test(t => {
+    return navigator.mediaDevices.enumerateDevices().then(async devices => {
+      for (var device of devices) {
+        if (device.kind == "audiooutput")
+          continue;
+        var device_id_constraint = {deviceId: {exact: device.deviceId}};
+        var constraints = device.kind == "audioinput"
+          ? {audio: device_id_constraint}
+          : {video: device_id_constraint};
+
+        var stream = await navigator.mediaDevices.getUserMedia(constraints);
+        assert_equals(stream.getTracks()[0].getSettings().groupId,
+                      device.groupId);
+        assert_true(device.groupId.length > 0);
+      }
+    });
+  }, 'groupId is correctly reported by getSettings() for all devices');
 </script>
diff --git a/tests/wpt/web-platform-tests/mediasession/OWNERS b/tests/wpt/web-platform-tests/mediasession/OWNERS
new file mode 100644
index 000000000000..b05a482a14b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/mediasession/OWNERS
@@ -0,0 +1 @@
+@mounirlamouri
diff --git a/tests/wpt/web-platform-tests/netinfo/OWNERS b/tests/wpt/web-platform-tests/netinfo/OWNERS
new file mode 100644
index 000000000000..095bbbdb31b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/netinfo/OWNERS
@@ -0,0 +1,4 @@
+@jkarlin
+@igrigorik
+@marcoscaceres
+@tarunban
diff --git a/tests/wpt/web-platform-tests/offscreen-canvas/OWNERS b/tests/wpt/web-platform-tests/offscreen-canvas/OWNERS
new file mode 100644
index 000000000000..3bb6edf248aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/offscreen-canvas/OWNERS
@@ -0,0 +1,5 @@
+@AmeliaBR
+@annevk
+@kenrussell
+@jdashg
+@fserb
diff --git a/tests/wpt/web-platform-tests/old-tests/OWNERS b/tests/wpt/web-platform-tests/old-tests/OWNERS
new file mode 100644
index 000000000000..04a7557ed2fe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/old-tests/OWNERS
@@ -0,0 +1,2 @@
+@foolip
+@Ms2ger
diff --git a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/history/history_000.htm b/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/history/history_000.htm
index 771ed154255f..855612b82a92 100644
--- a/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/history/history_000.htm
+++ b/tests/wpt/web-platform-tests/old-tests/submission/Microsoft/history/history_000.htm
@@ -322,8 +322,25 @@
         }
 
         add_result_callback(testFinished);
-        //start the first test manually
-        queue(testCollection[testIndex]);
+
+        function startTestsWhenIframesLoaded() {
+          if (testframe1.contentWindow.document.readyState != 'complete' ||
+              testframe2.contentWindow.document.readyState != 'complete') {
+            return;
+          }
+          testframe1.removeEventListener('load', startTestsWhenIframesLoaded, false);
+          testframe2.removeEventListener('load', startTestsWhenIframesLoaded, false);
+
+          //start the first test
+          queue(testCollection[testIndex]);
+        }
+
+        // add listeners to trigger the tests once the iframes are loaded,
+        // but also try to start it right away in case the load events have
+        // already fired and we missed them.
+        testframe1.addEventListener('load', startTestsWhenIframesLoaded, false);
+        testframe2.addEventListener('load', startTestsWhenIframesLoaded, false);
+        startTestsWhenIframesLoaded();
      </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/orientation-event/OWNERS b/tests/wpt/web-platform-tests/orientation-event/OWNERS
new file mode 100644
index 000000000000..77a3bbc2b7bb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/orientation-event/OWNERS
@@ -0,0 +1,2 @@
+@reillyeon
+@timvolodine
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
index ccefe2ea23ee..7f4257165f4a 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-disabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_disabled(AbsoluteOrientationSensor);
+run_fp_tests_disabled('AbsoluteOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index 6aed47d4ddf4..ab34f5b45429 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute_redirect_on_load(AbsoluteOrientationSensor);
+run_fp_tests_enabled_by_attribute_redirect_on_load('AbsoluteOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
index 51bbba1cae45..cb23e8b6aeca 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy-attribute.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute(AbsoluteOrientationSensor);
+run_fp_tests_enabled_by_attribute('AbsoluteOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
index c0b4cc8ed30d..cc09eeaea42b 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled(AbsoluteOrientationSensor);
+run_fp_tests_enabled('AbsoluteOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
index 9ce51ab64489..62e21beb9071 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_on_self_origin(AbsoluteOrientationSensor);
+run_fp_tests_enabled_on_self_origin('AbsoluteOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor.https.html b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor.https.html
new file mode 100644
index 000000000000..c476047f62a3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/orientation-sensor/AbsoluteOrientationSensor.https.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>OrientationSensor Test</title>
+<link rel="author" title="Intel" href="http://www.intel.com">
+<link rel="help" href="https://w3c.github.io/orientation-sensor/">
+<link rel="help" href="https://w3c.github.io/sensors/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
+<script src="/orientation-sensor/orientation-sensor-tests.js"></script>
+<div id="log"></div>
+
+<script>
+runOrienationSensorTests('AbsoluteOrientationSensor');
+runGenericSensorTests('AbsoluteOrientationSensor');
+</script>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_onerror-manual.https.html b/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_onerror-manual.https.html
index d70ea3048eae..415a63c1edf6 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_onerror-manual.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor_onerror-manual.https.html
@@ -16,7 +16,7 @@ <h2>Precondition</h2>
 </ol>
 <script>
 
-runGenericSensorOnerror(AbsoluteOrientationSensor);
-runGenericSensorOnerror(RelativeOrientationSensor);
+runGenericSensorOnerror('AbsoluteOrientationSensor');
+runGenericSensorOnerror('RelativeOrientationSensor');
 
 </script>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
index 9296af8ea6c2..d97d40b6ca3c 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-disabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_disabled(RelativeOrientationSensor);
+run_fp_tests_disabled('RelativeOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
index 01b45b099359..3a6173a2c115 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute-redirect-on-load.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute_redirect_on_load(RelativeOrientationSensor);
+run_fp_tests_enabled_by_attribute_redirect_on_load('RelativeOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
index 1bf41196663e..e8d30020c216 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy-attribute.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_by_attribute(RelativeOrientationSensor);
+run_fp_tests_enabled_by_attribute('RelativeOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
index 7ea2fb50f3b5..d9f38f2dccae 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled(RelativeOrientationSensor);
+run_fp_tests_enabled('RelativeOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
index 6d677bf0d42f..d63bf4e19b98 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor-enabled-on-self-origin-by-feature-policy.https.html
@@ -8,6 +8,6 @@
 <script>
 "use strict";
 
-run_fp_tests_enabled_on_self_origin(RelativeOrientationSensor);
+run_fp_tests_enabled_on_self_origin('RelativeOrientationSensor');
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor.https.html b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor.https.html
new file mode 100644
index 000000000000..9521a15f6cc7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/orientation-sensor/RelativeOrientationSensor.https.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>OrientationSensor Test</title>
+<link rel="author" title="Intel" href="http://www.intel.com">
+<link rel="help" href="https://w3c.github.io/orientation-sensor/">
+<link rel="help" href="https://w3c.github.io/sensors/">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/generic-sensor/generic-sensor-tests.js"></script>
+<script src="/orientation-sensor/orientation-sensor-tests.js"></script>
+<div id="log"></div>
+
+<script>
+runOrienationSensorTests('RelativeOrientationSensor');
+runGenericSensorTests('RelativeOrientationSensor');
+</script>
diff --git a/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor.https.html b/tests/wpt/web-platform-tests/orientation-sensor/orientation-sensor-tests.js
similarity index 63%
rename from tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor.https.html
rename to tests/wpt/web-platform-tests/orientation-sensor/orientation-sensor-tests.js
index 5e728a688db6..74e360a041a9 100644
--- a/tests/wpt/web-platform-tests/orientation-sensor/OrientationSensor.https.html
+++ b/tests/wpt/web-platform-tests/orientation-sensor/orientation-sensor-tests.js
@@ -1,16 +1,3 @@
- <!DOCTYPE html>
-<meta charset="utf-8">
-<title>OrientationSensor Test</title>
-<link rel="author" title="Intel" href="http://www.intel.com">
-<link rel="help" href="https://w3c.github.io/orientation-sensor/">
-<link rel="help" href="https://w3c.github.io/sensors/">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/generic-sensor/generic-sensor-tests.js"></script>
-<div id="log"></div>
-
-<script>
-
 //IEEE 754: single precision retricts to 7 decimal digits
 const float_precision = 1e-7;
 
@@ -80,23 +67,17 @@
   sensor.stop();
 }
 
-promise_test(t => {
-  return checkQuaternion(t, AbsoluteOrientationSensor);
-}, "Test AbsoluteOrientationSensor.quaternion return a four-element FrozenArray.");
-
-promise_test(t => {
-  return checkQuaternion(t, RelativeOrientationSensor);
-}, "Test RelativeOrientationSensor.quaternion return a four-element FrozenArray.");
+function runOrienationSensorTests(sensorName) {
+  const sensorType = self[sensorName];
 
-promise_test(t => {
-  return checkPopulateMatrix(t, AbsoluteOrientationSensor);
-}, "Test AbsoluteOrientationSensor.populateMatrix() method works correctly.");
+  sensor_test(async t => {
+    assert_true(sensorName in self);
+    return checkQuaternion(t, sensorType);
+  }, `${sensorName}.quaternion return a four-element FrozenArray.`);
 
-promise_test(t => {
-  return checkPopulateMatrix(t, RelativeOrientationSensor);
-}, "Test RelativeOrientationSensor.populateMatrix() method works correctly.");
-
-runGenericSensorTests(AbsoluteOrientationSensor);
-runGenericSensorTests(RelativeOrientationSensor);
+  sensor_test(async t => {
+    assert_true(sensorName in self);
+    return checkPopulateMatrix(t, sensorType);
+  }, `${sensorName}.populateMatrix() method works correctly.`);
+}
 
-</script>
diff --git a/tests/wpt/web-platform-tests/page-visibility/test_minimize-manual.html b/tests/wpt/web-platform-tests/page-visibility/test_minimize-manual.html
index 28e8486769c2..27fd0d7cefaf 100644
--- a/tests/wpt/web-platform-tests/page-visibility/test_minimize-manual.html
+++ b/tests/wpt/web-platform-tests/page-visibility/test_minimize-manual.html
@@ -5,6 +5,7 @@
         <title>Page Visibility API Operation While Minimizing Browser Window</title>
         <meta name="flags" content="interact" />
         <script type="text/javascript" src="/resources/testharness.js"></script>
+        <script type="text/javascript" src="/resources/testharnessreport.js"></script>
         <script type="text/javascript" src="resources/pagevistestharness.js"></script>
 
     </head>
diff --git a/tests/wpt/web-platform-tests/page-visibility/test_tab_state_change-manual.html b/tests/wpt/web-platform-tests/page-visibility/test_tab_state_change-manual.html
index c701e507862a..75d1da6e9375 100644
--- a/tests/wpt/web-platform-tests/page-visibility/test_tab_state_change-manual.html
+++ b/tests/wpt/web-platform-tests/page-visibility/test_tab_state_change-manual.html
@@ -5,6 +5,7 @@
         <title>Page Visibility API Operation While Changing Tabs</title>
         <meta name="flags" content="interact" />
         <script type="text/javascript" src="/resources/testharness.js"></script>
+        <script type="text/javascript" src="/resources/testharnessreport.js"></script>
         <script type="text/javascript" src="resources/pagevistestharness.js"></script>
 
     </head>
diff --git a/tests/wpt/web-platform-tests/payment-handler/app-can-make-payment.js b/tests/wpt/web-platform-tests/payment-handler/app-can-make-payment.js
index beec3283ec91..0bb949047359 100644
--- a/tests/wpt/web-platform-tests/payment-handler/app-can-make-payment.js
+++ b/tests/wpt/web-platform-tests/payment-handler/app-can-make-payment.js
@@ -76,9 +76,9 @@ self.addEventListener('canmakepayment', event => {
   }
 
   const methodAsURL = new URL(methodName);
-  if (event.topLevelOrigin !== methodAsURL.origin) {
-    const msg = `Unexpected event.topLevelOrigin: "${
-      event.topLevelOrigin
+  if (event.topOrigin !== methodAsURL.origin) {
+    const msg = `Unexpected event.topOrigin: "${
+      event.topOrigin
     }". Expected "${methodAsURL.origin}".`;
     event.respondWith(Promise.reject(new Error(msg)));
     return;
diff --git a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.worker.js b/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.worker.js
index 06af7de96ec5..8ae05d7853a7 100644
--- a/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.worker.js
+++ b/tests/wpt/web-platform-tests/payment-handler/can-make-payment-event-constructor.https.worker.js
@@ -30,13 +30,13 @@ test(() => {
 
 test(() => {
   const ev = new CanMakePaymentEvent('test', {
-    topLevelOrigin: 'https://foo.com',
+    topOrigin: 'https://foo.com',
     paymentRequestOrigin: 'https://bar.com',
     methodData: [],
     modifiers: [],
   });
   assert_false(ev.isTrusted, 'constructed in script, so not be trusted');
-  assert_equals(ev.topLevelOrigin, 'https://foo.com');
+  assert_equals(ev.topOrigin, 'https://foo.com');
   assert_equals(ev.paymentRequestOrigin, 'https://bar.com');
 }, 'CanMakePaymentEvent can be constructed with a CanMakePaymentEventInit, even if not trusted');
 
diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html b/tests/wpt/web-platform-tests/payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html
index 3925cdd81e6a..f767044d060f 100644
--- a/tests/wpt/web-platform-tests/payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/PaymentAddress/attributes-and-toJSON-method-manual.https.html
@@ -68,7 +68,7 @@ <h2>PaymentAddress interface</h2>
     <button onclick="
     const expectedAddress = {
       country: 'AU',
-      regionCode: 'AU-QLD',
+      regionCode: 'QLD',
       addressLine: '55 test st',
       city: 'Chapel Hill',
       dependentLocality: '',
@@ -90,8 +90,10 @@ <h2>PaymentAddress interface</h2>
       <dd>55 test st</dd>
       <dt>Country</dt>
       <dd>Australia</dd>
-      <dt>Suburb</dt>
+      <dt>City</dt>
       <dd>Chapel Hill</dd>
+      <dd>State/Region</dd>
+      <dd>Queensland</dd>
       <dt>postal code </dt>
       <dd>6095</dd>
       <dt>organization</dt>
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-not-exposed.https.worker.js b/tests/wpt/web-platform-tests/payment-request/payment-request-not-exposed.https.worker.js
index df20f801e9d6..e5576e673520 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-not-exposed.https.worker.js
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-not-exposed.https.worker.js
@@ -1,11 +1,7 @@
 importScripts("/resources/testharness.js");
 
-test(function() {
+test(() => {
   assert_true(isSecureContext);
   assert_false('PaymentRequest' in self);
-  assert_false('PaymentRequestUpdateEvent' in self);
-  assert_false('PaymentResponse' in self);
-  assert_false('PaymentAddress' in self);
 }, "PaymentRequest constructor must not be exposed in worker global scope");
-
 done();
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/OWNERS b/tests/wpt/web-platform-tests/picture-in-picture/OWNERS
new file mode 100644
index 000000000000..8f88b618d9fe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/picture-in-picture/OWNERS
@@ -0,0 +1,2 @@
+@beaufortfrancois
+@mounirlamouri
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/disable-picture-in-picture.html b/tests/wpt/web-platform-tests/picture-in-picture/disable-picture-in-picture.html
index 8726d1aaf88b..1a59b7a3b32c 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/disable-picture-in-picture.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/disable-picture-in-picture.html
@@ -24,15 +24,26 @@
   assert_equals(video.getAttribute('disablepictureinpicture'), null);
 }, 'Test disablePictureInPicture IDL attribute');
 
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
   video.disablePictureInPicture = true;
   return promise_rejects(t, 'InvalidStateError',
       requestPictureInPictureWithTrustedClick(video));
 }, 'Request Picture-in-Picture rejects if disablePictureInPicture is true');
 
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
+  return callWithTrustedClick(async () => {
+    const promise = video.requestPictureInPicture();
+    video.disablePictureInPicture = true;
+    await promise_rejects(t, 'InvalidStateError', promise);
+    assert_equals(document.pictureInPictureElement, null);
+  });
+}, 'Request Picture-in-Picture rejects if disablePictureInPicture becomes ' +
+   'true before promise resolves.');
+
+promise_test(async t => {
+  const video = await loadVideo();
   return requestPictureInPictureWithTrustedClick(video)
   .then(() => {
     video.disablePictureInPicture = true;
@@ -40,8 +51,8 @@
   });
 }, 'pictureInPictureElement is unset if disablePictureInPicture becomes true');
 
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
   return requestPictureInPictureWithTrustedClick(video)
   .then(() => {
     video.disablePictureInPicture = false;
@@ -49,8 +60,8 @@
   });
 }, 'pictureInPictureElement is unchanged if disablePictureInPicture becomes false');
 
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
   return requestPictureInPictureWithTrustedClick(video)
   .then(() => {
     document.createElement('video').disablePictureInPicture = true;
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/enter-picture-in-picture.html b/tests/wpt/web-platform-tests/picture-in-picture/enter-picture-in-picture.html
index 8830ab018bff..fc109e4f5a49 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/enter-picture-in-picture.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/enter-picture-in-picture.html
@@ -7,8 +7,8 @@
 <script src="resources/picture-in-picture-helpers.js"></script>
 <body></body>
 <script>
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
 
   video.addEventListener('enterpictureinpicture', t.step_func_done(event => {
     assert_equals(event.target, video);
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/exit-picture-in-picture.html b/tests/wpt/web-platform-tests/picture-in-picture/exit-picture-in-picture.html
index e0ab7acd8f91..9a5eedd9be8f 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/exit-picture-in-picture.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/exit-picture-in-picture.html
@@ -7,12 +7,12 @@
 <script src="resources/picture-in-picture-helpers.js"></script>
 <body></body>
 <script>
-promise_test(t => {
-  return requestPictureInPictureWithTrustedClick(document.createElement('video'))
+promise_test(async t => {
+  const video = await loadVideo();
+  return requestPictureInPictureWithTrustedClick(video)
   .then(() => document.exitPictureInPicture());
 }, 'Exit Picture-in-Picture resolves when there is a Picture-in-Picture video');
 
-
 promise_test(t => {
   return promise_rejects(t, 'InvalidStateError',
       document.exitPictureInPicture());
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/leave-picture-in-picture.html b/tests/wpt/web-platform-tests/picture-in-picture/leave-picture-in-picture.html
index a0d4cc26f357..5a5182bf64d7 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/leave-picture-in-picture.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/leave-picture-in-picture.html
@@ -7,8 +7,8 @@
 <script src="resources/picture-in-picture-helpers.js"></script>
 <body></body>
 <script>
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
 
   video.addEventListener('leavepictureinpicture', t.step_func_done(event => {
     assert_equals(event.target, video);
@@ -19,11 +19,11 @@
   }));
 
   return requestPictureInPictureWithTrustedClick(video)
-  .then(() => document.exitPictureInPicture())
+  .then(() => document.exitPictureInPicture());
 }, 'leavepictureinpicture event is fired if document.exitPictureInPicture');
 
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
 
   video.addEventListener('leavepictureinpicture', t.step_func_done(event => {
     assert_equals(event.target, video);
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-element.html b/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-element.html
index 71e399618166..809b3eeabcc3 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-element.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-element.html
@@ -7,9 +7,9 @@
 <script src="resources/picture-in-picture-helpers.js"></script>
 <body></body>
 <script>
-promise_test(t => {
+promise_test(async t => {
   assert_equals(document.pictureInPictureElement, null);
-  const video = document.createElement('video');
+  const video = await loadVideo();
 
   return requestPictureInPictureWithTrustedClick(video)
   .then(() => {
@@ -18,6 +18,6 @@
   })
   .then(() => {
     assert_equals(document.pictureInPictureElement, null);
-  })
+  });
 });
 </script>
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-window.html b/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-window.html
index 4bee95d9039e..82d64577294b 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-window.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/picture-in-picture-window.html
@@ -7,17 +7,18 @@
 <script src="resources/picture-in-picture-helpers.js"></script>
 <body></body>
 <script>
-promise_test(t => {
-  return requestPictureInPictureWithTrustedClick(document.createElement('video'))
+promise_test(async t => {
+  const video = await loadVideo();
+  return requestPictureInPictureWithTrustedClick(video)
   .then(pipWindow => {
     assert_not_equals(pipWindow.width, 0);
     assert_not_equals(pipWindow.height, 0);
   });
 }, 'Picture-in-Picture window dimensions are set after entering Picture-in-Picture');
 
-promise_test(t => {
-  const video1 = document.createElement('video');
-  const video2 = document.createElement('video');
+promise_test(async t => {
+  const video1 = await loadVideo();
+  const video2 = await loadVideo();
   return requestPictureInPictureWithTrustedClick(video1)
   .then(pipWindow1 => {
     return requestPictureInPictureWithTrustedClick(video2)
@@ -31,19 +32,20 @@
 }, 'Picture-in-Picture window dimensions are set to 0 after entering ' +
    'Picture-in-Picture for another video');
 
-promise_test(t => {
-  return requestPictureInPictureWithTrustedClick(document.createElement('video'))
+promise_test(async t => {
+  const video = await loadVideo();
+  return requestPictureInPictureWithTrustedClick(video)
   .then(pipWindow => {
     return document.exitPictureInPicture()
     .then(() => {
       assert_equals(pipWindow.width, 0);
       assert_equals(pipWindow.height, 0);
     });
-  })
+  });
 }, 'Picture-in-Picture window dimensions are set to 0 after exiting Picture-in-Picture');
 
-promise_test(t => {
-  const video = document.createElement('video');
+promise_test(async t => {
+  const video = await loadVideo();
   let thePipWindow;
 
   video.addEventListener('leavepictureinpicture', t.step_func_done(event => {
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture.html b/tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture.html
index 32bbfc204b71..d2a594134718 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/request-picture-in-picture.html
@@ -7,19 +7,39 @@
 <script src="resources/picture-in-picture-helpers.js"></script>
 <body></body>
 <script>
-promise_test(t => {
-  return requestPictureInPictureWithTrustedClick(document.createElement('video'));
+promise_test(async t => {
+  const video = await loadVideo();
+  return requestPictureInPictureWithTrustedClick(video);
 }, 'request Picture-in-Picture resolves on user click');
 
 promise_test(t => {
-  return promise_rejects(t, 'NotAllowedError',
-      document.createElement('video').requestPictureInPicture());
+  const video = document.createElement('video');
+  return promise_rejects(t, 'InvalidStateError',
+      requestPictureInPictureWithTrustedClick(video));
+}, 'request Picture-in-Picture requires loaded metadata for the video element');
+
+promise_test(async t => {
+  const video = document.createElement('video');
+  await new Promise(resolve => {
+    video.src = '/media/sound_5.oga';
+    video.onloadeddata = resolve;
+  }).then(() => {
+    return promise_rejects(t, 'InvalidStateError',
+      requestPictureInPictureWithTrustedClick(video));
+  })
+}, 'request Picture-in-Picture requires video track for the video element');
+
+promise_test(async t => {
+  const video = await loadVideo();
+  return promise_rejects(t, 'NotAllowedError', video.requestPictureInPicture());
 }, 'request Picture-in-Picture requires a user gesture');
 
-promise_test(t => {
+promise_test(async t => {
+  const video1 = await loadVideo();
+  const video2 = await loadVideo();
   return callWithTrustedClick(() => {
-    const first = document.createElement('video').requestPictureInPicture();
-    const second = document.createElement('video').requestPictureInPicture();
+    const first = video1.requestPictureInPicture();
+    const second = video2.requestPictureInPicture();
     return Promise.all([
       first,
       promise_rejects(t, 'NotAllowedError', second)
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js b/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js
index 0808a991a268..4538c8382781 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js
+++ b/tests/wpt/web-platform-tests/picture-in-picture/resources/picture-in-picture-helpers.js
@@ -14,6 +14,16 @@ function callWithTrustedClick(callback) {
   });
 }
 
+function loadVideo() {
+  return new Promise(resolve => {
+    let video = document.createElement('video');
+    video.src = '/media/movie_5.ogv';
+    video.onloadedmetadata = () => {
+      resolve(video);
+    };
+  });
+}
+
 // Calls requestPictureInPicture() in a context that's 'allowed to request PiP'.
 function requestPictureInPictureWithTrustedClick(videoElement) {
   return callWithTrustedClick(
diff --git a/tests/wpt/web-platform-tests/picture-in-picture/shadow-dom.html b/tests/wpt/web-platform-tests/picture-in-picture/shadow-dom.html
index 4f4c955d01ed..e36acc02193c 100644
--- a/tests/wpt/web-platform-tests/picture-in-picture/shadow-dom.html
+++ b/tests/wpt/web-platform-tests/picture-in-picture/shadow-dom.html
@@ -33,7 +33,7 @@
 </div>
 </body>
 <script>
-promise_test(t => {
+promise_test(async t => {
   const ids = createTestTree(host);
   document.body.appendChild(ids.host);
 
@@ -44,7 +44,11 @@
   assert_equals(ids.root4.pictureInPictureElement, null);
   assert_equals(ids.root5.pictureInPictureElement, null);
 
-  return requestPictureInPictureWithTrustedClick(ids.video)
+  await new Promise(resolve => {
+    ids.video.src = '/media/movie_5.ogv';
+    ids.video.onloadeddata = resolve;
+  })
+  .then(() => requestPictureInPictureWithTrustedClick(ids.video))
   .then(() => {
     assert_equals(document.pictureInPictureElement, ids.host2);
     assert_equals(ids.root.pictureInPictureElement, null);
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers-manual.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers-manual.html
new file mode 100644
index 000000000000..62a0a6d5a4a2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_boundary_events_at_implicit_release_hoverable_pointers-manual.html
@@ -0,0 +1,81 @@
+<!doctype html>
+<html>
+  <head>
+    <title>Pointer Event: Boundary event sequence at implicit capture release</title>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+    <link rel="author" title="Google" href="http://www.google.com "/>
+    <meta name="assert" content="When a captured pointer is implicitly released after a click, the boundary events should follow the lostpointercapture event."/>
+    <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script type="text/javascript" src="pointerevent_support.js"></script>
+    <script type="text/javascript">
+      var detected_pointertypes = {};
+      var event_log = [];
+      var start_logging = false;
+
+      function resetTestState() {
+        detected_eventTypes = {};
+        event_log = [];
+        start_logging = false;
+      }
+
+      function run() {
+        var test_pointer_event = setup_pointerevent_test("Event sequence at implicit release on click", ["mouse"]);
+
+        var target = document.getElementById("target");
+        var capture_target = document.getElementById("capture-target");
+
+        All_Pointer_Events.forEach(function(eventName) {
+          on_event(target, eventName, function (event) {
+            detected_pointertypes[event.pointerType] = true;
+
+            if (event.type == "pointerdown") {
+              capture_target.setPointerCapture(event.pointerId);
+              start_logging = true;
+            } else if (start_logging) {
+              event_log.push(event.type + '@' + event.target.id);
+            }
+          });
+
+          on_event(capture_target, eventName, function (event) {
+            detected_pointertypes[event.pointerType] = true;
+            event_log.push(event.type + '@' + event.target.id);
+            if (event.type == 'lostpointercapture') {
+              setTimeout(function() {
+                test_pointer_event.step(function () {
+                  var expected_events = "pointerup, lostpointercapture, pointerout, pointerleave";
+                  assert_equals(event_log.join(", "), "pointerout@target, pointerleave@target, pointerover@capture-target, pointerenter@capture-target, gotpointercapture@capture-target, pointerup@capture-target, lostpointercapture@capture-target, pointerout@capture-target, pointerleave@capture-target, pointerover@target, pointerenter@target");
+                });
+                test_pointer_event.done();
+              }, 200);
+            }
+          });
+        });
+      }
+    </script>
+    <style>
+      #target {
+        margin: 20px;
+        background-color: black;
+      }
+    </style>
+  </head>
+  <body onload="run()">
+    <h1>Pointer Event: Boundary event sequence at implicit capture release</h1>
+    <h2 id="pointerTypeDescription"></h2>
+    <h4>
+      When a captured pointer is implicitly released after a click, the boundary events should follow the lostpointercapture event.
+    </h4>
+    <ol>
+      <li>Click on the black box with mouse and do not move the mouse after or during the click.</li>
+    </ol>
+    <div id="capture-target"></div>
+    <div id="target"></div>
+    <div id="complete-notice">
+      <p>The following pointer types were detected: <span id="pointertype-log"></span>.</p>
+      <p>The following events were logged: <span id="event-log"></span>.</p>
+    </div>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy_when_locked-manual.html b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy_when_locked-manual.html
new file mode 100644
index 000000000000..ccb8c27cb59b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerlock/pointerevent_movementxy_when_locked-manual.html
@@ -0,0 +1,83 @@
+<!doctype html>
+<html>
+    <head>
+        <title>Pointer Events pointer lock tests</title>
+        <meta name="viewport" content="width=device-width">
+        <link rel="stylesheet" type="text/css" href="/external/wpt/pointerevents/pointerevent_styles.css">
+        <script src="/resources/testharness.js"></script>
+        <script src="/resources/testharnessreport.js"></script>
+        <script type="text/javascript" src="../pointerevent_support.js"></script>
+        <style>
+          #testContainer {
+            touch-action: none;
+            user-select: none;
+            position: relative;
+          }
+        </style>
+        <script>
+            var lock_change_count = 0;
+            var mouseeventMovements = []
+            var pointereventMovements = []
+
+            function resetTestState() {
+            }
+
+            function run() {
+                var test_pointerEvent = setup_pointerevent_test("pointerevent movementX/Y when lock test", ['mouse']);
+                var div1 = document.getElementById("target");
+
+                on_event(div1, 'pointerdown', function(event) {
+                    if (lock_change_count == 0)
+                       div1.requestPointerLock();
+                });
+                on_event(div1, 'pointerup', function(event) {
+                    if (lock_change_count == 1)
+                        document.exitPointerLock();
+                });
+                on_event(div1, 'pointermove', function(event) {
+                    if (lock_change_count == 1) {
+                        pointereventMovements.push(`${event.movementX}, ${event.movementY}`);
+                    }
+                });
+                on_event(div1, 'mousemove', function(event) {
+                    if (lock_change_count == 1) {
+                        mouseeventMovements.push(`${event.movementX}, ${event.movementY}`);
+                    }
+                });
+                on_event(document, 'pointerlockchange', function(event) {
+                    lock_change_count++;
+                    if (lock_change_count == 1) {
+                        test_pointerEvent.step(function() {
+                            assert_equals(document.pointerLockElement, div1, "document.pointerLockElement should be div1.");
+                        });
+                    } else if (lock_change_count == 2) {
+                        test_pointerEvent.step(function() {
+                            assert_equals(document.pointerLockElement, null, "document.pointerLockElement should be null.");
+                            assert_not_equals(mouseeventMovements.length, 0);
+                            assert_array_equals(pointereventMovements, mouseeventMovements, "pointermove should have movementX/Y same as mousemove");
+                        });
+                        test_pointerEvent.done();
+                    }
+                });
+            }
+        </script>
+    </head>
+    <body onload="run()">
+        <h1>Pointer Events movement in locked state test</h1>
+        <h2 id="pointerTypeDescription"></h2>
+        <h4>
+            Test Description: This test checks if pointermove.movementX/Y matches mousemove.movementX/Y when pointer is locked.
+            <ol>
+                 <li>Press left button down on the green rectangle and hold it.</li>
+                 <li>Move the mouse inside the green rectangle.</li>
+            </ol>
+            </ol>
+
+            Test passes if the proper behavior of the events is observed.
+        </h4>
+        <div id="testContainer">
+            <div id="target" style="width:800px;height:250px;background:green"></div>
+        </div>
+        <div class="spacer"></div>
+    </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/pointerlock/movementX_Y_basic-manual.html b/tests/wpt/web-platform-tests/pointerlock/movementX_Y_basic-manual.html
index c058d24a6e53..083b7075decf 100644
--- a/tests/wpt/web-platform-tests/pointerlock/movementX_Y_basic-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/movementX_Y_basic-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     #status-log {
         margin: 10px 0;
diff --git a/tests/wpt/web-platform-tests/pointerlock/movementX_Y_no-jumps-manual.html b/tests/wpt/web-platform-tests/pointerlock/movementX_Y_no-jumps-manual.html
index 9c8fabd28c9f..11b8d2a49e0a 100644
--- a/tests/wpt/web-platform-tests/pointerlock/movementX_Y_no-jumps-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/movementX_Y_no-jumps-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     #status-log {
         margin: 10px 0;
diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_basic-manual.html b/tests/wpt/web-platform-tests/pointerlock/pointerlock_basic-manual.html
index d926318abeef..141b349cf542 100644
--- a/tests/wpt/web-platform-tests/pointerlock/pointerlock_basic-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/pointerlock_basic-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     button {
         color: blue;
diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_fullscreen-manual.html b/tests/wpt/web-platform-tests/pointerlock/pointerlock_fullscreen-manual.html
index 7ce91ad16904..19f4cbeee9f3 100644
--- a/tests/wpt/web-platform-tests/pointerlock/pointerlock_fullscreen-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/pointerlock_fullscreen-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     button {
         color: blue;
diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_indefinite-manual.html b/tests/wpt/web-platform-tests/pointerlock/pointerlock_indefinite-manual.html
index 0db1227ad13d..96d5f94e6595 100644
--- a/tests/wpt/web-platform-tests/pointerlock/pointerlock_indefinite-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/pointerlock_indefinite-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     button {
         color: blue;
diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_Tab-manual.html b/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_Tab-manual.html
index 198e2fe63d74..f32c71abe5bb 100644
--- a/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_Tab-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_Tab-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     button {
         color: blue;
diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_UA-manual.html b/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_UA-manual.html
index e1440084479f..8373a345ea03 100644
--- a/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_UA-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/pointerlock_leave_UA-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     button {
         color: blue;
diff --git a/tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target-manual.html b/tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target-manual.html
index 210365090482..a38b06e12053 100644
--- a/tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/pointerlock_remove_target-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <style type="text/css">
     button {
         color: blue;
diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html
index 84971cbdf63b..9b75a85e9f69 100644
--- a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html
+++ b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnectionList_onconnectionavailable-manual.https.html
@@ -3,7 +3,6 @@
 <title>Monitoring incoming presentation connections</title>
 <link rel="author" title="Tomoyuki Shimizu" href="https://github.com/tomoyukilabs">
 <link rel="help" href="https://w3c.github.io/presentation-api/#monitoring-incoming-presentation-connections">
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="common.js"></script>
 <script src="support/stash.js"></script>
 <style>
@@ -75,4 +74,4 @@
         connection.terminate();
     });
   };
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html
index d6baad1c285d..50585f781324 100644
--- a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html
+++ b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onclose-manual.https.html
@@ -3,7 +3,6 @@
 <title>Closing a PresentationConnection</title>
 <link rel="author" title="Tomoyuki Shimizu" href="https://github.com/tomoyukilabs">
 <link rel="help" href="https://w3c.github.io/presentation-api/#closing-a-presentationconnection">
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="common.js"></script>
 <script src="support/stash.js"></script>
 <style>
@@ -82,4 +81,4 @@
         connection.terminate();
     });
   };
-</script>
\ No newline at end of file
+</script>
diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html
index 4b05cdc9e895..53451a6ceffe 100644
--- a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html
+++ b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/PresentationConnection_onmessage-manual.https.html
@@ -3,7 +3,6 @@
 <title>Receiving a message through PresentationConnection</title>
 <link rel="author" title="Tomoyuki Shimizu" href="https://github.com/tomoyukilabs/">
 <link rel="help" href="http://w3c.github.io/presentation-api/#receiving-a-message-through-presentationconnection">
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="common.js"></script>
 <script src="support/stash.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/idlharness-manual.https.html b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/idlharness-manual.https.html
index 079bb094acff..c7bd7344d536 100644
--- a/tests/wpt/web-platform-tests/presentation-api/receiving-ua/idlharness-manual.https.html
+++ b/tests/wpt/web-platform-tests/presentation-api/receiving-ua/idlharness-manual.https.html
@@ -3,7 +3,6 @@
 <title>Presentation API IDL tests for Receiving User Agent</title>
 <link rel="author" title="Tomoyuki Shimizu" href="https://github.com/tomoyukilabs">
 <link rel="help" href="http://w3c.github.io/presentation-api/#dfn-receiving-user-agent">
-<link rel="stylesheet" href="/resources/testharness.css">
 <script src="common.js"></script>
 <script src="support/stash.js"></script>
 
diff --git a/tests/wpt/web-platform-tests/referrer-policy/OWNERS b/tests/wpt/web-platform-tests/referrer-policy/OWNERS
index 68fa260f6de7..db1faa08f235 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/OWNERS
+++ b/tests/wpt/web-platform-tests/referrer-policy/OWNERS
@@ -1,3 +1,4 @@
 @estark37
 @jeisinger
 @kristijanburnik
+@domfarolino
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..f8712fd2a42c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..701ec1dba42c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..d1b0482e16f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..e6863a13df8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..9a2dd530ff94
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..058e087238ad
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..c2c4ccdb7147
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..e5da88157d58
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..a0e3be12513e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..389921d4d8f3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..dfbabf210821
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..233611e69523
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer-when-downgrade/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer-when-downgrade'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer-when-downgrade",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..542395d1f306
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..178f813a614c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..ff9462ecbcd4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..890ab5be5d46
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..1dd2d1c1c2fc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..4c9e15551ebf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..6edeebf3d75e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..0276285cd04b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..2760fdc1ddeb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..d3a2a4728814
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..393a92a4ac0e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..2f2926b128c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/no-referrer/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'no-referrer'</title>
+    <meta name="description" content="Check that sub-resource never gets the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "no-referrer",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..d34b4ae25bbe
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
new file mode 100644
index 000000000000..f8a200230bb1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..38a61d264a7b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..098b987b99d2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
new file mode 100644
index 000000000000..2d8217031d18
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..fce7ad9933b5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..318ffd577a2c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
new file mode 100644
index 000000000000..dea7ad286eef
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..46c715d6aa2f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..9063bbd5ee50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
new file mode 100644
index 000000000000..56bc742d64d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..3209c5beebf6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-downgrade.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..3209c5beebf6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..9063bbd5ee50
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
new file mode 100644
index 000000000000..56bc742d64d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..3209c5beebf6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-upgrade.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin-when-cross-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..9be1730a90ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..a7d72f506184
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..9bfb0810d3d0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..0a24543d610d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..463b67ec4ae7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..10ef951d91ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..84333fbb7ab8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..15cd9b2b89ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..10984fde1aa0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..554665cd3e0c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..6237b64bd34a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..6eae7c560197
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/origin/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'origin'</title>
+    <meta name="description" content="Check that all subresources in all casses get only the origin portion of the referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..0c7b71228174
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
new file mode 100644
index 000000000000..eca111bd511d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..f46299630e10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-http/script-tag/cross-origin.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..7b61c2621889
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
new file mode 100644
index 000000000000..aa3b6aa07b15
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..b993d95afa40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/cross-origin/http-https/script-tag/cross-origin.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..0a4d82c7eed3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
new file mode 100644
index 000000000000..7eee32a0406d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..f92bf349cff2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-http/script-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..ddd0fd439071
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/same-origin/attr-referrer/same-origin/http-https/script-tag/same-origin-insecure.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'same-origin'</title>
+    <meta name="description" content="Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin">
+    <meta name="assert" content="The referrer URL is omitted when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "same-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "omitted"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/spec.src.json b/tests/wpt/web-platform-tests/referrer-policy/spec.src.json
index 6d76af2f6f32..1ee2b70ee020 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/spec.src.json
+++ b/tests/wpt/web-platform-tests/referrer-policy/spec.src.json
@@ -489,7 +489,6 @@
       "redirection": "*",
       "origin": "*",
       "subresource": [
-        "script-tag",
         "xhr-request",
         "worker-request",
         "fetch-request"
diff --git a/tests/wpt/web-platform-tests/referrer-policy/spec_json.js b/tests/wpt/web-platform-tests/referrer-policy/spec_json.js
index 1da04bd59e80..dd1962dbe0c7 100644
--- a/tests/wpt/web-platform-tests/referrer-policy/spec_json.js
+++ b/tests/wpt/web-platform-tests/referrer-policy/spec_json.js
@@ -1 +1 @@
-var SPEC_JSON = {"subresource_path": {"img-tag": "/referrer-policy/generic/subresource/image.py", "fetch-request": "/referrer-policy/generic/subresource/xhr.py", "a-tag": "/referrer-policy/generic/subresource/document.py", "area-tag": "/referrer-policy/generic/subresource/document.py", "iframe-tag": "/referrer-policy/generic/subresource/document.py", "xhr-request": "/referrer-policy/generic/subresource/xhr.py", "worker-request": "/referrer-policy/generic/subresource/worker.py", "script-tag": "/referrer-policy/generic/subresource/script.py"}, "test_expansion_schema": {"origin": ["same-origin", "cross-origin"], "subresource": ["iframe-tag", "img-tag", "script-tag", "a-tag", "area-tag", "xhr-request", "worker-request", "fetch-request"], "target_protocol": ["http", "https"], "expansion": ["default", "override"], "delivery_method": ["http-rp", "meta-referrer", "attr-referrer", "rel-noreferrer"], "redirection": ["no-redirect", "keep-origin-redirect", "swap-origin-redirect"], "referrer_url": ["omitted", "origin", "stripped-referrer"], "source_protocol": ["http", "https"]}, "specification": [{"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "referrer_policy": null, "title": "Referrer Policy is not explicitly defined", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "unset-referrer-policy", "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "referrer_policy": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "no-referrer", "description": "Check that sub-resource never gets the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "referrer_policy": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "no-referrer-when-downgrade", "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "referrer_policy": "origin", "title": "Referrer Policy is set to 'origin'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin", "description": "Check that all subresources in all casses get only the origin portion of the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "referrer_policy": "same-origin", "title": "Referrer Policy is set to 'same-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "same-origin", "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "referrer_policy": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-upgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-downgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin-when-cross-origin", "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin", "referrer_policy": "strict-origin", "title": "Referrer Policy is set to 'strict-origin'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}], "name": "strict-origin", "description": "Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin", "referrer_policy": "strict-origin-when-cross-origin", "title": "Referrer Policy is set to 'strict-origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-insecure", "target_protocol": "http", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-secure", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-secure", "target_protocol": "https", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-secure", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}], "name": "strict-origin-when-cross-origin", "description": "Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "referrer_policy": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "*", "subresource": "*"}], "name": "unsafe-url", "description": "Check that all sub-resources get the stripped referrer URL."}], "referrer_policy_schema": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "excluded_tests": [{"origin": "cross-origin", "name": "cross-origin-workers", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": "worker-request"}, {"origin": "*", "name": "upgraded-protocol-workers", "target_protocol": "https", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "http", "subresource": "worker-request"}, {"origin": "*", "name": "mixed-content-insecure-subresources", "target_protocol": "http", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "elements-not-supporting-attr-referrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["attr-referrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["script-tag", "xhr-request", "worker-request", "fetch-request"]}, {"origin": "*", "name": "elements-not-supporting-rel-noreferrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["rel-noreferrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["iframe-tag", "img-tag", "script-tag", "xhr-request", "worker-request", "fetch-request", "area-tag"]}, {"origin": "*", "name": "area-tag", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": "area-tag"}, {"origin": "*", "name": "worker-requests-with-swap-origin-redirect", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "swap-origin-redirect", "referrer_url": "*", "source_protocol": "*", "subresource": ["worker-request"]}, {"origin": "*", "name": "overhead-for-redirection", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": ["keep-origin-redirect", "swap-origin-redirect"], "referrer_url": "*", "source_protocol": "*", "subresource": ["a-tag", "area-tag"]}, {"origin": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}]};
+var SPEC_JSON = {"subresource_path": {"img-tag": "/referrer-policy/generic/subresource/image.py", "fetch-request": "/referrer-policy/generic/subresource/xhr.py", "a-tag": "/referrer-policy/generic/subresource/document.py", "area-tag": "/referrer-policy/generic/subresource/document.py", "iframe-tag": "/referrer-policy/generic/subresource/document.py", "xhr-request": "/referrer-policy/generic/subresource/xhr.py", "worker-request": "/referrer-policy/generic/subresource/worker.py", "script-tag": "/referrer-policy/generic/subresource/script.py"}, "test_expansion_schema": {"origin": ["same-origin", "cross-origin"], "subresource": ["iframe-tag", "img-tag", "script-tag", "a-tag", "area-tag", "xhr-request", "worker-request", "fetch-request"], "target_protocol": ["http", "https"], "expansion": ["default", "override"], "delivery_method": ["http-rp", "meta-referrer", "attr-referrer", "rel-noreferrer"], "redirection": ["no-redirect", "keep-origin-redirect", "swap-origin-redirect"], "referrer_url": ["omitted", "origin", "stripped-referrer"], "source_protocol": ["http", "https"]}, "specification": [{"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policies", "referrer_policy": null, "title": "Referrer Policy is not explicitly defined", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "unset-referrer-policy", "description": "Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer", "referrer_policy": "no-referrer", "title": "Referrer Policy is set to 'no-referrer'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "no-referrer", "description": "Check that sub-resource never gets the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-no-referrer-when-downgrade", "referrer_policy": "no-referrer-when-downgrade", "title": "Referrer Policy is set to 'no-referrer-when-downgrade'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}], "name": "no-referrer-when-downgrade", "description": "Check that non a priori insecure subresource gets the full Referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin", "referrer_policy": "origin", "title": "Referrer Policy is set to 'origin'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin", "description": "Check that all subresources in all casses get only the origin portion of the referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-same-origin", "referrer_policy": "same-origin", "title": "Referrer Policy is set to 'same-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "*", "subresource": "*"}], "name": "same-origin", "description": "Check that cross-origin subresources get no referrer information and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-origin-when-cross-origin", "referrer_policy": "origin-when-cross-origin", "title": "Referrer Policy is set to 'origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-secure-default", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-upgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-downgrade", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-origin-insecure", "target_protocol": "*", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-origin", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "*", "subresource": "*"}], "name": "origin-when-cross-origin", "description": "Check that cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin", "referrer_policy": "strict-origin", "title": "Referrer Policy is set to 'strict-origin'", "test_expansion": [{"origin": "*", "name": "insecure-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "secure-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}], "name": "strict-origin", "description": "Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin", "referrer_policy": "strict-origin-when-cross-origin", "title": "Referrer Policy is set to 'strict-origin-when-cross-origin'", "test_expansion": [{"origin": "same-origin", "name": "same-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "http", "subresource": "*"}, {"origin": "same-origin", "name": "same-insecure", "target_protocol": "http", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-insecure", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "upgrade-protocol", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "http", "subresource": "*"}, {"origin": "*", "name": "downgrade-protocol", "target_protocol": "http", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "omitted", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-secure", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "https", "subresource": "*"}, {"origin": "same-origin", "name": "same-secure", "target_protocol": "https", "expansion": "override", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "swap-origin-redirect", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}, {"origin": "cross-origin", "name": "cross-secure", "target_protocol": "https", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "origin", "source_protocol": "https", "subresource": "*"}], "name": "strict-origin-when-cross-origin", "description": "Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL."}, {"specification_url": "https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url", "referrer_policy": "unsafe-url", "title": "Referrer Policy is set to 'unsafe-url'", "test_expansion": [{"origin": "*", "name": "generic", "target_protocol": "*", "expansion": "default", "delivery_method": ["http-rp", "meta-referrer", "attr-referrer"], "redirection": "*", "referrer_url": "stripped-referrer", "source_protocol": "*", "subresource": "*"}], "name": "unsafe-url", "description": "Check that all sub-resources get the stripped referrer URL."}], "referrer_policy_schema": [null, "no-referrer", "no-referrer-when-downgrade", "same-origin", "origin", "origin-when-cross-origin", "strict-origin", "strict-origin-when-cross-origin", "unsafe-url"], "excluded_tests": [{"origin": "cross-origin", "name": "cross-origin-workers", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": "worker-request"}, {"origin": "*", "name": "upgraded-protocol-workers", "target_protocol": "https", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "http", "subresource": "worker-request"}, {"origin": "*", "name": "mixed-content-insecure-subresources", "target_protocol": "http", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}, {"origin": "*", "name": "elements-not-supporting-attr-referrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["attr-referrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["xhr-request", "worker-request", "fetch-request"]}, {"origin": "*", "name": "elements-not-supporting-rel-noreferrer", "target_protocol": "*", "expansion": "*", "delivery_method": ["rel-noreferrer"], "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": ["iframe-tag", "img-tag", "script-tag", "xhr-request", "worker-request", "fetch-request", "area-tag"]}, {"origin": "*", "name": "area-tag", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "*", "subresource": "area-tag"}, {"origin": "*", "name": "worker-requests-with-swap-origin-redirect", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "swap-origin-redirect", "referrer_url": "*", "source_protocol": "*", "subresource": ["worker-request"]}, {"origin": "*", "name": "overhead-for-redirection", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": ["keep-origin-redirect", "swap-origin-redirect"], "referrer_url": "*", "source_protocol": "*", "subresource": ["a-tag", "area-tag"]}, {"origin": "*", "name": "source-https-unsupported-by-web-platform-tests-runners", "target_protocol": "*", "expansion": "*", "delivery_method": "*", "redirection": "*", "referrer_url": "*", "source_protocol": "https", "subresource": "*"}]};
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..aa2b89c0219c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html
new file mode 100644
index 000000000000..3d35d85a8a3f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..6185377c16f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-http/script-tag/cross-insecure.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..ad88c2de7a0d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..62cfcfbf644e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..867f86fc9378
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..6466b7f149f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html
new file mode 100644
index 000000000000..a86dca24c375
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..6936906ab3ee
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-http/script-tag/same-insecure.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..81f8677c3333
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..79b6a081e17f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..0517a5d4420e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin-when-cross-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin-when-cross-origin'</title>
+    <meta name="description" content="Check that a priori insecure subresource gets no referrer information. Otherwise, cross-origin subresources get the origin portion of the referrer URL and same-origin get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin-when-cross-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin-when-cross-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..966f10b28f10
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..3001dbfd9661
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..308d22db03b1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..5e202a4c467f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..437c1a502c43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..adb575e8fc4f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..6ee44808bf2b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..1e97bb824d0e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..bf2a2136ac48
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..e409624d7f9c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..d968e806708c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..9b6ea47cd8dc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/strict-origin/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'strict-origin'</title>
+    <meta name="description" content="Check that non a priori insecure subresource gets only the origin portion of the referrer URL. A priori insecure subresource gets no referrer information.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-strict-origin">
+    <meta name="assert" content="The referrer URL is origin when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "strict-origin",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "origin"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..edfdd5a4fb47
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..19bb2541bd31
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..45216007e36e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..9c4d68109b90
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..2c445f168927
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..384d6b4f05c5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/cross-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..3fae7fde3c20
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..6ad3c317b112
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..5976b8fc94a4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-http/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..61716199e584
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
new file mode 100644
index 000000000000..7c900a7466e2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..4b307df8c340
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unsafe-url/attr-referrer/same-origin/http-https/script-tag/generic.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is set to 'unsafe-url'</title>
+    <meta name="description" content="Check that all sub-resources get the stripped referrer URL.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policy-unsafe-url">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": "unsafe-url",
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..ce4ea6be8cf0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..2dc068ac4e5f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..87e94c62d012
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..67f0f034fe8b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..fcfa56d773ce
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..52400d6305ea
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/cross-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is cross-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "cross-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..3668aee53c25
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..2cd7df0252b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..3345a9ed2a52
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-http/script-tag/insecure-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an http
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "http",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
new file mode 100644
index 000000000000..ceb5586630af
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.keep-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with keep-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "keep-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
new file mode 100644
index 000000000000..3ea90747c0f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.no-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with no-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "no-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
new file mode 100644
index 000000000000..5b89eb7aedfa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/referrer-policy/unset-referrer-policy/attr-referrer/same-origin/http-https/script-tag/upgrade-protocol.swap-origin-redirect.http.html
@@ -0,0 +1,40 @@
+<!DOCTYPE html>
+<!-- DO NOT EDIT! Generated by referrer-policy/generic/tools/generate.py using referrer-policy/generic/template/test.release.html.template. -->
+<html>
+  <head>
+    <title>Referrer-Policy: Referrer Policy is not explicitly defined</title>
+    <meta name="description" content="Check that referrer URL follows no-referrer-when-downgrade policy when no explicit Referrer Policy is set.">
+    <link rel="author" title="Kristijan Burnik" href="burnik@chromium.org">
+    <link rel="help" href="https://w3c.github.io/webappsec-referrer-policy/#referrer-policies">
+    <meta name="assert" content="The referrer URL is stripped-referrer when a
+                                 document served over http requires an https
+                                 sub-resource via script-tag using the attr-referrer
+                                 delivery method with swap-origin-redirect and when
+                                 the target request is same-origin.">
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <!-- TODO(kristijanburnik): Minify and merge both: -->
+    <script src="/referrer-policy/generic/common.js"></script>
+    <script src="/referrer-policy/generic/referrer-policy-test-case.js?pipe=sub"></script>
+  </head>
+  <body>
+    <script>
+      ReferrerPolicyTestCase(
+        {
+          "referrer_policy": null,
+          "delivery_method": "attr-referrer",
+          "redirection": "swap-origin-redirect",
+          "origin": "same-origin",
+          "source_protocol": "http",
+          "target_protocol": "https",
+          "subresource": "script-tag",
+          "subresource_path": "/referrer-policy/generic/subresource/script.py",
+          "referrer_url": "stripped-referrer"
+        },
+        document.querySelector("meta[name=assert]").content,
+        new SanityChecker()
+      ).start();
+      </script>
+    <div id="log"></div>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/remote-playback/OWNERS b/tests/wpt/web-platform-tests/remote-playback/OWNERS
new file mode 100644
index 000000000000..b05a482a14b4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/remote-playback/OWNERS
@@ -0,0 +1 @@
+@mounirlamouri
diff --git a/tests/wpt/web-platform-tests/resources/chromium/chooser_service.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/chooser_service.mojom.js
index aee5d8741f3d..fd344e71faf7 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/chooser_service.mojom.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/chooser_service.mojom.js
@@ -257,7 +257,7 @@
   }
 
   var UsbChooserService = {
-    name: 'device::mojom::UsbChooserService',
+    name: 'device.mojom.UsbChooserService',
     kVersion: 0,
     ptrClass: UsbChooserServicePtr,
     proxyClass: UsbChooserServiceProxy,
@@ -270,4 +270,4 @@
   exports.UsbChooserService = UsbChooserService;
   exports.UsbChooserServicePtr = UsbChooserServicePtr;
   exports.UsbChooserServiceAssociatedPtr = UsbChooserServiceAssociatedPtr;
-})();
\ No newline at end of file
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js
index 86c93dd66a5e..435fc1fc7add 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/device.mojom.js
@@ -3395,7 +3395,7 @@
   }
 
   var UsbDevice = {
-    name: 'device::mojom::UsbDevice',
+    name: 'device.mojom.UsbDevice',
     kVersion: 0,
     ptrClass: UsbDevicePtr,
     proxyClass: UsbDeviceProxy,
@@ -3421,4 +3421,4 @@
   exports.UsbDevice = UsbDevice;
   exports.UsbDevicePtr = UsbDevicePtr;
   exports.UsbDeviceAssociatedPtr = UsbDeviceAssociatedPtr;
-})();
\ No newline at end of file
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/device_manager.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/device_manager.mojom.js
index 2e1b30164b9c..2d76263ba9b7 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/device_manager.mojom.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/device_manager.mojom.js
@@ -702,7 +702,7 @@
   }
 
   var UsbDeviceManager = {
-    name: 'device::mojom::UsbDeviceManager',
+    name: 'device.mojom.UsbDeviceManager',
     kVersion: 0,
     ptrClass: UsbDeviceManagerPtr,
     proxyClass: UsbDeviceManagerProxy,
@@ -822,7 +822,7 @@
   }
 
   var UsbDeviceManagerClient = {
-    name: 'device::mojom::UsbDeviceManagerClient',
+    name: 'device.mojom.UsbDeviceManagerClient',
     kVersion: 0,
     ptrClass: UsbDeviceManagerClientPtr,
     proxyClass: UsbDeviceManagerClientProxy,
@@ -840,4 +840,4 @@
   exports.UsbDeviceManagerClient = UsbDeviceManagerClient;
   exports.UsbDeviceManagerClientPtr = UsbDeviceManagerClientPtr;
   exports.UsbDeviceManagerClientAssociatedPtr = UsbDeviceManagerClientAssociatedPtr;
-})();
\ No newline at end of file
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth.mojom.js
index a8d795567c8b..da443362248a 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth.mojom.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth.mojom.js
@@ -4061,7 +4061,7 @@
   }
 
   var FakeBluetooth = {
-    name: 'bluetooth::mojom::FakeBluetooth',
+    name: 'bluetooth.mojom.FakeBluetooth',
     kVersion: 0,
     ptrClass: FakeBluetoothPtr,
     proxyClass: FakeBluetoothProxy,
@@ -5293,7 +5293,7 @@
   }
 
   var FakeCentral = {
-    name: 'bluetooth::mojom::FakeCentral',
+    name: 'bluetooth.mojom.FakeCentral',
     kVersion: 0,
     ptrClass: FakeCentralPtr,
     proxyClass: FakeCentralProxy,
@@ -5320,4 +5320,4 @@
   exports.FakeCentral = FakeCentral;
   exports.FakeCentralPtr = FakeCentralPtr;
   exports.FakeCentralAssociatedPtr = FakeCentralAssociatedPtr;
-})();
\ No newline at end of file
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js
index 535a90a4ab5c..42739393c109 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/fake_bluetooth_chooser.mojom.js
@@ -804,7 +804,7 @@
   }
 
   var FakeBluetoothChooser = {
-    name: 'content::mojom::FakeBluetoothChooser',
+    name: 'content.mojom.FakeBluetoothChooser',
     kVersion: 0,
     ptrClass: FakeBluetoothChooserPtr,
     proxyClass: FakeBluetoothChooserProxy,
@@ -819,4 +819,4 @@
   exports.FakeBluetoothChooser = FakeBluetoothChooser;
   exports.FakeBluetoothChooserPtr = FakeBluetoothChooserPtr;
   exports.FakeBluetoothChooserAssociatedPtr = FakeBluetoothChooserAssociatedPtr;
-})();
\ No newline at end of file
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
new file mode 100644
index 000000000000..ff3a05171462
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js
@@ -0,0 +1,226 @@
+'use strict';
+
+var GenericSensorTest = (() => {
+  // Class that mocks Sensor interface defined in
+  // https://cs.chromium.org/chromium/src/services/device/public/mojom/sensor.mojom
+  class MockSensor {
+    constructor(sensorRequest, handle, offset, size, reportingMode) {
+      this.client_ = null;
+      this.reportingMode_ = reportingMode;
+      this.sensorReadingTimerId_ = null;
+      this.requestedFrequencies_ = [];
+      let rv = handle.mapBuffer(offset, size);
+      assert_equals(rv.result, Mojo.RESULT_OK, "Failed to map shared buffer");
+      this.buffer_ = new Float64Array(rv.buffer);
+      this.buffer_.fill(0);
+      this.binding_ = new mojo.Binding(device.mojom.Sensor, this,
+                                       sensorRequest);
+      this.binding_.setConnectionErrorHandler(() => {
+        this.reset();
+      });
+    }
+
+    getDefaultConfiguration() {
+      return Promise.resolve({frequency: 5});
+    }
+
+    addConfiguration(configuration) {
+      assert_not_equals(configuration, null, "Invalid sensor configuration.");
+
+      this.requestedFrequencies_.push(configuration.frequency);
+      // Sort using descending order.
+      this.requestedFrequencies_.sort(
+          (first, second) => { return second - first });
+
+      this.startReading();
+
+      return Promise.resolve({success: true});
+    }
+
+    removeConfiguration(configuration) {
+      let index = this.requestedFrequencies_.indexOf(configuration.frequency);
+      if (index == -1)
+        return;
+
+      this.requestedFrequencies_.splice(index, 1);
+
+      if (this.isReading) {
+        this.stopReading();
+        if (this.requestedFrequencies_.length !== 0)
+          this.startReading();
+      }
+    }
+
+    suspend() {
+      this.stopReading();
+    }
+
+    resume() {
+      this.startReading();
+    }
+
+    reset() {
+      this.stopReading();
+      this.requestedFrequencies_ = [];
+      this.buffer_.fill(0);
+      this.binding_.close();
+    }
+
+    startReading() {
+      if (this.isReading) {
+        console.warn("Sensor reading is already started.");
+        return;
+      }
+
+      if (this.requestedFrequencies_.length == 0) {
+        console.warn("Sensor reading cannot be started as" +
+                     "there are no configurations added.");
+        return;
+      }
+
+      const maxFrequencyHz = this.requestedFrequencies_[0];
+      const timeoutMs = (1 / maxFrequencyHz) * 1000;
+      this.sensorReadingTimerId_ = window.setInterval(() => {
+        // For all tests sensor reading should have monotonically
+        // increasing timestamp in seconds.
+        this.buffer_[1] = window.performance.now() * 0.001;
+        if (this.reportingMode_ === device.mojom.ReportingMode.ON_CHANGE) {
+          this.client_.sensorReadingChanged();
+        }
+      }, timeoutMs);
+    }
+
+    stopReading() {
+      if (this.isReading) {
+        window.clearInterval(this.sensorReadingTimerId_);
+        this.sensorReadingTimerId_ = null;
+      }
+    }
+
+     get isReading() {
+       this.sensorReadingTimerId_ !== null;
+     }
+  }
+
+  // Class that mocks SensorProvider interface defined in
+  // https://cs.chromium.org/chromium/src/services/device/public/mojom/sensor_provider.mojom
+  class MockSensorProvider {
+    constructor() {
+      this.readingSizeInBytes_ =
+          device.mojom.SensorInitParams.kReadBufferSizeForTests;
+      this.sharedBufferSizeInBytes_ = this.readingSizeInBytes_ *
+              device.mojom.SensorType.LAST;
+      let rv = Mojo.createSharedBuffer(this.sharedBufferSizeInBytes_);
+      assert_equals(rv.result, Mojo.RESULT_OK, "Failed to create buffer");
+      this.sharedBufferHandle_ = rv.handle;
+      this.activeSensor_ = null;
+      this.isContinuous_ = false;
+      this.binding_ = new mojo.Binding(device.mojom.SensorProvider, this);
+
+      this.interceptor_ = new MojoInterfaceInterceptor(
+          device.mojom.SensorProvider.name);
+      this.interceptor_.oninterfacerequest = e => {
+        this.binding_.bind(e.handle);
+        this.binding_.setConnectionErrorHandler(() => {
+          console.error("Mojo connection error");
+          this.reset();
+        });
+      };
+      this.interceptor_.start();
+    }
+
+    async getSensor(type) {
+      const offset = (device.mojom.SensorType.LAST - type) *
+                      this.readingSizeInBytes_;
+      const reportingMode = device.mojom.ReportingMode.ON_CHANGE;
+
+      let sensorPtr = new device.mojom.SensorPtr();
+      if (this.activeSensor_ == null) {
+        let mockSensor = new MockSensor(
+            mojo.makeRequest(sensorPtr), this.sharedBufferHandle_, offset,
+            this.readingSizeInBytes_, reportingMode);
+        this.activeSensor_ = mockSensor;
+        this.activeSensor_.client_ = new device.mojom.SensorClientPtr();
+      }
+
+      let rv = this.sharedBufferHandle_.duplicateBufferHandle();
+
+      assert_equals(rv.result, Mojo.RESULT_OK);
+      let maxAllowedFrequencyHz = 60;
+      if (type == device.mojom.SensorType.AMBIENT_LIGHT ||
+          type == device.mojom.SensorType.MAGNETOMETER) {
+        maxAllowedFrequencyHz = 10;
+      }
+
+      let initParams = new device.mojom.SensorInitParams({
+        sensor: sensorPtr,
+        clientRequest: mojo.makeRequest(this.activeSensor_.client_),
+        memory: rv.handle,
+        bufferOffset: offset,
+        mode: reportingMode,
+        defaultConfiguration: {frequency: 5},
+        minimumFrequency: 1,
+        maximumFrequency: maxAllowedFrequencyHz
+      });
+
+      return {result: device.mojom.SensorCreationResult.SUCCESS,
+              initParams: initParams};
+    }
+
+    async reset() {
+      if (this.activeSensor_ !== null) {
+        this.activeSensor_.reset();
+        this.activeSensor_ = null;
+      }
+      // Wait for an event loop iteration to let
+      // the pending mojo commands pass.
+      function schedule(func) {
+        return new Promise(resolve => {
+          setTimeout(() => {
+            func();
+            resolve();
+          }, 0);
+        });
+      }
+      await schedule(this.binding_.close.bind(this.binding_));
+      await schedule(this.interceptor_.stop.bind(this.interceptor_));
+    }
+  }
+
+  let testInternal = {
+    initialized: false,
+    sensorProvider: null
+  }
+
+  class GenericSensorTestChromium {
+    constructor() {
+      Object.freeze(this); // Make it immutable.
+    }
+
+    initialize() {
+      if (testInternal.initialized)
+        throw new Error('Call reset() before initialize().');
+
+      if (testRunner) { // Grant sensor permissions for Chromium testrunner.
+        ['accelerometer', 'gyroscope',
+         'magnetometer', 'ambient-light-sensor'].forEach((entry) => {
+          testRunner.setPermission(entry, 'granted',
+                                   location.origin, location.origin);
+        });
+      }
+
+      testInternal.sensorProvider = new MockSensorProvider;
+      testInternal.initialized = true;
+    }
+    // Resets state of sensor mocks between test runs.
+    async reset() {
+      if (!testInternal.initialized)
+        throw new Error('Call initialize() before reset().');
+      await testInternal.sensorProvider.reset();
+      testInternal.sensorProvider = null;
+      testInternal.initialized = false;
+    }
+  }
+
+  return GenericSensorTestChromium;
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js.headers b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js.headers
new file mode 100644
index 000000000000..6805c323df5a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/chromium/generic_sensor_mocks.js.headers
@@ -0,0 +1 @@
+Content-Type: text/javascript; charset=utf-8
diff --git a/tests/wpt/web-platform-tests/resources/chromium/mojo_layouttest_test.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/mojo_layouttest_test.mojom.js
index 839d42a0f085..babaeda156fc 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/mojo_layouttest_test.mojom.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/mojo_layouttest_test.mojom.js
@@ -248,7 +248,7 @@
   }
 
   var MojoLayoutTestHelper = {
-    name: 'content::mojom::MojoLayoutTestHelper',
+    name: 'content.mojom.MojoLayoutTestHelper',
     kVersion: 0,
     ptrClass: MojoLayoutTestHelperPtr,
     proxyClass: MojoLayoutTestHelperProxy,
@@ -261,4 +261,4 @@
   exports.MojoLayoutTestHelper = MojoLayoutTestHelper;
   exports.MojoLayoutTestHelperPtr = MojoLayoutTestHelperPtr;
   exports.MojoLayoutTestHelperAssociatedPtr = MojoLayoutTestHelperAssociatedPtr;
-})();
\ No newline at end of file
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/sensor.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/sensor.mojom.js
new file mode 100644
index 000000000000..daa99217335f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/chromium/sensor.mojom.js
@@ -0,0 +1,1072 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+'use strict';
+
+(function() {
+  var mojomId = 'services/device/public/mojom/sensor.mojom';
+  if (mojo.internal.isMojomLoaded(mojomId)) {
+    console.warn('The following mojom is loaded multiple times: ' + mojomId);
+    return;
+  }
+  mojo.internal.markMojomLoaded(mojomId);
+  var bindings = mojo;
+  var associatedBindings = mojo;
+  var codec = mojo.internal;
+  var validator = mojo.internal;
+
+  var exports = mojo.internal.exposeNamespace('device.mojom');
+
+
+  var SensorType = {};
+  SensorType.FIRST = 1;
+  SensorType.AMBIENT_LIGHT = SensorType.FIRST;
+  SensorType.PROXIMITY = SensorType.AMBIENT_LIGHT + 1;
+  SensorType.ACCELEROMETER = SensorType.PROXIMITY + 1;
+  SensorType.LINEAR_ACCELERATION = SensorType.ACCELEROMETER + 1;
+  SensorType.GYROSCOPE = SensorType.LINEAR_ACCELERATION + 1;
+  SensorType.MAGNETOMETER = SensorType.GYROSCOPE + 1;
+  SensorType.PRESSURE = SensorType.MAGNETOMETER + 1;
+  SensorType.ABSOLUTE_ORIENTATION_EULER_ANGLES = SensorType.PRESSURE + 1;
+  SensorType.ABSOLUTE_ORIENTATION_QUATERNION = SensorType.ABSOLUTE_ORIENTATION_EULER_ANGLES + 1;
+  SensorType.RELATIVE_ORIENTATION_EULER_ANGLES = SensorType.ABSOLUTE_ORIENTATION_QUATERNION + 1;
+  SensorType.RELATIVE_ORIENTATION_QUATERNION = SensorType.RELATIVE_ORIENTATION_EULER_ANGLES + 1;
+  SensorType.LAST = SensorType.RELATIVE_ORIENTATION_QUATERNION;
+
+  SensorType.isKnownEnumValue = function(value) {
+    switch (value) {
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+    case 5:
+    case 6:
+    case 7:
+    case 8:
+    case 9:
+    case 10:
+    case 11:
+      return true;
+    }
+    return false;
+  };
+
+  SensorType.validate = function(enumValue) {
+    var isExtensible = false;
+    if (isExtensible || this.isKnownEnumValue(enumValue))
+      return validator.validationError.NONE;
+
+    return validator.validationError.UNKNOWN_ENUM_VALUE;
+  };
+  var ReportingMode = {};
+  ReportingMode.ON_CHANGE = 0;
+  ReportingMode.CONTINUOUS = ReportingMode.ON_CHANGE + 1;
+
+  ReportingMode.isKnownEnumValue = function(value) {
+    switch (value) {
+    case 0:
+    case 1:
+      return true;
+    }
+    return false;
+  };
+
+  ReportingMode.validate = function(enumValue) {
+    var isExtensible = false;
+    if (isExtensible || this.isKnownEnumValue(enumValue))
+      return validator.validationError.NONE;
+
+    return validator.validationError.UNKNOWN_ENUM_VALUE;
+  };
+
+  function SensorConfiguration(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  SensorConfiguration.prototype.initDefaults_ = function() {
+    this.frequency = 0;
+  };
+  SensorConfiguration.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  SensorConfiguration.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    return validator.validationError.NONE;
+  };
+
+  SensorConfiguration.encodedSize = codec.kStructHeaderSize + 8;
+
+  SensorConfiguration.decode = function(decoder) {
+    var packed;
+    var val = new SensorConfiguration();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.frequency = decoder.decodeStruct(codec.Double);
+    return val;
+  };
+
+  SensorConfiguration.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(SensorConfiguration.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStruct(codec.Double, val.frequency);
+  };
+  function Sensor_GetDefaultConfiguration_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_GetDefaultConfiguration_Params.prototype.initDefaults_ = function() {
+  };
+  Sensor_GetDefaultConfiguration_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_GetDefaultConfiguration_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_GetDefaultConfiguration_Params.encodedSize = codec.kStructHeaderSize + 0;
+
+  Sensor_GetDefaultConfiguration_Params.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_GetDefaultConfiguration_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  Sensor_GetDefaultConfiguration_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_GetDefaultConfiguration_Params.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function Sensor_GetDefaultConfiguration_ResponseParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_GetDefaultConfiguration_ResponseParams.prototype.initDefaults_ = function() {
+    this.configuration = null;
+  };
+  Sensor_GetDefaultConfiguration_ResponseParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_GetDefaultConfiguration_ResponseParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate Sensor_GetDefaultConfiguration_ResponseParams.configuration
+    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, SensorConfiguration, false);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_GetDefaultConfiguration_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
+
+  Sensor_GetDefaultConfiguration_ResponseParams.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_GetDefaultConfiguration_ResponseParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.configuration = decoder.decodeStructPointer(SensorConfiguration);
+    return val;
+  };
+
+  Sensor_GetDefaultConfiguration_ResponseParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_GetDefaultConfiguration_ResponseParams.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStructPointer(SensorConfiguration, val.configuration);
+  };
+  function Sensor_AddConfiguration_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_AddConfiguration_Params.prototype.initDefaults_ = function() {
+    this.configuration = null;
+  };
+  Sensor_AddConfiguration_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_AddConfiguration_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate Sensor_AddConfiguration_Params.configuration
+    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, SensorConfiguration, false);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_AddConfiguration_Params.encodedSize = codec.kStructHeaderSize + 8;
+
+  Sensor_AddConfiguration_Params.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_AddConfiguration_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.configuration = decoder.decodeStructPointer(SensorConfiguration);
+    return val;
+  };
+
+  Sensor_AddConfiguration_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_AddConfiguration_Params.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStructPointer(SensorConfiguration, val.configuration);
+  };
+  function Sensor_AddConfiguration_ResponseParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_AddConfiguration_ResponseParams.prototype.initDefaults_ = function() {
+    this.success = false;
+  };
+  Sensor_AddConfiguration_ResponseParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_AddConfiguration_ResponseParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_AddConfiguration_ResponseParams.encodedSize = codec.kStructHeaderSize + 8;
+
+  Sensor_AddConfiguration_ResponseParams.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_AddConfiguration_ResponseParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    packed = decoder.readUint8();
+    val.success = (packed >> 0) & 1 ? true : false;
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    return val;
+  };
+
+  Sensor_AddConfiguration_ResponseParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_AddConfiguration_ResponseParams.encodedSize);
+    encoder.writeUint32(0);
+    packed = 0;
+    packed |= (val.success & 1) << 0
+    encoder.writeUint8(packed);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+  };
+  function Sensor_RemoveConfiguration_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_RemoveConfiguration_Params.prototype.initDefaults_ = function() {
+    this.configuration = null;
+  };
+  Sensor_RemoveConfiguration_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_RemoveConfiguration_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate Sensor_RemoveConfiguration_Params.configuration
+    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 0, SensorConfiguration, false);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_RemoveConfiguration_Params.encodedSize = codec.kStructHeaderSize + 8;
+
+  Sensor_RemoveConfiguration_Params.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_RemoveConfiguration_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.configuration = decoder.decodeStructPointer(SensorConfiguration);
+    return val;
+  };
+
+  Sensor_RemoveConfiguration_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_RemoveConfiguration_Params.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStructPointer(SensorConfiguration, val.configuration);
+  };
+  function Sensor_Suspend_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_Suspend_Params.prototype.initDefaults_ = function() {
+  };
+  Sensor_Suspend_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_Suspend_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_Suspend_Params.encodedSize = codec.kStructHeaderSize + 0;
+
+  Sensor_Suspend_Params.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_Suspend_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  Sensor_Suspend_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_Suspend_Params.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function Sensor_Resume_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_Resume_Params.prototype.initDefaults_ = function() {
+  };
+  Sensor_Resume_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_Resume_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_Resume_Params.encodedSize = codec.kStructHeaderSize + 0;
+
+  Sensor_Resume_Params.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_Resume_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  Sensor_Resume_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_Resume_Params.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function Sensor_ConfigureReadingChangeNotifications_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  Sensor_ConfigureReadingChangeNotifications_Params.prototype.initDefaults_ = function() {
+    this.enabled = false;
+  };
+  Sensor_ConfigureReadingChangeNotifications_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  Sensor_ConfigureReadingChangeNotifications_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    return validator.validationError.NONE;
+  };
+
+  Sensor_ConfigureReadingChangeNotifications_Params.encodedSize = codec.kStructHeaderSize + 8;
+
+  Sensor_ConfigureReadingChangeNotifications_Params.decode = function(decoder) {
+    var packed;
+    var val = new Sensor_ConfigureReadingChangeNotifications_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    packed = decoder.readUint8();
+    val.enabled = (packed >> 0) & 1 ? true : false;
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    return val;
+  };
+
+  Sensor_ConfigureReadingChangeNotifications_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(Sensor_ConfigureReadingChangeNotifications_Params.encodedSize);
+    encoder.writeUint32(0);
+    packed = 0;
+    packed |= (val.enabled & 1) << 0
+    encoder.writeUint8(packed);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+  };
+  function SensorClient_RaiseError_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  SensorClient_RaiseError_Params.prototype.initDefaults_ = function() {
+  };
+  SensorClient_RaiseError_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  SensorClient_RaiseError_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  SensorClient_RaiseError_Params.encodedSize = codec.kStructHeaderSize + 0;
+
+  SensorClient_RaiseError_Params.decode = function(decoder) {
+    var packed;
+    var val = new SensorClient_RaiseError_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  SensorClient_RaiseError_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(SensorClient_RaiseError_Params.encodedSize);
+    encoder.writeUint32(0);
+  };
+  function SensorClient_SensorReadingChanged_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  SensorClient_SensorReadingChanged_Params.prototype.initDefaults_ = function() {
+  };
+  SensorClient_SensorReadingChanged_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  SensorClient_SensorReadingChanged_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 8}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  SensorClient_SensorReadingChanged_Params.encodedSize = codec.kStructHeaderSize + 0;
+
+  SensorClient_SensorReadingChanged_Params.decode = function(decoder) {
+    var packed;
+    var val = new SensorClient_SensorReadingChanged_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    return val;
+  };
+
+  SensorClient_SensorReadingChanged_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(SensorClient_SensorReadingChanged_Params.encodedSize);
+    encoder.writeUint32(0);
+  };
+  var kSensor_GetDefaultConfiguration_Name = 0;
+  var kSensor_AddConfiguration_Name = 1;
+  var kSensor_RemoveConfiguration_Name = 2;
+  var kSensor_Suspend_Name = 3;
+  var kSensor_Resume_Name = 4;
+  var kSensor_ConfigureReadingChangeNotifications_Name = 5;
+
+  function SensorPtr(handleOrPtrInfo) {
+    this.ptr = new bindings.InterfacePtrController(Sensor,
+                                                   handleOrPtrInfo);
+  }
+
+  function SensorAssociatedPtr(associatedInterfacePtrInfo) {
+    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
+        Sensor, associatedInterfacePtrInfo);
+  }
+
+  SensorAssociatedPtr.prototype =
+      Object.create(SensorPtr.prototype);
+  SensorAssociatedPtr.prototype.constructor =
+      SensorAssociatedPtr;
+
+  function SensorProxy(receiver) {
+    this.receiver_ = receiver;
+  }
+  SensorPtr.prototype.getDefaultConfiguration = function() {
+    return SensorProxy.prototype.getDefaultConfiguration
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorProxy.prototype.getDefaultConfiguration = function() {
+    var params = new Sensor_GetDefaultConfiguration_Params();
+    return new Promise(function(resolve, reject) {
+      var builder = new codec.MessageV1Builder(
+          kSensor_GetDefaultConfiguration_Name,
+          codec.align(Sensor_GetDefaultConfiguration_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.encodeStruct(Sensor_GetDefaultConfiguration_Params, params);
+      var message = builder.finish();
+      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
+        var reader = new codec.MessageReader(message);
+        var responseParams =
+            reader.decodeStruct(Sensor_GetDefaultConfiguration_ResponseParams);
+        resolve(responseParams);
+      }).catch(function(result) {
+        reject(Error("Connection error: " + result));
+      });
+    }.bind(this));
+  };
+  SensorPtr.prototype.addConfiguration = function() {
+    return SensorProxy.prototype.addConfiguration
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorProxy.prototype.addConfiguration = function(configuration) {
+    var params = new Sensor_AddConfiguration_Params();
+    params.configuration = configuration;
+    return new Promise(function(resolve, reject) {
+      var builder = new codec.MessageV1Builder(
+          kSensor_AddConfiguration_Name,
+          codec.align(Sensor_AddConfiguration_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.encodeStruct(Sensor_AddConfiguration_Params, params);
+      var message = builder.finish();
+      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
+        var reader = new codec.MessageReader(message);
+        var responseParams =
+            reader.decodeStruct(Sensor_AddConfiguration_ResponseParams);
+        resolve(responseParams);
+      }).catch(function(result) {
+        reject(Error("Connection error: " + result));
+      });
+    }.bind(this));
+  };
+  SensorPtr.prototype.removeConfiguration = function() {
+    return SensorProxy.prototype.removeConfiguration
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorProxy.prototype.removeConfiguration = function(configuration) {
+    var params = new Sensor_RemoveConfiguration_Params();
+    params.configuration = configuration;
+    var builder = new codec.MessageV0Builder(
+        kSensor_RemoveConfiguration_Name,
+        codec.align(Sensor_RemoveConfiguration_Params.encodedSize));
+    builder.encodeStruct(Sensor_RemoveConfiguration_Params, params);
+    var message = builder.finish();
+    this.receiver_.accept(message);
+  };
+  SensorPtr.prototype.suspend = function() {
+    return SensorProxy.prototype.suspend
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorProxy.prototype.suspend = function() {
+    var params = new Sensor_Suspend_Params();
+    var builder = new codec.MessageV0Builder(
+        kSensor_Suspend_Name,
+        codec.align(Sensor_Suspend_Params.encodedSize));
+    builder.encodeStruct(Sensor_Suspend_Params, params);
+    var message = builder.finish();
+    this.receiver_.accept(message);
+  };
+  SensorPtr.prototype.resume = function() {
+    return SensorProxy.prototype.resume
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorProxy.prototype.resume = function() {
+    var params = new Sensor_Resume_Params();
+    var builder = new codec.MessageV0Builder(
+        kSensor_Resume_Name,
+        codec.align(Sensor_Resume_Params.encodedSize));
+    builder.encodeStruct(Sensor_Resume_Params, params);
+    var message = builder.finish();
+    this.receiver_.accept(message);
+  };
+  SensorPtr.prototype.configureReadingChangeNotifications = function() {
+    return SensorProxy.prototype.configureReadingChangeNotifications
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorProxy.prototype.configureReadingChangeNotifications = function(enabled) {
+    var params = new Sensor_ConfigureReadingChangeNotifications_Params();
+    params.enabled = enabled;
+    var builder = new codec.MessageV0Builder(
+        kSensor_ConfigureReadingChangeNotifications_Name,
+        codec.align(Sensor_ConfigureReadingChangeNotifications_Params.encodedSize));
+    builder.encodeStruct(Sensor_ConfigureReadingChangeNotifications_Params, params);
+    var message = builder.finish();
+    this.receiver_.accept(message);
+  };
+
+  function SensorStub(delegate) {
+    this.delegate_ = delegate;
+  }
+  SensorStub.prototype.getDefaultConfiguration = function() {
+    return this.delegate_ && this.delegate_.getDefaultConfiguration && this.delegate_.getDefaultConfiguration();
+  }
+  SensorStub.prototype.addConfiguration = function(configuration) {
+    return this.delegate_ && this.delegate_.addConfiguration && this.delegate_.addConfiguration(configuration);
+  }
+  SensorStub.prototype.removeConfiguration = function(configuration) {
+    return this.delegate_ && this.delegate_.removeConfiguration && this.delegate_.removeConfiguration(configuration);
+  }
+  SensorStub.prototype.suspend = function() {
+    return this.delegate_ && this.delegate_.suspend && this.delegate_.suspend();
+  }
+  SensorStub.prototype.resume = function() {
+    return this.delegate_ && this.delegate_.resume && this.delegate_.resume();
+  }
+  SensorStub.prototype.configureReadingChangeNotifications = function(enabled) {
+    return this.delegate_ && this.delegate_.configureReadingChangeNotifications && this.delegate_.configureReadingChangeNotifications(enabled);
+  }
+
+  SensorStub.prototype.accept = function(message) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    case kSensor_RemoveConfiguration_Name:
+      var params = reader.decodeStruct(Sensor_RemoveConfiguration_Params);
+      this.removeConfiguration(params.configuration);
+      return true;
+    case kSensor_Suspend_Name:
+      var params = reader.decodeStruct(Sensor_Suspend_Params);
+      this.suspend();
+      return true;
+    case kSensor_Resume_Name:
+      var params = reader.decodeStruct(Sensor_Resume_Params);
+      this.resume();
+      return true;
+    case kSensor_ConfigureReadingChangeNotifications_Name:
+      var params = reader.decodeStruct(Sensor_ConfigureReadingChangeNotifications_Params);
+      this.configureReadingChangeNotifications(params.enabled);
+      return true;
+    default:
+      return false;
+    }
+  };
+
+  SensorStub.prototype.acceptWithResponder =
+      function(message, responder) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    case kSensor_GetDefaultConfiguration_Name:
+      var params = reader.decodeStruct(Sensor_GetDefaultConfiguration_Params);
+      this.getDefaultConfiguration().then(function(response) {
+        var responseParams =
+            new Sensor_GetDefaultConfiguration_ResponseParams();
+        responseParams.configuration = response.configuration;
+        var builder = new codec.MessageV1Builder(
+            kSensor_GetDefaultConfiguration_Name,
+            codec.align(Sensor_GetDefaultConfiguration_ResponseParams.encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.encodeStruct(Sensor_GetDefaultConfiguration_ResponseParams,
+                             responseParams);
+        var message = builder.finish();
+        responder.accept(message);
+      });
+      return true;
+    case kSensor_AddConfiguration_Name:
+      var params = reader.decodeStruct(Sensor_AddConfiguration_Params);
+      this.addConfiguration(params.configuration).then(function(response) {
+        var responseParams =
+            new Sensor_AddConfiguration_ResponseParams();
+        responseParams.success = response.success;
+        var builder = new codec.MessageV1Builder(
+            kSensor_AddConfiguration_Name,
+            codec.align(Sensor_AddConfiguration_ResponseParams.encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.encodeStruct(Sensor_AddConfiguration_ResponseParams,
+                             responseParams);
+        var message = builder.finish();
+        responder.accept(message);
+      });
+      return true;
+    default:
+      return false;
+    }
+  };
+
+  function validateSensorRequest(messageValidator) {
+    var message = messageValidator.message;
+    var paramsClass = null;
+    switch (message.getName()) {
+      case kSensor_GetDefaultConfiguration_Name:
+        if (message.expectsResponse())
+          paramsClass = Sensor_GetDefaultConfiguration_Params;
+      break;
+      case kSensor_AddConfiguration_Name:
+        if (message.expectsResponse())
+          paramsClass = Sensor_AddConfiguration_Params;
+      break;
+      case kSensor_RemoveConfiguration_Name:
+        if (!message.expectsResponse() && !message.isResponse())
+          paramsClass = Sensor_RemoveConfiguration_Params;
+      break;
+      case kSensor_Suspend_Name:
+        if (!message.expectsResponse() && !message.isResponse())
+          paramsClass = Sensor_Suspend_Params;
+      break;
+      case kSensor_Resume_Name:
+        if (!message.expectsResponse() && !message.isResponse())
+          paramsClass = Sensor_Resume_Params;
+      break;
+      case kSensor_ConfigureReadingChangeNotifications_Name:
+        if (!message.expectsResponse() && !message.isResponse())
+          paramsClass = Sensor_ConfigureReadingChangeNotifications_Params;
+      break;
+    }
+    if (paramsClass === null)
+      return validator.validationError.NONE;
+    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
+  }
+
+  function validateSensorResponse(messageValidator) {
+   var message = messageValidator.message;
+   var paramsClass = null;
+   switch (message.getName()) {
+      case kSensor_GetDefaultConfiguration_Name:
+        if (message.isResponse())
+          paramsClass = Sensor_GetDefaultConfiguration_ResponseParams;
+        break;
+      case kSensor_AddConfiguration_Name:
+        if (message.isResponse())
+          paramsClass = Sensor_AddConfiguration_ResponseParams;
+        break;
+    }
+    if (paramsClass === null)
+      return validator.validationError.NONE;
+    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
+  }
+
+  var Sensor = {
+    name: 'device.mojom.Sensor',
+    kVersion: 0,
+    ptrClass: SensorPtr,
+    proxyClass: SensorProxy,
+    stubClass: SensorStub,
+    validateRequest: validateSensorRequest,
+    validateResponse: validateSensorResponse,
+  };
+  SensorStub.prototype.validator = validateSensorRequest;
+  SensorProxy.prototype.validator = validateSensorResponse;
+  var kSensorClient_RaiseError_Name = 0;
+  var kSensorClient_SensorReadingChanged_Name = 1;
+
+  function SensorClientPtr(handleOrPtrInfo) {
+    this.ptr = new bindings.InterfacePtrController(SensorClient,
+                                                   handleOrPtrInfo);
+  }
+
+  function SensorClientAssociatedPtr(associatedInterfacePtrInfo) {
+    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
+        SensorClient, associatedInterfacePtrInfo);
+  }
+
+  SensorClientAssociatedPtr.prototype =
+      Object.create(SensorClientPtr.prototype);
+  SensorClientAssociatedPtr.prototype.constructor =
+      SensorClientAssociatedPtr;
+
+  function SensorClientProxy(receiver) {
+    this.receiver_ = receiver;
+  }
+  SensorClientPtr.prototype.raiseError = function() {
+    return SensorClientProxy.prototype.raiseError
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorClientProxy.prototype.raiseError = function() {
+    var params = new SensorClient_RaiseError_Params();
+    var builder = new codec.MessageV0Builder(
+        kSensorClient_RaiseError_Name,
+        codec.align(SensorClient_RaiseError_Params.encodedSize));
+    builder.encodeStruct(SensorClient_RaiseError_Params, params);
+    var message = builder.finish();
+    this.receiver_.accept(message);
+  };
+  SensorClientPtr.prototype.sensorReadingChanged = function() {
+    return SensorClientProxy.prototype.sensorReadingChanged
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorClientProxy.prototype.sensorReadingChanged = function() {
+    var params = new SensorClient_SensorReadingChanged_Params();
+    var builder = new codec.MessageV0Builder(
+        kSensorClient_SensorReadingChanged_Name,
+        codec.align(SensorClient_SensorReadingChanged_Params.encodedSize));
+    builder.encodeStruct(SensorClient_SensorReadingChanged_Params, params);
+    var message = builder.finish();
+    this.receiver_.accept(message);
+  };
+
+  function SensorClientStub(delegate) {
+    this.delegate_ = delegate;
+  }
+  SensorClientStub.prototype.raiseError = function() {
+    return this.delegate_ && this.delegate_.raiseError && this.delegate_.raiseError();
+  }
+  SensorClientStub.prototype.sensorReadingChanged = function() {
+    return this.delegate_ && this.delegate_.sensorReadingChanged && this.delegate_.sensorReadingChanged();
+  }
+
+  SensorClientStub.prototype.accept = function(message) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    case kSensorClient_RaiseError_Name:
+      var params = reader.decodeStruct(SensorClient_RaiseError_Params);
+      this.raiseError();
+      return true;
+    case kSensorClient_SensorReadingChanged_Name:
+      var params = reader.decodeStruct(SensorClient_SensorReadingChanged_Params);
+      this.sensorReadingChanged();
+      return true;
+    default:
+      return false;
+    }
+  };
+
+  SensorClientStub.prototype.acceptWithResponder =
+      function(message, responder) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    default:
+      return false;
+    }
+  };
+
+  function validateSensorClientRequest(messageValidator) {
+    var message = messageValidator.message;
+    var paramsClass = null;
+    switch (message.getName()) {
+      case kSensorClient_RaiseError_Name:
+        if (!message.expectsResponse() && !message.isResponse())
+          paramsClass = SensorClient_RaiseError_Params;
+      break;
+      case kSensorClient_SensorReadingChanged_Name:
+        if (!message.expectsResponse() && !message.isResponse())
+          paramsClass = SensorClient_SensorReadingChanged_Params;
+      break;
+    }
+    if (paramsClass === null)
+      return validator.validationError.NONE;
+    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
+  }
+
+  function validateSensorClientResponse(messageValidator) {
+    return validator.validationError.NONE;
+  }
+
+  var SensorClient = {
+    name: 'device.mojom.SensorClient',
+    kVersion: 0,
+    ptrClass: SensorClientPtr,
+    proxyClass: SensorClientProxy,
+    stubClass: SensorClientStub,
+    validateRequest: validateSensorClientRequest,
+    validateResponse: null,
+  };
+  SensorClientStub.prototype.validator = validateSensorClientRequest;
+  SensorClientProxy.prototype.validator = null;
+  exports.SensorType = SensorType;
+  exports.ReportingMode = ReportingMode;
+  exports.SensorConfiguration = SensorConfiguration;
+  exports.Sensor = Sensor;
+  exports.SensorPtr = SensorPtr;
+  exports.SensorAssociatedPtr = SensorAssociatedPtr;
+  exports.SensorClient = SensorClient;
+  exports.SensorClientPtr = SensorClientPtr;
+  exports.SensorClientAssociatedPtr = SensorClientAssociatedPtr;
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/sensor_provider.mojom.js b/tests/wpt/web-platform-tests/resources/chromium/sensor_provider.mojom.js
new file mode 100644
index 000000000000..d74ad97a281d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/resources/chromium/sensor_provider.mojom.js
@@ -0,0 +1,429 @@
+// Copyright 2014 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+'use strict';
+
+(function() {
+  var mojomId = 'services/device/public/mojom/sensor_provider.mojom';
+  if (mojo.internal.isMojomLoaded(mojomId)) {
+    console.warn('The following mojom is loaded multiple times: ' + mojomId);
+    return;
+  }
+  mojo.internal.markMojomLoaded(mojomId);
+  var bindings = mojo;
+  var associatedBindings = mojo;
+  var codec = mojo.internal;
+  var validator = mojo.internal;
+
+  var exports = mojo.internal.exposeNamespace('device.mojom');
+  var sensor$ =
+      mojo.internal.exposeNamespace('device.mojom');
+  if (mojo.config.autoLoadMojomDeps) {
+    mojo.internal.loadMojomIfNecessary(
+        'services/device/public/mojom/sensor.mojom', 'sensor.mojom.js');
+  }
+
+
+  var SensorCreationResult = {};
+  SensorCreationResult.SUCCESS = 0;
+  SensorCreationResult.ERROR_NOT_AVAILABLE = SensorCreationResult.SUCCESS + 1;
+  SensorCreationResult.ERROR_NOT_ALLOWED = SensorCreationResult.ERROR_NOT_AVAILABLE + 1;
+
+  SensorCreationResult.isKnownEnumValue = function(value) {
+    switch (value) {
+    case 0:
+    case 1:
+    case 2:
+      return true;
+    }
+    return false;
+  };
+
+  SensorCreationResult.validate = function(enumValue) {
+    var isExtensible = false;
+    if (isExtensible || this.isKnownEnumValue(enumValue))
+      return validator.validationError.NONE;
+
+    return validator.validationError.UNKNOWN_ENUM_VALUE;
+  };
+
+  function SensorInitParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  SensorInitParams.kReadBufferSizeForTests = 48;
+  SensorInitParams.prototype.initDefaults_ = function() {
+    this.sensor = new sensor$.SensorPtr();
+    this.clientRequest = new bindings.InterfaceRequest();
+    this.memory = null;
+    this.bufferOffset = 0;
+    this.mode = 0;
+    this.defaultConfiguration = null;
+    this.maximumFrequency = 0;
+    this.minimumFrequency = 0;
+  };
+  SensorInitParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  SensorInitParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 64}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate SensorInitParams.sensor
+    err = messageValidator.validateInterface(offset + codec.kStructHeaderSize + 0, false);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate SensorInitParams.clientRequest
+    err = messageValidator.validateInterfaceRequest(offset + codec.kStructHeaderSize + 8, false)
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate SensorInitParams.memory
+    err = messageValidator.validateHandle(offset + codec.kStructHeaderSize + 12, false)
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+
+    // validate SensorInitParams.mode
+    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 24, sensor$.ReportingMode);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate SensorInitParams.defaultConfiguration
+    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 32, sensor$.SensorConfiguration, false);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+
+    return validator.validationError.NONE;
+  };
+
+  SensorInitParams.encodedSize = codec.kStructHeaderSize + 56;
+
+  SensorInitParams.decode = function(decoder) {
+    var packed;
+    var val = new SensorInitParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.sensor = decoder.decodeStruct(new codec.Interface(sensor$.SensorPtr));
+    val.clientRequest = decoder.decodeStruct(codec.InterfaceRequest);
+    val.memory = decoder.decodeStruct(codec.Handle);
+    val.bufferOffset = decoder.decodeStruct(codec.Uint64);
+    val.mode = decoder.decodeStruct(codec.Int32);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    val.defaultConfiguration = decoder.decodeStructPointer(sensor$.SensorConfiguration);
+    val.maximumFrequency = decoder.decodeStruct(codec.Double);
+    val.minimumFrequency = decoder.decodeStruct(codec.Double);
+    return val;
+  };
+
+  SensorInitParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(SensorInitParams.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStruct(new codec.Interface(sensor$.SensorPtr), val.sensor);
+    encoder.encodeStruct(codec.InterfaceRequest, val.clientRequest);
+    encoder.encodeStruct(codec.Handle, val.memory);
+    encoder.encodeStruct(codec.Uint64, val.bufferOffset);
+    encoder.encodeStruct(codec.Int32, val.mode);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.encodeStructPointer(sensor$.SensorConfiguration, val.defaultConfiguration);
+    encoder.encodeStruct(codec.Double, val.maximumFrequency);
+    encoder.encodeStruct(codec.Double, val.minimumFrequency);
+  };
+  function SensorProvider_GetSensor_Params(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  SensorProvider_GetSensor_Params.prototype.initDefaults_ = function() {
+    this.type = 0;
+  };
+  SensorProvider_GetSensor_Params.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  SensorProvider_GetSensor_Params.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 16}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate SensorProvider_GetSensor_Params.type
+    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, sensor$.SensorType);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  SensorProvider_GetSensor_Params.encodedSize = codec.kStructHeaderSize + 8;
+
+  SensorProvider_GetSensor_Params.decode = function(decoder) {
+    var packed;
+    var val = new SensorProvider_GetSensor_Params();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.type = decoder.decodeStruct(codec.Int32);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    return val;
+  };
+
+  SensorProvider_GetSensor_Params.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(SensorProvider_GetSensor_Params.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStruct(codec.Int32, val.type);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+  };
+  function SensorProvider_GetSensor_ResponseParams(values) {
+    this.initDefaults_();
+    this.initFields_(values);
+  }
+
+
+  SensorProvider_GetSensor_ResponseParams.prototype.initDefaults_ = function() {
+    this.result = 0;
+    this.initParams = null;
+  };
+  SensorProvider_GetSensor_ResponseParams.prototype.initFields_ = function(fields) {
+    for(var field in fields) {
+        if (this.hasOwnProperty(field))
+          this[field] = fields[field];
+    }
+  };
+
+  SensorProvider_GetSensor_ResponseParams.validate = function(messageValidator, offset) {
+    var err;
+    err = messageValidator.validateStructHeader(offset, codec.kStructHeaderSize);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    var kVersionSizes = [
+      {version: 0, numBytes: 24}
+    ];
+    err = messageValidator.validateStructVersion(offset, kVersionSizes);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate SensorProvider_GetSensor_ResponseParams.result
+    err = messageValidator.validateEnum(offset + codec.kStructHeaderSize + 0, SensorCreationResult);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+
+    // validate SensorProvider_GetSensor_ResponseParams.initParams
+    err = messageValidator.validateStructPointer(offset + codec.kStructHeaderSize + 8, SensorInitParams, true);
+    if (err !== validator.validationError.NONE)
+        return err;
+
+    return validator.validationError.NONE;
+  };
+
+  SensorProvider_GetSensor_ResponseParams.encodedSize = codec.kStructHeaderSize + 16;
+
+  SensorProvider_GetSensor_ResponseParams.decode = function(decoder) {
+    var packed;
+    var val = new SensorProvider_GetSensor_ResponseParams();
+    var numberOfBytes = decoder.readUint32();
+    var version = decoder.readUint32();
+    val.result = decoder.decodeStruct(codec.Int32);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    decoder.skip(1);
+    val.initParams = decoder.decodeStructPointer(SensorInitParams);
+    return val;
+  };
+
+  SensorProvider_GetSensor_ResponseParams.encode = function(encoder, val) {
+    var packed;
+    encoder.writeUint32(SensorProvider_GetSensor_ResponseParams.encodedSize);
+    encoder.writeUint32(0);
+    encoder.encodeStruct(codec.Int32, val.result);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.skip(1);
+    encoder.encodeStructPointer(SensorInitParams, val.initParams);
+  };
+  var kSensorProvider_GetSensor_Name = 0;
+
+  function SensorProviderPtr(handleOrPtrInfo) {
+    this.ptr = new bindings.InterfacePtrController(SensorProvider,
+                                                   handleOrPtrInfo);
+  }
+
+  function SensorProviderAssociatedPtr(associatedInterfacePtrInfo) {
+    this.ptr = new associatedBindings.AssociatedInterfacePtrController(
+        SensorProvider, associatedInterfacePtrInfo);
+  }
+
+  SensorProviderAssociatedPtr.prototype =
+      Object.create(SensorProviderPtr.prototype);
+  SensorProviderAssociatedPtr.prototype.constructor =
+      SensorProviderAssociatedPtr;
+
+  function SensorProviderProxy(receiver) {
+    this.receiver_ = receiver;
+  }
+  SensorProviderPtr.prototype.getSensor = function() {
+    return SensorProviderProxy.prototype.getSensor
+        .apply(this.ptr.getProxy(), arguments);
+  };
+
+  SensorProviderProxy.prototype.getSensor = function(type) {
+    var params = new SensorProvider_GetSensor_Params();
+    params.type = type;
+    return new Promise(function(resolve, reject) {
+      var builder = new codec.MessageV1Builder(
+          kSensorProvider_GetSensor_Name,
+          codec.align(SensorProvider_GetSensor_Params.encodedSize),
+          codec.kMessageExpectsResponse, 0);
+      builder.encodeStruct(SensorProvider_GetSensor_Params, params);
+      var message = builder.finish();
+      this.receiver_.acceptAndExpectResponse(message).then(function(message) {
+        var reader = new codec.MessageReader(message);
+        var responseParams =
+            reader.decodeStruct(SensorProvider_GetSensor_ResponseParams);
+        resolve(responseParams);
+      }).catch(function(result) {
+        reject(Error("Connection error: " + result));
+      });
+    }.bind(this));
+  };
+
+  function SensorProviderStub(delegate) {
+    this.delegate_ = delegate;
+  }
+  SensorProviderStub.prototype.getSensor = function(type) {
+    return this.delegate_ && this.delegate_.getSensor && this.delegate_.getSensor(type);
+  }
+
+  SensorProviderStub.prototype.accept = function(message) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    default:
+      return false;
+    }
+  };
+
+  SensorProviderStub.prototype.acceptWithResponder =
+      function(message, responder) {
+    var reader = new codec.MessageReader(message);
+    switch (reader.messageName) {
+    case kSensorProvider_GetSensor_Name:
+      var params = reader.decodeStruct(SensorProvider_GetSensor_Params);
+      this.getSensor(params.type).then(function(response) {
+        var responseParams =
+            new SensorProvider_GetSensor_ResponseParams();
+        responseParams.result = response.result;
+        responseParams.initParams = response.initParams;
+        var builder = new codec.MessageV1Builder(
+            kSensorProvider_GetSensor_Name,
+            codec.align(SensorProvider_GetSensor_ResponseParams.encodedSize),
+            codec.kMessageIsResponse, reader.requestID);
+        builder.encodeStruct(SensorProvider_GetSensor_ResponseParams,
+                             responseParams);
+        var message = builder.finish();
+        responder.accept(message);
+      });
+      return true;
+    default:
+      return false;
+    }
+  };
+
+  function validateSensorProviderRequest(messageValidator) {
+    var message = messageValidator.message;
+    var paramsClass = null;
+    switch (message.getName()) {
+      case kSensorProvider_GetSensor_Name:
+        if (message.expectsResponse())
+          paramsClass = SensorProvider_GetSensor_Params;
+      break;
+    }
+    if (paramsClass === null)
+      return validator.validationError.NONE;
+    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
+  }
+
+  function validateSensorProviderResponse(messageValidator) {
+   var message = messageValidator.message;
+   var paramsClass = null;
+   switch (message.getName()) {
+      case kSensorProvider_GetSensor_Name:
+        if (message.isResponse())
+          paramsClass = SensorProvider_GetSensor_ResponseParams;
+        break;
+    }
+    if (paramsClass === null)
+      return validator.validationError.NONE;
+    return paramsClass.validate(messageValidator, messageValidator.message.getHeaderNumBytes());
+  }
+
+  var SensorProvider = {
+    name: 'device.mojom.SensorProvider',
+    kVersion: 0,
+    ptrClass: SensorProviderPtr,
+    proxyClass: SensorProviderProxy,
+    stubClass: SensorProviderStub,
+    validateRequest: validateSensorProviderRequest,
+    validateResponse: validateSensorProviderResponse,
+  };
+  SensorProviderStub.prototype.validator = validateSensorProviderRequest;
+  SensorProviderProxy.prototype.validator = validateSensorProviderResponse;
+  exports.SensorCreationResult = SensorCreationResult;
+  exports.SensorInitParams = SensorInitParams;
+  exports.SensorProvider = SensorProvider;
+  exports.SensorProviderPtr = SensorProviderPtr;
+  exports.SensorProviderAssociatedPtr = SensorProviderAssociatedPtr;
+})();
diff --git a/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js b/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js
index 502dd5c63942..630a7da945c2 100644
--- a/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js
+++ b/tests/wpt/web-platform-tests/resources/chromium/webusb-test.js
@@ -360,15 +360,17 @@ class FakeDeviceManager {
   }
 
   getDevice(guid, request) {
-    let device = this.devicesByGuid_.get(guid);
-    if (device) {
+    let retrievedDevice = this.devicesByGuid_.get(guid);
+    if (retrievedDevice) {
       let binding = new mojo.Binding(
-          window.device.mojom.UsbDevice, new FakeDevice(device.info), request);
+          device.mojom.UsbDevice,
+          new FakeDevice(retrievedDevice.info),
+          request);
       binding.setConnectionErrorHandler(() => {
-        if (device.fakeDevice.onclose)
-          device.fakeDevice.onclose();
+        if (retrievedDevice.fakeDevice.onclose)
+          retrievedDevice.fakeDevice.onclose();
       });
-      device.bindingArray.push(binding);
+      retrievedDevice.bindingArray.push(binding);
     } else {
       request.close();
     }
diff --git a/tests/wpt/web-platform-tests/resources/idlharness.js b/tests/wpt/web-platform-tests/resources/idlharness.js
index 4664465572c0..d413c5145cc5 100644
--- a/tests/wpt/web-platform-tests/resources/idlharness.js
+++ b/tests/wpt/web-platform-tests/resources/idlharness.js
@@ -183,11 +183,19 @@ self.IdlArray = function()
      *   A implements C;
      *   D implements E;
      *
-     * results in { A: ["B", "C"], D: ["E"] }.
+     * results in this["implements"] = { A: ["B", "C"], D: ["E"] }.
+     *
+     * Similarly,
+     *
+     *   interface A : B {};
+     *   interface B : C {};
+     *
+     * results in this["inheritance"] = { A: "B", B: "C" }
      */
     this.partials = [];
     this["implements"] = {};
     this["includes"] = {};
+    this["inheritance"] = {};
 };
 
 //@}
@@ -204,19 +212,115 @@ IdlArray.prototype.add_untested_idls = function(raw_idls, options)
 {
     /** Entry point.  See documentation at beginning of file. */
     var parsed_idls = WebIDL2.parse(raw_idls);
-    for (var i = 0; i < parsed_idls.length; i++)
-    {
+    this.mark_as_untested(parsed_idls);
+    this.internal_add_idls(parsed_idls, options);
+};
+
+//@}
+IdlArray.prototype.mark_as_untested = function (parsed_idls)
+//@{
+{
+    for (var i = 0; i < parsed_idls.length; i++) {
         parsed_idls[i].untested = true;
-        if ("members" in parsed_idls[i])
-        {
-            for (var j = 0; j < parsed_idls[i].members.length; j++)
-            {
+        if ("members" in parsed_idls[i]) {
+            for (var j = 0; j < parsed_idls[i].members.length; j++) {
                 parsed_idls[i].members[j].untested = true;
             }
         }
     }
-    this.internal_add_idls(parsed_idls, options);
 };
+//@}
+
+//@}
+IdlArray.prototype.is_excluded_by_options = function (name, options)
+//@{
+{
+    return options &&
+        (options.except && options.except.includes(name)
+         || options.only && !options.only.includes(name));
+};
+//@}
+
+//@}
+IdlArray.prototype.add_dependency_idls = function(raw_idls, options)
+//@{
+{
+    const parsed_idls = WebIDL2.parse(raw_idls);
+    const new_options = { only: [] }
+
+    const all_deps = new Set();
+    Object.values(this.inheritance).forEach(v => all_deps.add(v));
+    Object.values(this.implements).forEach(v => all_deps.add(v));
+    // NOTE: If 'A includes B' for B that we care about, then A is also a dep.
+    Object.keys(this.includes).forEach(k => {
+        all_deps.add(k);
+        this.includes[k].forEach(v => all_deps.add(v));
+    });
+    this.partials.map(p => p.name).forEach(v => all_deps.add(v));
+    // Add the attribute idlTypes of all the nested members of all tested idls.
+    Object.values(this.members).filter(m => !m.untested && m.members).forEach(parsed => {
+        Object.values(parsed.members).filter(m => m.type === 'attribute').forEach(m => {
+            all_deps.add(m.idlType.idlType);
+        });
+    });
+
+    if (options && options.except && options.only) {
+        throw new IdlHarnessError("The only and except options can't be used together.");
+    }
+
+    const should_skip = name => {
+        // NOTE: Deps are untested, so we're lenient, and skip re-encountered definitions.
+        // e.g. for 'idl' containing A:B, B:C, C:D
+        //      array.add_idls(idl, {only: ['A','B']}).
+        //      array.add_dependency_idls(idl);
+        // B would be encountered as tested, and encountered as a dep, so we ignore.
+        return name in this.members
+            || this.is_excluded_by_options(name, options);
+    }
+    // Record of skipped items, in case we later determine they are a dependency.
+    // Maps name -> [parsed_idl, ...]
+    const skipped = new Map();
+    const process = function(parsed) {
+        let name = parsed.name
+            || parsed.type == "implements" && parsed.target
+            || parsed.type == "includes" && parsed.target;
+        if (!name || should_skip(name) || !all_deps.has(name)) {
+            name &&
+                skipped.has(name)
+                    ? skipped.get(name).push(parsed)
+                    : skipped.set(name, [parsed]);
+            return;
+        }
+
+        new_options.only.push(name);
+        const follow_up = [];
+        for (const dep_type of ["inheritance", "implements", "includes"]) {
+            if (parsed[dep_type]) {
+                const dep = parsed[dep_type];
+                new_options.only.push(dep);
+                all_deps.add(dep);
+                follow_up.push(dep);
+            }
+        }
+
+        for (const deferred of follow_up) {
+            if (skipped.has(deferred)) {
+                const next = skipped.get(deferred);
+                skipped.delete(deferred);
+                next.forEach(process);
+            }
+        }
+    }
+    for (let parsed of parsed_idls) {
+        process(parsed);
+    }
+
+    this.mark_as_untested(parsed_idls);
+
+    if (new_options.only.length) {
+        this.internal_add_idls(parsed_idls, new_options);
+    }
+}
 
 //@}
 IdlArray.prototype.internal_add_idls = function(parsed_idls, options)
@@ -242,17 +346,8 @@ IdlArray.prototype.internal_add_idls = function(parsed_idls, options)
         throw new IdlHarnessError("The only and except options can't be used together.");
     }
 
-    function should_skip(name)
-    {
-        if (options && options.only && options.only.indexOf(name) == -1)
-        {
-            return true;
-        }
-        if (options && options.except && options.except.indexOf(name) != -1)
-        {
-            return true;
-        }
-        return false;
+    var should_skip = name => {
+        return this.is_excluded_by_options(name, options);
     }
 
     parsed_idls.forEach(function(parsed_idl)
@@ -304,6 +399,17 @@ IdlArray.prototype.internal_add_idls = function(parsed_idls, options)
         {
             throw new IdlHarnessError("Duplicate identifier " + parsed_idl.name);
         }
+
+        if (parsed_idl["inheritance"]) {
+            // NOTE: Clash should be impossible (would require redefinition of parsed_idl.name).
+            if (parsed_idl.name in this["inheritance"]
+                && parsed_idl["inheritance"] != this["inheritance"][parsed_idl.name]) {
+                throw new IdlHarnessError(
+                    `Inheritance for ${parsed_idl.name} was already defined`);
+            }
+            this["inheritance"][parsed_idl.name] = parsed_idl["inheritance"];
+        }
+
         switch(parsed_idl.type)
         {
         case "interface":
diff --git a/tests/wpt/web-platform-tests/resources/readme.md b/tests/wpt/web-platform-tests/resources/readme.md
index 8cf95b4052a7..97d2e6f92203 100644
--- a/tests/wpt/web-platform-tests/resources/readme.md
+++ b/tests/wpt/web-platform-tests/resources/readme.md
@@ -18,7 +18,7 @@ To use `testharness.js` you must include two scripts, in the order given:
 
 ### Full documentation
 
-For detailed API documentation please visit [http://web-platform-tests.org/writing-tests/testharness-api.html](http://web-platform-tests.org/writing-tests/testharness-api.html).
+For detailed API documentation please visit [https://web-platform-tests.org/writing-tests/testharness-api.html](https://web-platform-tests.org/writing-tests/testharness-api.html).
 
 ### Tutorials
 
diff --git a/tests/wpt/web-platform-tests/resources/test/tests/idlharness/IdlInterface/get_inheritance_stack.html b/tests/wpt/web-platform-tests/resources/test/tests/idlharness/IdlInterface/get_inheritance_stack.html
index bffced513e6d..fed6f9212be8 100644
--- a/tests/wpt/web-platform-tests/resources/test/tests/idlharness/IdlInterface/get_inheritance_stack.html
+++ b/tests/wpt/web-platform-tests/resources/test/tests/idlharness/IdlInterface/get_inheritance_stack.html
@@ -36,6 +36,14 @@
         idl.add_untested_idls('interface B : A { };');
         idl.assert_throws('A has a circular dependency: A,B,A', i => i.test());
     }, 'should throw when inheritance is circular');
+
+    test(function () {
+        var idl = new IdlArray();
+        idl.add_untested_idls('interface A : B { };');
+        idl.assert_throws(
+            'Duplicate identifier A',
+            i => i.add_untested_idls('interface A : C { };'));
+    }, 'should throw when multiple inheritances defined');
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/resources/test/wptserver.py b/tests/wpt/web-platform-tests/resources/test/wptserver.py
index 08bae26dedf3..79220e814478 100644
--- a/tests/wpt/web-platform-tests/resources/test/wptserver.py
+++ b/tests/wpt/web-platform-tests/resources/test/wptserver.py
@@ -1,17 +1,16 @@
-import json
 import os
 import subprocess
 import time
+import sys
 import urllib2
 
 
 class WPTServer(object):
-
     def __init__(self, wpt_root):
         self.wpt_root = wpt_root
-        config_file = os.path.join(wpt_root, 'config.default.json')
-        with open(config_file, 'rb') as config_handle:
-            config = json.load(config_handle)
+        sys.path.insert(0, os.path.join(wpt_root, "tools"))
+        from serve.serve import Config
+        config = Config()
         self.host = config["browser_host"]
         self.http_port = config["ports"]["http"][0]
         self.https_port = config["ports"]["https"][0]
diff --git a/tests/wpt/web-platform-tests/resources/testharness.js b/tests/wpt/web-platform-tests/resources/testharness.js
index 39a467c37a79..a48a0cfd3ec0 100644
--- a/tests/wpt/web-platform-tests/resources/testharness.js
+++ b/tests/wpt/web-platform-tests/resources/testharness.js
@@ -10,7 +10,7 @@ policies and contribution forms [3].
 [3] http://www.w3.org/2004/10/27-testcases
 */
 
-/* Documentation: http://web-platform-tests.org/writing-tests/testharness-api.html
+/* Documentation: https://web-platform-tests.org/writing-tests/testharness-api.html
  * (../docs/_writing-tests/testharness-api.md) */
 
 (function (global_scope)
@@ -451,6 +451,50 @@ policies and contribution forms [3].
         }
     };
 
+    /*
+     * JavaScript shells.
+     *
+     * This class is used as the test_environment when testharness is running
+     * inside a JavaScript shell.
+     */
+    function ShellTestEnvironment() {
+        this.name_counter = 0;
+        this.all_loaded = false;
+        this.on_loaded_callback = null;
+        Promise.resolve().then(function() {
+            this.all_loaded = true
+            if (this.on_loaded_callback) {
+                this.on_loaded_callback();
+            }
+        }.bind(this));
+        this.message_list = [];
+        this.message_ports = [];
+    }
+
+    ShellTestEnvironment.prototype.next_default_test_name = function() {
+        var suffix = this.name_counter > 0 ? " " + this.name_counter : "";
+        this.name_counter++;
+        return "Untitled" + suffix;
+    };
+
+    ShellTestEnvironment.prototype.on_new_harness_properties = function() {};
+
+    ShellTestEnvironment.prototype.on_tests_ready = function() {};
+
+    ShellTestEnvironment.prototype.add_on_loaded_callback = function(callback) {
+        if (this.all_loaded) {
+            callback();
+        } else {
+            this.on_loaded_callback = callback;
+        }
+    };
+
+    ShellTestEnvironment.prototype.test_timeout = function() {
+        // Tests running in a shell don't have a default timeout, so behave as
+        // if settings.explicit_timeout is true.
+        return null;
+    };
+
     function create_test_environment() {
         if ('document' in global_scope) {
             return new WindowTestEnvironment();
@@ -472,6 +516,10 @@ policies and contribution forms [3].
             return new DedicatedWorkerTestEnvironment();
         }
 
+        if (!('self' in global_scope)) {
+            return new ShellTestEnvironment();
+        }
+
         throw new Error("Unsupported test environment");
     }
 
@@ -1610,7 +1658,9 @@ policies and contribution forms [3].
 
         this.phase = this.phases.COMPLETE;
 
-        clearTimeout(this.timeout_id);
+        if (global_scope.clearTimeout) {
+            clearTimeout(this.timeout_id);
+        }
         tests.result(this);
         this.cleanup();
     };
@@ -1730,6 +1780,12 @@ policies and contribution forms [3].
             }
         };
 
+        if (self.Promise) {
+            this.done = new Promise(function(resolve) {
+                this_obj.doneResolve = resolve;
+            });
+        }
+
         this.message_target.addEventListener("message", this.message_handler);
     }
 
@@ -1779,6 +1835,10 @@ policies and contribution forms [3].
         this.running = false;
         this.remote = null;
         this.message_target = null;
+        if (this.doneResolve) {
+            this.doneResolve();
+        }
+
         if (tests.all_done()) {
             tests.complete();
         }
@@ -1925,12 +1985,14 @@ policies and contribution forms [3].
     };
 
     Tests.prototype.set_timeout = function() {
-        var this_obj = this;
-        clearTimeout(this.timeout_id);
-        if (this.timeout_length !== null) {
-            this.timeout_id = setTimeout(function() {
-                                             this_obj.timeout();
-                                         }, this.timeout_length);
+        if (global_scope.clearTimeout) {
+            var this_obj = this;
+            clearTimeout(this.timeout_id);
+            if (this.timeout_length !== null) {
+                this.timeout_id = setTimeout(function() {
+                                                 this_obj.timeout();
+                                             }, this.timeout_length);
+            }
         }
     };
 
@@ -2135,11 +2197,13 @@ policies and contribution forms [3].
             return;
         }
 
-        this.pending_remotes.push(this.create_remote_worker(worker));
+        var remoteContext = this.create_remote_worker(worker);
+        this.pending_remotes.push(remoteContext);
+        return remoteContext.done;
     };
 
     function fetch_tests_from_worker(port) {
-        tests.fetch_tests_from_worker(port);
+        return tests.fetch_tests_from_worker(port);
     }
     expose(fetch_tests_from_worker, 'fetch_tests_from_worker');
 
@@ -2910,36 +2974,38 @@ policies and contribution forms [3].
 
     var tests = new Tests();
 
-    var error_handler = function(e) {
-        if (tests.tests.length === 0 && !tests.allow_uncaught_exception) {
-            tests.set_file_is_test();
-        }
+    if (global_scope.addEventListener) {
+        var error_handler = function(e) {
+            if (tests.tests.length === 0 && !tests.allow_uncaught_exception) {
+                tests.set_file_is_test();
+            }
 
-        var stack;
-        if (e.error && e.error.stack) {
-            stack = e.error.stack;
-        } else {
-            stack = e.filename + ":" + e.lineno + ":" + e.colno;
-        }
+            var stack;
+            if (e.error && e.error.stack) {
+                stack = e.error.stack;
+            } else {
+                stack = e.filename + ":" + e.lineno + ":" + e.colno;
+            }
 
-        if (tests.file_is_test) {
-            var test = tests.tests[0];
-            if (test.phase >= test.phases.HAS_RESULT) {
-                return;
+            if (tests.file_is_test) {
+                var test = tests.tests[0];
+                if (test.phase >= test.phases.HAS_RESULT) {
+                    return;
+                }
+                test.set_status(test.FAIL, e.message, stack);
+                test.phase = test.phases.HAS_RESULT;
+                test.done();
+            } else if (!tests.allow_uncaught_exception) {
+                tests.status.status = tests.status.ERROR;
+                tests.status.message = e.message;
+                tests.status.stack = stack;
             }
-            test.set_status(test.FAIL, e.message, stack);
-            test.phase = test.phases.HAS_RESULT;
-            test.done();
-        } else if (!tests.allow_uncaught_exception) {
-            tests.status.status = tests.status.ERROR;
-            tests.status.message = e.message;
-            tests.status.stack = stack;
-        }
-        done();
-    };
+            done();
+        };
 
-    addEventListener("error", error_handler, false);
-    addEventListener("unhandledrejection", function(e){ error_handler(e.reason); }, false);
+        addEventListener("error", error_handler, false);
+        addEventListener("unhandledrejection", function(e){ error_handler(e.reason); }, false);
+    }
 
     test_environment.on_tests_ready();
 
diff --git a/tests/wpt/web-platform-tests/screen-orientation/page-visibility-manual.html b/tests/wpt/web-platform-tests/screen-orientation/page-visibility-manual.html
index 95633ba1240c..cc6327921780 100644
--- a/tests/wpt/web-platform-tests/screen-orientation/page-visibility-manual.html
+++ b/tests/wpt/web-platform-tests/screen-orientation/page-visibility-manual.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
 <html>
 <body>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <meta name='flags' content='interact'>
-<meta name="timeout" content="long">
 <p>Switch the page to background, then switch back in a minute.</p>
 <iframe src='about:blank'></iframe>
 <script>
diff --git a/tests/wpt/web-platform-tests/secure-contexts/OWNERS b/tests/wpt/web-platform-tests/secure-contexts/OWNERS
new file mode 100644
index 000000000000..12f907ceb418
--- /dev/null
+++ b/tests/wpt/web-platform-tests/secure-contexts/OWNERS
@@ -0,0 +1 @@
+@mikewest
diff --git a/tests/wpt/web-platform-tests/server-timing/OWNERS b/tests/wpt/web-platform-tests/server-timing/OWNERS
new file mode 100644
index 000000000000..f1882ce94fcd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/OWNERS
@@ -0,0 +1 @@
+@igrigorik
diff --git a/tests/wpt/web-platform-tests/server-timing/cross_origin.html b/tests/wpt/web-platform-tests/server-timing/cross_origin.html
index f5251034c93d..94c502eef1ca 100644
--- a/tests/wpt/web-platform-tests/server-timing/cross_origin.html
+++ b/tests/wpt/web-platform-tests/server-timing/cross_origin.html
@@ -9,10 +9,10 @@
       setup({explicit_done: true})
 
       const hostInfo = get_host_info()
-      const resourceUrl = 'server-timing/resources/blue.png'
       const urls = {
-        'same-origin': `${hostInfo.HTTP_ORIGIN}/${resourceUrl}`,
-        'cross-origin': `${hostInfo.HTTP_REMOTE_ORIGIN}/${resourceUrl}`
+        'same-origin': `${hostInfo.HTTP_ORIGIN}/server-timing/resources/blue.png`,
+        'cross-origin': `${hostInfo.HTTP_REMOTE_ORIGIN}/server-timing/resources/blue.png`,
+        'cross-origin-tao': `${hostInfo.HTTP_REMOTE_ORIGIN}/server-timing/resources/blue_tao.png`
       }
       Object.keys(urls).forEach(function(key) {
         const img = document.createElement('img')
@@ -28,6 +28,7 @@
         }
         assertServerTimingEntries(urls['same-origin'], 1)
         assertServerTimingEntries(urls['cross-origin'], 0)
+        assertServerTimingEntries(urls['cross-origin-tao'], 1)
         done()
       })
     </script>
diff --git a/tests/wpt/web-platform-tests/server-timing/navigation_timing_idl.https.html b/tests/wpt/web-platform-tests/server-timing/navigation_timing_idl.https.html
new file mode 100644
index 000000000000..290bb889b149
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/navigation_timing_idl.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<head>
+    <meta charset='utf-8' />
+    <script src="/resources/testharness.js"></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script>
+      setup({explicit_done: true})
+      window.addEventListener('load', function(){
+        assert_not_equals(typeof performance.getEntriesByType('navigation')[0].serverTiming, 'undefined',
+          'An instance of `PerformanceNavigationTiming` should have a `serverTiming` attribute.')
+        done()
+      })
+    </script>
+</head>
diff --git a/tests/wpt/web-platform-tests/server-timing/resource_timing_idl.https.html b/tests/wpt/web-platform-tests/server-timing/resource_timing_idl.https.html
new file mode 100644
index 000000000000..d2c3c9274eab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/resource_timing_idl.https.html
@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<head>
+    <meta charset='utf-8' />
+    <script src="/resources/testharness.js"></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script>
+      setup({explicit_done: true})
+      window.addEventListener('load', function(){
+        assert_not_equals(typeof performance.getEntriesByType('resource')[0].serverTiming, 'undefined',
+          'An instance of `PerformanceResourceTiming` should have a `serverTiming` attribute.')
+        done()
+      })
+    </script>
+</head>
diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png b/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png
new file mode 100644
index 000000000000..4498dd258a20
Binary files /dev/null and b/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png differ
diff --git a/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png.sub.headers b/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png.sub.headers
new file mode 100644
index 000000000000..3ca09d6a9dc8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/resources/blue_tao.png.sub.headers
@@ -0,0 +1,2 @@
+Timing-Allow-Origin: *
+Server-Timing: metric2; dur=2.1; desc=blue.png
diff --git a/tests/wpt/web-platform-tests/server-timing/server_timing_header-parsing.https.html b/tests/wpt/web-platform-tests/server-timing/server_timing_header-parsing.https.html
new file mode 100644
index 000000000000..50396ed642f4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/server_timing_header-parsing.https.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<!--
+tests generated by:
+  https://github.com/cvazac/generate-server-timing-tests
+-->
+
+<head>
+    <meta charset='utf-8' />
+    <script src="/resources/testharness.js"></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script src="/common/performance-timeline-utils.js"></script>
+    <script>
+      setup({explicit_done: true})
+      const tests = []
+      const urlToIndex = {}
+      function testServerTiming(script, expectedResults) {
+        const url = script.src
+        tests[urlToIndex[url]] = {url, expectedResults}
+      }
+      function runTests() {
+        tests.forEach(function({url, expectedResults}) {
+          const {serverTiming} = performance.getEntriesByName(url)[0]
+          const fileName = url.substring(url.lastIndexOf('/') + 1)
+
+          test_equals(serverTiming.length, expectedResults.length, `${fileName} - count (${serverTiming.length} ?== ${expectedResults.length})`)
+
+          expectedResults.forEach(function(expectedResult, i) {
+            const dur = expectedResult.dur || 0
+            const desc = expectedResult.desc || ''
+            const index = expectedResults.length === 1 ? '' : `[${i}].`
+            test_equals(expectedResult.name, serverTiming[i].name,
+                `${fileName} - ${index}name (${expectedResult.name} ?== ${serverTiming[i].name})`)
+            test_equals(dur, serverTiming[i].duration,
+                `${fileName} - ${index}duration (${dur} ?== ${serverTiming[i].duration})`)
+            test_equals(desc, serverTiming[i].description,
+                `${fileName} - ${index}description (${desc} ?== ${serverTiming[i].description})`)
+          })
+        })
+        done()
+      }
+      for (let i = 0; i <= 83; i++) {
+        const script = document.createElement('script')
+        script.src = `./resources/parsing/${i}.js`
+        document.getElementsByTagName('head')[0].appendChild(script)
+        urlToIndex[script.src] = i
+      }
+      window.addEventListener('load', runTests)
+    </script>
+</head>
diff --git a/tests/wpt/web-platform-tests/server-timing/service_worker_idl.html b/tests/wpt/web-platform-tests/server-timing/service_worker_idl.html
new file mode 100644
index 000000000000..1c1be8995b33
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/service_worker_idl.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<head>
+    <meta charset='utf-8' />
+    <script src="/resources/testharness.js"></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script>
+      (async () => {
+        const scope = 'does/not/exist'
+
+        let registration = await navigator.serviceWorker.getRegistration(scope)
+        if (registration)
+          await registration.unregister()
+        registration = await navigator.serviceWorker.register('./sw.js', {scope})
+
+        fetch_tests_from_worker(registration.installing)
+      })()
+    </script>
+</head>
diff --git a/tests/wpt/web-platform-tests/server-timing/sw.js b/tests/wpt/web-platform-tests/server-timing/sw.js
new file mode 100644
index 000000000000..a6fd72ad17bc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/sw.js
@@ -0,0 +1,19 @@
+importScripts('/resources/testharness.js')
+
+promise_test((test) => {
+  return fetch('./sw.js').then((response) => {
+    return new Promise((resolve, reject) => {
+      step_timeout(() => {
+        const entry = performance.getEntriesByName(response.url)[0]
+        if (!entry) {
+          reject('no entry: ' + response.url)
+        }
+
+        assert_not_equals(typeof entry.serverTiming,
+          'undefined',
+          'An instance of `PerformanceResourceTiming` should have a `serverTiming` attribute in the Service Worker context.')
+        resolve()
+      }, 250)
+    })
+  })
+})
diff --git a/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html b/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html
new file mode 100644
index 000000000000..2d43aa2d43b7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html
@@ -0,0 +1,45 @@
+<!DOCTYPE html>
+<head>
+    <meta charset='utf-8' />
+    <script src="/resources/testharness.js"></script>
+    <script src='/resources/testharnessreport.js'></script>
+    <script src="/common/performance-timeline-utils.js"></script>
+    <script>
+      setup({explicit_done: true})
+
+      window.addEventListener('load', function() {
+        // there should be exactly three server-timing entries, 2 for document, 1 for img#one
+        test_entries(performance.getEntriesByType('navigation')[0].serverTiming, [{
+          duration: 1.1,
+          name: 'metric1',
+          description: 'document',
+        }, {
+          duration: 1.2,
+          name: 'metric1',
+          description: 'document',
+        }])
+        test_entries(performance.getEntriesByName(document.querySelector('img#one').src)[0].serverTiming, [{
+          duration: 2.1,
+          name: 'metric2',
+          description: 'blue.png',
+        }])
+
+        new PerformanceObserver(function(entryList, observer) {
+          // there should be exactly one server-timing entry, 1 for img#two
+          test_entries(entryList.getEntriesByName(document.querySelector('img#two').src)[0].serverTiming, [{
+            duration: 3.1,
+            name: 'metric3',
+            description: 'green.png',
+          }])
+          observer.disconnect()
+          done()
+        }).observe({entryTypes: ['resource']})
+
+        var img = document.createElement('img')
+        img.id = 'two'
+        img.src = './resources/green.png'
+        document.getElementsByTagName('script')[0].parentNode.appendChild(img)
+      })
+    </script>
+</head>
+<img id='one' src='resources/blue.png'>
diff --git a/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html.sub.headers b/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html.sub.headers
new file mode 100644
index 000000000000..ad018b70fd8f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/server-timing/test_server_timing.https.html.sub.headers
@@ -0,0 +1 @@
+Server-Timing: metric1; dur=1.1; desc=document, metric1; dur=1.2; desc=document
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
index 48aefd4a7af6..5755758e5716 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/activation.https.html
@@ -49,7 +49,7 @@
         return wait_for_state(t, registration.installing, 'installed');
       })
     .then(() => {
-        return wait_for_activation_on_dummy_scope(t);
+        return wait_for_activation_on_dummy_scope(t, self);
       })
     .then(() => {
         assert_not_equals(registration.waiting, null);
@@ -69,7 +69,7 @@
           iframe = result.iframe;
           // Finish the in-flight request.
           registration.active.postMessage('go');
-          return wait_for_activation_on_dummy_scope(t);
+          return wait_for_activation_on_dummy_scope(t, self);
         })
       .then(() => {
           // The new worker is still waiting. Remove the frame and it should
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
index e70de4d70b61..5ae4de8cc81e 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/detached-context.https.html
@@ -54,7 +54,7 @@
                               () => {});
           r.update().then(() => resolvedCount += 1,
                           () => {});
-          return wait_for_activation_on_dummy_scope(t);
+          return wait_for_activation_on_dummy_scope(t, window);
         })
       .then(() => {
           assert_equals(resolvedCount, 0,
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html
index b1fd902994f1..64c277d94dc6 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-updateviacache.https.html
@@ -100,13 +100,18 @@
         await wait_for_state(t, sw, 'activated');
         const values = await getScriptTimes(sw, testName);
 
+        const frame = await with_iframe(SCOPE);
+        const reg_in_frame = await frame.contentWindow.navigator.serviceWorker.getRegistration(normalizeURL(SCOPE));
+        assert_equals(reg_in_frame.updateViaCache, updateViaCache1 || 'imports', "reg_in_frame.updateViaCache");
+
         opts = {scope: SCOPE};
         if (updateViaCache2) opts.updateViaCache = updateViaCache2;
 
         await navigator.serviceWorker.register(fullScriptUrl, opts);
 
-        assert_equals(reg.updateViaCache, updateViaCache2 || 'imports', "reg.updateViaCache updated");
+        const expected_updateViaCache = updateViaCache2 || 'imports';
 
+        assert_equals(reg.updateViaCache, expected_updateViaCache, "reg.updateViaCache updated");
         // If the update happens via the cache, the scripts will come back byte-identical.
         // We bypass the byte-identical check if the script URL has changed, but not if
         // only the updateViaCache value has changed.
@@ -138,9 +143,44 @@
           }
         }
 
+        // Wait for all registration related tasks on |frame| to complete.
+        await wait_for_activation_on_dummy_scope(t, frame.contentWindow);
+        // The updateViaCache change should have been propagated to all
+        // corresponding JS registration objects.
+        assert_equals(reg_in_frame.updateViaCache, expected_updateViaCache, "reg_in_frame.updateViaCache updated");
+        frame.remove();
+
         await cleanup();
       }, testName);
     }
   }
 
+  // Test accessing updateViaCache of an unregistered registration.
+  for (const updateViaCache of UPDATE_VIA_CACHE_VALUES) {
+    const testName = `access-updateViaCache-after-unregister-${updateViaCache}`;
+
+    promise_test(async t => {
+      await cleanup();
+
+      const opts = {scope: SCOPE};
+
+      if (updateViaCache) opts.updateViaCache = updateViaCache;
+
+      const reg = await navigator.serviceWorker.register(
+        `${SCRIPT_URL}?test=${testName}`,
+        opts
+      );
+
+      const expected_updateViaCache = updateViaCache || 'imports';
+      assert_equals(reg.updateViaCache, expected_updateViaCache, "reg.updateViaCache");
+
+      await reg.unregister();
+
+      // Keep the original value.
+      assert_equals(reg.updateViaCache, expected_updateViaCache, "reg.updateViaCache");
+
+      await cleanup();
+    }, testName);
+  }
+
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-cross-origin.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-cross-origin.https.html
new file mode 100644
index 000000000000..827688df011e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resource-timing-cross-origin.https.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+<meta charset="utf-8" />
+<title>This test validates Resource Timing for cross origin content fetched by Service Worker from an originally same-origin URL.</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="resources/test-helpers.sub.js"></script>
+</head>
+
+<body>
+<script>
+async_test(function(t) {
+    const worker_url = 'resources/worker-fetching-cross-origin.js';
+    const scope = 'resources/iframe-with-image.html';
+    let registration;
+    service_worker_unregister_and_register(t, worker_url, scope)
+    .then(function(r) {
+        registration = r;
+        return wait_for_state(t, r.installing, 'activated');
+    })
+    .then(function() {
+        return with_iframe(scope);
+    })
+    .then(function(frame) {
+        const frame_performance = frame.contentWindow.performance;
+        // Check that there is one entry for which the timing allow check algorithm failed.
+        const entries = frame_performance.getEntriesByType('resource');
+        assert_equals(entries.length, 1);
+        const entry = entries[0];
+        assert_equals(entry.redirectStart, 0, 'redirectStart should be 0 in cross-origin request.');
+        assert_equals(entry.redirectEnd, 0, 'redirectEnd should be 0 in cross-origin request.');
+        assert_equals(entry.domainLookupStart, 0, 'domainLookupStart should be 0 in cross-origin request.');
+        assert_equals(entry.domainLookupEnd, 0, 'domainLookupEnd should be 0 in cross-origin request.');
+        assert_equals(entry.connectStart, 0, 'connectStart should be 0 in cross-origin request.');
+        assert_equals(entry.connectEnd, 0, 'connectEnd should be 0 in cross-origin request.');
+        assert_equals(entry.requestStart, 0, 'requestStart should be 0 in cross-origin request.');
+        assert_equals(entry.responseStart, 0, 'responseStart should be 0 in cross-origin request.');
+        assert_equals(entry.secureConnectionStart, 0, 'secureConnectionStart should be 0 in cross-origin request.');
+        assert_equals(entry.decodedBodySize, 0, 'decodedBodySize should be 0 in cross-origin request.');
+        frame.remove();
+        return registration.unregister();
+      })
+    .then(function() {
+        t.done();
+      })
+    .catch(unreached_rejection(t));
+}, 'Test that timing allow check fails when service worker changes origin from same to cross origin.');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iframe-with-image.html b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iframe-with-image.html
new file mode 100644
index 000000000000..ce78840cb283
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/iframe-with-image.html
@@ -0,0 +1,2 @@
+<!DOCTYPE html>
+<img src="square">
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js
index 452876838f57..8b30467227da 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/resource-timing-worker.js
@@ -1,9 +1,9 @@
 self.addEventListener('fetch', function(event) {
-    if (event.request.url.indexOf('dummy.js') != -1) {
-      event.respondWith(new Promise(resolve => {
-        // Slightly delay the response so we ensure we get a non-zero
-        // duration.
-        setTimeout(_ => resolve(new Response()), 100);
-      }));
-    }
-  });
+  if (event.request.url.indexOf('dummy.js') != -1) {
+    event.respondWith(new Promise(resolve => {
+      // Slightly delay the response so we ensure we get a non-zero
+      // duration.
+      setTimeout(_ => resolve(new Response('// Empty javascript')), 50);
+    }));
+  }
+});
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/square.png.sub.headers b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/square.png.sub.headers
new file mode 100644
index 000000000000..7341132745be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/square.png.sub.headers
@@ -0,0 +1,2 @@
+Content-Type: image/png
+Access-Control-Allow-Origin: *
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
index b99ed200f1a1..8fa3e3bd9ad9 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/test-helpers.sub.js
@@ -264,10 +264,10 @@ function with_sandboxed_iframe(url, sandbox) {
 // activate, and then unregister a service worker.  When checking that
 // certain behavior does *NOT* happen, this is preferable to using an
 // arbitrary delay.
-async function wait_for_activation_on_dummy_scope(t) {
-  const script = 'resources/empty-worker.js';
+async function wait_for_activation_on_dummy_scope(t, window_or_workerglobalscope) {
+  const script = '/service-workers/service-worker/resources/empty-worker.js';
   const scope = 'resources/there/is/no/there/there?' + Date.now();
-  let registration = await navigator.serviceWorker.register(script, { scope });
+  let registration = await window_or_workerglobalscope.navigator.serviceWorker.register(script, { scope });
   await wait_for_state(t, registration.installing, 'activated');
   await registration.unregister();
 }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-fetching-cross-origin.js b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-fetching-cross-origin.js
new file mode 100644
index 000000000000..79f08991174c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/resources/worker-fetching-cross-origin.js
@@ -0,0 +1,10 @@
+importScripts('/common/get-host-info.sub.js');
+importScripts('test-helpers.sub.js');
+
+self.addEventListener('fetch', event => {
+  const host_info = get_host_info();
+  // The sneaky Service Worker changes the same-origin 'square' request for a cross-origin image.
+  if (event.request.url.indexOf('square') != -1) {
+    event.respondWith(fetch(host_info['HTTPS_REMOTE_ORIGIN'] + base_path() + 'square.png', {mode: 'cors'}));
+  }
+});
diff --git a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html b/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html
index 14d3f8227b8c..58135b107304 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/untriaged/shadow-trees/upper-boundary-encapsulation/test-011.html
@@ -44,8 +44,6 @@
 
 
 }), 'A_04_01_11_T2');
-
-// TODO check selectedStyleSheetSet, lastStyleSheetSet, preferredStyleSheetSet, styleSheetSets
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/svg/foreignobject/foreign-object-circular-filter-reference-crash.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html
similarity index 100%
rename from tests/wpt/web-platform-tests/svg/foreignobject/foreign-object-circular-filter-reference-crash.html
rename to tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-circular-filter-reference-crash.html
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html
new file mode 100644
index 000000000000..a0a869260242
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect-expected.html
@@ -0,0 +1,12 @@
+<!doctype HTML>
+<!doctype HTML>
+<style>
+* {
+  margin: 0
+}
+</style>
+<svg style="width: 500px; height: 500px">
+  <rect x="0" y="0" width="100%" height="100%" style="fill: blue"/>
+  <rect x="0" y="0" width="50%" height="50%"/>
+</svg>
+
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html
new file mode 100644
index 000000000000..928a136c95e1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-paints-before-rect.html
@@ -0,0 +1,16 @@
+<!doctype HTML>
+<link rel="match" href="foreign-object-paints-before-rect-expected.html">
+<link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-ForeignObjectElement"/>
+<style>
+* {
+  margin: 0
+}
+</style>
+<!-- Test that the <foreignObject> root element paints in element order
+within the SVG, but content within it is atomic. -->
+<svg style="width: 500px; height: 500px">
+  <foreignObject width="100%" height="100%">
+    <div style="width: 500px; height: 500px; background: blue"></div>
+  </foreignObject>
+  <rect x="0" y="0" width="50%" height="50%"/>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size-ref.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size-ref.html
new file mode 100644
index 000000000000..e0b17a2c4a28
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size-ref.html
@@ -0,0 +1,8 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Reference</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<style>
+div { width: 100px; height: 100px; background-color: green; }
+</style>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size.html
new file mode 100644
index 000000000000..91fc3ef7fe75
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/foreign-object-size.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<meta charset="utf-8">
+<title>Test: auto values for width and height properties on foreignObject compute to zero</title>
+<link rel="author" title="Cameron McCormack" href="mailto:cam@mcc.id.au">
+<link rel="help" href="https://svgwg.org/svg2-draft/geometry.html#Sizing">
+<link rel="match" href="foreign-object-size-ref.html">
+<style>
+div { width: 100px; height: 100px; }
+</style>
+<svg>
+  <foreignObject width="100" height="100">
+    <div style="background-color: green;"></div>
+  </foreignObject>
+  <!--
+    The foreignObject takes its size from its width and height properties.
+    Unlike HTML elements, a value of auto for these properties (as omitting
+    the width="" and height="" presentation attributes will do) will compute
+    to zero, causing it not to be rendered.
+    -->
+  <foreignObject>
+    <div style="background-color: red;"></div>
+  </foreignObject>
+</svg>
diff --git a/tests/wpt/web-platform-tests/svg/foreignobject/position-svg-root-in-foreign-object-ref.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/svg/foreignobject/position-svg-root-in-foreign-object-ref.html
rename to tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object-ref.html
diff --git a/tests/wpt/web-platform-tests/svg/foreignobject/position-svg-root-in-foreign-object.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html
similarity index 92%
rename from tests/wpt/web-platform-tests/svg/foreignobject/position-svg-root-in-foreign-object.html
rename to tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html
index 5bf382266279..fd32d2a961ef 100644
--- a/tests/wpt/web-platform-tests/svg/foreignobject/position-svg-root-in-foreign-object.html
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/position-svg-root-in-foreign-object.html
@@ -6,7 +6,7 @@
 <link rel="match" href="position-svg-root-in-foreign-object-ref.html">
 <p>You should see the word PASS and no red below.</p>
 <svg>
-  <foreignObject>
+  <foreignObject width="200" height="200">
     PASS
     <svg style="position:absolute; left: -1000px; width:100px; height: 100px; background: red"></svg>
   </foreignObject>
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context-expected.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context-ref.html
similarity index 100%
rename from tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context-expected.html
rename to tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context-ref.html
diff --git a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context.html b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context.html
index c60a111f6331..dfad5a175fb4 100644
--- a/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context.html
+++ b/tests/wpt/web-platform-tests/svg/extensibility/foreignObject/stacking-context.html
@@ -1,6 +1,6 @@
 <!doctype HTML>
 <title>Test that the foreignObject element is a stacking context</title>
-<link rel="match" href="stacking-context-expected.html">
+<link rel="match" href="stacking-context-ref.html">
 <link rel="help" href="https://svgwg.org/svg2-draft/single-page.html#embedded-ForeignObjectElement"/>
 <style>
   * {
diff --git a/tests/wpt/web-platform-tests/tools/ci/check_stability.py b/tests/wpt/web-platform-tests/tools/ci/check_stability.py
index b215e3c9e1df..d781bae3f9c9 100644
--- a/tests/wpt/web-platform-tests/tools/ci/check_stability.py
+++ b/tests/wpt/web-platform-tests/tools/ci/check_stability.py
@@ -7,8 +7,6 @@
 import sys
 from ConfigParser import SafeConfigParser
 
-import requests
-
 here = os.path.dirname(__file__)
 wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
 sys.path.insert(0, wpt_root)
@@ -178,52 +176,6 @@ def pr():
     return pr if pr != "false" else None
 
 
-def post_results(results, pr_number, iterations, product, url, status):
-    """Post stability results to a given URL."""
-    payload_results = []
-
-    for test_name, test in results.iteritems():
-        subtests = []
-        for subtest_name, subtest in test['subtests'].items():
-            subtests.append({
-                'test': subtest_name,
-                'result': {
-                    'messages': list(subtest['messages']),
-                    'status': subtest['status']
-                },
-            })
-        payload_results.append({
-            'test': test_name,
-            'result': {
-                'status': test['status'],
-                'subtests': subtests
-            }
-        })
-
-    payload = {
-        "pull": {
-            "number": int(pr_number),
-            "sha": os.environ.get("TRAVIS_PULL_REQUEST_SHA"),
-        },
-        "job": {
-            "id": int(os.environ.get("TRAVIS_JOB_ID")),
-            "number": os.environ.get("TRAVIS_JOB_NUMBER"),
-            "allow_failure": os.environ.get("TRAVIS_ALLOW_FAILURE") == 'true',
-            "status": status,
-        },
-        "build": {
-            "id": int(os.environ.get("TRAVIS_BUILD_ID")),
-            "number": os.environ.get("TRAVIS_BUILD_NUMBER"),
-        },
-        "product": product,
-        "iterations": iterations,
-        "message": "All results were stable." if status == "passed" else "Unstable results.",
-        "results": payload_results,
-    }
-
-    requests.post(url, json=payload)
-
-
 def get_changed_files(manifest_path, rev, ignore_changes, skip_tests):
     if not rev:
         branch_point = testfiles.branch_point()
@@ -248,7 +200,6 @@ def main():
 
     venv = Virtualenv(os.environ.get("VIRTUAL_ENV", os.path.join(wpt_root, "_venv")))
     venv.install_requirements(os.path.join(wpt_root, "tools", "wptrunner", "requirements.txt"))
-    venv.install("requests")
 
     args, wpt_args = get_parser().parse_known_args()
     return run(venv, wpt_args, **vars(args))
@@ -266,7 +217,6 @@ def run(venv, wpt_args, **kwargs):
         config.readfp(config_fp)
         skip_tests = config.get("file detection", "skip_tests").split()
         ignore_changes = set(config.get("file detection", "ignore_changes").split())
-        results_url = config.get("file detection", "results_url")
 
     if kwargs["output_bytes"] is not None:
         replace_streams(kwargs["output_bytes"],
@@ -281,8 +231,6 @@ def run(venv, wpt_args, **kwargs):
 
     setup_logging()
 
-    browser_name = wpt_args.product.split(":")[0]
-
     pr_number = pr()
 
     with TravisFold("browser_setup"):
@@ -345,10 +293,6 @@ def run(venv, wpt_args, **kwargs):
             write_results(logger.info, results, iterations,
                           pr_number=pr_number,
                           use_details=True)
-            if pr_number:
-                post_results(results, iterations=iterations, url=results_url,
-                             product=wpt_args.product, pr_number=pr_number,
-                             status="failed" if inconsistent else "passed")
     else:
         logger.info("No tests run.")
         # Be conservative and only return errors when we know for sure tests are changed.
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_resources_unittest.sh b/tests/wpt/web-platform-tests/tools/ci/ci_resources_unittest.sh
index ff1e224843d2..78868b93433e 100755
--- a/tests/wpt/web-platform-tests/tools/ci/ci_resources_unittest.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_resources_unittest.sh
@@ -5,7 +5,11 @@ SCRIPT_DIR=$(dirname $(readlink -f "$0"))
 WPT_ROOT=$(readlink -f $SCRIPT_DIR/../..)
 cd $WPT_ROOT
 
+source tools/ci/lib.sh
+
 main() {
+    hosts_fixup
+
     cd $WPT_ROOT
     pip install -U tox
     ./wpt install firefox browser --destination $HOME
diff --git a/tests/wpt/web-platform-tests/tools/ci/ci_taskcluster.sh b/tests/wpt/web-platform-tests/tools/ci/ci_taskcluster.sh
index 00e1f0b776af..8d00a5c53781 100755
--- a/tests/wpt/web-platform-tests/tools/ci/ci_taskcluster.sh
+++ b/tests/wpt/web-platform-tests/tools/ci/ci_taskcluster.sh
@@ -1,8 +1,9 @@
 #!/bin/bash
 
 ./wpt manifest-download
+
 if [ $1 == "firefox" ]; then
-    ./wpt run firefox --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y --install-browser --no-pause --no-restart-on-unexpected --reftest-internal
+    ./wpt run firefox --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y --install-browser --no-pause --no-restart-on-unexpected --reftest-internal --install-fonts --no-fail-on-unexpected
 elif [ $1 == "chrome" ]; then
-    ./wpt run chrome --log-tbpl==../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y  --no-pause --no-restart-on-unexpected
+    ./wpt run chrome --log-tbpl=../artifacts/log_tbpl.log --log-tbpl-level=info --log-wptreport=../artifacts/wpt_report.json --log-mach=- --this-chunk=$3 --total-chunks=$4 --test-type=$2 -y  --no-pause --no-restart-on-unexpected --install-fonts --no-fail-on-unexpected
 fi
diff --git a/tests/wpt/web-platform-tests/tools/ci/jobs.py b/tests/wpt/web-platform-tests/tools/ci/jobs.py
index 4545f496e50a..b58ab9239078 100644
--- a/tests/wpt/web-platform-tests/tools/ci/jobs.py
+++ b/tests/wpt/web-platform-tests/tools/ci/jobs.py
@@ -27,11 +27,10 @@
     "wptrunner_unittest": ["tools/wptrunner/*"],
     "build_css": ["css/"],
     "update_built": ["2dcontext/",
-                     "assumptions/",
                      "html/",
                      "offscreen-canvas/"],
     "wpt_integration": ["tools/"],
-    "wptrunner_infrastructure": ["tools/"],
+    "wptrunner_infrastructure": ["infrastructure/", "tools/"],
 }
 
 
diff --git a/tests/wpt/web-platform-tests/tools/ci/make_hosts_file.py b/tests/wpt/web-platform-tests/tools/ci/make_hosts_file.py
index 6bf2249ad1fc..f6f38a563094 100644
--- a/tests/wpt/web-platform-tests/tools/ci/make_hosts_file.py
+++ b/tests/wpt/web-platform-tests/tools/ci/make_hosts_file.py
@@ -11,7 +11,6 @@ def create_parser():
     return parser
 
 def run(**kwargs):
-    config = load_config(os.path.join(repo_root, "config.default.json"),
-                         os.path.join(repo_root, "config.json"))
+    config = load_config(os.path.join(repo_root, "config.json"))
 
     print(make_hosts_file(config, kwargs["address"]))
diff --git a/tests/wpt/web-platform-tests/tools/ci/taskgraph.py b/tests/wpt/web-platform-tests/tools/ci/taskgraph.py
index 2fcdba0bf4d4..894071d8d817 100644
--- a/tests/wpt/web-platform-tests/tools/ci/taskgraph.py
+++ b/tests/wpt/web-platform-tests/tools/ci/taskgraph.py
@@ -9,6 +9,7 @@
 here = os.path.dirname(__file__)
 wpt_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir))
 
+docker_image = "harjgam/web-platform-tests:0.11"
 
 task_template = {
     "provisionerId": "{{ taskcluster.docker.provisionerId }}",
@@ -21,17 +22,14 @@
     },
     "payload": {
         "maxRunTime": 7200,
-        "image": "harjgam/web-platform-tests:0.6",
+        "image": docker_image,
         "command":[
             "/bin/bash",
             "--login",
             "-c",
             """>-
-            ~/start.sh &&
-            cd /home/test/web-platform-tests &&
-            git fetch {{event.head.repo.url}} &&
-            git config advice.detachedHead false &&
-            git checkout {{event.head.sha}} &&
+            ~/start.sh {{event.head.repo.url}} {{ event.head.repo.branch }} {{event.head.sha}} %(browser_name)s &&
+            cd ~/web-platform-tests &&
             %(command)s"""],
         "artifacts": {
             "public/results": {
diff --git a/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py b/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
index 1b1ed3620649..ac3729cf18c5 100644
--- a/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
+++ b/tests/wpt/web-platform-tests/tools/ci/tests/test_jobs.py
@@ -69,8 +69,6 @@ def test_build_css():
 def test_update_built():
     assert jobs.get_jobs(["2dcontext/foo.html"],
                          includes=["update_built"]) == set(["update_built"])
-    assert jobs.get_jobs(["assumptions/foo.html"],
-                         includes=["update_built"]) == set(["update_built"])
     assert jobs.get_jobs(["html/foo.html"],
                          includes=["update_built"]) == set(["update_built"])
     assert jobs.get_jobs(["offscreen-canvas/foo.html"],
@@ -82,3 +80,9 @@ def test_wpt_integration():
                          includes=["wpt_integration"]) == set(["wpt_integration"])
     assert jobs.get_jobs(["tools/wptrunner/wptrunner/wptrunner.py"],
                          includes=["wpt_integration"]) == set(["wpt_integration"])
+
+def test_wpt_infrastructure():
+    assert jobs.get_jobs(["tools/hammer.html"],
+                         includes=["wptrunner_infrastructure"]) == set(["wptrunner_infrastructure"])
+    assert jobs.get_jobs(["infrastructure/assumptions/ahem.html"],
+                         includes=["wptrunner_infrastructure"]) == set(["wptrunner_infrastructure"])
diff --git a/tests/wpt/web-platform-tests/tools/docker/Dockerfile b/tests/wpt/web-platform-tests/tools/docker/Dockerfile
index 7157ee319504..b0541dc6c983 100644
--- a/tests/wpt/web-platform-tests/tools/docker/Dockerfile
+++ b/tests/wpt/web-platform-tests/tools/docker/Dockerfile
@@ -60,17 +60,13 @@ USER test
 
 WORKDIR /home/test
 
-COPY .bashrc /home/test/.bashrc
-
-COPY start.sh /home/test/start.sh
-
 # Remove information on how to use sudo on login
 RUN sudo echo ""
 
-RUN git clone --depth=1 https://github.com/w3c/web-platform-tests.git
+RUN mkdir -p /home/test/artifacts
 
-RUN mkdir -p /home/test/.fonts && \
-    cp web-platform-tests/fonts/Ahem.ttf ~/.fonts && \
-    fc-cache -f -v
+WORKDIR /home/test/
 
-RUN mkdir -p /home/test/artifacts
+COPY .bashrc /home/test/.bashrc
+
+COPY start.sh /home/test/start.sh
diff --git a/tests/wpt/web-platform-tests/tools/docker/start.sh b/tests/wpt/web-platform-tests/tools/docker/start.sh
index 908ec0c742b8..2fa1204615df 100755
--- a/tests/wpt/web-platform-tests/tools/docker/start.sh
+++ b/tests/wpt/web-platform-tests/tools/docker/start.sh
@@ -1,14 +1,34 @@
 #!/bin/bash
+set -ex
 
+REMOTE=${1:-https://github.com/w3c/web-platform-tests}
+BRANCH=${2:-master}
+REV=${3:-FETCH_HEAD}
+BROWSER=${4:-all}
+
+cd ~
+
+# Initially we just fetch 50 commits in order to save several minutes of fetching
+git clone ${REMOTE} --single-branch --branch ${BRANCH} --no-checkout -q --depth=50 web-platform-tests
 cd web-platform-tests
-git pull --depth=50
+if [[ ! `git rev-parse --verify -q ${REV}` ]];
+then
+    # But if for some reason the commit under test isn't in that range, we give in and
+    # fetch everything
+    git fetch -q --unshallow ${REMOTE}
+    git rev-parse --verify ${REV}
+fi
+git checkout -b build ${REV}
 
 sudo sh -c './wpt make-hosts-file >> /etc/hosts'
 
-# Install Chome dev
-deb_archive=google-chrome-unstable_current_amd64.deb
-wget https://dl.google.com/linux/direct/$deb_archive
+if [[ $BROWSER == "chrome"* ]] || [[ "$BROWSER" == all ]]
+then
+    # Install Chrome dev
+    deb_archive=google-chrome-unstable_current_amd64.deb
+    wget https://dl.google.com/linux/direct/$deb_archive
 
-sudo gdebi -n $deb_archive
+    sudo gdebi -n $deb_archive
+fi
 
 sudo Xvfb $DISPLAY -screen 0 ${SCREEN_WIDTH}x${SCREEN_HEIGHT}x${SCREEN_DEPTH} &
diff --git a/tests/wpt/web-platform-tests/tools/lint/lint.py b/tests/wpt/web-platform-tests/tools/lint/lint.py
index 9f0d1250d804..c1ffd50fb2b6 100644
--- a/tests/wpt/web-platform-tests/tools/lint/lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/lint.py
@@ -50,7 +50,7 @@ def setup_logging(prefix=False):
 
 
 ERROR_MSG = """You must fix all errors; for details on how to fix them, see
-http://web-platform-tests.org/writing-tests/lint-tool.html
+https://web-platform-tests.org/writing-tests/lint-tool.html
 
 However, instead of fixing a particular error, it's sometimes
 OK to add a line to the lint.whitelist file in the root of the
@@ -443,7 +443,7 @@ def check_parsed(repo_root, path, f):
             not source_file.spec_links):
             return [("MISSING-LINK", "Testcase file must have a link to a spec", path, None)]
 
-    if source_file.name_is_non_test or source_file.name_is_manual:
+    if source_file.name_is_non_test:
         return []
 
     if source_file.markup_type is None:
@@ -453,10 +453,10 @@ def check_parsed(repo_root, path, f):
         return [("PARSE-FAILED", "Unable to parse file", path, None)]
 
     if source_file.type == "manual" and not source_file.name_is_manual:
-        return [("CONTENT-MANUAL", "Manual test whose filename doesn't end in '-manual'", path, None)]
+        errors.append(("CONTENT-MANUAL", "Manual test whose filename doesn't end in '-manual'", path, None))
 
     if source_file.type == "visual" and not source_file.name_is_visual:
-        return [("CONTENT-VISUAL", "Visual test whose filename doesn't end in '-visual'", path, None)]
+        errors.append(("CONTENT-VISUAL", "Visual test whose filename doesn't end in '-visual'", path, None))
 
     for reftest_node in source_file.reftest_nodes:
         href = reftest_node.attrib.get("href", "").strip(space_chars)
@@ -666,6 +666,8 @@ def check_script_metadata(repo_root, path, f):
                     errors.append(("UNKNOWN-TIMEOUT-METADATA", "Unexpected value for timeout metadata", path, idx + 1))
             elif key == b"script":
                 pass
+            elif key == b"variant":
+                pass
             else:
                 errors.append(("UNKNOWN-METADATA", "Unexpected kind of metadata", path, idx + 1))
         else:
@@ -813,8 +815,6 @@ def create_parser():
                         help="Output machine-readable JSON format")
     parser.add_argument("--markdown", action="store_true",
                         help="Output markdown")
-    parser.add_argument("--css-mode", action="store_true",
-                        help="Run CSS testsuite specific lints")
     parser.add_argument("--repo-root", help="The WPT directory. Use this"
                         "option if the lint script exists outside the repository")
     parser.add_argument("--all", action="store_true", help="If no paths are passed, try to lint the whole "
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness-interact.html b/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness-interact.html
new file mode 100644
index 000000000000..a50ef983a939
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness-interact.html
@@ -0,0 +1,5 @@
+<!doctype html>
+<link rel=help href="https://www.w3.org/TR/CSS2/visufx.html#overflow-clipping">
+<meta name=flags content=interact>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness.html b/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness.html
new file mode 100644
index 000000000000..f15649e3aa4a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/dummy/css/css-unique/relative-testharness.html
@@ -0,0 +1,4 @@
+<!doctype html>
+<link rel=help href="https://www.w3.org/TR/CSS2/visufx.html#overflow-clipping">
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/relative-testharness-manual.html b/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/relative-testharness-manual.html
new file mode 100644
index 000000000000..15693b990c1d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/dummy/tests/relative-testharness-manual.html
@@ -0,0 +1,3 @@
+<!doctype html>
+<script src="../../../resources/testharness.js"></script>
+<script src="../../../resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_file_lints.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_file_lints.py
index b42a2dcfce88..539022bb9884 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_file_lints.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_file_lints.py
@@ -525,6 +525,8 @@ def test_css_missing_file_manual():
     (b"""// META: timeout=long\n""", None),
     (b"""//  META: timeout=long\n""", None),
     (b"""// META: script=foo.js\n""", None),
+    (b"""// META: variant=\n""", None),
+    (b"""// META: variant=?wss\n""", None),
     (b"""# META:\n""", None),
     (b"""\n// META: timeout=long\n""", (2, "STRAY-METADATA")),
     (b""" // META: timeout=long\n""", (1, "INDENTED-METADATA")),
diff --git a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
index 0a96b2968bb1..2899b1dfa233 100644
--- a/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
+++ b/tests/wpt/web-platform-tests/tools/lint/tests/test_lint.py
@@ -245,6 +245,29 @@ def test_ref_same_file_path(caplog):
     assert "same_file_path.html" in caplog.text
 
 
+def test_manual_path_testharness(caplog):
+    rv = lint(_dummy_repo, ["tests/relative-testharness-manual.html"], "normal")
+    assert rv == 2
+    assert "TESTHARNESS-PATH" in caplog.text
+    assert "TESTHARNESSREPORT-PATH" in caplog.text
+
+
+def test_css_visual_path_testharness(caplog):
+    rv = lint(_dummy_repo, ["css/css-unique/relative-testharness.html"], "normal")
+    assert rv == 3
+    assert "CONTENT-VISUAL" in caplog.text
+    assert "TESTHARNESS-PATH" in caplog.text
+    assert "TESTHARNESSREPORT-PATH" in caplog.text
+
+
+def test_css_manual_path_testharness(caplog):
+    rv = lint(_dummy_repo, ["css/css-unique/relative-testharness-interact.html"], "normal")
+    assert rv == 3
+    assert "CONTENT-MANUAL" in caplog.text
+    assert "TESTHARNESS-PATH" in caplog.text
+    assert "TESTHARNESSREPORT-PATH" in caplog.text
+
+
 def test_lint_passing_and_failing(caplog):
     with _mock_lint("check_path") as mocked_check_path:
         with _mock_lint("check_file_contents") as mocked_check_file_contents:
diff --git a/tests/wpt/web-platform-tests/tools/manifest/item.py b/tests/wpt/web-platform-tests/tools/manifest/item.py
index 06ae3c236e61..5a87d2820c4e 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/item.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/item.py
@@ -102,10 +102,11 @@ def from_json(cls, manifest, tests_root, path, obj, source_files=None):
 class TestharnessTest(URLManifestItem):
     item_type = "testharness"
 
-    def __init__(self, source_file, url, url_base="/", timeout=None, testdriver=False, manifest=None):
+    def __init__(self, source_file, url, url_base="/", timeout=None, testdriver=False, jsshell=False, manifest=None):
         URLManifestItem.__init__(self, source_file, url, url_base=url_base, manifest=manifest)
         self.timeout = timeout
         self.testdriver = testdriver
+        self.jsshell = jsshell
 
     def meta_key(self):
         return (self.timeout, self.testdriver)
@@ -116,6 +117,8 @@ def to_json(self):
             rv[-1]["timeout"] = self.timeout
         if self.testdriver:
             rv[-1]["testdriver"] = self.testdriver
+        if self.jsshell:
+            rv[-1]["jsshell"] = True
         return rv
 
     @classmethod
@@ -128,6 +131,7 @@ def from_json(cls, manifest, tests_root, path, obj, source_files=None):
                    url_base=manifest.url_base,
                    timeout=extras.get("timeout"),
                    testdriver=bool(extras.get("testdriver")),
+                   jsshell=bool(extras.get("jsshell")),
                    manifest=manifest)
 
 
diff --git a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
index 1d3451cd720b..3b4abbc29bfa 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/sourcefile.py
@@ -55,7 +55,8 @@ def read_script_metadata(f, regexp):
     b"serviceworker": {"force_https": True},
     b"sharedworker": {},
     b"dedicatedworker": {"suffix": ".any.worker.html"},
-    b"worker": {"longhand": {b"dedicatedworker", b"sharedworker", b"serviceworker"}}
+    b"worker": {"longhand": {b"dedicatedworker", b"sharedworker", b"serviceworker"}},
+    b"jsshell": {"suffix": ".any.js"},
 }
 
 
@@ -100,8 +101,9 @@ def parse_variants(value):
 
 def global_suffixes(value):
     """
-    Yields the relevant filename suffixes (strings) for the variants defined by
-    the given comma-separated value.
+    Yields tuples of the relevant filename suffix (a string) and whether the
+    variant is intended to run in a JS shell, for the variants defined by the
+    given comma-separated value.
     """
     assert isinstance(value, binary_type), value
 
@@ -113,7 +115,7 @@ def global_suffixes(value):
         suffix = variant.get("suffix", ".any.%s.html" % global_type.decode("utf-8"))
         if variant.get("force_https", False):
             suffix = ".https" + suffix
-        rv.add(suffix)
+        rv.add((suffix, global_type == b"jsshell"))
 
     return rv
 
@@ -560,7 +562,7 @@ def spec_links(self):
     @cached_property
     def content_is_css_visual(self):
         """Boolean indicating whether the file content represents a
-        CSS WG-style manual test"""
+        CSS WG-style visual test"""
         if self.root is None:
             return None
         return bool(self.ext in {'.xht', '.html', '.xhtml', '.htm', '.xml', '.svg'} and
@@ -605,8 +607,8 @@ def manifest_items(self):
                     break
 
             tests = [
-                TestharnessTest(self, global_variant_url(self.url, suffix) + variant, timeout=self.timeout)
-                for suffix in sorted(global_suffixes(globals))
+                TestharnessTest(self, global_variant_url(self.url, suffix) + variant, timeout=self.timeout, jsshell=jsshell)
+                for (suffix, jsshell) in sorted(global_suffixes(globals))
                 for variant in self.test_variants
             ]
             rv = TestharnessTest.item_type, tests
diff --git a/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py b/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
index 6e1059253dbd..c7093b8b6937 100644
--- a/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
+++ b/tests/wpt/web-platform-tests/tools/manifest/tests/test_sourcefile.py
@@ -376,6 +376,37 @@ def test_multi_global_with_custom_globals(input, expected):
 
     for item, url in zip(items, expected_urls):
         assert item.url == url
+        assert item.jsshell is False
+        assert item.timeout is None
+
+
+def test_multi_global_with_jsshell_globals():
+    contents = b"""// META: global=jsshell
+test()"""
+
+    s = create("html/test.any.js", contents=contents)
+    assert not s.name_is_non_test
+    assert not s.name_is_manual
+    assert not s.name_is_visual
+    assert s.name_is_multi_global
+    assert not s.name_is_worker
+    assert not s.name_is_reference
+
+    assert not s.content_is_testharness
+
+    item_type, items = s.manifest_items()
+    assert item_type == "testharness"
+
+    expected = [
+        ("/html/test.any.html", False),
+        ("/html/test.any.js", True),
+        ("/html/test.any.worker.html", False),
+    ]
+    assert len(items) == len(expected)
+
+    for item, (url, jsshell) in zip(items, expected):
+        assert item.url == url
+        assert item.jsshell == jsshell
         assert item.timeout is None
 
 
diff --git a/tests/wpt/web-platform-tests/tools/serve/serve.py b/tests/wpt/web-platform-tests/tools/serve/serve.py
index a7bb3cb4a42b..0fd5f907e964 100644
--- a/tests/wpt/web-platform-tests/tools/serve/serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/serve.py
@@ -7,6 +7,7 @@
 import json
 import logging
 import os
+import platform
 import socket
 import sys
 import threading
@@ -399,9 +400,13 @@ def is_alive(self):
         return self.proc.is_alive()
 
 
-def check_subdomains(domains, paths, bind_address, ssl_config, aliases):
-    domains = domains.copy()
-    host = domains.pop("")
+def check_subdomains(config):
+    paths = config.paths
+    bind_address = config.bind_address
+    ssl_config = config.ssl_config
+    aliases = config.aliases
+
+    host = config.server_host
     port = get_port(host)
     logger.debug("Going to use port %d to check subdomains" % port)
 
@@ -423,7 +428,10 @@ def check_subdomains(domains, paths, bind_address, ssl_config, aliases):
                         "You may need to edit /etc/hosts or similar, see README.md." % (host, port))
         sys.exit(1)
 
-    for domain in domains.itervalues():
+    for domain in config.domains_set:
+        if domain == host:
+            continue
+
         try:
             urllib2.urlopen("http://%s:%d/" % (domain, port))
         except Exception as e:
@@ -437,11 +445,19 @@ def check_subdomains(domains, paths, bind_address, ssl_config, aliases):
 def make_hosts_file(config, host):
     rv = []
 
-    for domain in config["domains"].values():
+    for domain in config.domains_set:
         rv.append("%s\t%s\n" % (host, domain))
 
-    for not_domain in config.get("not_domains", {}).values():
-        rv.append("0.0.0.0\t%s\n" % not_domain)
+    # Windows interpets the IP address 0.0.0.0 as non-existent, making it an
+    # appropriate alias for non-existent hosts. However, UNIX-like systems
+    # interpret the same address to mean any IP address, which is inappropraite
+    # for this context. These systems do not reserve any value for this
+    # purpose, so the inavailability of the domains must be taken for granted.
+    #
+    # https://github.com/w3c/web-platform-tests/issues/10560
+    if platform.uname()[0] == "Windows":
+        for not_domain in config.not_domains_set:
+            rv.append("0.0.0.0\t%s\n" % not_domain)
 
     return "".join(rv)
 
@@ -613,16 +629,10 @@ def iter_procs(servers):
             yield server.proc
 
 
-def load_config(default_path, override_path=None, **kwargs):
-    if os.path.exists(default_path):
-        with open(default_path) as f:
-            base_obj = json.load(f)
-    else:
-        raise ValueError("Config path %s does not exist" % default_path)
-
-    rv = Config(**base_obj)
+def load_config(override_path=None, **kwargs):
+    rv = Config()
 
-    if os.path.exists(override_path):
+    if override_path and os.path.exists(override_path):
         with open(override_path) as f:
             override_obj = json.load(f)
         rv.update(override_obj)
@@ -655,12 +665,49 @@ def load_config(default_path, override_path=None, **kwargs):
                u"天気の良い日",
                u"élève"}
 
-_not_subdomains = {u"nonexistent-origin"}
+_not_subdomains = {u"nonexistent"}
+
 
 class Config(config.Config):
     """serve config
 
     this subclasses wptserve.config.Config to add serve config options"""
+
+    _default = {
+        "browser_host": "web-platform.test",
+        "alternate_hosts": {
+            "alt": "not-web-platform.test"
+        },
+        "doc_root": repo_root,
+        "ws_doc_root": os.path.join(repo_root, "websockets", "handlers"),
+        "server_host": None,
+        "ports": {
+            "http": [8000, "auto"],
+            "https": [8443],
+            "ws": ["auto"],
+            "wss": ["auto"]
+        },
+        "check_subdomains": True,
+        "log_level": "debug",
+        "bind_address": True,
+        "ssl": {
+            "type": "pregenerated",
+            "encrypt_after_connect": False,
+            "openssl": {
+                "openssl_binary": "openssl",
+                "base_path": "_certs",
+                "force_regenerate": False,
+                "base_conf_path": None
+            },
+            "pregenerated": {
+                "host_key_path": os.path.join(repo_root, "tools", "certs", "web-platform.test.key"),
+                "host_cert_path": os.path.join(repo_root, "tools", "certs", "web-platform.test.pem")
+            },
+            "none": {}
+        },
+        "aliases": []
+    }
+
     def __init__(self, *args, **kwargs):
         super(Config, self).__init__(
             subdomains=_subdomains,
@@ -669,6 +716,23 @@ def __init__(self, *args, **kwargs):
             **kwargs
         )
 
+    @property
+    def ws_doc_root(self):
+        if self._ws_doc_root is not None:
+            return self._ws_doc_root
+        else:
+            return os.path.join(self.doc_root, "websockets", "handlers")
+
+    @ws_doc_root.setter
+    def ws_doc_root(self, v):
+        self._ws_doc_root = v
+
+    @property
+    def paths(self):
+        rv = super(Config, self).paths
+        rv["ws_doc_root"] = self.ws_doc_root
+        return rv
+
 
 def get_parser():
     parser = argparse.ArgumentParser()
@@ -684,8 +748,7 @@ def get_parser():
 
 
 def run(**kwargs):
-    config = load_config(os.path.join(repo_root, "config.default.json"),
-                         os.path.join(repo_root, "config.json"),
+    config = load_config(os.path.join(repo_root, "config.json"),
                          **kwargs)
 
     global logger
@@ -695,9 +758,7 @@ def run(**kwargs):
     bind_address = config["bind_address"]
 
     if config["check_subdomains"]:
-        paths = config.paths
-        ssl_config = config.ssl_config
-        check_subdomains(config.domains, paths, bind_address, ssl_config, config["aliases"])
+        check_subdomains(config)
 
     stash_address = None
     if bind_address:
diff --git a/tests/wpt/web-platform-tests/tools/serve/test_serve.py b/tests/wpt/web-platform-tests/tools/serve/test_serve.py
index 333760153e98..b517e64ad1c0 100644
--- a/tests/wpt/web-platform-tests/tools/serve/test_serve.py
+++ b/tests/wpt/web-platform-tests/tools/serve/test_serve.py
@@ -1,12 +1,79 @@
+import pickle
+import platform
+import os
+
+import pytest
+
+import localpaths
 from . import serve
+from .serve import Config
 
-def test_make_hosts_file():
-    hosts = serve.make_hosts_file({
-        "domains": {"www": "www.foo.bar.test", "www1": "www1.foo.bar.test"},
-        "not_domains": {"aaa": "aaa.foo.bar.test", "bbb": "bbb.foo.bar.test"}
-    }, "127.1.1.1")
+
+@pytest.mark.skipif(platform.uname()[0] == "Windows",
+                    reason="Expected contents are platform-dependent")
+def test_make_hosts_file_nix():
+    c = Config(browser_host="foo.bar", alternate_hosts={"alt": "foo2.bar"})
+    hosts = serve.make_hosts_file(c, "192.168.42.42")
     lines = hosts.split("\n")
-    assert "127.1.1.1\twww.foo.bar.test" in lines
-    assert "127.1.1.1\twww1.foo.bar.test" in lines
-    assert "0.0.0.0\taaa.foo.bar.test" in lines
-    assert "0.0.0.0\tbbb.foo.bar.test" in lines
+    assert set(lines) == {"",
+                          "192.168.42.42\tfoo.bar",
+                          "192.168.42.42\tfoo2.bar",
+                          "192.168.42.42\twww.foo.bar",
+                          "192.168.42.42\twww.foo2.bar",
+                          "192.168.42.42\twww1.foo.bar",
+                          "192.168.42.42\twww1.foo2.bar",
+                          "192.168.42.42\twww2.foo.bar",
+                          "192.168.42.42\twww2.foo2.bar",
+                          "192.168.42.42\txn--lve-6lad.foo.bar",
+                          "192.168.42.42\txn--lve-6lad.foo2.bar",
+                          "192.168.42.42\txn--n8j6ds53lwwkrqhv28a.foo.bar",
+                          "192.168.42.42\txn--n8j6ds53lwwkrqhv28a.foo2.bar"}
+    assert lines[-1] == ""
+
+@pytest.mark.skipif(platform.uname()[0] != "Windows",
+                    reason="Expected contents are platform-dependent")
+def test_make_hosts_file_windows():
+    c = Config(browser_host="foo.bar", alternate_hosts={"alt": "foo2.bar"})
+    hosts = serve.make_hosts_file(c, "192.168.42.42")
+    lines = hosts.split("\n")
+    assert set(lines) == {"",
+                          "0.0.0.0\tnonexistent.foo.bar",
+                          "0.0.0.0\tnonexistent.foo2.bar",
+                          "192.168.42.42\tfoo.bar",
+                          "192.168.42.42\tfoo2.bar",
+                          "192.168.42.42\twww.foo.bar",
+                          "192.168.42.42\twww.foo2.bar",
+                          "192.168.42.42\twww1.foo.bar",
+                          "192.168.42.42\twww1.foo2.bar",
+                          "192.168.42.42\twww2.foo.bar",
+                          "192.168.42.42\twww2.foo2.bar",
+                          "192.168.42.42\txn--lve-6lad.foo.bar",
+                          "192.168.42.42\txn--lve-6lad.foo2.bar",
+                          "192.168.42.42\txn--n8j6ds53lwwkrqhv28a.foo.bar",
+                          "192.168.42.42\txn--n8j6ds53lwwkrqhv28a.foo2.bar"}
+    assert lines[-1] == ""
+
+
+def test_ws_doc_root_default():
+    c = Config()
+    assert c.ws_doc_root == os.path.join(localpaths.repo_root, "websockets", "handlers")
+
+
+def test_init_ws_doc_root():
+    c = Config(ws_doc_root="/")
+    assert c.doc_root == localpaths.repo_root  # check this hasn't changed
+    assert c._ws_doc_root == "/"
+    assert c.ws_doc_root == "/"
+
+
+def test_set_ws_doc_root():
+    c = Config()
+    c.ws_doc_root = "/"
+    assert c.doc_root == localpaths.repo_root  # check this hasn't changed
+    assert c._ws_doc_root == "/"
+    assert c.ws_doc_root == "/"
+
+
+def test_pickle():
+    # Ensure that the config object can be pickled
+    pickle.dumps(Config())
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 58e64f5848db..a8abda0b2fcf 100644
--- a/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
+++ b/tests/wpt/web-platform-tests/tools/webdriver/webdriver/client.py
@@ -536,7 +536,12 @@ def switch_frame(self, frame):
 
     @command
     def close(self):
-        return self.send_session_command("DELETE", "window")
+        handles = self.send_session_command("DELETE", "window")
+        if len(handles) == 0:
+            # With no more open top-level browsing contexts, the session is closed.
+            self.session_id = None
+
+        return handles
 
     @property
     @command
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index 0c37e13ab48d..1932cf4f4ba7 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -6,6 +6,7 @@
 import stat
 import subprocess
 import sys
+import tempfile
 from abc import ABCMeta, abstractmethod
 from ConfigParser import RawConfigParser
 from datetime import datetime, timedelta
@@ -48,7 +49,7 @@ def find_webdriver(self):
         return NotImplemented
 
     @abstractmethod
-    def version(self, root):
+    def version(self, binary=None):
         """Retrieve the release version of the installed browser."""
         return NotImplemented
 
@@ -150,7 +151,7 @@ def find_binary_path(self, path=None):
 
     def find_binary(self, venv_path=None):
         if venv_path is None:
-            venv_path = os.path.join(os.getcwd(), venv_path)
+            venv_path = os.path.join(os.getcwd(), "_venv")
 
         binary = self.find_binary_path(os.path.join(venv_path, "browsers"))
 
@@ -179,19 +180,16 @@ def find_certutil(self):
     def find_webdriver(self):
         return find_executable("geckodriver")
 
-    def get_version_number(self, binary):
-        version_re = re.compile("Mozilla Firefox (\d+\.\d+(?:\.\d+)?)(a|b)?")
-        proc = subprocess.Popen([binary, "--version"], stdout=subprocess.PIPE)
-        stdout, _ = proc.communicate()
-        stdout.strip()
-        m = version_re.match(stdout)
+    def get_version_and_channel(self, binary):
+        version_string = call(binary, "--version").strip()
+        m = re.match(r"Mozilla Firefox (\d+\.\d+(?:\.\d+)?)(a|b)?", version_string)
         if not m:
             return None, "nightly"
         version, status = m.groups()
         channel = {"a": "nightly", "b": "beta"}
         return version, channel.get(status, "stable")
 
-    def get_prefs_url(self, version, channel):
+    def get_profile_bundle_url(self, version, channel):
         if channel == "stable":
             repo = "https://hg.mozilla.org/releases/mozilla-release"
             tag = "FIREFOX_%s_RELEASE" % version.replace(".", "_")
@@ -205,44 +203,44 @@ def get_prefs_url(self, version, channel):
                 # can get if we have an application.ini file
                 tag = "tip"
 
-        return "%s/raw-file/%s/testing/profiles/prefs_general.js" % (repo, tag)
+        return "%s/archive/%s.zip/testing/profiles/" % (repo, tag)
 
     def install_prefs(self, binary, dest=None):
-        version, channel = self.get_version_number(binary)
-
+        version, channel = self.get_version_and_channel(binary)
         if dest is None:
             dest = os.pwd
 
-        dest = os.path.join(dest, "profiles")
-        if not os.path.exists(dest):
-            os.makedirs(dest)
-        prefs_file = os.path.join(dest, "prefs_general.js")
-        cache_file = os.path.join(dest,
-                                  "%s-%s.cache" % (version, channel)
-                                  if channel != "nightly"
-                                  else "nightly.cache")
-
+        dest = os.path.join(dest, "profiles", channel, version)
         have_cache = False
-        if os.path.exists(cache_file):
+        if os.path.exists(dest):
             if channel != "nightly":
                 have_cache = True
             else:
                 now = datetime.now()
-                have_cache = (datetime.fromtimestamp(os.stat(cache_file).st_mtime) >
+                have_cache = (datetime.fromtimestamp(os.stat(dest).st_mtime) >
                               now - timedelta(days=1))
 
-        # If we don't have a recent download, grab the url
+        # If we don't have a recent download, grab and extract the latest one
         if not have_cache:
-            url = self.get_prefs_url(version, channel)
+            if os.path.exists(dest):
+                shutil.rmtree(dest)
+            os.makedirs(dest)
 
-            with open(cache_file, "wb") as f:
-                print("Installing test prefs from %s" % url)
-                resp = get(url)
-                f.write(resp.content)
-        else:
-            print("Using cached test prefs from %s" % cache_file)
+            url = self.get_profile_bundle_url(version, channel)
+
+            print("Installing test prefs from %s" % url)
+            try:
+                extract_dir = tempfile.mkdtemp()
+                unzip(get(url).raw, dest=extract_dir)
 
-        shutil.copyfile(cache_file, prefs_file)
+                profiles = os.path.join(extract_dir, os.listdir(extract_dir)[0], 'testing', 'profiles')
+                for name in os.listdir(profiles):
+                    path = os.path.join(profiles, name)
+                    shutil.move(path, dest)
+            finally:
+                shutil.rmtree(extract_dir)
+        else:
+            print("Using cached test prefs from %s" % dest)
 
         return dest
 
@@ -278,15 +276,14 @@ def install_webdriver(self, dest=None):
             untar(get(url).raw, dest=dest)
         return find_executable(os.path.join(dest, "geckodriver"))
 
-    def version(self, root):
+    def version(self, binary=None):
         """Retrieve the release version of the installed browser."""
-        platform_info = RawConfigParser()
-
-        with open(os.path.join(root, self.platform_ini), "r") as fp:
-            platform_info.readfp(BytesIO(fp.read()))
-            return "BuildID %s; SourceStamp %s" % (
-                platform_info.get("Build", "BuildID"),
-                platform_info.get("Build", "SourceStamp"))
+        binary = binary or self.find_binary()
+        version_string = call(binary, "--version").strip()
+        m = re.match(r"Mozilla Firefox (.*)", version_string)
+        if not m:
+            return None
+        return m.group(1)
 
 
 class Chrome(Browser):
@@ -296,9 +293,18 @@ class Chrome(Browser):
     """
 
     product = "chrome"
-    binary = "/usr/bin/google-chrome"
     requirements = "requirements_chrome.txt"
 
+    @property
+    def binary(self):
+        if uname[0] == "Linux":
+            return "/usr/bin/google-chrome"
+        if uname[0] == "Darwin":
+            return "/Applications/Google Chrome.app/Contents/MacOS/Google Chrome"
+        # TODO Windows?
+        logger.warn("Unable to find the browser binary.")
+        return None
+
     def install(self, dest=None):
         raise NotImplementedError
 
@@ -340,9 +346,18 @@ def install_webdriver(self, dest=None):
         os.chmod(path, st.st_mode | stat.S_IEXEC)
         return path
 
-    def version(self, root):
-        output = call(self.binary, "--version")
-        return re.search(r"[0-9\.]+( [a-z]+)?$", output.strip()).group(0)
+    def version(self, binary=None):
+        binary = binary or self.binary
+        try:
+            version_string = call(binary, "--version").strip()
+        except subprocess.CalledProcessError:
+            logger.warn("Failed to call %s", binary)
+            return None
+        m = re.match(r"Google Chrome (.*)", version_string)
+        if not m:
+            logger.warn("Failed to extract version from: s%", version_string)
+            return None
+        return m.group(1)
 
 
 class ChromeAndroid(Browser):
@@ -367,8 +382,8 @@ def install_webdriver(self, dest=None):
         chrome = Chrome()
         return chrome.install_webdriver(dest)
 
-    def version(self, root):
-        raise NotImplementedError
+    def version(self, binary):
+        return None
 
 
 class Opera(Browser):
@@ -378,9 +393,16 @@ class Opera(Browser):
     """
 
     product = "opera"
-    binary = "/usr/bin/opera"
     requirements = "requirements_opera.txt"
 
+    @property
+    def binary(self):
+        if uname[0] == "Linux":
+            return "/usr/bin/opera"
+        # TODO Windows, Mac?
+        logger.warn("Unable to find the browser binary.")
+        return None
+
     def install(self, dest=None):
         raise NotImplementedError
 
@@ -426,9 +448,14 @@ def install_webdriver(self, dest=None):
         os.chmod(path, st.st_mode | stat.S_IEXEC)
         return path
 
-    def version(self, root):
+    def version(self, binary):
         """Retrieve the release version of the installed browser."""
-        output = call(self.binary, "--version")
+        binary = binary or self.binary
+        try:
+            output = call(binary, "--version")
+        except subprocess.CalledProcessError:
+            logger.warn("Failed to call %s", binary)
+            return None
         return re.search(r"[0-9\.]+( [a-z]+)?$", output.strip()).group(0)
 
 
@@ -450,8 +477,8 @@ def find_webdriver(self):
     def install_webdriver(self, dest=None):
         raise NotImplementedError
 
-    def version(self, root):
-        raise NotImplementedError
+    def version(self, binary):
+        return None
 
 
 class InternetExplorer(Browser):
@@ -472,8 +499,8 @@ def find_webdriver(self):
     def install_webdriver(self, dest=None):
         raise NotImplementedError
 
-    def version(self, root):
-        raise NotImplementedError
+    def version(self, binary):
+        return None
 
 
 class Safari(Browser):
@@ -497,8 +524,8 @@ def find_webdriver(self):
     def install_webdriver(self):
         raise NotImplementedError
 
-    def version(self, root):
-        raise NotImplementedError
+    def version(self, binary):
+        return None
 
 
 class Servo(Browser):
@@ -548,9 +575,9 @@ def find_webdriver(self):
     def install_webdriver(self, dest=None):
         raise NotImplementedError
 
-    def version(self, root):
+    def version(self, binary):
         """Retrieve the release version of the installed browser."""
-        output = call(self.binary, "--version")
+        output = call(binary, "--version")
         return re.search(r"[0-9\.]+( [a-z]+)?$", output.strip()).group(0)
 
 
@@ -572,9 +599,10 @@ def find_webdriver(self):
     def install_webdriver(self, dest=None):
         raise NotImplementedError
 
-    def version(self, root):
+    def version(self, binary):
         return None
 
+
 class WebKit(Browser):
     """WebKit-specific interface."""
 
@@ -593,5 +621,5 @@ def find_webdriver(self):
     def install_webdriver(self):
         raise NotImplementedError
 
-    def version(self, root):
+    def version(self, binary):
         return None
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index cb396782be01..2c8edbbe9a58 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -96,15 +96,19 @@ def args_general(kwargs):
 
 def check_environ(product):
     if product not in ("firefox", "servo"):
-        config = serve.load_config(os.path.join(wpt_root, "config.default.json"),
-                                   os.path.join(wpt_root, "config.json"))
-        expected_hosts = (set(config["domains"].itervalues()) ^
-                          set(config["not_domains"].itervalues()))
+        config = serve.load_config(os.path.join(wpt_root, "config.json"))
+        expected_hosts = set(config.domains_set)
+        is_windows = platform.uname()[0] == "Windows"
+
+        if is_windows:
+            expected_hosts.update(config.not_domains_set)
+
         missing_hosts = set(expected_hosts)
-        if platform.uname()[0] != "Windows":
-            hosts_path = "/etc/hosts"
-        else:
+        if is_windows:
             hosts_path = "C:\Windows\System32\drivers\etc\hosts"
+        else:
+            hosts_path = "/etc/hosts"
+
         with open(hosts_path, "r") as f:
             for line in f:
                 line = line.split("#", 1)[0].strip()
@@ -113,16 +117,16 @@ def check_environ(product):
                 for host in hosts:
                     missing_hosts.discard(host)
             if missing_hosts:
-                if platform.uname()[0] != "Windows":
+                if is_windows:
                     message = """Missing hosts file configuration. Run
 
-./wpt make-hosts-file | sudo tee -a %s""" % hosts_path
+python wpt make-hosts-file | Out-File %SystemRoot%\System32\drivers\etc\hosts -Encoding ascii -Append
+
+in PowerShell with Administrator privileges.""" % hosts_path
                 else:
                     message = """Missing hosts file configuration. Run
 
-python wpt make-hosts-file >> %s
-
-from a shell with Administrator privileges.""" % hosts_path
+./wpt make-hosts-file | sudo tee -a %s""" % hosts_path
                 raise WptrunError(message)
 
 
@@ -423,6 +427,7 @@ def setup_wptrunner(venv, prompt=True, install=False, **kwargs):
 
     venv.install_requirements(os.path.join(wptrunner_path, "requirements.txt"))
 
+    kwargs['browser_version'] = setup_cls.browser.version(kwargs.get("binary"))
     return kwargs
 
 
@@ -457,8 +462,7 @@ def log(x):
 
 def run_single(venv, **kwargs):
     from wptrunner import wptrunner
-    wptrunner.start(**kwargs)
-    return
+    return wptrunner.start(**kwargs)
 
 
 def main():
diff --git a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
index e6e673d73fdb..d7779fe8f8d5 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/testfiles.py
@@ -6,6 +6,8 @@
 import subprocess
 import sys
 
+from collections import OrderedDict
+
 from ..manifest import manifest, update
 
 here = os.path.dirname(__file__)
@@ -42,25 +44,45 @@ def branch_point():
         # This is a PR, so the base branch is in TRAVIS_BRANCH
         travis_branch = os.environ.get("TRAVIS_BRANCH")
         assert travis_branch, "TRAVIS_BRANCH environment variable is defined"
-        branch_point = git("rev-parse", travis_branch)
+        branch_point = git("merge-base", "HEAD", travis_branch)
     else:
         # Otherwise we aren't on a PR, so we try to find commits that are only in the
         # current branch c.f.
         # http://stackoverflow.com/questions/13460152/find-first-ancestor-commit-in-another-branch
+
+        # parse HEAD into an object ref
         head = git("rev-parse", "HEAD")
-        not_heads = [item for item in git("rev-parse", "--not", "--all").split("\n")
-                     if item.strip() and head not in item]
-        commits = git("rev-list", "HEAD", *not_heads).split("\n")
+
+        # get everything in refs/heads and refs/remotes that doesn't include HEAD
+        not_heads = [item for item in git("rev-parse", "--not", "--branches", "--remotes").split("\n")
+                     if item != "^%s" % head]
+
+        # get all commits on HEAD but not reachable from anything in not_heads
+        commits = git("rev-list", "--topo-order", "--parents", "HEAD", *not_heads)
+        commit_parents = OrderedDict()
+        if commits:
+            for line in commits.split("\n"):
+                line_commits = line.split(" ")
+                commit_parents[line_commits[0]] = line_commits[1:]
+
         branch_point = None
-        if len(commits):
-            first_commit = commits[-1]
-            if first_commit:
-                branch_point = git("rev-parse", first_commit + "^")
+
+        # if there are any commits, take the first parent that is not in commits
+        for commit, parents in commit_parents.iteritems():
+            for parent in parents:
+                if parent not in commit_parents:
+                    branch_point = parent
+                    break
+
+            if branch_point:
+                break
+
+        # if we had any commits, we should now have a branch point
+        assert branch_point or not commit_parents
 
         # The above heuristic will fail in the following cases:
         #
-        # - The current branch has fallen behind the version retrieved via the above
-        #   `fetch` invocation
+        # - The current branch has fallen behind the remote version
         # - Changes on the current branch were rebased and therefore do not exist on any
         #   other branch. This will result in the selection of a commit that is earlier
         #   in the history than desired (as determined by calculating the later of the
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
index 93c6938c26dd..ada7cc7c164d 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
@@ -13,6 +13,9 @@
 from tools.wpt import wpt
 
 
+here = os.path.abspath(os.path.dirname(__file__))
+
+
 def is_port_8000_in_use():
     s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
     try:
@@ -63,6 +66,68 @@ def test_help():
     assert excinfo.value.code == 0
 
 
+@pytest.mark.slow
+def test_list_tests(manifest_dir):
+    """The `--list-tests` option should not produce an error under normal
+    conditions."""
+
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["run", "--metadata", manifest_dir, "--list-tests",
+                       "--yes", "chrome", "/dom/nodes/Element-tagName.html"])
+    assert excinfo.value.code == 0
+
+
+@pytest.mark.slow
+def test_list_tests_missing_manifest(manifest_dir):
+    """The `--list-tests` option should not produce an error in the absence of
+    a test manifest file."""
+
+    os.remove(os.path.join(manifest_dir, "MANIFEST.json"))
+
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["run",
+                       # This test triggers the creation of a new manifest
+                       # file which is not necessary to ensure successful
+                       # process completion. Specifying the current directory
+                       # as the tests source via the --tests` option
+                       # drastically reduces the time to execute the test.
+                       "--tests", here,
+                       "--metadata", manifest_dir,
+                       "--list-tests",
+                       "--yes",
+                       "firefox", "/dom/nodes/Element-tagName.html"])
+
+    assert excinfo.value.code == 0
+
+
+@pytest.mark.slow
+def test_list_tests_invalid_manifest(manifest_dir):
+    """The `--list-tests` option should not produce an error in the presence of
+    a malformed test manifest file."""
+
+    manifest_filename = os.path.join(manifest_dir, "MANIFEST.json")
+
+    assert os.path.isfile(manifest_filename)
+
+    with open(manifest_filename, "a+") as handle:
+        handle.write("extra text which invalidates the file")
+
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["run",
+                       # This test triggers the creation of a new manifest
+                       # file which is not necessary to ensure successful
+                       # process completion. Specifying the current directory
+                       # as the tests source via the --tests` option
+                       # drastically reduces the time to execute the test.
+                       "--tests", here,
+                       "--metadata", manifest_dir,
+                       "--list-tests",
+                       "--yes",
+                       "firefox", "/dom/nodes/Element-tagName.html"])
+
+    assert excinfo.value.code == 0
+
+
 @pytest.mark.slow
 @pytest.mark.remote_network
 @pytest.mark.xfail(sys.platform == "win32",
@@ -106,6 +171,52 @@ def test_run_chrome(manifest_dir):
     assert excinfo.value.code == 0
 
 
+@pytest.mark.slow
+@pytest.mark.remote_network
+@pytest.mark.xfail(sys.platform == "win32",
+                   reason="Tests currently don't work on Windows for path reasons")
+def test_run_zero_tests():
+    """A test execution describing zero tests should be reported as an error
+    even in the presence of the `--no-fail-on-unexpected` option."""
+    if is_port_8000_in_use():
+        pytest.skip("port 8000 already in use")
+
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["run", "--yes", "--no-pause", "--binary-arg", "headless",
+                       "chrome", "/non-existent-dir/non-existent-file.html"])
+    assert excinfo.value.code != 0
+
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["run", "--yes", "--no-pause", "--binary-arg", "headless",
+                       "--no-fail-on-unexpected",
+                       "chrome", "/non-existent-dir/non-existent-file.html"])
+    assert excinfo.value.code != 0
+
+@pytest.mark.slow
+@pytest.mark.remote_network
+@pytest.mark.xfail(sys.platform == "win32",
+                   reason="Tests currently don't work on Windows for path reasons")
+def test_run_failing_test():
+    """Failing tests should be reported with a non-zero exit status unless the
+    `--no-fail-on-unexpected` option has been specified."""
+    if is_port_8000_in_use():
+        pytest.skip("port 8000 already in use")
+    failing_test = "/infrastructure/expected-fail/failing-test.html"
+
+    assert os.path.isfile("../../%s" % failing_test)
+
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["run", "--yes", "--no-pause", "--binary-arg", "headless",
+                       "chrome", failing_test])
+    assert excinfo.value.code != 0
+
+    with pytest.raises(SystemExit) as excinfo:
+        wpt.main(argv=["run", "--yes", "--no-pause", "--binary-arg", "headless",
+                       "--no-fail-on-unexpected",
+                       "chrome", failing_test])
+    assert excinfo.value.code == 0
+
+
 @pytest.mark.slow
 @pytest.mark.remote_network
 @pytest.mark.xfail(sys.platform == "win32",
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt
index b5e48068722e..f10d7186f561 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.11.0
+selenium==3.12.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt
index b5e48068722e..f10d7186f561 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_chrome_android.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.11.0
+selenium==3.12.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt
index b5e48068722e..f10d7186f561 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_edge.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.11.0
+selenium==3.12.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt
index b5e48068722e..f10d7186f561 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_ie.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.11.0
+selenium==3.12.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt
index b5e48068722e..f10d7186f561 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_opera.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.11.0
+selenium==3.12.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt
index b5e48068722e..f10d7186f561 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_safari.txt
@@ -1,2 +1,2 @@
 mozprocess == 0.26
-selenium==3.11.0
+selenium==3.12.0
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
index e0ae7e262c5f..5ea06d34a3f8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/requirements_sauce.txt
@@ -1,3 +1,3 @@
 mozprocess == 0.26
-selenium==3.11.0
+selenium==3.12.0
 requests==2.18.4
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py
index 184ae32ac9a5..b0ec6c149fcd 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/edge.py
@@ -16,13 +16,22 @@
                  "env_extras": "env_extras",
                  "env_options": "env_options"}
 
+def get_timeout_multiplier(test_type, run_info_data, **kwargs):
+    if kwargs["timeout_multiplier"] is not None:
+        return kwargs["timeout_multiplier"]
+    if test_type == "wdspec":
+        return 10
+    return 1
 
 def check_args(**kwargs):
     require_arg(kwargs, "webdriver_binary")
 
 def browser_kwargs(test_type, run_info_data, **kwargs):
     return {"webdriver_binary": kwargs["webdriver_binary"],
-            "webdriver_args": kwargs.get("webdriver_args")}
+            "webdriver_args": kwargs.get("webdriver_args"),
+            "timeout_multiplier": get_timeout_multiplier(test_type,
+                                                         run_info_data,
+                                                         **kwargs)}
 
 def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
                     **kwargs):
@@ -31,6 +40,9 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
     executor_kwargs = base_executor_kwargs(test_type, server_config,
                                            cache_manager, **kwargs)
     executor_kwargs["close_after_done"] = True
+    executor_kwargs["timeout_multiplier"] = get_timeout_multiplier(test_type,
+                                                                   run_info_data,
+                                                                   **kwargs)
     executor_kwargs["capabilities"] = dict(DesiredCapabilities.EDGE.items())
     return executor_kwargs
 
@@ -42,14 +54,18 @@ def env_options():
 
 class EdgeBrowser(Browser):
     used_ports = set()
+    init_timeout = 60
 
-    def __init__(self, logger, webdriver_binary, webdriver_args=None):
+    def __init__(self, logger, webdriver_binary, timeout_multiplier=None, webdriver_args=None):
         Browser.__init__(self, logger)
         self.server = EdgeDriverServer(self.logger,
                                        binary=webdriver_binary,
                                        args=webdriver_args)
         self.webdriver_host = "localhost"
         self.webdriver_port = self.server.port
+        if timeout_multiplier:
+            self.init_timeout = self.init_timeout * timeout_multiplier
+
 
     def start(self, **kwargs):
         print self.server.url
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
index 0a0ca7e9b55e..68017abf0482 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/firefox.py
@@ -1,3 +1,4 @@
+import json
 import os
 import platform
 import signal
@@ -102,7 +103,7 @@ def executor_kwargs(test_type, server_config, cache_manager, run_info_data,
         if kwargs["binary_args"]:
             options["args"] = kwargs["binary_args"]
         options["prefs"] = {
-            "network.dns.localDomains": ",".join(server_config.domains.itervalues())
+            "network.dns.localDomains": ",".join(server_config.domains_set)
         }
         capabilities["moz:firefoxOptions"] = options
     if kwargs["certutil_binary"] is None:
@@ -198,7 +199,7 @@ def start(self, **kwargs):
         self.profile = FirefoxProfile(preferences=preferences)
         self.profile.set_preferences({"marionette.port": self.marionette_port,
                                       "dom.disable_open_during_load": False,
-                                      "network.dns.localDomains": ",".join(self.config.domains.itervalues()),
+                                      "network.dns.localDomains": ",".join(self.config.domains_set),
                                       "network.proxy.type": 0,
                                       "places.history.enabled": False,
                                       "dom.send_after_paint_to_content": True,
@@ -245,11 +246,23 @@ def start(self, **kwargs):
     def load_prefs(self):
         prefs = Preferences()
 
-        prefs_path = os.path.join(self.prefs_root, "prefs_general.js")
-        if os.path.exists(prefs_path):
-            prefs.add(Preferences.read_prefs(prefs_path))
-        else:
-            self.logger.warning("Failed to find base prefs file in %s" % prefs_path)
+        pref_paths = []
+        prefs_general = os.path.join(self.prefs_root, 'prefs_general.js')
+        if os.path.isfile(prefs_general):
+            # Old preference file used in Firefox 60 and earlier (remove when no longer supported)
+            pref_paths.append(prefs_general)
+
+        profiles = os.path.join(self.prefs_root, 'profiles.json')
+        if os.path.isfile(profiles):
+            with open(profiles, 'r') as fh:
+                for name in json.load(fh)['web-platform-tests']:
+                    pref_paths.append(os.path.join(self.prefs_root, name, 'user.js'))
+
+        for path in pref_paths:
+            if os.path.exists(path):
+                prefs.add(Preferences.read_prefs(path))
+            else:
+                self.logger.warning("Failed to find base prefs file in %s" % path)
 
         # Add any custom preferences
         prefs.add(self.extra_prefs, cast=True)
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py
index 9ae2f7ecf54d..709af41bd84d 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/sauce.py
@@ -166,7 +166,7 @@ def __enter__(self):
             "--metrics-address=0.0.0.0:9876",
             "--readyfile=./sauce_is_ready",
             "--tunnel-domains",
-            ",".join(self.env_config['domains'].values())
+            ",".join(self.env_config.domains_set)
         ])
 
         # Timeout config vars
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
index 9ce3cda8bebc..309174c42e65 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/environment.py
@@ -10,12 +10,12 @@
 
 from wptlogging import LogLevelRewriter
 from wptserve.handlers import StringHandler
+from wptserve import sslutils
 
 here = os.path.split(__file__)[0]
 repo_root = os.path.abspath(os.path.join(here, os.pardir, os.pardir, os.pardir))
 
 serve = None
-sslutils = None
 
 
 def do_delayed_imports(logger, test_paths):
@@ -31,11 +31,6 @@ def do_delayed_imports(logger, test_paths):
     except ImportError:
         failed.append("serve")
 
-    try:
-        import sslutils
-    except ImportError:
-        failed.append("sslutils")
-
     if failed:
         logger.critical(
             "Failed to import %s. Ensure that tests path %s contains web-platform-tests" %
@@ -134,13 +129,9 @@ def process_interrupts(self):
         signal.signal(signal.SIGINT, signal.SIG_DFL)
 
     def load_config(self):
-        default_config_path = os.path.join(serve_path(self.test_paths), "config.default.json")
         override_path = os.path.join(serve_path(self.test_paths), "config.json")
 
-        with open(default_config_path) as f:
-            default_config = json.load(f)
-
-        config = serve.Config(override_ssl_env=self.ssl_env, **default_config)
+        config = serve.Config(override_ssl_env=self.ssl_env)
 
         config.ports = {
             "http": [8000, 8001],
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
index 3f6d1a249b70..08030b3f5f92 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/base.py
@@ -104,6 +104,7 @@ class TestExecutor(object):
     test_type = None
     convert_result = None
     supports_testdriver = False
+    supports_jsshell = False
 
     def __init__(self, browser, server_config, timeout_multiplier=1,
                  debug_info=None, **kwargs):
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
index 2c4bc59089f7..bff509c53c60 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/executormarionette.py
@@ -60,7 +60,7 @@ def setup(self):
 
     def execute_script(self, script, async=False):
         method = self.marionette.execute_async_script if async else self.marionette.execute_script
-        return method(script, new_sandbox=False)
+        return method(script, new_sandbox=False, sandbox=None)
 
     def set_timeout(self, timeout):
         """Set the Marionette script timeout.
@@ -119,7 +119,7 @@ def setup(self):
 
     def load_runner(self, url_protocol):
         # Check if we previously had a test window open, and if we did make sure it's closed
-        self.marionette.execute_script("if (window.win) {window.win.close()}")
+        self.parent.base.execute_script("if (window.win) {window.win.close()}")
         url = urlparse.urljoin(self.parent.executor.server_url(url_protocol),
                                "/testharness_runner.html")
         self.logger.debug("Loading %s" % url)
@@ -133,7 +133,7 @@ def load_runner(self, url_protocol):
                 "that your firewall rules or network setup does not "
                 "prevent access.\e%s" % (url, traceback.format_exc(e)))
             raise
-        self.marionette.execute_script(
+        self.parent.base.execute_script(
             "document.title = '%s'" % threading.current_thread().name.replace("'", '"'))
 
     def close_old_windows(self, url_protocol):
@@ -183,7 +183,7 @@ def get_test_window(self, window_id, parent):
         if window_id:
             try:
                 # Try this, it's in Level 1 but nothing supports it yet
-                win_s = self.marionette.execute_script("return window['%s'];" % self.window_id)
+                win_s = self.parent.base.execute_script("return window['%s'];" % self.window_id)
                 win_obj = json.loads(win_s)
                 test_window = win_obj["window-fcc6-11e5-b4f8-330a88ab9d7f"]
             except Exception:
@@ -326,7 +326,7 @@ def send_message(self, message_type, status, message=None):
         }
         if message:
             obj["message"] = str(message)
-        self.marionette.execute_script("window.postMessage(%s, '*')" % json.dumps(obj))
+        self.parent.base.execute_script("window.postMessage(%s, '*')" % json.dumps(obj))
 
 
 class MarionetteProtocol(Protocol):
@@ -494,8 +494,8 @@ def __init__(self, browser, server_config, timeout_multiplier=1,
                                      debug_info=debug_info)
 
         self.protocol = MarionetteProtocol(self, browser, capabilities, timeout_multiplier)
-        self.script = open(os.path.join(here, "testharness_marionette.js")).read()
-        self.script_resume = open(os.path.join(here, "testharness_marionette_resume.js")).read()
+        self.script = open(os.path.join(here, "testharness_webdriver.js")).read()
+        self.script_resume = open(os.path.join(here, "testharness_webdriver_resume.js")).read()
         self.close_after_done = close_after_done
         self.window_id = str(uuid.uuid4())
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest-wait_marionette.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest-wait_marionette.js
index c226027281e2..61f894f8760b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest-wait_marionette.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/reftest-wait_marionette.js
@@ -1,7 +1,9 @@
+var callback = arguments[arguments.length - 1];
+
 function test(x) {
   if (!root.classList.contains("reftest-wait")) {
     observer.disconnect();
-    marionetteScriptFinished();
+    callback();
   }
 }
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette.js
deleted file mode 100644
index 049caa4688c5..000000000000
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette.js
+++ /dev/null
@@ -1,24 +0,0 @@
-window.timeout_multiplier = %(timeout_multiplier)d;
-window.explicit_timeout = %(explicit_timeout)d;
-
-window.message_queue = [];
-
-window.setMessageListener = function(func) {
-  window.current_listener = func;
-  window.addEventListener(
-    "message",
-    func,
-    false
-  );
-};
-
-window.setMessageListener(function(event) {
-  window.message_queue.push(event);
-});
-
-window.win = window.open("%(abs_url)s", "%(window_id)s");
-
-window.timer = setTimeout(function() {
-  window.win.timeout();
-  window.win.close();
-}, %(timeout)s);
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette_resume.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette_resume.js
deleted file mode 100644
index 7a2df98ed4e7..000000000000
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_marionette_resume.js
+++ /dev/null
@@ -1,46 +0,0 @@
-var callback = arguments[arguments.length - 1];
-
-function process_event(event) {
-  var data = event.data;
-
-  var payload = undefined;
-
-  switch(data.type) {
-  case "complete":
-    var tests = event.data.tests;
-    var status = event.data.status;
-
-    var subtest_results = tests.map(function(x) {
-      return [x.name, x.status, x.message, x.stack];
-    });
-    payload = [status.status,
-               status.message,
-               status.stack,
-               subtest_results];
-    clearTimeout(window.timer);
-    break;
-
-  case "action":
-    window.setMessageListener(function(event) {
-      window.message_queue.push(event);
-    });
-    payload = data;
-    break;
-  default:
-    return;
-  }
-
-  callback(["%(url)s", data.type, payload]);
-}
-
-window.removeEventListener("message", window.current_listener);
-if (window.message_queue.length) {
-  var next = window.message_queue.shift();
-  process_event(next);
-} else {
-  window.addEventListener(
-    "message", function f(event) {
-      window.removeEventListener("message", f);
-      process_event(event);
-    }, false);
-}
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py
index 79fca428ceb6..a370f5f5a3b6 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/font.py
@@ -2,9 +2,10 @@
 import logging
 import os
 import platform
+import plistlib
 
 from shutil import copy2, rmtree
-from subprocess import call
+from subprocess import call, check_output
 
 HERE = os.path.split(__file__)[0]
 SYSTEM = platform.system().lower()
@@ -71,9 +72,19 @@ def install_darwin_font(self, font_name, font_path):
         if not os.path.exists(self.font_dir):
             os.makedirs(self.font_dir)
             self.created_dir = True
-        if not os.path.exists(os.path.join(self.font_dir, font_name)):
+        installed_font_path = os.path.join(self.font_dir, font_name)
+        if not os.path.exists(installed_font_path):
             copy2(font_path, self.font_dir)
-        return True
+
+        # Per https://github.com/web-platform-tests/results-collection/issues/218
+        # installing Ahem on macOS is flaky, so check if it actually installed
+        fonts = check_output(['/usr/sbin/system_profiler', '-xml', 'SPFontsDataType'])
+        fonts = plistlib.readPlistFromString(fonts)
+        assert len(fonts) == 1
+        for font in fonts[0]['_items']:
+            if font['path'] == installed_font_path:
+                return True
+        return False
 
     def install_windows_font(self, _, font_path):
         hwnd_broadcast = 0xFFFF
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters.py
index 0e888ce269dd..24d065384fab 100755
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/formatters.py
@@ -8,15 +8,20 @@ class WptreportFormatter(BaseFormatter):
 
     def __init__(self):
         self.raw_results = {}
+        self.results = {}
+
+    def suite_start(self, data):
+        self.results['run_info'] = data['run_info']
+        self.results['time_start'] = data['time']
 
     def suite_end(self, data):
-        results = {}
-        results["results"] = []
+        self.results['time_end'] = data['time']
+        self.results["results"] = []
         for test_name in self.raw_results:
             result = {"test": test_name}
             result.update(self.raw_results[test_name])
-            results["results"].append(result)
-        return json.dumps(results)
+            self.results["results"].append(result)
+        return json.dumps(self.results)
 
     def find_or_create_test(self, data):
         test_name = data["test"]
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/reduce.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/reduce.py
index d245ee3602b9..f5c60bf008a3 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/reduce.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/reduce.py
@@ -47,6 +47,7 @@ def __init__(self, target, **kwargs):
         self.test_type = kwargs["test_types"][0]
         run_info = wpttest.get_run_info(kwargs["metadata_root"],
                                         kwargs["product"],
+                                        browser_version=kwargs.get("browser_version"),
                                         debug=False)
         test_filter = wptrunner.TestFilter(include=kwargs["include"])
         self.test_loader = wptrunner.TestLoader(kwargs["tests_root"],
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
index 9ac2e9472b4a..6aaf5f1484b8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testloader.py
@@ -416,10 +416,12 @@ def update_manifest(self, manifest_path, tests_path, url_base="/",
                 with open(manifest_path) as f:
                     json_data = json.load(f)
             except IOError:
-                #If the existing file doesn't exist just create one from scratch
-                pass
+                self.logger.info("Unable to find test manifest")
+            except ValueError:
+                self.logger.info("Unable to parse test manifest")
 
         if not json_data:
+            self.logger.info("Creating test manifest")
             manifest_file = manifest.Manifest(url_base)
         else:
             try:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py
index aa1bc010d19e..db0de8f89d2a 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/browsers/test_sauce.py
@@ -110,6 +110,7 @@ def test_sauceconnect_tunnel_domains():
             sauce_connect_binary="ddd")
 
         env_config = Config(browser_host="example.net",
+                            alternate_hosts={"alt": "example.org"},
                             subdomains={"a", "b"},
                             not_subdomains={"x", "y"})
         sauce_connect(None, env_config)
@@ -125,4 +126,7 @@ def test_sauceconnect_tunnel_domains():
                 assert rest[1].startswith("-"), "--tunnel-domains takes a comma separated list (not a space separated list)"
             assert set(rest[0].split(",")) == {'example.net',
                                                'a.example.net',
-                                               'b.example.net'}
+                                               'b.example.net',
+                                               'example.org',
+                                               'a.example.org',
+                                               'b.example.org'}
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
index c7109c525fdf..8ece29b82941 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/tests/test_products.py
@@ -9,10 +9,8 @@
 from .base import all_products, active_products
 
 sys.path.insert(0, join(dirname(__file__), "..", "..", "..", ".."))  # repo root
-
 from tools import localpaths
-
-import sslutils
+from wptserve import sslutils
 
 from wptrunner import environment
 from wptrunner import products
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/tree.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/tree.py
index 279ddba1f6f3..2e35236b228f 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/tree.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/tree.py
@@ -131,11 +131,11 @@ def contains_commit(self, commit):
 class GitTree(object):
     name = "git"
 
-    def __init__(self, root=None):
+    def __init__(self, root=None, log_error=True):
         if root is None:
-            root = git("rev-parse", "--show-toplevel").strip()
+            root = git("rev-parse", "--show-toplevel", log_error=log_error).strip()
         self.root = root
-        self.git = vcs.bind_to_repo(git, self.root)
+        self.git = vcs.bind_to_repo(git, self.root, log_error=log_error)
         self.message = None
         self.commit_cls = Commit
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py
index a51312d3937a..ab72cf8c894b 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/vcs.py
@@ -27,6 +27,10 @@ def inner(command, *args, **kwargs):
         logger.debug(" ".join(command_line))
         try:
             return subprocess.check_output(command_line, stderr=subprocess.STDOUT, **proc_kwargs)
+        except OSError as e:
+            if log_error:
+                logger.error(e)
+            raise
         except subprocess.CalledProcessError as e:
             if log_error:
                 logger.error(e.output)
@@ -37,13 +41,13 @@ def inner(command, *args, **kwargs):
 hg = vcs("hg")
 
 
-def bind_to_repo(vcs_func, repo):
-    return partial(vcs_func, repo=repo)
+def bind_to_repo(vcs_func, repo, log_error=True):
+    return partial(vcs_func, repo=repo, log_error=log_error)
 
 
-def is_git_root(path):
+def is_git_root(path, log_error=True):
     try:
-        rv = git("rev-parse", "--show-cdup", repo=path)
+        rv = git("rev-parse", "--show-cdup", repo=path, log_error=log_error)
     except subprocess.CalledProcessError:
         return False
     return rv == "\n"
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
index 8361ca1daa21..c4a01932de49 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -66,6 +66,10 @@ def create_parser(product_choices=None):
 
     parser.add_argument("--no-capture-stdio", action="store_true", default=False,
                         help="Don't capture stdio and write to logging")
+    parser.add_argument("--no-fail-on-unexpected", action="store_false",
+                        default=True,
+                        dest="fail_on_unexpected",
+                        help="Exit with status code 0 when test expectations are violated")
 
     mode_group = parser.add_argument_group("Mode")
     mode_group.add_argument("--list-test-groups", action="store_true",
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 40863d8d862d..bd2b3ad23bd0 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptrunner.py
@@ -43,7 +43,9 @@ def get_loader(test_paths, product, ssl_env, debug=None, run_info_extras=None, *
     if run_info_extras is None:
         run_info_extras = {}
 
-    run_info = wpttest.get_run_info(kwargs["run_info"], product, debug=debug,
+    run_info = wpttest.get_run_info(kwargs["run_info"], product,
+                                    browser_version=kwargs.get("browser_version"),
+                                    debug=debug,
                                     extras=run_info_extras)
 
     test_manifests = testloader.ManifestLoader(test_paths, force_manifest_update=kwargs["manifest_update"],
@@ -153,7 +155,9 @@ def run_tests(config, test_paths, product, **kwargs):
             ))
 
         if "test_loader" in kwargs:
-            run_info = wpttest.get_run_info(kwargs["run_info"], product, debug=None,
+            run_info = wpttest.get_run_info(kwargs["run_info"], product,
+                                            browser_version=kwargs.get("browser_version"),
+                                            debug=None,
                                             extras=run_info_extras(**kwargs))
             test_loader = kwargs["test_loader"]
         else:
@@ -245,6 +249,12 @@ def run_tests(config, test_paths, product, **kwargs):
                             if test.testdriver and not executor_cls.supports_testdriver:
                                 logger.test_start(test.id)
                                 logger.test_end(test.id, status="SKIP")
+                            elif test.jsshell and not executor_cls.supports_jsshell:
+                                # We expect that tests for JavaScript shells
+                                # will not be run along with tests that run in
+                                # a full web browser, so we silently skip them
+                                # here.
+                                pass
                             else:
                                 run_tests["testharness"].append(test)
                     else:
@@ -283,6 +293,10 @@ def run_tests(config, test_paths, product, **kwargs):
         logger.error("No tests ran")
         return False
 
+    if unexpected_total and not kwargs["fail_on_unexpected"]:
+        logger.info("Tolerating %s unexpected results" % unexpected_total)
+        return True
+
     return unexpected_total == 0
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
index 0fb1bdd3e8e3..9e4290d9bbdb 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wpttest.py
@@ -1,4 +1,5 @@
 import os
+import subprocess
 from collections import defaultdict
 
 from wptmanifest.parser import atoms
@@ -65,11 +66,20 @@ def get_run_info(metadata_root, product, **kwargs):
 
 
 class RunInfo(dict):
-    def __init__(self, metadata_root, product, debug, extras=None):
+    def __init__(self, metadata_root, product, debug, browser_version=None, extras=None):
         import mozinfo
-
         self._update_mozinfo(metadata_root)
         self.update(mozinfo.info)
+
+        from update.tree import GitTree
+        try:
+            # GitTree.__init__ throws if we are not in a git tree.
+            rev = GitTree(log_error=False).rev
+        except (OSError, subprocess.CalledProcessError):
+            rev = None
+        if rev:
+            self["revision"] = rev
+
         self["product"] = product
         if debug is not None:
             self["debug"] = debug
@@ -82,6 +92,8 @@ def __init__(self, metadata_root, product, debug, extras=None):
             self["stylo"] = True
         if "STYLO_FORCE_DISABLED" in os.environ:
             self["stylo"] = False
+        if browser_version:
+            self["browser_version"] = browser_version
         if extras is not None:
             self.update(extras)
 
@@ -244,17 +256,20 @@ class TestharnessTest(Test):
     test_type = "testharness"
 
     def __init__(self, tests_root, url, inherit_metadata, test_metadata,
-                 timeout=None, path=None, protocol="http", testdriver=False):
+                 timeout=None, path=None, protocol="http", testdriver=False,
+                 jsshell=False):
         Test.__init__(self, tests_root, url, inherit_metadata, test_metadata, timeout,
                       path, protocol)
 
         self.testdriver = testdriver
+        self.jsshell = jsshell
 
     @classmethod
     def from_manifest(cls, manifest_item, inherit_metadata, test_metadata):
         timeout = cls.long_timeout if manifest_item.timeout == "long" else cls.default_timeout
         protocol = "https" if hasattr(manifest_item, "https") and manifest_item.https else "http"
         testdriver = manifest_item.testdriver if hasattr(manifest_item, "testdriver") else False
+        jsshell = manifest_item.jsshell if hasattr(manifest_item, "jsshell") else False
         return cls(manifest_item.source_file.tests_root,
                    manifest_item.url,
                    inherit_metadata,
@@ -262,7 +277,8 @@ def from_manifest(cls, manifest_item, inherit_metadata, test_metadata):
                    timeout=timeout,
                    path=manifest_item.source_file.path,
                    protocol=protocol,
-                   testdriver=testdriver)
+                   testdriver=testdriver,
+                   jsshell=jsshell)
 
     @property
     def id(self):
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/setup.py b/tests/wpt/web-platform-tests/tools/wptserve/setup.py
index c71f60af8689..194c3372c94a 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/setup.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/setup.py
@@ -1,6 +1,6 @@
 from setuptools import setup
 
-PACKAGE_VERSION = '1.4.0'
+PACKAGE_VERSION = '2.0'
 deps = ["six>=1.8"]
 
 setup(name='wptserve',
@@ -16,7 +16,7 @@
       author_email='james@hoppipolla.co.uk',
       url='http://wptserve.readthedocs.org/',
       license='BSD',
-      packages=['wptserve'],
+      packages=['wptserve', 'wptserve.sslutils'],
       include_package_data=True,
       zip_safe=False,
       install_requires=deps
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_config.py b/tests/wpt/web-platform-tests/tools/wptserve/tests/test_config.py
index c9c270b27b55..2c5f3f9fc6a9 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/tests/test_config.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/tests/test_config.py
@@ -1,12 +1,9 @@
 import logging
-import os
 import pickle
 from logging import handlers
 
 import pytest
 
-import localpaths
-
 config = pytest.importorskip("wptserve.config")
 
 
@@ -207,11 +204,6 @@ def test_ports_openssl():
     assert ports["wss"] == [1004]
 
 
-def test_doc_root_default():
-    c = config.Config()
-    assert c.doc_root == localpaths.repo_root
-
-
 def test_init_doc_root():
     c = config.Config(doc_root="/")
     assert c._doc_root == "/"
@@ -225,31 +217,6 @@ def test_set_doc_root():
     assert c.doc_root == "/"
 
 
-def test_ws_doc_root_default():
-    c = config.Config()
-    assert c.ws_doc_root == os.path.join(localpaths.repo_root, "websockets", "handlers")
-
-
-def test_ws_doc_root_from_doc_root():
-    c = config.Config(doc_root="/foo")
-    assert c.ws_doc_root == os.path.join("/foo", "websockets", "handlers")
-
-
-def test_init_ws_doc_root():
-    c = config.Config(ws_doc_root="/")
-    assert c.doc_root == localpaths.repo_root  # check this hasn't changed
-    assert c._ws_doc_root == "/"
-    assert c.ws_doc_root == "/"
-
-
-def test_set_ws_doc_root():
-    c = config.Config()
-    c.ws_doc_root = "/"
-    assert c.doc_root == localpaths.repo_root  # check this hasn't changed
-    assert c._ws_doc_root == "/"
-    assert c.ws_doc_root == "/"
-
-
 def test_server_host_from_browser_host():
     c = config.Config(browser_host="foo.bar")
     assert c.server_host == "foo.bar"
@@ -257,7 +224,7 @@ def test_server_host_from_browser_host():
 
 def test_init_server_host():
     c = config.Config(server_host="foo.bar")
-    assert c.browser_host == "web-platform.test"  # check this hasn't changed
+    assert c.browser_host == "localhost"  # check this hasn't changed
     assert c._server_host == "foo.bar"
     assert c.server_host == "foo.bar"
 
@@ -265,55 +232,135 @@ def test_init_server_host():
 def test_set_server_host():
     c = config.Config()
     c.server_host = "/"
-    assert c.browser_host == "web-platform.test"  # check this hasn't changed
+    assert c.browser_host == "localhost"  # check this hasn't changed
     assert c._server_host == "/"
     assert c.server_host == "/"
 
 
 def test_domains():
     c = config.Config(browser_host="foo.bar",
+                      alternate_hosts={"alt": "foo2.bar"},
                       subdomains={"a", "b"},
                       not_subdomains={"x", "y"})
     domains = c.domains
     assert domains == {
-        "": "foo.bar",
-        "a": "a.foo.bar",
-        "b": "b.foo.bar",
+        "": {
+            "": "foo.bar",
+            "a": "a.foo.bar",
+            "b": "b.foo.bar",
+        },
+        "alt": {
+            "": "foo2.bar",
+            "a": "a.foo2.bar",
+            "b": "b.foo2.bar",
+        },
     }
 
 
 def test_not_domains():
     c = config.Config(browser_host="foo.bar",
+                      alternate_hosts={"alt": "foo2.bar"},
                       subdomains={"a", "b"},
                       not_subdomains={"x", "y"})
     not_domains = c.not_domains
     assert not_domains == {
-        "x": "x.foo.bar",
-        "y": "y.foo.bar",
+        "": {
+            "x": "x.foo.bar",
+            "y": "y.foo.bar",
+        },
+        "alt": {
+            "x": "x.foo2.bar",
+            "y": "y.foo2.bar",
+        },
     }
 
 
 def test_domains_not_domains_intersection():
     c = config.Config(browser_host="foo.bar",
+                      alternate_hosts={"alt": "foo2.bar"},
                       subdomains={"a", "b"},
                       not_subdomains={"x", "y"})
     domains = c.domains
     not_domains = c.not_domains
-    assert len(set(domains.iterkeys()) & set(not_domains.iterkeys())) == 0
-    assert len(set(domains.itervalues()) & set(not_domains.itervalues())) == 0
+    assert len(set(domains.iterkeys()) ^ set(not_domains.iterkeys())) == 0
+    for host in domains.iterkeys():
+        host_domains = domains[host]
+        host_not_domains = not_domains[host]
+        assert len(set(host_domains.iterkeys()) & set(host_not_domains.iterkeys())) == 0
+        assert len(set(host_domains.itervalues()) & set(host_not_domains.itervalues())) == 0
 
 
 def test_all_domains():
     c = config.Config(browser_host="foo.bar",
+                      alternate_hosts={"alt": "foo2.bar"},
                       subdomains={"a", "b"},
                       not_subdomains={"x", "y"})
     all_domains = c.all_domains
     assert all_domains == {
-        "": "foo.bar",
-        "a": "a.foo.bar",
-        "b": "b.foo.bar",
-        "x": "x.foo.bar",
-        "y": "y.foo.bar",
+        "": {
+            "": "foo.bar",
+            "a": "a.foo.bar",
+            "b": "b.foo.bar",
+            "x": "x.foo.bar",
+            "y": "y.foo.bar",
+        },
+        "alt": {
+            "": "foo2.bar",
+            "a": "a.foo2.bar",
+            "b": "b.foo2.bar",
+            "x": "x.foo2.bar",
+            "y": "y.foo2.bar",
+        },
+    }
+
+
+def test_domains_set():
+    c = config.Config(browser_host="foo.bar",
+                      alternate_hosts={"alt": "foo2.bar"},
+                      subdomains={"a", "b"},
+                      not_subdomains={"x", "y"})
+    domains_set = c.domains_set
+    assert domains_set == {
+        "foo.bar",
+        "a.foo.bar",
+        "b.foo.bar",
+        "foo2.bar",
+        "a.foo2.bar",
+        "b.foo2.bar",
+    }
+
+
+def test_not_domains_set():
+    c = config.Config(browser_host="foo.bar",
+                      alternate_hosts={"alt": "foo2.bar"},
+                      subdomains={"a", "b"},
+                      not_subdomains={"x", "y"})
+    not_domains_set = c.not_domains_set
+    assert not_domains_set == {
+        "x.foo.bar",
+        "y.foo.bar",
+        "x.foo2.bar",
+        "y.foo2.bar",
+    }
+
+
+def test_all_domains_set():
+    c = config.Config(browser_host="foo.bar",
+                      alternate_hosts={"alt": "foo2.bar"},
+                      subdomains={"a", "b"},
+                      not_subdomains={"x", "y"})
+    all_domains_set = c.all_domains_set
+    assert all_domains_set == {
+        "foo.bar",
+        "a.foo.bar",
+        "b.foo.bar",
+        "x.foo.bar",
+        "y.foo.bar",
+        "foo2.bar",
+        "a.foo2.bar",
+        "b.foo2.bar",
+        "x.foo2.bar",
+        "y.foo2.bar",
     }
 
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/config.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/config.py
index 24cace3431a4..3e4729a7f037 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/config.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/config.py
@@ -1,13 +1,9 @@
-import json
 import logging
 import os
 
 from collections import defaultdict, Mapping
 
 import sslutils
-
-from localpaths import repo_root
-
 from .utils import get_port
 
 
@@ -35,8 +31,31 @@ class Config(Mapping):
 
     Inherits from Mapping for backwards compatibility with the old dict-based config"""
 
-    with open(os.path.join(repo_root, "config.default.json"), "rb") as _fp:
-        _default = json.load(_fp)
+    _default = {
+        "browser_host": "localhost",
+        "alternate_hosts": {},
+        "doc_root": os.path.dirname("__file__"),
+        "server_host": None,
+        "ports": {"http": [8000]},
+        "check_subdomains": True,
+        "log_level": "debug",
+        "bind_address": True,
+        "ssl": {
+            "type": "none",
+            "encrypt_after_connect": False,
+            "openssl": {
+                "openssl_binary": "openssl",
+                "base_path": "_certs",
+                "force_regenerate": False,
+                "base_conf_path": None
+            },
+            "pregenerated": {
+                "host_key_path": None,
+                "host_cert_path": None,
+            },
+        },
+        "aliases": []
+    }
 
     def __init__(self,
                  logger=None,
@@ -149,23 +168,12 @@ def ports(self, v):
 
     @property
     def doc_root(self):
-        return self._doc_root if self._doc_root is not None else repo_root
+        return self._doc_root
 
     @doc_root.setter
     def doc_root(self, v):
         self._doc_root = v
 
-    @property
-    def ws_doc_root(self):
-        if self._ws_doc_root is not None:
-            return self._ws_doc_root
-        else:
-            return os.path.join(self.doc_root, "websockets", "handlers")
-
-    @ws_doc_root.setter
-    def ws_doc_root(self, v):
-        self._ws_doc_root = v
-
     @property
     def server_host(self):
         return self._server_host if self._server_host is not None else self.browser_host
@@ -176,24 +184,56 @@ def server_host(self, v):
 
     @property
     def domains(self):
-        assert self.browser_host.encode("idna") == self.browser_host
-        domains = {subdomain: (subdomain.encode("idna") + u"." + self.browser_host)
-                   for subdomain in self.subdomains}
-        domains[""] = self.browser_host
-        return domains
+        hosts = self.alternate_hosts.copy()
+        assert "" not in hosts
+        hosts[""] = self.browser_host
+
+        rv = {}
+        for name, host in hosts.iteritems():
+            rv[name] = {subdomain: (subdomain.encode("idna") + u"." + host)
+                        for subdomain in self.subdomains}
+            rv[name][""] = host
+        return rv
 
     @property
     def not_domains(self):
-        assert self.browser_host.encode("idna") == self.browser_host
-        domains = {subdomain: (subdomain.encode("idna") + u"." + self.browser_host)
-                   for subdomain in self.not_subdomains}
-        return domains
+        hosts = self.alternate_hosts.copy()
+        assert "" not in hosts
+        hosts[""] = self.browser_host
+
+        rv = {}
+        for name, host in hosts.iteritems():
+            rv[name] = {subdomain: (subdomain.encode("idna") + u"." + host)
+                        for subdomain in self.not_subdomains}
+        return rv
 
     @property
     def all_domains(self):
-        domains = self.domains.copy()
-        domains.update(self.not_domains)
-        return domains
+        rv = self.domains.copy()
+        nd = self.not_domains
+        for host in rv:
+            rv[host].update(nd[host])
+        return rv
+
+    @property
+    def domains_set(self):
+        return {domain
+                for per_host_domains in self.domains.itervalues()
+                for domain in per_host_domains.itervalues()}
+
+    @property
+    def not_domains_set(self):
+        return {domain
+                for per_host_domains in self.not_domains.itervalues()
+                for domain in per_host_domains.itervalues()}
+
+    @property
+    def all_domains_set(self):
+        return self.domains_set | self.not_domains_set
+
+    @property
+    def paths(self):
+        return {"doc_root": self.doc_root}
 
     @property
     def ssl_env(self):
@@ -212,14 +252,9 @@ def ssl_env(self):
         kwargs = self.ssl.get(implementation_type, {}).copy()
         return cls(self.logger, **kwargs)
 
-    @property
-    def paths(self):
-        return {"doc_root": self.doc_root,
-                "ws_doc_root": self.ws_doc_root}
-
     @property
     def ssl_config(self):
-        key_path, cert_path = self.ssl_env.host_cert_path(self.domains.itervalues())
+        key_path, cert_path = self.ssl_env.host_cert_path(self.domains_set)
         return {"key_path": key_path,
                 "cert_path": cert_path,
                 "encrypt_after_connect": self.ssl["encrypt_after_connect"]}
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/pipes.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/pipes.py
index f061f8392c74..9c13965cb3ec 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/pipes.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/pipes.py
@@ -1,4 +1,5 @@
 from cgi import escape
+from collections import deque
 import gzip as gzip_module
 import hashlib
 import os
@@ -420,17 +421,18 @@ def config_replacement(match):
         content, = match.groups()
 
         tokens = tokenizer.tokenize(content)
+        tokens = deque(tokens)
 
-        if tokens[0][0] == "var":
-            variable = tokens[0][1]
-            tokens = tokens[1:]
+        token_type, field = tokens.popleft()
+
+        if token_type == "var":
+            variable = field
+            token_type, field = tokens.popleft()
         else:
             variable = None
 
-        assert tokens[0][0] == "ident", tokens
-        assert all(item[0] in ("index", "arguments") for item in tokens[1:]), tokens
-
-        field = tokens[0][1]
+        if token_type != "ident":
+            raise Exception("unexpected token type %s (token '%r'), expected ident" % (token_type, field))
 
         if field in variables:
             value = variables[field]
@@ -440,16 +442,14 @@ def config_replacement(match):
             value = request.headers
         elif field == "GET":
             value = FirstWrapper(request.GET)
+        elif field == "hosts":
+            value = request.server.config.all_domains
         elif field == "domains":
-            if ('not_domains' in request.server.config and
-                    tokens[1][1] in request.server.config['not_domains']):
-                value = request.server.config['not_domains']
-            else:
-                value = request.server.config['domains']
+            value = request.server.config.all_domains[""]
         elif field == "host":
             value = request.server.config["browser_host"]
         elif field in request.server.config:
-            value = request.server.config[tokens[0][1]]
+            value = request.server.config[field]
         elif field == "location":
             value = {"server": "%s://%s:%s" % (request.url_parts.scheme,
                                                request.url_parts.hostname,
@@ -467,11 +467,16 @@ def config_replacement(match):
         else:
             raise Exception("Undefined template variable %s" % field)
 
-        for item in tokens[1:]:
-            if item[0] == "index":
-                value = value[item[1]]
+        while tokens:
+            ttype, field = tokens.popleft()
+            if ttype == "index":
+                value = value[field]
+            elif ttype == "arguments":
+                value = value(request, *field)
             else:
-                value = value(request, *item[1])
+                raise Exception(
+                    "unexpected token type %s (token '%r'), expected ident or arguments" % (ttype, field)
+                )
 
         assert isinstance(value, (int,) + types.StringTypes), tokens
 
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 a678452cd754..95d2320f41ce 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/server.py
@@ -13,6 +13,7 @@
 from six.moves.urllib.parse import urlsplit, urlunsplit
 
 from . import routes as default_routes
+from .config import Config
 from .logger import get_logger
 from .request import Server, Request
 from .response import Response
@@ -168,10 +169,8 @@ def __init__(self, server_address, request_handler_cls,
             Server.config = config
         else:
             self.logger.debug("Using default configuration")
-            Server.config = {"browser_host": server_address[0],
-                             "server_host": server_address[0],
-                             "domains": {"": server_address[0]},
-                             "ports": {"http": [self.server_address[1]]}}
+            Server.config = Config(browser_host=server_address[0],
+                                   ports={"http": [self.server_address[1]]})
 
 
         self.key_file = key_file
diff --git a/tests/wpt/web-platform-tests/tools/sslutils/__init__.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/sslutils/__init__.py
rename to tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/__init__.py
diff --git a/tests/wpt/web-platform-tests/tools/sslutils/base.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/base.py
similarity index 88%
rename from tests/wpt/web-platform-tests/tools/sslutils/base.py
rename to tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/base.py
index 237ae5f23ccf..c95b693f3712 100644
--- a/tests/wpt/web-platform-tests/tools/sslutils/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/base.py
@@ -10,7 +10,7 @@ def __enter__(self):
     def __exit__(self, *args, **kwargs):
         pass
 
-    def host_cert_path(self, host):
+    def host_cert_path(self, hosts):
         return None, None
 
     def ca_cert_path(self):
diff --git a/tests/wpt/web-platform-tests/tools/sslutils/openssl.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
similarity index 99%
rename from tests/wpt/web-platform-tests/tools/sslutils/openssl.py
rename to tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
index f44d0deb9870..6f345eb83123 100644
--- a/tests/wpt/web-platform-tests/tools/sslutils/openssl.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/openssl.py
@@ -361,7 +361,7 @@ def host_cert_path(self, hosts):
 
         hosts must be a list of all hosts to appear on the certificate, with
         the primary hostname first."""
-        hosts = tuple(hosts)
+        hosts = tuple(sorted(hosts, key=lambda x:-len(x)))
         if hosts not in self.host_certificates:
             if not self.force_regenerate:
                 key_cert = self._load_host_cert(hosts)
diff --git a/tests/wpt/web-platform-tests/tools/sslutils/pregenerated.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/pregenerated.py
similarity index 100%
rename from tests/wpt/web-platform-tests/tools/sslutils/pregenerated.py
rename to tests/wpt/web-platform-tests/tools/wptserve/wptserve/sslutils/pregenerated.py
diff --git a/tests/wpt/web-platform-tests/touch-events/create-touch-touchlist.html b/tests/wpt/web-platform-tests/touch-events/create-touch-touchlist.html
index abd0f4835c52..2e6e49f4aff2 100644
--- a/tests/wpt/web-platform-tests/touch-events/create-touch-touchlist.html
+++ b/tests/wpt/web-platform-tests/touch-events/create-touch-touchlist.html
@@ -8,17 +8,6 @@
 <body>
 <div id="target0"></div>
 <script>
-test(function() {
-    var testTarget = document.getElementById('target0');
-    var touch1 = document.createTouch(window, testTarget, 42, 15, 20, 35, 40);
-    assert_equals(touch1.target, testTarget, "touch.target is target0");
-    assert_equals(touch1.identifier, 42, "touch.identifier is requested value");
-    assert_equals(touch1.pageX, 15, "touch.pageX is requested value");
-    assert_equals(touch1.pageY, 20, "touch.pageY is requested value");
-    assert_equals(touch1.screenX, 35, "touch.screenX is requested value");
-    assert_equals(touch1.screenY, 40, "touch.screenY is requested value");
-}, "document.createTouch exists and creates a Touch object with requested properties");
-
 test(function() {
     var touchList = document.createTouchList();
     assert_equals(touchList.length, 0, "touchList.length is 0");
@@ -27,7 +16,7 @@
 
 test(function() {
     var testTarget = document.getElementById('target0');
-    var touch1 = document.createTouch(window, testTarget, 42, 15, 20, 35, 40);
+    var touch1 = new Touch({identifier: 123, target: testTarget});
     var touchList = document.createTouchList(touch1);
     assert_equals(touchList.length, 1, "touchList.length is 1");
     assert_equals(touchList.item(0), touch1, "touchList.item(0) is touch1");
@@ -36,8 +25,8 @@
 
 test(function() {
     var testTarget = document.getElementById('target0');
-    var touch1 = document.createTouch(window, testTarget, 42, 15, 20, 35, 40);
-    var touch2 = document.createTouch(window, target0, 44, 25, 30, 45, 50);
+    var touch1 = new Touch({identifier: 123, target: testTarget});
+    var touch2 = new Touch({identifier: 124, target: target0});
     var touchList = document.createTouchList(touch1, touch2);
     assert_equals(touchList.length, 2, "touchList.length is 2");
     assert_equals(touchList.item(0), touch1, "touchList.item(0) is touch1");
diff --git a/tests/wpt/web-platform-tests/touch-events/historical.html b/tests/wpt/web-platform-tests/touch-events/historical.html
index 7d1e323c4d56..e5db6ef32da2 100644
--- a/tests/wpt/web-platform-tests/touch-events/historical.html
+++ b/tests/wpt/web-platform-tests/touch-events/historical.html
@@ -16,7 +16,7 @@
     assert_false(name in Touch.prototype,
                  "Should not be supported on the prototype");
 
-    var touch = document.createTouch(window, window, 0, 0, 0, 0, 0);
+    var touch = new Touch({identifier: 12341, target:document.body});
     assert_false(name in touch,
                  "Should not be supported on the instance");
   }, "Touch::" + name);
@@ -39,4 +39,12 @@
   assert_false("initTouchEvent" in touchEvent,
                "Should not be supported on the instance");
 }, "TouchEvent::initTouchEvent");
+
+test(function() {
+  assert_false("createTouch" in Document.prototype,
+               "Should not be supported on the prototype");
+
+  assert_false("createTouch" in document,
+               "Should not be supported on the instance");
+}, "Document::createTouch");
 </script>
diff --git a/tests/wpt/web-platform-tests/touch-events/multi-touch-interfaces-manual.html b/tests/wpt/web-platform-tests/touch-events/multi-touch-interfaces-manual.html
index e593fd0b9611..e9f1b91c4862 100644
--- a/tests/wpt/web-platform-tests/touch-events/multi-touch-interfaces-manual.html
+++ b/tests/wpt/web-platform-tests/touch-events/multi-touch-interfaces-manual.html
@@ -19,6 +19,7 @@
 <title>Touch Events Multi-Touch Interface Tests</title>
 <meta name="viewport" content="width=device-width">
 <script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
 <script>
     setup({explicit_done: true});
 
diff --git a/tests/wpt/web-platform-tests/touch-events/single-touch-manual.html b/tests/wpt/web-platform-tests/touch-events/single-touch-manual.html
index f1f643cb55e6..1b47a64c157a 100644
--- a/tests/wpt/web-platform-tests/touch-events/single-touch-manual.html
+++ b/tests/wpt/web-platform-tests/touch-events/single-touch-manual.html
@@ -15,6 +15,7 @@
   <title>Touch Events Single Touch Tests</title>
   <meta name="viewport" content="width=device-width">
   <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
   <script>
     setup({explicit_done: true});
 
diff --git a/tests/wpt/web-platform-tests/trusted-types/OWNERS b/tests/wpt/web-platform-tests/trusted-types/OWNERS
new file mode 100644
index 000000000000..12f907ceb418
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/OWNERS
@@ -0,0 +1 @@
+@mikewest
diff --git a/tests/wpt/web-platform-tests/upgrade-insecure-requests/OWNERS b/tests/wpt/web-platform-tests/upgrade-insecure-requests/OWNERS
new file mode 100644
index 000000000000..12f907ceb418
--- /dev/null
+++ b/tests/wpt/web-platform-tests/upgrade-insecure-requests/OWNERS
@@ -0,0 +1 @@
+@mikewest
diff --git a/tests/wpt/web-platform-tests/url/README.md b/tests/wpt/web-platform-tests/url/README.md
index 4cb3c00d61c4..cc63177a842e 100644
--- a/tests/wpt/web-platform-tests/url/README.md
+++ b/tests/wpt/web-platform-tests/url/README.md
@@ -1,10 +1,10 @@
 These tests are for browsers, but the data for
-`a-element.html`, `url-constructor.html`, and `a-element-xhtml.xhtml`
+`a-element.html`, `url-constructor.html`, `a-element-xhtml.xhtml`, and `failure.html`
 is in `urltestdata.json` and can be re-used by non-browser implementations.
 This file contains a JSON array of comments as strings and test cases as objects.
 The keys for each test case are:
 
-* `base`: an absolute URL as a string whose [parsing] without a base of its own should succeed.
+* `base`: an absolute URL as a string whose [parsing] without a base of its own must succeed.
   This key is always present,
   and may have a value like `"about:blank"` when `input` is an absolute URL.
 * `input`: an URL as a string to be [parsed][parsing] with `base` as its base URL.
@@ -19,5 +19,11 @@ The keys for each test case are:
     The `origin` key may be missing.
     In that case, the API’s `origin` attribute is not tested.
 
+In addition to testing that parsing `input` against `base` gives the result, a test harness for the
+`URL` constructor (or similar APIs) should additionally test the following pattern: if `failure` is
+true, parsing `about:blank` against `base` must give failure. This tests that the logic for
+converting base URLs into strings properly fails the whole parsing algorithm if the base URL cannot
+be parsed.
+
 [parsing]: https://url.spec.whatwg.org/#concept-basic-url-parser
 [API]: https://url.spec.whatwg.org/#api
diff --git a/tests/wpt/web-platform-tests/url/failure.html b/tests/wpt/web-platform-tests/url/failure.html
index d097d4e35100..8ae9da7f158b 100644
--- a/tests/wpt/web-platform-tests/url/failure.html
+++ b/tests/wpt/web-platform-tests/url/failure.html
@@ -16,7 +16,13 @@
 
     const name = test.input + " should throw"
 
-    self.test(() => { // new URL itself is already tested by url-constructor.html
+    self.test(() => { // URL's constructor's first argument is tested by url-constructor.html
+      // If a URL fails to parse with any valid base, it must also fail to parse with no base, i.e.
+      // when used as a base URL itself.
+      assert_throws(new TypeError(), () => new URL("about:blank", test.input));
+    }, "URL's constructor's base argument: " + name)
+
+    self.test(() => {
       const url = new URL("about:blank")
       assert_throws(new TypeError, () => url.href = test.input)
     }, "URL's href: " + name)
diff --git a/tests/wpt/web-platform-tests/url/setters_tests.json b/tests/wpt/web-platform-tests/url/setters_tests.json
index 714bd5e7ce23..db23d9247328 100644
--- a/tests/wpt/web-platform-tests/url/setters_tests.json
+++ b/tests/wpt/web-platform-tests/url/setters_tests.json
@@ -719,6 +719,17 @@
                 "port": "80"
             }
         },
+        {
+            "comment": "Port number is removed if new port is scheme default and existing URL has a non-default port",
+            "href": "http://example.net:8080",
+            "new_value": "example.com:80",
+            "expected": {
+                "href": "http://example.com/",
+                "host": "example.com",
+                "hostname": "example.com",
+                "port": ""
+            }
+        },
         {
             "comment": "Stuff after a / delimiter is ignored",
             "href": "http://example.net/path",
diff --git a/tests/wpt/web-platform-tests/url/urlsearchparams-foreach.html b/tests/wpt/web-platform-tests/url/urlsearchparams-foreach.html
index 33d1055b81c5..29c0ee802fde 100644
--- a/tests/wpt/web-platform-tests/url/urlsearchparams-foreach.html
+++ b/tests/wpt/web-platform-tests/url/urlsearchparams-foreach.html
@@ -41,7 +41,7 @@
     const url = new URL("http://localhost/query?param0=0&param1=1&param2=2");
     const searchParams = url.searchParams;
     const seen = [];
-    for (const param of searchParams) {
+    for (param of searchParams) {
         if (param[0] === 'param0') {
             searchParams.delete('param1');
         }
@@ -56,7 +56,7 @@
     const url = new URL("http://localhost/query?param0=0&param1=1&param2=2");
     const searchParams = url.searchParams;
     const seen = [];
-    for (const param of searchParams) {
+    for (param of searchParams) {
         if (param[0] === 'param0') {
             searchParams.delete('param0');
             // 'param1=1' is now in the first slot, so the next iteration will see 'param2=2'.
@@ -72,7 +72,7 @@
     const url = new URL("http://localhost/query?param0=0&param1=1&param2=2");
     const searchParams = url.searchParams;
     const seen = [];
-    for (const param of searchParams) {
+    for (param of searchParams) {
         seen.push(param[0]);
         searchParams.delete(param[0]);
     }
diff --git a/tests/wpt/web-platform-tests/url/urltestdata.json b/tests/wpt/web-platform-tests/url/urltestdata.json
index 867056619b4c..8c87da2bf5df 100644
--- a/tests/wpt/web-platform-tests/url/urltestdata.json
+++ b/tests/wpt/web-platform-tests/url/urltestdata.json
@@ -6521,27 +6521,34 @@
     "search": "?a",
     "hash": "#%GH"
   },
-  "Bad bases",
+  "URLs that require a non-about:blank base. (Also serve as invalid base tests.)",
   {
-    "input": "test-a.html",
-    "base": "a",
+    "input": "a",
+    "base": "about:blank",
     "failure": true
   },
   {
-    "input": "test-a-slash.html",
-    "base": "a/",
+    "input": "a/",
+    "base": "about:blank",
     "failure": true
   },
   {
-    "input": "test-a-slash-slash.html",
-    "base": "a//",
+    "input": "a//",
+    "base": "about:blank",
     "failure": true
   },
+  "Bases that don't fail to parse but fail to be bases",
   {
     "input": "test-a-colon.html",
     "base": "a:",
     "failure": true
   },
+  {
+    "input": "test-a-colon-b.html",
+    "base": "a:b",
+    "failure": true
+  },
+  "Other base URL tests, that must succeed",
   {
     "input": "test-a-colon-slash.html",
     "base": "a:/",
@@ -6570,11 +6577,6 @@
     "search": "",
     "hash": ""
   },
-  {
-    "input": "test-a-colon-b.html",
-    "base": "a:b",
-    "failure": true
-  },
   {
     "input": "test-a-colon-slash-b.html",
     "base": "a:/b",
diff --git a/tests/wpt/web-platform-tests/user-timing/user-timing-tojson.html b/tests/wpt/web-platform-tests/user-timing/user-timing-tojson.html
new file mode 100644
index 000000000000..6aef7fa904ab
--- /dev/null
+++ b/tests/wpt/web-platform-tests/user-timing/user-timing-tojson.html
@@ -0,0 +1,44 @@
+<!doctype html>
+<html>
+<head>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+</head>
+<body>
+<script>
+const keys = [
+  'name',
+  'entryType',
+  'startTime',
+  'duration',
+];
+test(() => {
+  performance.mark('a');
+  const markEntries = performance.getEntriesByType('mark');
+  assert_equals(1, markEntries.length);
+  const markEntry = markEntries[0];
+  assert_equals(markEntry.entryType, 'mark');
+  assert_equals(typeof(markEntry.toJSON), 'function');
+  const markJSON = markEntry.toJSON();
+  assert_equals(typeof(markJSON), 'object');
+  for (const key of keys) {
+    assert_equals(markJSON[key], markEntry[key], `PerformanceMark ${key} entry does not match its toJSON value`);
+  }
+}, 'Test toJSON() in PerformanceMark');
+
+test(() => {
+  performance.measure('m');
+  const measureEntries = performance.getEntriesByType('measure');
+  assert_equals(1, measureEntries.length);
+  const measureEntry = measureEntries[0];
+  assert_equals(measureEntry.entryType, 'measure');
+  assert_equals(typeof(measureEntry.toJSON), 'function');
+  const measureJSON = measureEntry.toJSON();
+  assert_equals(typeof(measureJSON), 'object');
+  for (const key of keys) {
+    assert_equals(measureJSON[key], measureEntry[key], `PerformanceMeasure ${key} entry does not match its toJSON value`);
+  }
+}, 'Test toJSON() in PerformanceMeasure');
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_false-manual.html
index 5a5829e924e7..ee64c9dbf0d2 100644
--- a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>alertdialog modal false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html
index b86bcae6c9ff..4affe2fd5e61 100644
--- a/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/alertdialog_modal_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>alertdialog modal true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/application_activedescendant-manual.html b/tests/wpt/web-platform-tests/wai-aria/application_activedescendant-manual.html
index 4e256bd51e6f..a6ef85ac3dd1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/application_activedescendant-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/application_activedescendant-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>application activedescendant</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/application_activedescendant_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/application_activedescendant_value_changes-manual.html
index b85232360302..d923c84dea71 100644
--- a/tests/wpt/web-platform-tests/wai-aria/application_activedescendant_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/application_activedescendant_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>application activedescendant value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_not_declared-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_not_declared-manual.html
index 471e718c2ecc..ecf95bb64fc1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_not_declared-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_not_declared-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current not declared</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_changes-manual.html
index 84e0b60f60d0..d3f1eae00521 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_date-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_date-manual.html
index 0438ef5d2802..b15f5ec13adc 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_date-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_date-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value date</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_location-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_location-manual.html
index aac8e63f7872..e8cf762c0e7a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_location-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_location-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value location</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_page-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_page-manual.html
index 4ff50ac1b405..ba48b738cc06 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_page-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_page-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value page</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_step-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_step-manual.html
index 812ec0368549..6f4d5986c610 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_step-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_step-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value step</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_time-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_time-manual.html
index 3362af00dd64..046fb817695d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_time-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_time-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value time</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_true-manual.html
index bf7377705d7c..3ce799f8b2cf 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_unspecified-manual.html
index 271c085eb353..c017a000a114 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-current_with_value_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-current with value unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_details_element-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_details_element-manual.html
index bec86ace50a3..6a0d9d776a6f 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_details_element-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_details_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-details pointing to details element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_div_element-manual.html b/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_div_element-manual.html
index 239f3cccd612..8a46e78d9711 100644
--- a/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_div_element-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/aria-details_pointing_to_div_element-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>aria-details pointing to div element</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/article_in_feed_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/article_in_feed_posinset_and_setsize-manual.html
index ff960795b40e..9c89dc3fa993 100644
--- a/tests/wpt/web-platform-tests/wai-aria/article_in_feed_posinset_and_setsize-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/article_in_feed_posinset_and_setsize-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>article in feed posinset and setsize</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/article_in_feed_setsize_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/article_in_feed_setsize_-1-manual.html
index dd87dc5d8740..0552f926e942 100644
--- a/tests/wpt/web-platform-tests/wai-aria/article_in_feed_setsize_-1-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/article_in_feed_setsize_-1-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>article in feed setsize -1</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html
index 57e92c1ebcf3..91cb0e0eb487 100644
--- a/tests/wpt/web-platform-tests/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/article_not_in_feed_posinset_and_setsize-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>article not in feed posinset and setsize</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_dialog-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_dialog-manual.html
index e69e6c917ae2..8ba0a22a8d4d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_dialog-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_dialog-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup dialog</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_emptystring-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_emptystring-manual.html
index c41c72832cd3..e9091489068a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_emptystring-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_emptystring-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup emptystring</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_false-manual.html
index a41063cabf1d..97188995e526 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_foo-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_foo-manual.html
index 92bf3b324021..a09d21c07416 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_foo-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_foo-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup foo</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_grid-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_grid-manual.html
index 52d325ac4b73..57c8efbde24d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_grid-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_grid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup grid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_listbox-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_listbox-manual.html
index f8494ea1a0b0..4191fc40a3c8 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_listbox-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_listbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup listbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_menu-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_menu-manual.html
index 261f448379dd..9378993f5581 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_menu-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_tree-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_tree-manual.html
index 5dd268d94ba7..e62b87f59d64 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_tree-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_tree-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup tree</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_true-manual.html
index 0d7b660c14dd..a6d94658d272 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_unspecified-manual.html
index 5dd9371203ca..96d7095d4ded 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_haspopup_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_haspopup_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button haspopup unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_empty-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_roledescription_empty-manual.html
index 5695dff804eb..d9eb0fe7cc82 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_empty-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_roledescription_empty-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button roledescription empty</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_valid-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_roledescription_valid-manual.html
index 34cbc9ed8ae5..cdcf6071e619 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_valid-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_roledescription_valid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button roledescription valid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_whitespace_only-manual.html b/tests/wpt/web-platform-tests/wai-aria/button_roledescription_whitespace_only-manual.html
index a213ed3b403d..59e463778a12 100644
--- a/tests/wpt/web-platform-tests/wai-aria/button_roledescription_whitespace_only-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/button_roledescription_whitespace_only-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>button roledescription whitespace only</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell-manual.html
index fad0e8804cea..d9f0eafbe076 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_div-manual.html
index a9b83ff49f46..fa120dc5e43d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-colspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
index c225ab393695..a7c65fed3d49 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-colspan 2 on td html colspan 3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
index 5730d157f525..057918c6b0cd 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_headers_and_border-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-colspan 2 on td html colspan 3 with headers and border</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
index b2a1901da851..2c05e6ea71f9 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_html_colspan_3_with_three_actual_columns-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-colspan 2 on td html colspan 3 with three actual columns</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
index 980f5008bb12..06212078b74d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-colspan_2_on_td_with_html_colspan_not_specified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-colspan 2 on td with html colspan not specified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_div-manual.html
index 4abd0de0b297..e94303848dac 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-rowspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
index 356911e72094..86ea1a4aec1e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-rowspan 2 on td html rowspan 3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
index 0fed9aedeedb..f1572046f29e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_html_rowspan_3_with_three_actual_rows-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-rowspan 2 on td html rowspan 3 with three actual rows</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
index e9c5bd712c8e..0978186febaf 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_aria-rowspan_2_on_td_with_html_rowspan_not_specified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell aria-rowspan 2 on td with html rowspan not specified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_colindex_4-manual.html
index 0c3895af1646..02003065e09b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_colindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_colindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell colindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/cell_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/cell_rowindex_4-manual.html
index 14a9247ff660..ea2937efcbfa 100644
--- a/tests/wpt/web-platform-tests/wai-aria/cell_rowindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/cell_rowindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>cell rowindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_false-manual.html
index dcb1a8b1f6cb..558dc8e3912d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>checkbox readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_true-manual.html
index 6718fada7a5a..f3c879038f75 100644
--- a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>checkbox readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_unspecified-manual.html
index f8de2099e3f6..583985f00095 100644
--- a/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/checkbox_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>checkbox readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_div-manual.html
index 1797d47a91c6..4789ced84d26 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-colspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
index 586ff2982d49..2ad8cb4bed9d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-colspan 2 on th html colspan 3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
index fa7bf0bed719..3ac8701f5d7b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_html_colspan_3_with_three_actual_columns-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-colspan 2 on th html colspan 3 with three actual columns</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
index 453ff9666415..82c75991885f 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-colspan_2_on_th_with_html_colspan_not_specified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-colspan 2 on th with html colspan not specified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html
index e3431e42b88f..00c00683924f 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-rowspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
index e7dee7186736..256a3d73bde1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-rowspan 2 on th html rowspan 3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
index 25d827e85d45..6327e5fb4ec8 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_html_rowspan_3_with_three_actual_rows-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-rowspan 2 on th html rowspan 3 with three actual rows</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
index a029e6b600df..425eb5b15e0c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_aria-rowspan_2_on_th_with_html_rowspan_not_specified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader aria-rowspan 2 on th with html rowspan not specified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_colindex_4-manual.html
index d8d0587845fd..f44e8343fb05 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_colindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_colindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader colindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_rowindex_4-manual.html
index 665d344dc381..7ab7e9c8d0f1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_rowindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_rowindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader rowindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html
index 92cfc2e753c2..7624f2a3b80b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_false_not_automatically_propagated-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader selected false not automatically propagated</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html
index 32ce45ca7a26..1bc364cb884c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/columnheader_selected_true_not_automatically_propagated-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>columnheader selected true not automatically propagated</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_controls_an_invalid_id-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_controls_an_invalid_id-manual.html
index 88b4229fff9f..91188d8e3ca5 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_controls_an_invalid_id-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_controls_an_invalid_id-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox controls an invalid ID</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_dialog-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_dialog-manual.html
index 4d985a34e442..d9cf618d9b55 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_dialog-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_dialog-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup dialog</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_false-manual.html
index 5bfcb9fbecf3..2b0ca94745a0 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_grid-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_grid-manual.html
index 76ad36ee87a3..a3929cf79e73 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_grid-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_grid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup grid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_listbox-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_listbox-manual.html
index 135459591fb3..e1c9084fd540 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_listbox-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_listbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup listbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_menu-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_menu-manual.html
index 85faaf317b15..a9439ed496ac 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_menu-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_menu-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup menu</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_tree-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_tree-manual.html
index ea2d91680b5e..a0602b520f72 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_tree-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_tree-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup tree</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_true-manual.html
index f087508a5c39..c7548ce5cd3b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_unspecified-manual.html
index a60e9a1ef026..cd61076fb4e3 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_haspopup_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox haspopup unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_horizontal-manual.html
index 3831f41d9d08..a5bcc700eca6 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_unspecified-manual.html
index b37568df299b..20bd53d8d118 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_vertical-manual.html
index a1a0b83e2689..189345c4151b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_false-manual.html
index 4a87a4cb8964..978ab1194842 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_true-manual.html
index 6f2872adfa85..26a4302c24b8 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_unspecified-manual.html
index 86926586cdb9..4ad87b2c0a91 100644
--- a/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/combobox_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>combobox readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_false-manual.html
index d78f21f5db37..6c906d320f15 100644
--- a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>dialog modal false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html
index a58a88f24306..02cbfb5fe897 100644
--- a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>dialog modal true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_unspecified-manual.html
index 117969b16ee9..edd4605dad83 100644
--- a/tests/wpt/web-platform-tests/wai-aria/dialog_modal_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/dialog_modal_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>dialog modal unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/div_element_without_role_roledescription_valid-manual.html b/tests/wpt/web-platform-tests/wai-aria/div_element_without_role_roledescription_valid-manual.html
index 7e9b9fc7515d..68b6cc51c728 100644
--- a/tests/wpt/web-platform-tests/wai-aria/div_element_without_role_roledescription_valid-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/div_element_without_role_roledescription_valid-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>div element without role roledescription valid</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_invalid_state-manual.html b/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_invalid_state-manual.html
index fee1f8804f73..999656826281 100644
--- a/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_invalid_state-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_invalid_state-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>errormessage object in invalid state</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_valid_state-manual.html b/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_valid_state-manual.html
index 5845479e5569..7c194c6d0ace 100644
--- a/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_valid_state-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/errormessage_object_in_valid_state-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>errormessage object in valid state</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/feed-manual.html b/tests/wpt/web-platform-tests/wai-aria/feed-manual.html
index ddb684f4767b..91fc6778dbfe 100644
--- a/tests/wpt/web-platform-tests/wai-aria/feed-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/feed-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>feed</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/figure-manual.html b/tests/wpt/web-platform-tests/wai-aria/figure-manual.html
index 619978ffad75..d60973527a9c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/figure-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/figure-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>figure</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html
index 21663a7f010b..d373a3023efa 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_false_automatically_propagated-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid aria-readonly false automatically propagated</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html
index 722d367d994a..7b6a22e2921a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_aria-readonly_true_automatically_propagated-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid aria-readonly true automatically propagated</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_busy_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_busy_false-manual.html
index 68376ef95ed8..48edba5bf765 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_busy_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_busy_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid busy false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_busy_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_busy_true-manual.html
index 873f57309054..ddcdf0198f89 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_busy_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_busy_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid busy true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_busy_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_busy_value_changes-manual.html
index ad65db939e71..4891198882ac 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_busy_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_busy_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid busy value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_colcount_8-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_colcount_8-manual.html
index 624c1d21a79c..0f03b12605df 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_colcount_8-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_colcount_8-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid colcount 8</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_false-manual.html
index 79f4c82e39fd..bb8dd34a92f8 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid columnheader readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_true-manual.html
index 4ef4e7d45a9e..a81e4cbdced1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid columnheader readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_unspecified-manual.html
index bf9c24ba3625..d45d3b9ca71a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid columnheader readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_false-manual.html
index f6736756c193..b8f7ae332ca6 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid columnheader required false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_true-manual.html
index c810369cf667..76155ab905d6 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid columnheader required true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_unspecified-manual.html
index c9d83d2358b6..491cbed6f2ff 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_columnheader_required_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid columnheader required unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowcount_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_rowcount_3-manual.html
index ed92788e57d1..3079b59b4de7 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_rowcount_3-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_rowcount_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid rowcount 3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_false-manual.html
index a099315b4049..883918fd043f 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid rowheader readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_true-manual.html
index 67b1004b1681..5d53c3624c62 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid rowheader readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_unspecified-manual.html
index 694e65699e9b..f9321cac1021 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid rowheader readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_false-manual.html
index ffd30ccdd708..4fafba50a983 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid rowheader required false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_true-manual.html
index e9b732485e04..0f14d2dea8bd 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid rowheader required true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_unspecified-manual.html
index 52d92a6b6679..208f0c5e56d7 100644
--- a/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/grid_rowheader_required_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>grid rowheader required unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-colspan_2_on_div-manual.html
index 47b13a5c142c..c151087767e3 100644
--- a/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-colspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-colspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>gridcell aria-colspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html
index 2fc132331ac5..318709b36090 100644
--- a/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/gridcell_aria-rowspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>gridcell aria-rowspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/gridcell_colindex_4-manual.html
index a3662ed8cdc5..6ef4fb3a1669 100644
--- a/tests/wpt/web-platform-tests/wai-aria/gridcell_colindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/gridcell_colindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>gridcell colindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/gridcell_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/gridcell_rowindex_4-manual.html
index 5fcae9a5fd16..8b9daaa7030e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/gridcell_rowindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/gridcell_rowindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>gridcell rowindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_not_rendered-manual.html b/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_not_rendered-manual.html
index 8f2404b20af2..ef947859dba1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_not_rendered-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_not_rendered-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>group hidden undefined element not rendered</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_rendered-manual.html b/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_rendered-manual.html
index 0097832a3b71..92c067c2160a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_rendered-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/group_hidden_undefined_element_rendered-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>group hidden undefined element rendered</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/heading_level_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/heading_level_unspecified-manual.html
index 2bf64185191e..819bc7b60c6d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/heading_level_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/heading_level_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>heading level unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_multiple_shortcuts-manual.html b/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_multiple_shortcuts-manual.html
index 67e04b07e91d..ce4074a4f2cd 100644
--- a/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_multiple_shortcuts-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_multiple_shortcuts-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>keyshortcuts multiple shortcuts</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_one_shortcut-manual.html b/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_one_shortcut-manual.html
index 6cf5c71250df..d0238dbf20e7 100644
--- a/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_one_shortcut-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/keyshortcuts_one_shortcut-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>keyshortcuts one shortcut</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_busy_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_busy_false-manual.html
index 06258ae40559..9f6b8b36a88a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_busy_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_busy_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox busy false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_busy_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_busy_true-manual.html
index b8604dc99608..c8388f7addfd 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_busy_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_busy_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox busy true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_horizontal-manual.html
index e496a357cc6b..c718a54eafb8 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_unspecified-manual.html
index d39db919b940..7dd2762d6db0 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_vertical-manual.html
index 5f6431ff3066..8bcca037d307 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_false-manual.html
index 0f7e2b678ce4..b3bde923a406 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_true-manual.html
index 39771bf3a125..30213919e488 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_unspecified-manual.html
index c1bb93d8bcaf..9283ad24046e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listbox_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listbox readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/listitem_setsize_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/listitem_setsize_-1-manual.html
index 376692eeb8ba..7537a4bcd72b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/listitem_setsize_-1-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/listitem_setsize_-1-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>listitem setsize -1</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/menu_orientation_horizontal-manual.html
index df2f22e3af47..184c42052e4f 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menu_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menu orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/menu_orientation_unspecified-manual.html
index b47451bab39a..07e8e691b943 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menu_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menu orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/menu_orientation_vertical-manual.html
index c1958d4a6bea..10a65e997d5a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menu_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menu_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menu orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_busy_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/menubar_busy_false-manual.html
index 62060a2fa963..8224d79b8762 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menubar_busy_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menubar_busy_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menubar busy false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_busy_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/menubar_busy_true-manual.html
index e8c6b649f424..b1695dcef4ca 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menubar_busy_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menubar_busy_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menubar busy true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_horizontal-manual.html
index 66207b91afbc..e47a68e81af1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menubar orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_unspecified-manual.html
index e94dd0c0948c..0e945ae26f24 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menubar orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_vertical-manual.html
index dd7434e5949a..c0830abc7fe8 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menubar_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menubar orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitem_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitem_posinset_and_setsize-manual.html
index 411086b7f34a..ac0ec8871d55 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitem_posinset_and_setsize-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitem_posinset_and_setsize-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitem posinset and setsize</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html
index 9368e9848794..cf867c1cf927 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_posinset_and_setsize-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemcheckbox posinset and setsize</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_false-manual.html
index 767d01e79446..59f12ed0fc99 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemcheckbox readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_true-manual.html
index 40fc07899a5f..faa9703fda36 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemcheckbox readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html
index 388d89ea404b..d9b5dc298072 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemcheckbox_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemcheckbox readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_posinset_and_setsize-manual.html
index 9f6489ebf089..d512e95dddbd 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_posinset_and_setsize-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_posinset_and_setsize-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemradio posinset and setsize</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_false-manual.html
index 3771b5d62879..164bde7ae177 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemradio readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_true-manual.html
index fd92109744d9..70690f372c07 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemradio readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_unspecified-manual.html
index e39165367cb7..a4257c439f80 100644
--- a/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/menuitemradio_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>menuitemradio readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/none-manual.html b/tests/wpt/web-platform-tests/wai-aria/none-manual.html
index f8c38af34582..ded346faa6d6 100644
--- a/tests/wpt/web-platform-tests/wai-aria/none-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/none-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>none</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/option_selected_false-manual.html
index c7091203dcc1..02b1ec8293db 100644
--- a/tests/wpt/web-platform-tests/wai-aria/option_selected_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/option_selected_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>option selected false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/option_selected_true-manual.html
index 3769bcce22d0..8bb7dd7ef54b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/option_selected_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/option_selected_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>option selected true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_undefined-manual.html b/tests/wpt/web-platform-tests/wai-aria/option_selected_undefined-manual.html
index 536ac9b7c180..5930de9a4825 100644
--- a/tests/wpt/web-platform-tests/wai-aria/option_selected_undefined-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/option_selected_undefined-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>option selected undefined</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/option_selected_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/option_selected_value_changes-manual.html
index f11e4893e4e6..2c02a8707d3e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/option_selected_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/option_selected_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>option selected value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_horizontal-manual.html
index 695f1c60d753..4943335cf264 100644
--- a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radiogroup orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_unspecified-manual.html
index 6cc09ea816ab..40ceab71ca8e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radiogroup orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_vertical-manual.html
index ef3090bba06d..def4543652a0 100644
--- a/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/radiogroup_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radiogroup orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_false-manual.html
index cb829c4b0272..102f51757baf 100644
--- a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radiogroup readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_true-manual.html
index 279da4edb1a2..0c97e24a8bf0 100644
--- a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radiogroup readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_unspecified-manual.html
index 6b3596bcf98a..6e8c641ac7b5 100644
--- a/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/radiogroup_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>radiogroup readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/region_with_name-manual.html b/tests/wpt/web-platform-tests/wai-aria/region_with_name-manual.html
index 0763660c892f..ba868a77b2e4 100644
--- a/tests/wpt/web-platform-tests/wai-aria/region_with_name-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/region_with_name-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>region with name</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/region_without_name-manual.html b/tests/wpt/web-platform-tests/wai-aria/region_without_name-manual.html
index bf2333e33bcf..84ea6658e705 100644
--- a/tests/wpt/web-platform-tests/wai-aria/region_without_name-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/region_without_name-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>region without name</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/row_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/row_colindex_4-manual.html
index 1e483bf6c514..82ee257d9e51 100644
--- a/tests/wpt/web-platform-tests/wai-aria/row_colindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/row_colindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>row colindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/row_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/row_rowindex_4-manual.html
index 98c9e15ece1c..1333219e0486 100644
--- a/tests/wpt/web-platform-tests/wai-aria/row_rowindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/row_rowindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>row rowindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-colspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-colspan_2_on_div-manual.html
index 294e5052c4b5..3d8288895974 100644
--- a/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-colspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-colspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowheader aria-colspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html b/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html
index 361526fad480..4ddf4f5c9acf 100644
--- a/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/rowheader_aria-rowspan_2_on_div-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowheader aria-rowspan 2 on div</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_colindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/rowheader_colindex_4-manual.html
index e3fa1156a8f1..8b1eb477e47e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/rowheader_colindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/rowheader_colindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowheader colindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_rowindex_4-manual.html b/tests/wpt/web-platform-tests/wai-aria/rowheader_rowindex_4-manual.html
index 8591196c8128..716403cfeb61 100644
--- a/tests/wpt/web-platform-tests/wai-aria/rowheader_rowindex_4-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/rowheader_rowindex_4-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowheader rowindex 4</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html
index cc6eb5df2aa9..7cd9a5599007 100644
--- a/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_false_not_automatically_propagated-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowheader selected false not automatically propagated</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html b/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html
index fe34db97d40f..51b2b68fee31 100644
--- a/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/rowheader_selected_true_not_automatically_propagated-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>rowheader selected true not automatically propagated</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/scrollbar_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/scrollbar_all_values_unspecified-manual.html
index c5849c574250..910fe2b11812 100644
--- a/tests/wpt/web-platform-tests/wai-aria/scrollbar_all_values_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/scrollbar_all_values_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>scrollbar all values unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/scrollbar_only_valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/scrollbar_only_valuenow_unspecified-manual.html
index 34c59cedd47f..73e315817635 100644
--- a/tests/wpt/web-platform-tests/wai-aria/scrollbar_only_valuenow_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/scrollbar_only_valuenow_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>scrollbar only valuenow unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/scrollbar_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/scrollbar_orientation_unspecified-manual.html
index 0fb9ae8c7c58..32791ae1d8df 100644
--- a/tests/wpt/web-platform-tests/wai-aria/scrollbar_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/scrollbar_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>scrollbar orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox-manual.html
index f3e154836a0f..979bd0fad45a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant-manual.html
index 1e2ad175228c..a72cf9326364 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox activedescendant</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant_value_changes-manual.html
index a1ceab641793..956f931ae863 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_activedescendant_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox activedescendant value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_both-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_both-manual.html
index 1b67134540fa..ea8b69867946 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_both-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_both-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox autocomplete both</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_inline-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_inline-manual.html
index 4aa12aa91e6f..77e707666c56 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_inline-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_inline-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox autocomplete inline</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_list-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_list-manual.html
index 778dfe9d9a57..0ce8068ea94c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_list-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_list-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox autocomplete list</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_none-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_none-manual.html
index 237446195e0d..341d75c53201 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_none-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_none-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox autocomplete none</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_unspecified-manual.html
index 3513eeb0fe40..59becae655e9 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_autocomplete_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox autocomplete unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_false-manual.html
index 2413dd440510..8f49eb61e93a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox multiline false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_true-manual.html
index 4a3d65793f29..47e6c3aaa970 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox multiline true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_unspecified-manual.html
index 8768b5bc34d7..5c1d7f5185aa 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_multiline_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox multiline unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_placeholder-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_placeholder-manual.html
index 4e9ddbae3bcc..da513456d2de 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_placeholder-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_placeholder-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox placeholder</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_false-manual.html
index a587eb5dfbd1..574666a0177b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_true-manual.html
index 83ff4ec535c3..833f1bc4288c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_unspecified-manual.html
index 615785f2c16b..51b9893595d4 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_required_false-manual.html
index dc544dd26831..1bfc8953564d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_required_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox required false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_required_true-manual.html
index a1dcb29a8c92..7e26e5ab03ab 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_required_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox required true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/searchbox_required_unspecified-manual.html
index fb7c657bdacf..13489ad13a0c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/searchbox_required_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/searchbox_required_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>searchbox required unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/separator_focusable_all_values_unspecified-manual.html
index 5f2d8bae8932..fb8e852bb17c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_all_values_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/separator_focusable_all_values_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator focusable all values unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html
index 8c4c809ce8e3..680c2a3605a1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/separator_focusable_only_valuenow_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator focusable only valuenow unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_valuetext-manual.html b/tests/wpt/web-platform-tests/wai-aria/separator_focusable_valuetext-manual.html
index ebfd2119a9c2..5992f15aeb00 100644
--- a/tests/wpt/web-platform-tests/wai-aria/separator_focusable_valuetext-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/separator_focusable_valuetext-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator focusable valuetext</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/separator_orientation_unspecified-manual.html
index 43dfe6dbe200..3a3901b42440 100644
--- a/tests/wpt/web-platform-tests/wai-aria/separator_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/separator_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_all_values_unspecified-manual.html
index 5dbe67d8df36..171370f422bc 100644
--- a/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_all_values_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_all_values_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator unfocusable all values unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_valuetext-manual.html b/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_valuetext-manual.html
index 4e8fd4056341..db8ee6322dd1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_valuetext-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/separator_unfocusable_valuetext-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>separator unfocusable valuetext</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/slider_all_values_unspecified-manual.html
index 2a72d5db5826..0dea62e620f7 100644
--- a/tests/wpt/web-platform-tests/wai-aria/slider_all_values_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/slider_all_values_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>slider all values unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_only_valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/slider_only_valuenow_unspecified-manual.html
index 4f80a39fe80e..ffcbc783734e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/slider_only_valuenow_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/slider_only_valuenow_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>slider only valuenow unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/slider_orientation_unspecified-manual.html
index 50e87c8b3f19..295b0a61960b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/slider_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/slider_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>slider orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/slider_readonly_false-manual.html
index 13c36efeec8d..f5a70984d51d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/slider_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>slider readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/slider_readonly_true-manual.html
index 5793bf20d887..2588079d784c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/slider_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>slider readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/slider_readonly_unspecified-manual.html
index dc5ce40c9d1f..271325a47d39 100644
--- a/tests/wpt/web-platform-tests/wai-aria/slider_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/slider_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>slider readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_all_values_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/spinbutton_all_values_unspecified-manual.html
index 446f4534152b..8da69af36d6e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/spinbutton_all_values_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/spinbutton_all_values_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>spinbutton all values unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html
index ae6948b7826a..bbb94702fe33 100644
--- a/tests/wpt/web-platform-tests/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/spinbutton_only_aria-valuenow_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>spinbutton only aria-valuenow unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_false-manual.html
index 94a9d44eec12..5e9429ca28a4 100644
--- a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>spinbutton readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_true-manual.html
index 7652a5695d6e..a7a3abe63279 100644
--- a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>spinbutton readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_unspecified-manual.html
index 8a3f2d76033d..0976b0737c7a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/spinbutton_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>spinbutton readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_checked_false-manual.html
index b5cf84fa9f13..ac61802bdfb3 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_checked_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_checked_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch checked false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_mixed-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_checked_mixed-manual.html
index f9e45cf4246b..a674c7d7bcf6 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_checked_mixed-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_checked_mixed-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch checked mixed</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_checked_true-manual.html
index fbe80aebfceb..e23e72356163 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_checked_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_checked_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch checked true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_undefined-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_checked_undefined-manual.html
index 94297a47f655..4f5399e88ceb 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_checked_undefined-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_checked_undefined-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch checked undefined</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_checked_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_checked_value_changes-manual.html
index 11ebcb3951eb..b58e52fefb03 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_checked_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_checked_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch checked value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_readonly_false-manual.html
index fdb095d1bb4e..e68b6bb0d27a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_readonly_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch readonly false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_readonly_true-manual.html
index 2a6f6fbc86c0..605d2d0d9afd 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_readonly_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch readonly true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/switch_readonly_unspecified-manual.html
index 7a253657377a..0fd582c0e9ba 100644
--- a/tests/wpt/web-platform-tests/wai-aria/switch_readonly_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/switch_readonly_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>switch readonly unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tab_posinset_and_setsize-manual.html b/tests/wpt/web-platform-tests/wai-aria/tab_posinset_and_setsize-manual.html
index f00d59856527..f27f485ac97b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tab_posinset_and_setsize-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/tab_posinset_and_setsize-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tab posinset and setsize</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_colcount_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/table_colcount_-1-manual.html
index 8a6e46f028b9..2135f6ed8d0d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/table_colcount_-1-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/table_colcount_-1-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>table colcount -1</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_colcount_8-manual.html b/tests/wpt/web-platform-tests/wai-aria/table_colcount_8-manual.html
index 0c25f18c1e9c..1b8e0affdd5d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/table_colcount_8-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/table_colcount_8-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>table colcount 8</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_rowcount_-1-manual.html b/tests/wpt/web-platform-tests/wai-aria/table_rowcount_-1-manual.html
index fbc809be09f8..5e7b5b8bf49a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/table_rowcount_-1-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/table_rowcount_-1-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>table rowcount -1</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/table_rowcount_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/table_rowcount_3-manual.html
index 81a3a3c16b18..5bfad69b240d 100644
--- a/tests/wpt/web-platform-tests/wai-aria/table_rowcount_3-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/table_rowcount_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>table rowcount 3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_horizontal-manual.html
index 2d7062aade04..104668cbb95e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tablist orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_unspecified-manual.html
index 497751d7d01d..001c2ee77b31 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tablist orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_vertical-manual.html
index 18c196b5638b..f6fe16e8955c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/tablist_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tablist orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/term_role-manual.html b/tests/wpt/web-platform-tests/wai-aria/term_role-manual.html
index 76941b51ab4d..ac5030df9503 100644
--- a/tests/wpt/web-platform-tests/wai-aria/term_role-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/term_role-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>term role</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/textbox_placeholder-manual.html b/tests/wpt/web-platform-tests/wai-aria/textbox_placeholder-manual.html
index 5c40558325df..fdf0635be67b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/textbox_placeholder-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/textbox_placeholder-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>textbox placeholder</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_horizontal-manual.html
index 356c9833b0d3..1b8fda8dd60b 100644
--- a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>toolbar orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_unspecified-manual.html
index bd2c399bbc95..4607511874bd 100644
--- a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>toolbar orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_vertical-manual.html
index b0d85f9f8c7a..792952d323d1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/toolbar_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>toolbar orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tools/make_tests.pl b/tests/wpt/web-platform-tests/wai-aria/tools/make_tests.pl
index b680c0eb202b..01cb5b0b8506 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tools/make_tests.pl
+++ b/tests/wpt/web-platform-tests/wai-aria/tools/make_tests.pl
@@ -493,7 +493,6 @@ ()
   <head>
     <title>$title</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/tree_orientation_horizontal-manual.html
index 88ba1e705e4e..15813f5f039a 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/tree_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tree orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/tree_orientation_unspecified-manual.html
index b8c256671446..dfc1bdcc587e 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/tree_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tree orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/tree_orientation_vertical-manual.html
index b9e88b034df2..b9afa33ff44c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/tree_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/tree_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>tree orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_colcount_8-manual.html b/tests/wpt/web-platform-tests/wai-aria/treegrid_colcount_8-manual.html
index 381f39c2f44f..a3e9ea14963c 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treegrid_colcount_8-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treegrid_colcount_8-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treegrid colcount 8</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_horizontal-manual.html b/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_horizontal-manual.html
index 41b49e7a2f5d..756153abf3bc 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_horizontal-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_horizontal-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treegrid orientation horizontal</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_unspecified-manual.html b/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_unspecified-manual.html
index 1eabb26aabf7..d536e9afbed7 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_unspecified-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_unspecified-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treegrid orientation unspecified</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_vertical-manual.html b/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_vertical-manual.html
index 92c0e2897d61..62a19d090466 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_vertical-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treegrid_orientation_vertical-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treegrid orientation vertical</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treegrid_rowcount_3-manual.html b/tests/wpt/web-platform-tests/wai-aria/treegrid_rowcount_3-manual.html
index 86942708dcfd..9d9b8acf4470 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treegrid_rowcount_3-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treegrid_rowcount_3-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treegrid rowcount 3</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_false-manual.html b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_false-manual.html
index 0e2c1f95de80..684fda69b6d1 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_false-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_false-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treeitem selected false</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_true-manual.html b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_true-manual.html
index 21775643e761..b951c54dec67 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_true-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_true-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treeitem selected true</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_undefined-manual.html b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_undefined-manual.html
index f9880872214f..dddfd3826f09 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_undefined-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_undefined-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treeitem selected undefined</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_value_changes-manual.html b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_value_changes-manual.html
index 06b48fc49484..69734c82ddaa 100644
--- a/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_value_changes-manual.html
+++ b/tests/wpt/web-platform-tests/wai-aria/treeitem_selected_value_changes-manual.html
@@ -3,7 +3,6 @@
   <head>
     <title>treeitem selected value changes</title>
     <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
-    <link rel="stylesheet" href="/resources/testharness.css">
     <link rel="stylesheet" href="/wai-aria/scripts/manual.css">
     <script src="/resources/testharness.js"></script>
     <script src="/resources/testharnessreport.js"></script>
diff --git a/tests/wpt/web-platform-tests/wasm/OWNERS b/tests/wpt/web-platform-tests/wasm/OWNERS
new file mode 100644
index 000000000000..2e6844b89d27
--- /dev/null
+++ b/tests/wpt/web-platform-tests/wasm/OWNERS
@@ -0,0 +1,2 @@
+@titzer
+@Ms2ger
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html
index 0b737a5882ed..4d78ca5a417c 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Animation/idlharness.html
@@ -11,15 +11,16 @@
 'use strict';
 
 promise_test(async () => {
-  const text = await fetch('/interfaces/web-animations.idl').then(response =>
-    response.text(),
-  );
-  const idlArray = new IdlArray();
-  idlArray.add_idls(text, { only: ['Animation', 'AnimationPlayState'] });
+  const idl = await fetch('/interfaces/web-animations.idl').then(r => r.text());
+  const dom = await fetch('/interfaces/dom.idl').then(r => r.text());
+  const html = await fetch('/interfaces/html.idl').then(r => r.text());
 
-  idlArray.add_untested_idls('interface AnimationTimeline {};');
-  idlArray.add_untested_idls('interface EventHandler {};');
-  idlArray.add_untested_idls('interface EventTarget {};');
+  const idlArray = new IdlArray();
+  idlArray.add_idls(idl, {only: ['Animation', 'AnimationPlayState']});
+  idlArray.add_dependency_idls(idl);
+  idlArray.add_dependency_idls(dom);
+  idlArray.add_dependency_idls(html);
+  idlArray.add_untested_idls('interface CSSPseudoElement {};');
   idlArray.add_objects( { Animation: ['new Animation()'] } );
   idlArray.test();
   done();
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html
index 89466e27c8af..10bd193361e0 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/AnimationEffect/getComputedTiming.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <meta charset=utf-8>
-<title>AnimationEffectTiming.getComputedTiming</title>
-<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffectreadonly-getcomputedtiming">
+<title>AnimationEffect.getComputedTiming</title>
+<link rel="help" href="https://drafts.csswg.org/web-animations/#dom-animationeffect-getcomputedtiming">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="../../testcommon.js"></script>
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html b/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
index 381d954ea7aa..6b8534bf035f 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/Document/getAnimations.html
@@ -64,5 +64,26 @@
                 'elements in this document');
 }, 'Test document.getAnimations with null target');
 
+async_test(t => {
+  const iframe = document.createElement('iframe');
+
+  iframe.addEventListener("load", t.step_func_done(function() {
+    const div = createDiv(t, iframe.contentDocument)
+    const effect = new KeyframeEffect(div, null, 100 * MS_PER_SEC);
+    const anim = new Animation(effect, document.timeline);
+    anim.play();
+
+    // The animation's timeline is from the main document, but the effect's
+    // target element is part of the iframe document and that is what matters
+    // for getAnimations.
+    assert_equals(document.getAnimations().length, 0);
+    assert_equals(iframe.contentDocument.getAnimations().length, 1);
+    anim.finish();
+  }));
+
+  document.body.appendChild(iframe);
+  t.add_cleanup(function() { document.body.removeChild(iframe); });
+}, 'Test document.getAnimations for elements inside same-origin iframes');
+
 </script>
 </body>
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_push_ArrayBuffer-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/nfc_push_ArrayBuffer-manual.https.html
index 89dbff038abf..8d12e42d2050 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_push_ArrayBuffer-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_push_ArrayBuffer-manual.https.html
@@ -3,11 +3,11 @@
 <title>Web NFC Test: push ArrayBuffer message</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc_help.js"></script>
 <meta name="flags" content="interact">
-<meta name="timeout" content="long">
 
 <p>Tap an NFC tag to the test device with NFC support.</p>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_push_DOMString-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/nfc_push_DOMString-manual.https.html
index 9782f67b29be..a6c3df8b004e 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_push_DOMString-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_push_DOMString-manual.https.html
@@ -3,11 +3,11 @@
 <title>Web NFC Test: push DOMString message</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc_help.js"></script>
 <meta name="flags" content="interact">
-<meta name="timeout" content="long">
 
 <p>Tap an NFC tag to the test device with NFC support.</p>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_empty-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_empty-manual.https.html
index a213537716bc..213d6fe5767f 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_empty-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_empty-manual.https.html
@@ -3,11 +3,11 @@
 <title>Web NFC Test: push and watch empty records</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc_help.js"></script>
 <meta name="flags" content="interact">
-<meta name="timeout" content="long">
 
 <p>Tap an NFC tag to the test device with NFC support.</p>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_json-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_json-manual.https.html
index 883bbe731ec8..6a0129efd0c6 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_json-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_json-manual.https.html
@@ -3,11 +3,11 @@
 <title>Web NFC Test: push and watch json records</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc_help.js"></script>
 <meta name="flags" content="interact">
-<meta name="timeout" content="long">
 
 <p>Tap an NFC tag to the test device with NFC support.</p>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_opaque-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_opaque-manual.https.html
index 81e9ec12f521..8035a30ae814 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_opaque-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_opaque-manual.https.html
@@ -3,11 +3,11 @@
 <title>Web NFC Test: push and watch opaque records</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc_help.js"></script>
 <meta name="flags" content="interact">
-<meta name="timeout" content="long">
 
 <p>Tap an NFC tag to the test device with NFC support.</p>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_text-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_text-manual.https.html
index 279bd6634fdc..9b0ee276c857 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_text-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_text-manual.https.html
@@ -3,11 +3,11 @@
 <title>Web NFC Test: push and watch text records</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc_help.js"></script>
 <meta name="flags" content="interact">
-<meta name="timeout" content="long">
 
 <p>Tap an NFC tag to the test device with NFC support.</p>
 
diff --git a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_url-manual.https.html b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_url-manual.https.html
index 70f982373d38..b2e1cfef0b31 100644
--- a/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_url-manual.https.html
+++ b/tests/wpt/web-platform-tests/web-nfc/nfc_recordType_url-manual.https.html
@@ -3,11 +3,11 @@
 <title>Web NFC Test: push and watch url records</title>
 <link rel="author" title="Intel" href="http://www.intel.com"/>
 <link rel="help" href="https://w3c.github.io/web-nfc/"/>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/nfc_help.js"></script>
 <meta name="flags" content="interact">
-<meta name="timeout" content="long">
 
 <p>Tap an NFC tag to the test device with NFC support.</p>
 
diff --git a/tests/wpt/web-platform-tests/webaudio/js/helpers.js b/tests/wpt/web-platform-tests/webaudio/js/helpers.js
index 650d25c2ad66..fbbfc8e00444 100644
--- a/tests/wpt/web-platform-tests/webaudio/js/helpers.js
+++ b/tests/wpt/web-platform-tests/webaudio/js/helpers.js
@@ -5,7 +5,7 @@
 function trimEmptyElements(array) {
   var start = 0;
   var end = array.length;
-  
+
   while (start < array.length) {
     if (array[start] !== 0) {
       break;
@@ -115,7 +115,7 @@ function compareBuffers(got, expected) {
  * + skipOfflineContextTests: optional. when true, skips running tests on an offline
  *                            context by circumventing testOnOfflineContext.
  *
- * [0]: http://web-platform-tests.org/writing-tests/testharness-api.html#single-page-tests
+ * [0]: https://web-platform-tests.org/writing-tests/testharness-api.html#single-page-tests
  */
 function runTest(name)
 {
diff --git a/tests/wpt/web-platform-tests/webaudio/resources/audio-param.js b/tests/wpt/web-platform-tests/webaudio/resources/audio-param.js
new file mode 100644
index 000000000000..bc33fe8a21f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/resources/audio-param.js
@@ -0,0 +1,44 @@
+// Define functions that implement the formulas for AudioParam automations.
+
+// AudioParam linearRamp value at time t for a linear ramp between (t0, v0) and
+// (t1, v1).  It is assumed that t0 <= t.  Results are undefined otherwise.
+function audioParamLinearRamp(t, v0, t0, v1, t1) {
+  if (t >= t1)
+    return v1;
+  return (v0 + (v1 - v0) * (t - t0) / (t1 - t0))
+}
+
+// AudioParam exponentialRamp value at time t for an exponential ramp between
+// (t0, v0) and (t1, v1). It is assumed that t0 <= t.  Results are undefined
+// otherwise.
+function audioParamExponentialRamp(t, v0, t0, v1, t1) {
+  if (t >= t1)
+    return v1;
+  return v0 * Math.pow(v1 / v0, (t - t0) / (t1 - t0));
+}
+
+// AudioParam setTarget value at time t for a setTarget curve starting at (t0,
+// v0) with a final value of vFainal and a time constant of timeConstant.  It is
+// assumed that t0 <= t.  Results are undefined otherwise.
+function audioParamSetTarget(t, v0, t0, vFinal, timeConstant) {
+  return vFinal + (v0 - vFinal) * Math.exp(-(t - t0) / timeConstant);
+}
+
+// AudioParam setValueCurve value at time t for a setValueCurve starting at time
+// t0 with curve, curve, and duration duration.  The sample rate is sampleRate.
+// It is assumed that t0 <= t.
+function audioParamSetValueCurve(t, curve, t0, duration) {
+  if (t > t0 + duration)
+    return curve[curve.length - 1];
+
+  let curvePointsPerSecond = (curve.length - 1) / duration;
+
+  let virtualIndex = (t - t0) * curvePointsPerSecond;
+  let index = Math.floor(virtualIndex);
+
+  let delta = virtualIndex - index;
+
+  let c0 = curve[index];
+  let c1 = curve[Math.min(index + 1, curve.length - 1)];
+  return c0 + (c1 - c0) * delta;
+}
diff --git a/tests/wpt/web-platform-tests/webaudio/resources/mix-testing.js b/tests/wpt/web-platform-tests/webaudio/resources/mix-testing.js
new file mode 100644
index 000000000000..63c8e1aca61b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/resources/mix-testing.js
@@ -0,0 +1,23 @@
+let toneLengthSeconds = 1;
+
+// Create a buffer with multiple channels.
+// The signal frequency in each channel is the multiple of that in the first
+// channel.
+function createToneBuffer(context, frequency, duration, numberOfChannels) {
+  let sampleRate = context.sampleRate;
+  let sampleFrameLength = duration * sampleRate;
+
+  let audioBuffer =
+      context.createBuffer(numberOfChannels, sampleFrameLength, sampleRate);
+
+  let n = audioBuffer.length;
+
+  for (let k = 0; k < numberOfChannels; ++k) {
+    let data = audioBuffer.getChannelData(k);
+
+    for (let i = 0; i < n; ++i)
+      data[i] = Math.sin(frequency * (k + 1) * 2.0 * Math.PI * i / sampleRate);
+  }
+
+  return audioBuffer;
+}
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html
new file mode 100644
index 000000000000..e176d6111e81
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-basic.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      realtimeanalyser-basic.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let context = 0;
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define('Basic AnalyserNode test', function(task, should) {
+        context = new AudioContext();
+        let analyser = context.createAnalyser();
+
+        should(analyser.numberOfInputs, 'Number of inputs for AnalyserNode')
+            .beEqualTo(1);
+
+        should(analyser.numberOfOutputs, 'Number of outputs for AnalyserNode')
+            .beEqualTo(1);
+
+        should(analyser.minDecibels, 'Default minDecibels value')
+            .beEqualTo(-100);
+
+        should(analyser.maxDecibels, 'Default maxDecibels value')
+            .beEqualTo(-30);
+
+        should(
+            analyser.smoothingTimeConstant,
+            'Default smoothingTimeConstant value')
+            .beEqualTo(0.8);
+
+        let expectedValue = -50 - (1 / 3);
+        analyser.minDecibels = expectedValue;
+
+        should(analyser.minDecibels, 'node.minDecibels = ' + expectedValue)
+            .beEqualTo(expectedValue);
+
+        expectedValue = -40 - (1 / 3);
+        analyser.maxDecibels = expectedValue;
+
+        should(analyser.maxDecibels, 'node.maxDecibels = ' + expectedValue)
+            .beEqualTo(expectedValue);
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html
new file mode 100644
index 000000000000..6a0ab7d06eda
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html
@@ -0,0 +1,113 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      realtimeanalyser-fft-scaling.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <div id="description"></div>
+    <div id="console"></div>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // The number of analysers. We have analysers from size for each of the
+      // possible sizes of 2^5 to 2^15 for a total of 11.
+      let numberOfAnalysers = 11;
+      let sampleRate = 44100;
+      let nyquistFrequency = sampleRate / 2;
+
+      // Frequency of the sine wave test signal.  Should be high enough so that
+      // we get at least one full cycle for the 32-point FFT.  This should also
+      // be such that the frequency should be exactly in one of the FFT bins for
+      // each of the possible FFT sizes.
+      let oscFrequency = nyquistFrequency / 16;
+
+      // The actual peak values from each analyser.  Useful for examining the
+      // actual peak values.
+      let peakValue = new Array(numberOfAnalysers);
+
+      // For a 0dBFS sine wave, we would expect the FFT magnitude to be 0dB as
+      // well, but the analyzer node applies a Blackman window (to smooth the
+      // estimate).  This reduces the energy of the signal so the FFT peak is
+      // less than 0dB.  The threshold value given here was determined
+      // experimentally.
+      //
+      // See https://code.google.com/p/chromium/issues/detail?id=341596.
+      let peakThreshold = [
+        -14.43, -13.56, -13.56, -13.56, -13.56, -13.56, -13.56, -13.56, -13.56,
+        -13.56, -13.56
+      ];
+
+      function checkResult(order, analyser, should) {
+        return function() {
+          let index = order - 5;
+          let fftSize = 1 << order;
+          let fftData = new Float32Array(fftSize);
+          analyser.getFloatFrequencyData(fftData);
+
+          // Compute the frequency bin that should contain the peak.
+          let expectedBin =
+              analyser.frequencyBinCount * (oscFrequency / nyquistFrequency);
+
+          // Find the actual bin by finding the bin containing the peak.
+          let actualBin = 0;
+          peakValue[index] = -1000;
+          for (k = 0; k < analyser.frequencyBinCount; ++k) {
+            if (fftData[k] > peakValue[index]) {
+              actualBin = k;
+              peakValue[index] = fftData[k];
+            }
+          }
+
+          should(actualBin, (1 << order) + '-point FFT peak position')
+              .beEqualTo(expectedBin);
+
+          should(
+              peakValue[index], (1 << order) + '-point FFT peak value in dBFS')
+              .beGreaterThanOrEqualTo(peakThreshold[index]);
+        }
+      }
+
+      audit.define(
+          {
+            label: 'FFT scaling tests',
+            description: 'Test Scaling of FFT in AnalyserNode'
+          },
+          function(task, should) {
+            let tests = [];
+            for (let k = 5; k <= 15; ++k)
+              tests.push(runTest(k, should));
+
+            // The order in which the tests finish is not important.
+            Promise.all(tests).then(task.done.bind(task));
+          });
+
+      function runTest(order, should) {
+        let context = new OfflineAudioContext(1, 1 << order, sampleRate);
+        // Use a sine wave oscillator as the reference source signal.
+        let osc = context.createOscillator();
+        osc.type = 'sine';
+        osc.frequency.value = oscFrequency;
+        osc.connect(context.destination);
+
+        let analyser = context.createAnalyser();
+        // No smoothing to simplify the analysis of the result.
+        analyser.smoothingTimeConstant = 0;
+        analyser.fftSize = 1 << order;
+        osc.connect(analyser);
+
+        osc.start();
+        return context.startRendering().then(() => {
+          checkResult(order, analyser, should)();
+        });
+      }
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html
new file mode 100644
index 000000000000..b3de37f119f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-sizing.html
@@ -0,0 +1,54 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      realtimeanalyser-fft-sizing.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      function doTest(fftSize, illegal, should) {
+        let c = new OfflineAudioContext(1, 1000, 44100);
+        let a = c.createAnalyser();
+        let message = 'Setting fftSize to ' + fftSize;
+        let tester = function() {
+          a.fftSize = fftSize;
+        };
+
+        if (illegal) {
+          should(tester, message).throw('IndexSizeError');
+        } else {
+          should(tester, message).notThrow();
+        }
+      }
+
+      audit.define(
+          {
+            label: 'FFT size test',
+            description: 'Test that re-sizing the FFT arrays does not fail.'
+          },
+          function(task, should) {
+            doTest(-1, true, should);
+            doTest(0, true, should);
+            doTest(1, true, should);
+            for (let i = 2; i <= 0x20000; i *= 2) {
+              if (i >= 32 && i <= 32768)
+                doTest(i, false, should);
+              else
+                doTest(i, true, should);
+              doTest(i + 1, true, should);
+            }
+
+            task.done();
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html
new file mode 100644
index 000000000000..7d0af70df625
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-copy-channel.html
@@ -0,0 +1,331 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test Basic Functionality of AudioBuffer.copyFromChannel and
+      AudioBuffer.copyToChannel
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      // Define utility routines.
+
+      // Initialize the AudioBuffer |buffer| with a ramp signal on each channel.
+      // The ramp starts at channel number + 1.
+      function initializeAudioBufferRamp(buffer) {
+        for (let c = 0; c < buffer.numberOfChannels; ++c) {
+          let d = buffer.getChannelData(c);
+          for (let k = 0; k < d.length; ++k) {
+            d[k] = k + c + 1;
+          }
+        }
+      }
+
+      // Create a Float32Array of length |length| and initialize the array to
+      // -1.
+      function createInitializedF32Array(length) {
+        let x = new Float32Array(length);
+        for (let k = 0; k < length; ++k) {
+          x[k] = -1;
+        }
+        return x;
+      }
+
+      // Create a Float32Array of length |length| that is initialized to be a
+      // ramp starting at 1.
+      function createFloat32RampArray(length) {
+        let x = new Float32Array(length);
+        for (let k = 0; k < x.length; ++k) {
+          x[k] = k + 1;
+        }
+
+        return x;
+      }
+
+      // Test that the array |x| is a ramp starting at value |start| of length
+      // |length|, starting at |startIndex| in the array.  |startIndex| is
+      // optional and defaults to 0. Any other values must be -1.
+      function shouldBeRamp(
+          should, testName, x, startValue, length, startIndex) {
+        let k;
+        let startingIndex = startIndex || 0;
+        let expected = Array(x.length);
+
+        // Fill the expected array with the correct results.
+
+        // The initial part (if any) must be -1.
+        for (k = 0; k < startingIndex; ++k) {
+          expected[k] = -1;
+        }
+
+        // The second part should be a ramp starting with |startValue|
+        for (; k < startingIndex + length; ++k) {
+          expected[k] = startValue + k - startingIndex;
+        }
+
+        // The last part (if any) should be -1.
+        for (; k < x.length; ++k) {
+          expected[k] = -1;
+        }
+
+        should(x, testName, {numberOfArrayLog: 32}).beEqualToArray(expected);
+      }
+
+      let audit = Audit.createTaskRunner();
+
+      let context = new AudioContext();
+      // Temp array for testing exceptions for copyToChannel/copyFromChannel.
+      // The length is arbitrary.
+      let x = new Float32Array(8);
+
+      // Number of frames in the AudioBuffer for testing.  This is pretty
+      // arbitrary so choose a fairly small value.
+      let bufferLength = 16;
+
+      // Number of channels in the AudioBuffer.  Also arbitrary, but it should
+      // be greater than 1 for test coverage.
+      let numberOfChannels = 3;
+
+      // AudioBuffer that will be used for testing copyFrom and copyTo.
+      let buffer = context.createBuffer(
+          numberOfChannels, bufferLength, context.sampleRate);
+
+      let initialValues = Array(numberOfChannels);
+
+      // Initialize things
+      audit.define('initialize', (task, should) => {
+        // Initialize to -1.
+        initialValues.fill(-1);
+        should(initialValues, 'Initialized values').beConstantValueOf(-1)
+        task.done();
+      });
+
+      // Test that expected exceptions are signaled for copyFrom.
+      audit.define('copyFrom-exceptions', (task, should) => {
+        should(
+            AudioBuffer.prototype.copyFromChannel,
+            'AudioBuffer.prototype.copyFromChannel')
+            .exist();
+
+        should(
+            () => {
+              buffer = context.createBuffer(
+                  numberOfChannels, bufferLength, context.sampleRate);
+            },
+            '0: buffer = context.createBuffer(' + numberOfChannels + ', ' +
+                bufferLength + ', context.sampleRate)')
+            .notThrow();
+        should(() => {
+          buffer.copyFromChannel(null, 0);
+        }, '1: buffer.copyFromChannel(null, 0)').throw('TypeError');
+        should(() => {
+          buffer.copyFromChannel(context, 0);
+        }, '2: buffer.copyFromChannel(context, 0)').throw('TypeError');
+        should(() => {
+          buffer.copyFromChannel(x, -1);
+        }, '3: buffer.copyFromChannel(x, -1)').throw('IndexSizeError');
+        should(
+            () => {
+              buffer.copyFromChannel(x, numberOfChannels);
+            },
+            '4: buffer.copyFromChannel(x, ' + numberOfChannels + ')')
+            .throw('IndexSizeError');
+        ;
+        should(() => {
+          buffer.copyFromChannel(x, 0, -1);
+        }, '5: buffer.copyFromChannel(x, 0, -1)').throw('IndexSizeError');
+        should(
+            () => {
+              buffer.copyFromChannel(x, 0, bufferLength);
+            },
+            '6: buffer.copyFromChannel(x, 0, ' + bufferLength + ')')
+            .throw('IndexSizeError');
+
+        should(() => {
+          buffer.copyFromChannel(x, 3);
+        }, '7: buffer.copyFromChannel(x, 3)').throw('IndexSizeError');
+
+        if (window.SharedArrayBuffer) {
+          let shared_buffer = new Float32Array(new SharedArrayBuffer(32));
+          should(
+              () => {
+                buffer.copyFromChannel(shared_buffer, 0);
+              },
+              '8: buffer.copyFromChannel(SharedArrayBuffer view, 0)')
+              .throw('TypeError');
+
+          should(
+              () => {
+                buffer.copyFromChannel(shared_buffer, 0, 0);
+              },
+              '9: buffer.copyFromChannel(SharedArrayBuffer view, 0, 0)')
+              .throw('TypeError');
+        }
+
+        task.done();
+      });
+
+      // Test that expected exceptions are signaled for copyTo.
+      audit.define('copyTo-exceptions', (task, should) => {
+        should(
+            AudioBuffer.prototype.copyToChannel,
+            'AudioBuffer.prototype.copyToChannel')
+            .exist();
+        should(() => {
+          buffer.copyToChannel(null, 0);
+        }, '0: buffer.copyToChannel(null, 0)').throw('TypeError');
+        should(() => {
+          buffer.copyToChannel(context, 0);
+        }, '1: buffer.copyToChannel(context, 0)').throw('TypeError');
+        should(() => {
+          buffer.copyToChannel(x, -1);
+        }, '2: buffer.copyToChannel(x, -1)').throw('IndexSizeError');
+        should(
+            () => {
+              buffer.copyToChannel(x, numberOfChannels);
+            },
+            '3: buffer.copyToChannel(x, ' + numberOfChannels + ')')
+            .throw('IndexSizeError');
+        should(() => {
+          buffer.copyToChannel(x, 0, -1);
+        }, '4: buffer.copyToChannel(x, 0, -1)').throw('IndexSizeError');
+        should(
+            () => {
+              buffer.copyToChannel(x, 0, bufferLength);
+            },
+            '5: buffer.copyToChannel(x, 0, ' + bufferLength + ')')
+            .throw('IndexSizeError');
+
+        should(() => {
+          buffer.copyToChannel(x, 3);
+        }, '6: buffer.copyToChannel(x, 3)').throw('IndexSizeError');
+
+        if (window.SharedArrayBuffer) {
+          let shared_buffer = new Float32Array(new SharedArrayBuffer(32));
+          should(
+              () => {
+                buffer.copyToChannel(shared_buffer, 0);
+              },
+              '7: buffer.copyToChannel(SharedArrayBuffer view, 0)')
+              .throw('TypeError');
+
+          should(
+              () => {
+                buffer.copyToChannel(shared_buffer, 0, 0);
+              },
+              '8: buffer.copyToChannel(SharedArrayBuffer view, 0, 0)')
+              .throw('TypeError');
+        }
+
+        task.done();
+      });
+
+      // Test copyFromChannel
+      audit.define('copyFrom-validate', (task, should) => {
+        // Initialize the AudioBuffer to a ramp for testing copyFrom.
+        initializeAudioBufferRamp(buffer);
+
+        // Test copyFrom operation with a short destination array, filling the
+        // destination completely.
+        for (let c = 0; c < numberOfChannels; ++c) {
+          let dst8 = createInitializedF32Array(8);
+          buffer.copyFromChannel(dst8, c);
+          shouldBeRamp(
+              should, 'buffer.copyFromChannel(dst8, ' + c + ')', dst8, c + 1, 8)
+        }
+
+        // Test copyFrom operation with a short destination array using a
+        // non-zero start index that still fills the destination completely.
+        for (let c = 0; c < numberOfChannels; ++c) {
+          let dst8 = createInitializedF32Array(8);
+          buffer.copyFromChannel(dst8, c, 1);
+          shouldBeRamp(
+              should, 'buffer.copyFromChannel(dst8, ' + c + ', 1)', dst8, c + 2,
+              8)
+        }
+
+        // Test copyFrom operation with a short destination array using a
+        // non-zero start index that does not fill the destinatiom completely.
+        // The extra elements should be unchanged.
+        for (let c = 0; c < numberOfChannels; ++c) {
+          let dst8 = createInitializedF32Array(8);
+          let startInChannel = bufferLength - 5;
+          buffer.copyFromChannel(dst8, c, startInChannel);
+          shouldBeRamp(
+              should,
+              'buffer.copyFromChannel(dst8, ' + c + ', ' + startInChannel + ')',
+              dst8, c + 1 + startInChannel, bufferLength - startInChannel);
+        }
+
+        // Copy operation with the destination longer than the buffer, leaving
+        // the trailing elements of the destination untouched.
+        for (let c = 0; c < numberOfChannels; ++c) {
+          let dst26 = createInitializedF32Array(bufferLength + 10);
+          buffer.copyFromChannel(dst26, c);
+          shouldBeRamp(
+              should, 'buffer.copyFromChannel(dst26, ' + c + ')', dst26, c + 1,
+              bufferLength);
+        }
+
+        task.done();
+      });
+
+      // Test copyTo
+      audit.define('copyTo-validate', (task, should) => {
+        // Create a source consisting of a ramp starting at 1, longer than the
+        // AudioBuffer
+        let src = createFloat32RampArray(bufferLength + 10);
+
+        // Test copyTo with AudioBuffer shorter than Float32Array. The
+        // AudioBuffer should be completely filled with the Float32Array.
+        should(
+            () => {
+              buffer =
+                  createConstantBuffer(context, bufferLength, initialValues);
+            },
+            'buffer = createConstantBuffer(context, ' + bufferLength + ', [' +
+                initialValues + '])')
+            .notThrow();
+
+        for (let c = 0; c < numberOfChannels; ++c) {
+          buffer.copyToChannel(src, c);
+          shouldBeRamp(
+              should, 'buffer.copyToChannel(src, ' + c + ')',
+              buffer.getChannelData(c), 1, bufferLength);
+        }
+
+        // Test copyTo with AudioBuffer longer than the Float32Array.  The tail
+        // of the AudioBuffer should be unchanged.
+        buffer = createConstantBuffer(context, bufferLength, initialValues);
+        let src10 = createFloat32RampArray(10);
+        for (let c = 0; c < numberOfChannels; ++c) {
+          buffer.copyToChannel(src10, c);
+          shouldBeRamp(
+              should, 'buffer.copyToChannel(src10, ' + c + ')',
+              buffer.getChannelData(c), 1, 10);
+        }
+
+        // Test copyTo with non-default startInChannel.  Part of the AudioBuffer
+        // should filled with the beginning and end sections untouched.
+        buffer = createConstantBuffer(context, bufferLength, initialValues);
+        for (let c = 0; c < numberOfChannels; ++c) {
+          let startInChannel = 5;
+          buffer.copyToChannel(src10, c, startInChannel);
+
+          shouldBeRamp(
+              should,
+              'buffer.copyToChannel(src10, ' + c + ', ' + startInChannel + ')',
+              buffer.getChannelData(c), 1, src10.length, startInChannel);
+        }
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html
new file mode 100644
index 000000000000..612a91cf4ef6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer-getChannelData.html
@@ -0,0 +1,66 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioBuffer.getChannelData() Returns the Same Object
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let sampleRate = 48000;
+      let renderDuration = 0.5;
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define('buffer-eq', (task, should) => {
+        // Verify that successive calls to getChannelData return the same
+        // buffer.
+        let context = new AudioContext();
+        let channelCount = 2;
+        let frameLength = 1000;
+        let buffer =
+            context.createBuffer(channelCount, frameLength, context.sampleRate);
+
+        for (let c = 0; c < channelCount; ++c) {
+          let a = buffer.getChannelData(c);
+          let b = buffer.getChannelData(c);
+
+          let message = 'buffer.getChannelData(' + c + ')';
+          should(a === b, message + ' === ' + message).beEqualTo(true);
+        }
+
+        task.done();
+      });
+
+      audit.define('buffer-not-eq', (task, should) => {
+        let context = new AudioContext();
+        let channelCount = 2;
+        let frameLength = 1000;
+        let buffer1 =
+            context.createBuffer(channelCount, frameLength, context.sampleRate);
+        let buffer2 =
+            context.createBuffer(channelCount, frameLength, context.sampleRate);
+        let success = true;
+
+        for (let c = 0; c < channelCount; ++c) {
+          let a = buffer1.getChannelData(c);
+          let b = buffer2.getChannelData(c);
+
+          let message = 'getChannelData(' + c + ')';
+          should(a === b, 'buffer1.' + message + ' === buffer2.' + message)
+                  .beEqualTo(false) &&
+              success;
+        }
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html
new file mode 100644
index 000000000000..07a34f07c185
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiobuffer-interface/audiobuffer.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      audiobuffer.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let sampleRate = 44100.0
+      let lengthInSeconds = 2;
+      let numberOfChannels = 4;
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define('Basic tests for AudioBuffer', function(task, should) {
+        let context = new AudioContext();
+        let buffer = context.createBuffer(
+            numberOfChannels, sampleRate * lengthInSeconds, sampleRate);
+
+        // Just for printing out a message describing what "buffer" is in the
+        // following tests.
+        should(
+            true,
+            'buffer = context.createBuffer(' + numberOfChannels + ', ' +
+                (sampleRate * lengthInSeconds) + ', ' + sampleRate + ')')
+            .beTrue();
+
+        should(buffer.sampleRate, 'buffer.sampleRate').beEqualTo(sampleRate);
+
+        should(buffer.length, 'buffer.length')
+            .beEqualTo(sampleRate * lengthInSeconds);
+
+        should(buffer.duration, 'buffer.duration').beEqualTo(lengthInSeconds);
+
+        should(buffer.numberOfChannels, 'buffer.numberOfChannels')
+            .beEqualTo(numberOfChannels);
+
+        for (let index = 0; index < buffer.numberOfChannels; ++index) {
+          should(
+              buffer.getChannelData(index) instanceof window.Float32Array,
+              'buffer.getChannelData(' + index +
+                  ') instanceof window.Float32Array')
+              .beTrue();
+        }
+
+        should(
+            function() {
+              buffer.getChannelData(buffer.numberOfChannels);
+            },
+            'buffer.getChannelData(' + buffer.numberOfChannels + ')')
+            .throw('IndexSizeError');
+
+        let buffer2 = context.createBuffer(1, 1000, 24576);
+        let expectedDuration = 1000 / 24576;
+
+        should(
+            buffer2.duration, 'context.createBuffer(1, 1000, 24576).duration')
+            .beEqualTo(expectedDuration);
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html
new file mode 100644
index 000000000000..cd09696e6890
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-getoutputtimestamp.html
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Testing AudioContext.getOutputTimestamp() method
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      audit.define('getoutputtimestamp-initial-values', function(task, should) {
+        let context = new AudioContext;
+        let timestamp = context.getOutputTimestamp();
+
+        should(timestamp.contextTime, 'timestamp.contextTime').exist();
+        should(timestamp.performanceTime, 'timestamp.performanceTime').exist();
+
+        should(timestamp.contextTime, 'timestamp.contextTime').beEqualTo(0);
+        should(timestamp.performanceTime, 'timestamp.performanceTime')
+            .beEqualTo(0);
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html
new file mode 100644
index 000000000000..48506d65ac9c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontext-suspend-resume.html
@@ -0,0 +1,145 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioContext.suspend() and AudioContext.resume()
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let offlineContext;
+      let osc;
+      let p1;
+      let p2;
+      let p3;
+
+      let sampleRate = 44100;
+      let durationInSeconds = 1;
+
+      let audit = Audit.createTaskRunner();
+
+      // Task: test suspend().
+      audit.define(
+          {
+            label: 'test-suspend',
+            description: 'Test suspend() for offline context'
+          },
+          function(task, should) {
+            // Test suspend/resume.  Ideally this test is best with a online
+            // AudioContext, but content shell doesn't really have a working
+            // online AudioContext. Hence, use an OfflineAudioContext. Not all
+            // possible scenarios can be easily checked with an offline context
+            // instead of an online context.
+
+            // Create an audio context with an oscillator.
+            should(
+                () => {
+                  offlineContext = new OfflineAudioContext(
+                      1, durationInSeconds * sampleRate, sampleRate);
+                },
+                'offlineContext = new OfflineAudioContext(1, ' +
+                    (durationInSeconds * sampleRate) + ', ' + sampleRate + ')')
+                .notThrow();
+            osc = offlineContext.createOscillator();
+            osc.connect(offlineContext.destination);
+
+            // Verify the state.
+            should(offlineContext.state, 'offlineContext.state')
+                .beEqualTo('suspended');
+
+            // Multiple calls to suspend() should not be a problem. But we can't
+            // test that on an offline context.  Thus, check that suspend() on
+            // an OfflineAudioContext rejects the promise.
+            should(
+                () => p1 = offlineContext.suspend(),
+                'p1 = offlineContext.suspend()')
+                .notThrow();
+            should(p1 instanceof Promise, 'p1 instanceof Promise').beTrue();
+
+            should(p1, 'p1').beRejected().then(task.done.bind(task));
+          });
+
+
+      // Task: test resume().
+      audit.define(
+          {
+            label: 'test-resume',
+            description: 'Test resume() for offline context'
+          },
+          function(task, should) {
+            // Multiple calls to resume should not be a problem. But we can't
+            // test that on an offline context. Thus, check that resume() on an
+            // OfflineAudioContext rejects the promise.
+            should(
+                () => p2 = offlineContext.resume(),
+                'p2 = offlineContext.resume()')
+                .notThrow();
+            should(p2 instanceof Promise, 'p2 instanceof Promise').beTrue();
+
+            // Resume doesn't actually resume an offline context
+            should(offlineContext.state, 'After resume, offlineContext.state')
+                .beEqualTo('suspended');
+            should(p2, 'p2').beRejected().then(task.done.bind(task));
+          });
+
+      // Task: test the state after context closed.
+      audit.define(
+          {
+            label: 'test-after-close',
+            description: 'Test state after context closed'
+          },
+          function(task, should) {
+            // Render the offline context.
+            osc.start();
+
+            // Test suspend/resume in tested promise pattern. We don't care
+            // about the actual result of the offline rendering.
+            should(
+                () => p3 = offlineContext.startRendering(),
+                'p3 = offlineContext.startRendering()')
+                .notThrow();
+
+            p3.then(() => {
+              should(offlineContext.state, 'After close, offlineContext.state')
+                  .beEqualTo('closed');
+
+              // suspend() should be rejected on a closed context.
+              should(offlineContext.suspend(), 'offlineContext.suspend()')
+                  .beRejected()
+                  .then(() => {
+                    // resume() should be rejected on closed context.
+                    should(offlineContext.resume(), 'offlineContext.resume()')
+                        .beRejected()
+                        .then(task.done.bind(task));
+                  })
+            });
+          });
+
+      audit.define(
+          {
+            label: 'resume-running-context',
+            description: 'Test resuming a running context'
+          },
+          (task, should) => {
+            let context;
+            should(() => context = new AudioContext(), 'Create online context')
+                .notThrow();
+
+            should(context.state, 'context.state').beEqualTo('running');
+            should(context.resume(), 'context.resume')
+                .beResolved()
+                .then(() => {
+                  should(context.state, 'context.state after resume')
+                      .beEqualTo('running');
+                })
+                .then(() => task.done());
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html
new file mode 100644
index 000000000000..295cd5a5db11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audiocontext-interface/audiocontextoptions.html
@@ -0,0 +1,162 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioContextOptions
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let context;
+      let defaultLatency;
+      let interactiveLatency;
+      let balancedLatency;
+      let playbackLatency;
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define(
+          {
+            label: 'test-audiocontextoptions-latencyHint-basic',
+            description: 'Test creating contexts with basic latencyHint types.'
+          },
+          function(task, should) {
+            let closingPromises = [];
+
+            // Verify that an AudioContext can be created with default options.
+            should(function() {
+              context = new AudioContext()
+            }, 'context = new AudioContext()').notThrow();
+
+            should(context.sampleRate,
+              `context.sampleRate (${context.sampleRate} Hz)`).beGreaterThan(0);
+
+            defaultLatency = context.baseLatency;
+            should(defaultLatency, 'default baseLatency').beGreaterThan(0);
+
+            // Verify that an AudioContext can be created with the expected
+            // latency types.
+            should(
+                function() {
+                  context = new AudioContext({'latencyHint': 'interactive'})
+                },
+                'context = new AudioContext({\'latencyHint\': \'interactive\'})')
+                .notThrow();
+
+            interactiveLatency = context.baseLatency;
+            should(interactiveLatency, 'interactive baseLatency')
+                .beEqualTo(defaultLatency);
+            closingPromises.push(context.close());
+
+            should(
+                function() {
+                  context = new AudioContext({'latencyHint': 'balanced'})
+                },
+                'context = new AudioContext({\'latencyHint\': \'balanced\'})')
+                .notThrow();
+
+            balancedLatency = context.baseLatency;
+            should(balancedLatency, 'balanced baseLatency')
+                .beGreaterThanOrEqualTo(interactiveLatency);
+            closingPromises.push(context.close());
+
+            should(
+                function() {
+                  context = new AudioContext({'latencyHint': 'playback'})
+                },
+                'context = new AudioContext({\'latencyHint\': \'playback\'})')
+                .notThrow();
+
+            playbackLatency = context.baseLatency;
+            should(playbackLatency, 'playback baseLatency')
+                .beGreaterThanOrEqualTo(balancedLatency);
+            closingPromises.push(context.close());
+
+            Promise.all(closingPromises).then(function() {
+              task.done();
+            });
+          });
+
+      audit.define(
+          {
+            label: 'test-audiocontextoptions-latencyHint-double',
+            description:
+                'Test creating contexts with explicit latencyHint values.'
+          },
+          function(task, should) {
+            let closingPromises = [];
+
+            // Verify too small exact latency clamped to 'interactive'
+            should(
+                function() {
+                  context =
+                      new AudioContext({'latencyHint': interactiveLatency / 2})
+                },
+                'context = new AudioContext({\'latencyHint\': ' +
+                    'interactiveLatency/2})')
+                .notThrow();
+            should(context.baseLatency, 'double-constructor baseLatency small')
+                .beLessThanOrEqualTo(interactiveLatency);
+            closingPromises.push(context.close());
+
+            // Verify that exact latency in range works as expected
+            let validLatency = (interactiveLatency + playbackLatency) / 2;
+            should(
+                function() {
+                  context = new AudioContext({'latencyHint': validLatency})
+                },
+                'context = new AudioContext({\'latencyHint\': validLatency})')
+                .notThrow();
+            should(
+                context.baseLatency, 'double-constructor baseLatency inrange 1')
+                .beGreaterThanOrEqualTo(interactiveLatency);
+            should(
+                context.baseLatency, 'double-constructor baseLatency inrange 2')
+                .beLessThanOrEqualTo(playbackLatency);
+            closingPromises.push(context.close());
+
+            // Verify too big exact latency clamped to some value
+            let context1;
+            let context2;
+            should(function() {
+              context1 =
+                  new AudioContext({'latencyHint': playbackLatency * 10});
+              context2 =
+                  new AudioContext({'latencyHint': playbackLatency * 20});
+            }, 'creating two high latency contexts').notThrow();
+            should(context1.baseLatency, 'high latency context baseLatency')
+                .beEqualTo(context2.baseLatency);
+            should(context1.baseLatency, 'high latency context baseLatency')
+                .beGreaterThan(interactiveLatency);
+            closingPromises.push(context1.close());
+            closingPromises.push(context2.close());
+
+            // Verify that invalid latencyHint values are rejected.
+            should(
+                function() {
+                  context = new AudioContext({'latencyHint': 'foo'})
+                },
+                'context = new AudioContext({\'latencyHint\': \'foo\'})')
+                .throw('TypeError');
+
+            // Verify that no extra options can be passed into the
+            // AudioContextOptions.
+            should(
+                function() {
+                  context = new AudioContext('latencyHint')
+                },
+                'context = new AudioContext(\'latencyHint\')')
+                .throw('TypeError');
+
+            Promise.all(closingPromises).then(function() {
+              task.done();
+            });
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html
new file mode 100644
index 000000000000..517d64f3dbb6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-connect-audioratesignal.html
@@ -0,0 +1,103 @@
+<!DOCTYPE html>
+<!-- 
+Tests that an audio-rate signal (AudioNode output) can be connected to an
+AudioParam.  Specifically, this tests that an audio-rate signal coming from an
+AudioBufferSourceNode playing an AudioBuffer containing a specific curve can be
+connected to an AudioGainNode's .gain attribute (an AudioParam).  Another
+AudioBufferSourceNode will be the audio source having its gain changed.  We load
+this one with an AudioBuffer containing a constant value of 1.  Thus it's easy
+to check that the resultant signal should be equal to the gain-scaling curve.
+-->
+<html>
+  <head>
+    <title>
+      audioparam-connect-audioratesignal.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      let sampleRate = 44100.0;
+      let lengthInSeconds = 1;
+
+      let context = 0;
+      let constantOneBuffer = 0;
+      let linearRampBuffer = 0;
+
+      function checkResult(renderedBuffer, should) {
+        let renderedData = renderedBuffer.getChannelData(0);
+        let expectedData = linearRampBuffer.getChannelData(0);
+        let n = renderedBuffer.length;
+
+        should(n, 'Rendered signal length').beEqualTo(linearRampBuffer.length);
+
+        // Check that the rendered result exactly matches the buffer used to
+        // control gain.  This is because we're changing the gain of a signal
+        // having constant value 1.
+        let success = true;
+        for (let i = 0; i < n; ++i) {
+          if (renderedData[i] != expectedData[i]) {
+            success = false;
+            break;
+          }
+        }
+
+        should(
+            success,
+            'Rendered signal exactly matches the audio-rate gain changing signal')
+            .beTrue();
+      }
+
+      audit.define('test', function(task, should) {
+        let sampleFrameLength = sampleRate * lengthInSeconds;
+
+        // Create offline audio context.
+        context = new OfflineAudioContext(1, sampleFrameLength, sampleRate);
+
+        // Create buffer used by the source which will have its gain controlled.
+        constantOneBuffer = createConstantBuffer(context, sampleFrameLength, 1);
+
+        // Create buffer used to control gain.
+        linearRampBuffer = createLinearRampBuffer(context, sampleFrameLength);
+
+        // Create the two sources.
+
+        let constantSource = context.createBufferSource();
+        constantSource.buffer = constantOneBuffer;
+
+        let gainChangingSource = context.createBufferSource();
+        gainChangingSource.buffer = linearRampBuffer;
+
+        // Create a gain node controlling the gain of constantSource and make
+        // the connections.
+        let gainNode = context.createGain();
+
+        // Intrinsic baseline gain of zero.
+        gainNode.gain.value = 0;
+
+        constantSource.connect(gainNode);
+        gainNode.connect(context.destination);
+
+        // Connect an audio-rate signal to control the .gain AudioParam.
+        // This is the heart of what is being tested.
+        gainChangingSource.connect(gainNode.gain);
+
+        // Start both sources at time 0.
+        constantSource.start(0);
+        gainChangingSource.start(0);
+
+        context.startRendering().then(buffer => {
+          checkResult(buffer, should);
+          task.done();
+        });
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html
new file mode 100644
index 000000000000..c2d18de21708
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exceptional-values.html
@@ -0,0 +1,235 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      audioparam-exceptional-values.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Context to use for all of the tests.  The context isn't used for any
+      // processing; just need one for creating a gain node, which is used for
+      // all the tests.
+      let context;
+
+      // For these values, AudioParam methods should throw a Typeerror because
+      // they are not finite values.
+      let nonFiniteValues = [Infinity, -Infinity, NaN];
+
+      audit.define('initialize', (task, should) => {
+        should(() => {
+          // Context for testing.  Rendering isn't done, so any valid values can
+          // be used here so might as well make them small.
+          context = new OfflineAudioContext(1, 1, 8000);
+        }, 'Creating context for testing').notThrow();
+
+        task.done();
+      });
+
+      audit.define(
+          {
+            label: 'test value',
+            description: 'Test non-finite arguments for AudioParam value'
+          },
+          (task, should) => {
+            let gain = context.createGain();
+
+            // Default method for generating the arguments for an automation
+            // method for testing the value of the automation.
+            let defaultFuncArg = (value) => [value, 1];
+
+            // Test the value parameter
+            doTests(should, gain, 'TypeError', nonFiniteValues, [
+              {automationName: 'setValueAtTime', funcArg: defaultFuncArg}, {
+                automationName: 'linearRampToValueAtTime',
+                funcArg: defaultFuncArg
+              },
+              {
+                automationName: 'exponentialRampToValueAtTime',
+                funcArg: defaultFuncArg
+              },
+              {
+                automationName: 'setTargetAtTime',
+                funcArg: (value) => [value, 1, 1]
+              }
+            ]);
+            task.done();
+          });
+
+      audit.define(
+          {
+            label: 'test time',
+            description: 'Test non-finite arguments for AudioParam time'
+          },
+          (task, should) => {
+            let gain = context.createGain();
+
+            // Default method for generating the arguments for an automation
+            // method for testing the time parameter of the automation.
+            let defaultFuncArg = (startTime) => [1, startTime];
+
+            // Test the time parameter
+            doTests(should, gain, 'TypeError', nonFiniteValues, [
+              {automationName: 'setValueAtTime', funcArg: defaultFuncArg},
+              {
+                automationName: 'linearRampToValueAtTime',
+                funcArg: defaultFuncArg
+              },
+              {
+                automationName: 'exponentialRampToValueAtTime',
+                funcArg: defaultFuncArg
+              },
+              // Test start time for setTarget
+              {
+                automationName: 'setTargetAtTime',
+                funcArg: (startTime) => [1, startTime, 1]
+              },
+              // Test time constant for setTarget
+              {
+                automationName: 'setTargetAtTime',
+                funcArg: (timeConstant) => [1, 1, timeConstant]
+              },
+            ]);
+
+            task.done();
+          });
+
+      audit.define(
+          {
+            label: 'test setValueCurve',
+            description: 'Test non-finite arguments for setValueCurveAtTime'
+          },
+          (task, should) => {
+            let gain = context.createGain();
+
+            // Just an array for use by setValueCurveAtTime. The length and
+            // contents of the array are not important.
+            let curve = new Float32Array(3);
+
+            doTests(should, gain, 'TypeError', nonFiniteValues, [
+              {
+                automationName: 'setValueCurveAtTime',
+                funcArg: (startTime) => [curve, startTime, 1]
+              },
+            ]);
+
+            // Non-finite values for the curve should signal an error
+            doTests(
+                should, gain, 'TypeError',
+                [[1, 2, Infinity, 3], [1, NaN, 2, 3]], [{
+                  automationName: 'setValueCurveAtTime',
+                  funcArg: (c) => [c, 1, 1]
+                }]);
+
+            task.done();
+          });
+
+      audit.define(
+          {
+            label: 'special cases 1',
+            description: 'Test exceptions for finite values'
+          },
+          (task, should) => {
+            let gain = context.createGain();
+
+            // Default method for generating the arguments for an automation
+            // method for testing the time parameter of the automation.
+            let defaultFuncArg = (startTime) => [1, startTime];
+
+            // Test the time parameter
+            let curve = new Float32Array(3);
+            doTests(should, gain, 'RangeError', [-1], [
+              {automationName: 'setValueAtTime', funcArg: defaultFuncArg},
+              {
+                automationName: 'linearRampToValueAtTime',
+                funcArg: defaultFuncArg
+              },
+              {
+                automationName: 'exponentialRampToValueAtTime',
+                funcArg: defaultFuncArg
+              },
+              {
+                automationName: 'setTargetAtTime',
+                funcArg: (startTime) => [1, startTime, 1]
+              },
+              // Test time constant
+              {
+                automationName: 'setTargetAtTime',
+                funcArg: (timeConstant) => [1, 1, timeConstant]
+              },
+              // startTime and duration for setValueCurve
+              {
+                automationName: 'setValueCurveAtTime',
+                funcArg: (startTime) => [curve, startTime, 1]
+              },
+              {
+                automationName: 'setValueCurveAtTime',
+                funcArg: (duration) => [curve, 1, duration]
+              },
+            ]);
+
+            // One final test for setValueCurve: duration can't be 0.
+            should(
+                () => gain.gain.setValueCurveAtTime(curve, 1, 0),
+                'gain.gain.setValueCurveAtTime(curve, 1, 0)')
+                .throw('RangeError');
+
+            task.done();
+          });
+
+      audit.define(
+          {
+            label: 'special cases 2',
+            description: 'Test special cases for expeonentialRamp'
+          },
+          (task, should) => {
+            let gain = context.createGain();
+
+            doTests(should, gain, 'RangeError', [0, -1e-100, 1e-100], [{
+                      automationName: 'exponentialRampToValueAtTime',
+                      funcArg: (value) => [value, 1]
+                    }]);
+
+            task.done();
+          });
+
+      audit.run();
+
+      // Run test over the set of values in |testValues| for all of the
+      // automation methods in |testMethods|.  The expected error type is
+      // |errorName|. |testMethods| is an array of dictionaries with attributes
+      // |automationName| giving the name of the automation method to be tested
+      // and |funcArg| being a function of one parameter that produces an array
+      // that will be used as the argument to the automation method.
+      function doTests(should, node, errorName, testValues, testMethods) {
+        testValues.forEach(value => {
+          testMethods.forEach(method => {
+            let args = method.funcArg(value);
+            let message = 'gain.gain.' + method.automationName + '(' +
+                argString(args) + ')';
+            should(() => node.gain[method.automationName](...args), message)
+                .throw(errorName);
+          });
+        });
+      }
+
+      // Specialized printer for automation arguments so that messages make
+      // sense.  We assume the first element is either a number or an array.  If
+      // it's an array, there are always three elements, and we want to print
+      // out the brackets for the array argument.
+      function argString(arg) {
+        if (typeof(arg[0]) === 'number') {
+          return arg.toString();
+        }
+
+        return '[' + arg[0] + '],' + arg[1] + ',' + arg[2];
+      }
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html
new file mode 100644
index 000000000000..bec4c1286b4a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-exponentialRampToValueAtTime.html
@@ -0,0 +1,63 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioParam.exponentialRampToValueAtTime
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Play a long DC signal out through an AudioGainNode, and call
+      // setValueAtTime() and exponentialRampToValueAtTime() at regular
+      // intervals to set the starting and ending values for an exponential
+      // ramp.  Each time interval has a ramp with a different starting and
+      // ending value so that there is a discontinuity at each time interval
+      // boundary.  The discontinuity is for testing timing.  Also, we alternate
+      // between an increasing and decreasing ramp for each interval.
+
+      // Number of tests to run.
+      let numberOfTests = 100;
+
+      // Max allowed difference between the rendered data and the expected
+      // result.
+      let maxAllowedError = 1.222e-5;
+
+      // The AudioGainNode starts with this value instead of the default value.
+      let initialValue = 100;
+
+      // Set the gain node value to the specified value at the specified time.
+      function setValue(value, time) {
+        gainNode.gain.setValueAtTime(value, time);
+      }
+
+      // Generate an exponential ramp ending at time |endTime| with an ending
+      // value of |value|.
+      function generateRamp(value, startTime, endTime){
+          // |startTime| is ignored because the exponential ramp
+          // uses the value from the setValueAtTime() call above.
+          gainNode.gain.exponentialRampToValueAtTime(value, endTime)}
+
+      audit.define(
+          {
+            label: 'test',
+            description:
+                'AudioParam exponentialRampToValueAtTime() functionality'
+          },
+          function(task, should) {
+            createAudioGraphAndTest(
+                task, should, numberOfTests, initialValue, setValue,
+                generateRamp, 'exponentialRampToValueAtTime()', maxAllowedError,
+                createExponentialRampArray);
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html
new file mode 100644
index 000000000000..d8f38eeba085
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-large-endtime.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      AudioParam with Huge End Time
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let sampleRate = 48000;
+      // Render for some small (but fairly arbitrary) time.
+      let renderDuration = 0.125;
+      // Any huge time value that won't fit in a size_t (2^64 on a 64-bit
+      // machine).
+      let largeTime = 1e300;
+
+      let audit = Audit.createTaskRunner();
+
+      // See crbug.com/582701.  Create an audioparam with a huge end time and
+      // verify that to automation is run.  We don't care about the actual
+      // results, just that it runs.
+
+      // Test linear ramp with huge end time
+      audit.define('linearRamp', (task, should) => {
+        let graph = createGraph();
+        graph.gain.gain.linearRampToValueAtTime(0.1, largeTime);
+
+        graph.source.start();
+        graph.context.startRendering()
+            .then(function(buffer) {
+              should(true, 'linearRampToValue(0.1, ' + largeTime + ')')
+                  .message('successfully rendered', 'unsuccessfully rendered');
+            })
+            .then(() => task.done());
+      });
+
+      // Test exponential ramp with huge end time
+      audit.define('exponentialRamp', (task, should) => {
+        let graph = createGraph();
+        graph.gain.gain.exponentialRampToValueAtTime(.1, largeTime);
+
+        graph.source.start();
+        graph.context.startRendering()
+            .then(function(buffer) {
+              should(true, 'exponentialRampToValue(0.1, ' + largeTime + ')')
+                  .message('successfully rendered', 'unsuccessfully rendered');
+            })
+            .then(() => task.done());
+      });
+
+      audit.run();
+
+      // Create the graph and return the context, the source, and the gain node.
+      function createGraph() {
+        let context =
+            new OfflineAudioContext(1, renderDuration * sampleRate, sampleRate);
+        let src = context.createBufferSource();
+        src.buffer = createConstantBuffer(context, 1, 1);
+        src.loop = true;
+        let gain = context.createGain();
+        src.connect(gain);
+        gain.connect(context.destination);
+        gain.gain.setValueAtTime(1, 0.1 / sampleRate);
+
+        return {context: context, gain: gain, source: src};
+      }
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html
new file mode 100644
index 000000000000..509c254d92d8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-linearRampToValueAtTime.html
@@ -0,0 +1,60 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioParam.linearRampToValueAtTime
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Play a long DC signal out through an AudioGainNode, and call
+      // setValueAtTime() and linearRampToValueAtTime() at regular intervals to
+      // set the starting and ending values for a linear ramp. Each time
+      // interval has a ramp with a different starting and ending value so that
+      // there is a discontinuity at each time interval boundary.  The
+      // discontinuity is for testing timing.  Also, we alternate between an
+      // increasing and decreasing ramp for each interval.
+
+      // Number of tests to run.
+      let numberOfTests = 100;
+
+      // Max allowed difference between the rendered data and the expected
+      // result.
+      let maxAllowedError = 1.865e-6;
+
+      // Set the gain node value to the specified value at the specified time.
+      function setValue(value, time) {
+        gainNode.gain.setValueAtTime(value, time);
+      }
+
+      // Generate a linear ramp ending at time |endTime| with an ending value of
+      // |value|.
+      function generateRamp(value, startTime, endTime){
+          // |startTime| is ignored because the linear ramp uses the value from
+          // the
+          // setValueAtTime() call above.
+          gainNode.gain.linearRampToValueAtTime(value, endTime)}
+
+      audit.define(
+          {
+            label: 'test',
+            description: 'AudioParam linearRampToValueAtTime() functionality'
+          },
+          function(task, should) {
+            createAudioGraphAndTest(
+                task, should, numberOfTests, 1, setValue, generateRamp,
+                'linearRampToValueAtTime()', maxAllowedError,
+                createLinearRampArray);
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html
new file mode 100644
index 000000000000..ed25a0193b5e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-method-chaining.html
@@ -0,0 +1,143 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      audioparam-method-chaining.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let sampleRate = 8000;
+
+      // Create a dummy array for setValueCurveAtTime method.
+      let curveArray = new Float32Array([5.0, 6.0]);
+
+      // AudioNode dictionary with associated dummy arguments.
+      let methodDictionary = [
+        {name: 'setValueAtTime', args: [1.0, 0.0]},
+        {name: 'linearRampToValueAtTime', args: [2.0, 1.0]},
+        {name: 'exponentialRampToValueAtTime', args: [3.0, 2.0]},
+        {name: 'setTargetAtTime', args: [4.0, 2.0, 0.5]},
+        {name: 'setValueCurveAtTime', args: [curveArray, 5.0, 1.0]},
+        {name: 'cancelScheduledValues', args: [6.0]}
+      ];
+
+      let audit = Audit.createTaskRunner();
+
+      // Task: testing entries from the dictionary.
+      audit.define('from-dictionary', (task, should) => {
+        let context = new AudioContext();
+
+        methodDictionary.forEach(function(method) {
+          let sourceParam = context.createGain().gain;
+          should(
+              sourceParam === sourceParam[method.name](...method.args),
+              'The return value of ' + sourceParam.constructor.name + '.' +
+                  method.name + '()' +
+                  ' matches the source AudioParam')
+              .beEqualTo(true);
+
+        });
+
+        task.done();
+      });
+
+      // Task: test method chaining with invalid operation.
+      audit.define('invalid-operation', (task, should) => {
+        let context = new OfflineAudioContext(1, sampleRate, sampleRate);
+        let osc = context.createOscillator();
+        let amp1 = context.createGain();
+        let amp2 = context.createGain();
+
+        osc.connect(amp1);
+        osc.connect(amp2);
+        amp1.connect(context.destination);
+        amp2.connect(context.destination);
+
+        // The first operation fails with an exception, thus the second one
+        // should not have effect on the parameter value. Instead, it should
+        // maintain the default value of 1.0.
+        should(
+            function() {
+              amp1.gain.setValueAtTime(0.25, -1.0)
+                  .linearRampToValueAtTime(2.0, 1.0);
+            },
+            'Calling setValueAtTime() with a negative end time')
+            .throw('RangeError');
+
+        // The first operation succeeds but the second fails due to zero target
+        // value for the exponential ramp. Thus only the first should have
+        // effect on the parameter value, setting the value to 0.5.
+        should(
+            function() {
+              amp2.gain.setValueAtTime(0.5, 0.0).exponentialRampToValueAtTime(
+                  0.0, 1.0);
+            },
+            'Calling exponentialRampToValueAtTime() with a zero target value')
+            .throw('RangeError');
+
+        osc.start();
+        osc.stop(1.0);
+
+        context.startRendering()
+            .then(function(buffer) {
+              should(amp1.gain.value, 'The gain value of the first gain node')
+                  .beEqualTo(1.0);
+              should(amp2.gain.value, 'The gain value of the second gain node')
+                  .beEqualTo(0.5);
+            })
+            .then(() => task.done());
+      });
+
+      // Task: verify if the method chaining actually works. Create an arbitrary
+      // envelope and compare the result with the expected one created by JS
+      // code.
+      audit.define('verification', (task, should) => {
+        let context = new OfflineAudioContext(1, sampleRate * 4, sampleRate);
+        let constantBuffer = createConstantBuffer(context, 1, 1.0);
+
+        let source = context.createBufferSource();
+        source.buffer = constantBuffer;
+        source.loop = true;
+
+        let envelope = context.createGain();
+
+        source.connect(envelope);
+        envelope.connect(context.destination);
+
+        envelope.gain.setValueAtTime(0.0, 0.0)
+            .linearRampToValueAtTime(1.0, 1.0)
+            .exponentialRampToValueAtTime(0.5, 2.0)
+            .setTargetAtTime(0.001, 2.0, 0.5);
+
+        source.start();
+
+        context.startRendering()
+            .then(function(buffer) {
+              let expectedEnvelope =
+                  createLinearRampArray(0.0, 1.0, 0.0, 1.0, sampleRate);
+              expectedEnvelope.push(...createExponentialRampArray(
+                  1.0, 2.0, 1.0, 0.5, sampleRate));
+              expectedEnvelope.push(...createExponentialApproachArray(
+                  2.0, 4.0, 0.5, 0.001, sampleRate, 0.5));
+
+              // There are slight differences between JS implementation of
+              // AudioParam envelope and the internal implementation. (i.e.
+              // double/float and rounding up) The error threshold is adjusted
+              // empirically through the local testing.
+              should(buffer.getChannelData(0), 'The rendered envelope')
+                  .beCloseToArray(
+                      expectedEnvelope, {absoluteThreshold: 4.0532e-6});
+            })
+            .then(() => task.done());
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html
new file mode 100644
index 000000000000..faf00c007b37
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setTargetAtTime.html
@@ -0,0 +1,61 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioParam.setTargetAtTime
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Play a long DC signal out through an AudioGainNode, and call
+      // setValueAtTime() and setTargetAtTime at regular intervals to set the
+      // starting value and the target value. Each time interval has a ramp with
+      // a different starting and target value so that there is a discontinuity
+      // at each time interval boundary. The discontinuity is for testing
+      // timing.  Also, we alternate between an increasing and decreasing ramp
+      // for each interval.
+
+      // Number of tests to run.
+      let numberOfTests = 100;
+
+      // Max allowed difference between the rendered data and the expected
+      // result.
+      let maxAllowedError = 6.5683e-4
+
+      // The AudioGainNode starts with this value instead of the default value.
+      let initialValue = 100;
+
+      // Set the gain node value to the specified value at the specified time.
+      function setValue(value, time) {
+        gainNode.gain.setValueAtTime(value, time);
+      }
+
+      // Generate an exponential approach starting at |startTime| with a target
+      // value of |value|.
+      function automation(value, startTime, endTime){
+          // endTime is not used for setTargetAtTime.
+          gainNode.gain.setTargetAtTime(value, startTime, timeConstant)}
+
+      audit.define(
+          {
+            label: 'test',
+            description: 'AudioParam setTargetAtTime() functionality.'
+          },
+          function(task, should) {
+            createAudioGraphAndTest(
+                task, should, numberOfTests, initialValue, setValue, automation,
+                'setTargetAtTime()', maxAllowedError,
+                createExponentialApproachArray);
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html
new file mode 100644
index 000000000000..ab2edfd009f1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueAtTime.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      audioparam-setValueAtTime.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Play a long DC signal out through an AudioGainNode, and call
+      // setValueAtTime() at regular intervals to set the value for the duration
+      // of the interval.  Each time interval has different value so that there
+      // is a discontinuity at each time interval boundary.  The discontinuity
+      // is for testing timing.
+
+      // Number of tests to run.
+      let numberOfTests = 100;
+
+      // Max allowed difference between the rendered data and the expected
+      // result.
+      let maxAllowedError = 6e-8;
+
+      // Set the gain node value to the specified value at the specified time.
+      function setValue(value, time) {
+        gainNode.gain.setValueAtTime(value, time);
+      }
+
+      // For testing setValueAtTime(), we don't need to do anything for
+      // automation. because the value at the beginning of the interval is set
+      // by setValue and it remains constant for the duration, which is what we
+      // want.
+      function automation(value, startTime, endTime) {
+        // Do nothing.
+      }
+
+      audit.define(
+          {
+            label: 'test',
+            description: 'AudioParam setValueAtTime() functionality.'
+          },
+          function(task, should) {
+            createAudioGraphAndTest(
+                task, should, numberOfTests, 1, setValue, automation,
+                'setValueAtTime()', maxAllowedError, createConstantArray);
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html
new file mode 100644
index 000000000000..590dcbd5a29b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurve-exceptions.html
@@ -0,0 +1,320 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test Exceptions from setValueCurveAtTime
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let sampleRate = 48000;
+      // Some short duration because we don't need to run the test for very
+      // long.
+      let testDurationSec = 0.125;
+      let testDurationFrames = testDurationSec * sampleRate;
+
+      let audit = Audit.createTaskRunner();
+
+      audit.define('setValueCurve', (task, should) => {
+        let success = true;
+        let context =
+            new OfflineAudioContext(1, testDurationFrames, sampleRate);
+        let g = context.createGain();
+        let curve = new Float32Array(2);
+
+        // Start time and duration for setValueCurveAtTime
+        let curveStartTime = 0.1 * testDurationSec;
+        let duration = 0.1 * testDurationSec;
+
+        // Some time that is known to during the setValueCurveTime interval.
+        let automationTime = curveStartTime + duration / 2;
+
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(curve, curveStartTime, duration);
+            },
+            'setValueCurveAtTime(curve, ' + curveStartTime + ', ' + duration +
+                ')')
+            .notThrow();
+
+        should(
+            function() {
+              g.gain.setValueAtTime(1, automationTime);
+            },
+            'setValueAtTime(1, ' + automationTime + ')')
+            .throw('NotSupportedError');
+
+        should(
+            function() {
+              g.gain.linearRampToValueAtTime(1, automationTime);
+            },
+            'linearRampToValueAtTime(1, ' + automationTime + ')')
+            .throw('NotSupportedError');
+
+        should(
+            function() {
+              g.gain.exponentialRampToValueAtTime(1, automationTime);
+            },
+            'exponentialRampToValueAtTime(1, ' + automationTime + ')')
+            .throw('NotSupportedError');
+
+        should(
+            function() {
+              g.gain.setTargetAtTime(1, automationTime, 1);
+            },
+            'setTargetAtTime(1, ' + automationTime + ', 1)')
+            .throw('NotSupportedError');
+
+        should(
+            function() {
+              g.gain.setValueAtTime(1, curveStartTime + 1.1 * duration);
+            },
+            'setValueAtTime(1, ' + (curveStartTime + 1.1 * duration) + ')')
+            .notThrow();
+
+        task.done();
+      });
+
+      audit.define('automations', (task, should) => {
+        let context =
+            new OfflineAudioContext(1, testDurationFrames, sampleRate);
+        let g = context.createGain();
+
+        let curve = new Float32Array(2);
+        // Start time and duration for setValueCurveAtTime
+        let startTime = 0;
+        let timeInterval = testDurationSec / 10;
+        let time;
+
+        startTime += timeInterval;
+        should(() => {
+          g.gain.linearRampToValueAtTime(1, startTime);
+        }, 'linearRampToValueAtTime(1, ' + startTime + ')').notThrow();
+
+        startTime += timeInterval;
+        should(() => {
+          g.gain.exponentialRampToValueAtTime(1, startTime);
+        }, 'exponentialRampToValueAtTime(1, ' + startTime + ')').notThrow();
+
+        startTime += timeInterval;
+        should(() => {
+          g.gain.setTargetAtTime(1, startTime, 0.1);
+        }, 'setTargetAtTime(1, ' + startTime + ', 0.1)').notThrow();
+
+        startTime += timeInterval;
+        should(() => {
+          g.gain.setValueCurveAtTime(curve, startTime, 0.1);
+        }, 'setValueCurveAtTime(curve, ' + startTime + ', 0.1)').notThrow();
+
+        // Now try to setValueCurve that overlaps each of the above automations
+        startTime = timeInterval / 2;
+
+        for (let k = 0; k < 4; ++k) {
+          time = startTime + timeInterval * k;
+          should(
+              () => {
+                g.gain.setValueCurveAtTime(curve, time, 0.01);
+              },
+              'setValueCurveAtTime(curve, ' + time + ', 0.01)')
+              .throw('NotSupportedError');
+        }
+
+        // Elements of setValueCurve should be finite.
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(
+                  Float32Array.from([NaN, NaN]), time, 0.01);
+            },
+            'setValueCurveAtTime([NaN, NaN], ' + time + ', 0.01)')
+            .throw('TypeError');
+
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(
+                  Float32Array.from([1, Infinity]), time, 0.01);
+            },
+            'setValueCurveAtTime([1, Infinity], ' + time + ', 0.01)')
+            .throw('TypeError');
+
+        let d = context.createDelay();
+        // Check that we get warnings for out-of-range values and also throw for
+        // non-finite values.
+        should(
+            () => {
+              d.delayTime.setValueCurveAtTime(
+                  Float32Array.from([1, 5]), time, 0.01);
+            },
+            'delayTime.setValueCurveAtTime([1, 5], ' + time + ', 0.01)')
+            .notThrow();
+
+        should(
+            () => {
+              d.delayTime.setValueCurveAtTime(
+                  Float32Array.from([1, 5, Infinity]), time, 0.01);
+            },
+            'delayTime.setValueCurveAtTime([1, 5, Infinity], ' + time +
+                ', 0.01)')
+            .throw('TypeError');
+
+        // One last test that prints out lots of digits for the time.
+        time = Math.PI / 100;
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(curve, time, 0.01);
+            },
+            'setValueCurveAtTime(curve, ' + time + ', 0.01)')
+            .throw('NotSupportedError');
+
+        task.done();
+      });
+
+      audit.define('catch-exception', (task, should) => {
+        // Verify that the curve isn't inserted into the time line even if we
+        // catch the exception.
+        let success = true;
+        let context =
+            new OfflineAudioContext(1, testDurationFrames, sampleRate);
+        let gain = context.createGain();
+        let source = context.createBufferSource();
+        let buffer = context.createBuffer(1, 1, context.sampleRate);
+        buffer.getChannelData(0)[0] = 1;
+        source.buffer = buffer;
+        source.loop = true;
+
+        source.connect(gain);
+        gain.connect(context.destination);
+
+        gain.gain.setValueAtTime(1, 0);
+        try {
+          // The value curve has an invalid element. This automation shouldn't
+          // be inserted into the timeline at all.
+          gain.gain.setValueCurveAtTime(
+              Float32Array.from([0, NaN]), 128 / context.sampleRate, .5);
+        } catch (e) {
+        };
+        source.start();
+
+        context.startRendering()
+            .then(function(resultBuffer) {
+              // Since the setValueCurve wasn't inserted, the output should be
+              // exactly 1 for the entire duration.
+              should(
+                  resultBuffer.getChannelData(0),
+                  'Handled setValueCurve exception so output')
+                  .beConstantValueOf(1);
+
+            })
+            .then(() => task.done());
+      });
+
+      audit.define('start-end', (task, should) => {
+        let context =
+            new OfflineAudioContext(1, testDurationFrames, sampleRate);
+        let g = context.createGain();
+        let curve = new Float32Array(2);
+
+        // Verify that a setValueCurve can start at the end of an automation.
+        let time = 0;
+        let timeInterval = testDurationSec / 50;
+        should(() => {
+          g.gain.setValueAtTime(1, time);
+        }, 'setValueAtTime(1, ' + time + ')').notThrow();
+
+        time += timeInterval;
+        should(() => {
+          g.gain.linearRampToValueAtTime(0, time);
+        }, 'linearRampToValueAtTime(0, ' + time + ')').notThrow();
+
+        // setValueCurve starts at the end of the linear ramp. This should be
+        // fine.
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(curve, time, timeInterval);
+            },
+            'setValueCurveAtTime(..., ' + time + ', ' + timeInterval + ')')
+            .notThrow();
+
+        // exponentialRamp ending one interval past the setValueCurve should be
+        // fine.
+        time += 2 * timeInterval;
+        should(() => {
+          g.gain.exponentialRampToValueAtTime(1, time);
+        }, 'exponentialRampToValueAtTime(1, ' + time + ')').notThrow();
+
+        // setValueCurve starts at the end of the exponential ramp. This should
+        // be fine.
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(curve, time, timeInterval);
+            },
+            'setValueCurveAtTime(..., ' + time + ', ' + timeInterval + ')')
+            .notThrow();
+
+        // setValueCurve at the end of the setValueCurve should be fine.
+        time += timeInterval;
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(curve, time, timeInterval);
+            },
+            'setValueCurveAtTime(..., ' + time + ', ' + timeInterval + ')')
+            .notThrow();
+
+        // setValueAtTime at the end of setValueCurve should be fine.
+        time += timeInterval;
+        should(() => {
+          g.gain.setValueAtTime(0, time);
+        }, 'setValueAtTime(0, ' + time + ')').notThrow();
+
+        // setValueCurve at the end of setValueAtTime should be fine.
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(curve, time, timeInterval);
+            },
+            'setValueCurveAtTime(..., ' + time + ', ' + timeInterval + ')')
+            .notThrow();
+
+        // setTarget starting at the end of setValueCurve should be fine.
+        time += timeInterval;
+        should(() => {
+          g.gain.setTargetAtTime(1, time, 1);
+        }, 'setTargetAtTime(1, ' + time + ', 1)').notThrow();
+
+        task.done();
+      });
+
+      audit.define('curve lengths', (task, should) => {
+        let context =
+            new OfflineAudioContext(1, testDurationFrames, sampleRate);
+        let g = context.createGain();
+        let time = 0;
+
+        // Check for invalid curve lengths
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(Float32Array.from([]), time, 0.01);
+            },
+            'setValueCurveAtTime([], ' + time + ', 0.01)')
+            .throw('InvalidStateError');
+
+        should(
+            () => {
+              g.gain.setValueCurveAtTime(Float32Array.from([1]), time, 0.01);
+            },
+            'setValueCurveAtTime([1], ' + time + ', 0.01)')
+            .throw('InvalidStateError');
+
+        should(() => {
+          g.gain.setValueCurveAtTime(Float32Array.from([1, 2]), time, 0.01);
+        }, 'setValueCurveAtTime([1,2], ' + time + ', 0.01)').notThrow();
+
+        task.done();
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html
new file mode 100644
index 000000000000..de8406244bc3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-setValueCurveAtTime.html
@@ -0,0 +1,71 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>
+      Test AudioParam.setValueCurveAtTime
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audioparam-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Play a long DC signal out through an AudioGainNode and for each time
+      // interval call setValueCurveAtTime() to set the values for the duration
+      // of the interval.  Each curve is a sine wave, and we assume that the
+      // time interval is not an exact multiple of the period. This causes a
+      // discontinuity between time intervals which is used to test timing.
+
+      // Number of tests to run.
+      let numberOfTests = 20;
+
+      // Max allowed difference between the rendered data and the expected
+      // result. Because of the linear interpolation, the rendered curve isn't
+      // exactly the same as the reference.  This value is experimentally
+      // determined.
+      let maxAllowedError = 3.7194e-6;
+
+      // The amplitude of the sine wave.
+      let sineAmplitude = 1;
+
+      // Frequency of the sine wave.
+      let freqHz = 440;
+
+      // Curve to use for setValueCurveAtTime().
+      let curve;
+
+      // Sets the curve data for the entire time interval.
+      function automation(value, startTime, endTime) {
+        gainNode.gain.setValueCurveAtTime(
+            curve, startTime, endTime - startTime);
+      }
+
+      audit.define(
+          {
+            label: 'test',
+            description: 'AudioParam setValueCurveAtTime() functionality.'
+          },
+          function(task, should) {
+            // The curve of values to use.
+            curve = createSineWaveArray(
+                timeInterval, freqHz, sineAmplitude, sampleRate);
+
+            createAudioGraphAndTest(
+                task, should, numberOfTests, sineAmplitude,
+                function(k) {
+                  // Don't need to set the value.
+                },
+                automation, 'setValueCurveAtTime()', maxAllowedError,
+                createReferenceSineArray,
+                2 * Math.PI * sineAmplitude * freqHz / sampleRate,
+                differenceErrorMetric);
+          });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html
new file mode 100644
index 000000000000..9084942f7032
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/audioparam-summingjunction.html
@@ -0,0 +1,120 @@
+<!DOCTYPE html>
+<!--
+Tests that multiple audio-rate signals (AudioNode outputs) can be connected to an AudioParam
+and that these signals are summed, along with the AudioParams intrinsic value.
+-->
+<html>
+  <head>
+    <title>
+      audioparam-summingjunction.html
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/mix-testing.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      let sampleRate = 44100.0;
+      let lengthInSeconds = 1;
+
+      let context = 0;
+
+      // Buffers used by the two gain controlling sources.
+      let linearRampBuffer;
+      let toneBuffer;
+      let toneFrequency = 440;
+
+      // Arbitrary non-zero value.
+      let baselineGain = 5;
+
+      // Allow for a small round-off error.
+      let maxAllowedError = 1e-6;
+
+      function checkResult(renderedBuffer, should) {
+        let renderedData = renderedBuffer.getChannelData(0);
+
+        // Get buffer data from the two sources used to control gain.
+        let linearRampData = linearRampBuffer.getChannelData(0);
+        let toneData = toneBuffer.getChannelData(0);
+
+        let n = renderedBuffer.length;
+
+        should(n, 'Rendered signal length').beEqualTo(linearRampBuffer.length);
+
+        // Check that the rendered result exactly matches the sum of the
+        // intrinsic gain plus the two sources used to control gain. This is
+        // because we're changing the gain of a signal having constant value 1.
+        let success = true;
+        for (let i = 0; i < n; ++i) {
+          let expectedValue = baselineGain + linearRampData[i] + toneData[i];
+          let error = Math.abs(expectedValue - renderedData[i]);
+
+          if (error > maxAllowedError) {
+            success = false;
+            break;
+          }
+        }
+
+        should(
+            success,
+            'Rendered signal matches sum of two audio-rate gain changing signals plus baseline gain')
+            .beTrue();
+      }
+
+      audit.define('test', function(task, should) {
+        let sampleFrameLength = sampleRate * lengthInSeconds;
+
+        // Create offline audio context.
+        context = new OfflineAudioContext(1, sampleFrameLength, sampleRate);
+
+        // Create buffer used by the source which will have its gain controlled.
+        let constantOneBuffer =
+            createConstantBuffer(context, sampleFrameLength, 1);
+        let constantSource = context.createBufferSource();
+        constantSource.buffer = constantOneBuffer;
+
+        // Create 1st buffer used to control gain (a linear ramp).
+        linearRampBuffer = createLinearRampBuffer(context, sampleFrameLength);
+        let gainSource1 = context.createBufferSource();
+        gainSource1.buffer = linearRampBuffer;
+
+        // Create 2st buffer used to control gain (a simple sine wave tone).
+        toneBuffer =
+            createToneBuffer(context, toneFrequency, lengthInSeconds, 1);
+        let gainSource2 = context.createBufferSource();
+        gainSource2.buffer = toneBuffer;
+
+        // Create a gain node controlling the gain of constantSource and make
+        // the connections.
+        let gainNode = context.createGain();
+
+        // Intrinsic baseline gain.
+        // This gain value should be summed with gainSource1 and gainSource2.
+        gainNode.gain.value = baselineGain;
+
+        constantSource.connect(gainNode);
+        gainNode.connect(context.destination);
+
+        // Connect two audio-rate signals to control the .gain AudioParam.
+        gainSource1.connect(gainNode.gain);
+        gainSource2.connect(gainNode.gain);
+
+        // Start all sources at time 0.
+        constantSource.start(0);
+        gainSource1.start(0);
+        gainSource2.start(0);
+
+        context.startRendering().then(buffer => {
+          checkResult(buffer, should);
+          task.done();
+        });
+      });
+
+      audit.run();
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html
new file mode 100644
index 000000000000..eab77c494d11
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webaudio/the-audio-api/the-audioparam-interface/event-insertion.html
@@ -0,0 +1,314 @@
+<!doctype html>
+<html>
+  <head>
+    <title>
+      Test Handling of Event Insertion
+    </title>
+    <script src="/resources/testharness.js"></script>
+    <script src="/resources/testharnessreport.js"></script>
+    <script src="/webaudio/resources/audit-util.js"></script>
+    <script src="/webaudio/resources/audit.js"></script>
+    <script src="/webaudio/resources/audio-param.js"></script>
+  </head>
+  <body>
+    <script id="layout-test-code">
+      let audit = Audit.createTaskRunner();
+
+      // Use a power of two for the sample rate so there's no round-off in
+      // computing time from frame.
+      let sampleRate = 16384;
+
+      audit.define(
+          {label: 'Insert same event at same time'}, (task, should) => {
+            // Context for testing.
+            let context = new OfflineAudioContext(
+                {length: 16384, sampleRate: sampleRate});
+
+            // The source node to use.  Automations will be scheduled here.
+            let src = new ConstantSourceNode(context, {offset: 0});
+            src.connect(context.destination);
+
+            // An array of tests to be done.  Each entry specifies the event
+            // type and the event time.  The events are inserted in the order
+            // given (in |values|), and the second event should replace the
+            // first, as required by the spec.
+            let testCases = [
+              {
+                event: 'setValueAtTime',
+                frame: RENDER_QUANTUM_FRAMES,
+                values: [99, 1],
+                outputTestFrame: RENDER_QUANTUM_FRAMES,
+                expectedOutputValue: 1
+              },
+              {
+                event: 'linearRampToValueAtTime',
+                frame: 2 * RENDER_QUANTUM_FRAMES,
+                values: [99, 2],
+                outputTestFrame: 2 * RENDER_QUANTUM_FRAMES,
+                expectedOutputValue: 2
+              },
+              {
+                event: 'exponentialRampToValueAtTime',
+                frame: 3 * RENDER_QUANTUM_FRAMES,
+                values: [99, 3],
+                outputTestFrame: 3 * RENDER_QUANTUM_FRAMES,
+                expectedOutputValue: 3
+              },
+              {
+                event: 'setValueCurveAtTime',
+                frame: 3 * RENDER_QUANTUM_FRAMES,
+                values: [[98, 99], [3, 4]],
+                extraArgs: RENDER_QUANTUM_FRAMES / context.sampleRate,
+                outputTestFrame: 4 * RENDER_QUANTUM_FRAMES,
+                expectedOutputValue: 4
+              }
+            ];
+
+            testCases.forEach(entry => {
+              entry.values.forEach(value => {
+                let eventTime = entry.frame / context.sampleRate;
+                let message = eventToString(
+                    entry.event, value, eventTime, entry.extraArgs);
+                // This is mostly to print out the event that is getting
+                // inserted.  It should never ever throw.
+                should(() => {
+                  src.offset[entry.event](value, eventTime, entry.extraArgs);
+                }, message).notThrow();
+              });
+            });
+
+            src.start();
+
+            context.startRendering()
+                .then(audioBuffer => {
+                  let audio = audioBuffer.getChannelData(0);
+
+                  // Look through the test cases to figure out what the correct
+                  // output values should be.
+                  testCases.forEach(entry => {
+                    let expected = entry.expectedOutputValue;
+                    let frame = entry.outputTestFrame;
+                    let time = frame / context.sampleRate;
+                    should(
+                        audio[frame], `Output at frame ${frame} (time ${time})`)
+                        .beEqualTo(expected);
+                  });
+                })
+                .then(() => task.done());
+          });
+
+      audit.define(
+          {
+            label: 'Linear + Expo',
+            description: 'Different events at same time'
+          },
+          (task, should) => {
+            // Should be a linear ramp up to the event time, and after a
+            // constant value because the exponential ramp has ended.
+            let testCase = [
+              {event: 'linearRampToValueAtTime', value: 2, relError: 0},
+              {event: 'setValueAtTime', value: 99},
+              {event: 'exponentialRampToValueAtTime', value: 3},
+            ];
+            let eventFrame = 2 * RENDER_QUANTUM_FRAMES;
+            let prefix = 'Linear+Expo: ';
+
+            testEventInsertion(prefix, should, eventFrame, testCase)
+                .then(expectConstant(prefix, should, eventFrame, testCase))
+                .then(() => task.done());
+          });
+
+      audit.define(
+          {
+            label: 'Expo + Linear',
+            description: 'Different events at same time',
+          },
+          (task, should) => {
+            // Should be an exponential ramp up to the event time, and after a
+            // constant value because the linear ramp has ended.
+            let testCase = [
+              {
+                event: 'exponentialRampToValueAtTime',
+                value: 3,
+                relError: 4.2533e-6
+              },
+              {event: 'setValueAtTime', value: 99},
+              {event: 'linearRampToValueAtTime', value: 2},
+            ];
+            let eventFrame = 2 * RENDER_QUANTUM_FRAMES;
+            let prefix = 'Expo+Linear: ';
+
+            testEventInsertion(prefix, should, eventFrame, testCase)
+                .then(expectConstant(prefix, should, eventFrame, testCase))
+                .then(() => task.done());
+          });
+
+      audit.define(
+          {
+            label: 'Linear + SetTarget',
+            description: 'Different events at same time',
+          },
+          (task, should) => {
+            // Should be a linear ramp up to the event time, and then a
+            // decaying value.
+            let testCase = [
+              {event: 'linearRampToValueAtTime', value: 3, relError: 0},
+              {event: 'setValueAtTime', value: 100},
+              {event: 'setTargetAtTime', value: 0, extraArgs: 0.1},
+            ];
+            let eventFrame = 2 * RENDER_QUANTUM_FRAMES;
+            let prefix = 'Linear+SetTarget: ';
+
+            testEventInsertion(prefix, should, eventFrame, testCase)
+                .then(audioBuffer => {
+                  let audio = audioBuffer.getChannelData(0);
+                  let prefix = 'Linear+SetTarget: ';
+                  let eventTime = eventFrame / sampleRate;
+                  let expectedValue = methodMap[testCase[0].event](
+                      (eventFrame - 1) / sampleRate, 1, 0, testCase[0].value,
+                      eventTime);
+                  should(
+                      audio[eventFrame - 1],
+                      prefix +
+                          `At time ${
+                                     (eventFrame - 1) / sampleRate
+                                   } (frame ${eventFrame - 1}) output`)
+                      .beCloseTo(
+                          expectedValue,
+                          {threshold: testCase[0].relError || 0});
+
+                  // The setValue should have taken effect
+                  should(
+                      audio[eventFrame],
+                      prefix +
+                          `At time ${eventTime} (frame ${eventFrame}) output`)
+                      .beEqualTo(testCase[1].value);
+
+                  // The final event is setTarget.  Compute the expected output.
+                  let actual = audio.slice(eventFrame);
+                  let expected = new Float32Array(actual.length);
+                  for (let k = 0; k < expected.length; ++k) {
+                    let t = (eventFrame + k) / sampleRate;
+                    expected[k] = audioParamSetTarget(
+                        t, testCase[1].value, eventTime, testCase[2].value,
+                        testCase[2].extraArgs);
+                  }
+                  should(
+                      actual,
+                      prefix +
+                          `At time ${eventTime} (frame ${
+                                                         eventFrame
+                                                       }) and later`)
+                      .beCloseToArray(expected, {relativeThreshold: 1.7807e-7});
+                })
+                .then(() => task.done());
+          });
+
+
+      audit.run();
+
+      // Takes a list of |testCases| consisting of automation methods and
+      // schedules them to occur at |eventFrame|. |prefix| is a prefix for
+      // messages produced by |should|.
+      //
+      // Each item in |testCases| is a dictionary with members:
+      //   event     - the name of automation method to be inserted,
+      //   value     - the value for the event,
+      //   extraArgs - extra arguments if the event needs more than the value
+      //               and time (such as setTargetAtTime).
+      function testEventInsertion(prefix, should, eventFrame, testCases) {
+        let context = new OfflineAudioContext(
+            {length: 4 * RENDER_QUANTUM_FRAMES, sampleRate: sampleRate});
+
+        // The source node to use.  Automations will be scheduled here.
+        let src = new ConstantSourceNode(context, {offset: 0});
+        src.connect(context.destination);
+
+        // Initialize value to 1 at the beginning.
+        src.offset.setValueAtTime(1, 0);
+
+        // Test automations have this event time.
+        let eventTime = eventFrame / context.sampleRate;
+
+        // Sanity check that context is long enough for the test
+        should(
+            eventFrame < context.length,
+            prefix + 'Context length is long enough for the test')
+            .beTrue();
+
+        // Automations to be tested.  The first event should be the actual
+        // output up to the event time.  The last event should be the final
+        // output from the event time and onwards.
+        testCases.forEach(entry => {
+          should(
+              () => {
+                src.offset[entry.event](
+                    entry.value, eventTime, entry.extraArgs);
+              },
+              prefix +
+                  eventToString(
+                      entry.event, entry.value, eventTime, entry.extraArgs))
+              .notThrow();
+        });
+
+        src.start();
+
+        return context.startRendering();
+      }
+
+      // Verify output of test where the final value of the automation is
+      // expected to be constant.
+      function expectConstant(prefix, should, eventFrame, testCases) {
+        return audioBuffer => {
+          let audio = audioBuffer.getChannelData(0);
+
+          let eventTime = eventFrame / sampleRate;
+
+          // Compute the expected value of the first automation one frame before
+          // the event time.  This is a quick check that the correct automation
+          // was done.
+          let expectedValue = methodMap[testCases[0].event](
+              (eventFrame - 1) / sampleRate, 1, 0, testCases[0].value,
+              eventTime);
+          should(
+              audio[eventFrame - 1],
+              prefix +
+                  `At time ${
+                             (eventFrame - 1) / sampleRate
+                           } (frame ${eventFrame - 1}) output`)
+              .beCloseTo(expectedValue, {threshold: testCases[0].relError});
+
+          // The last event scheduled is expected to set the value for all
+          // future times.  Verify that the output has the expected value.
+          should(
+              audio.slice(eventFrame),
+              prefix +
+                  `At time ${eventTime} (frame ${
+                                                 eventFrame
+                                               }) and later, output`)
+              .beConstantValueOf(testCases[testCases.length - 1].value);
+        };
+      }
+
+      // Convert an automation method to a string for printing.
+      function eventToString(method, value, time, extras) {
+        let string = method + '(';
+        string += (value instanceof Array) ? `[${value}]` : value;
+        string += ', ' + time;
+        if (extras) {
+          string += ', ' + extras;
+        }
+        string += ')';
+        return string;
+      }
+
+      // Map between the automation method name and a function that computes the
+      // output value of the automation method.
+      const methodMap = {
+        linearRampToValueAtTime: audioParamLinearRamp,
+        exponentialRampToValueAtTime: audioParamExponentialRamp,
+        setValueAtTime: (t, v) => v
+      };
+    </script>
+  </body>
+</html>
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/accept_alert/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/__init__.py
rename to tests/wpt/web-platform-tests/webdriver/tests/accept_alert/__init__.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/accept_alert.py b/tests/wpt/web-platform-tests/webdriver/tests/accept_alert/accept.py
similarity index 89%
rename from tests/wpt/web-platform-tests/webdriver/tests/user_prompts/accept_alert.py
rename to tests/wpt/web-platform-tests/webdriver/tests/accept_alert/accept.py
index d47ed1c86278..efcbf3fc2e3b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/accept_alert.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/accept_alert/accept.py
@@ -3,8 +3,8 @@
 
 
 def accept_alert(session):
-    return session.transport.send("POST", "session/{session_id}/alert/accept"
-                                  .format(session_id=session.session_id))
+    return session.transport.send(
+        "POST", "session/{session_id}/alert/accept".format(**vars(session)))
 
 
 # 18.2 Accept Alert
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/add_cookie/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/__init__.py
rename to tests/wpt/web-platform-tests/webdriver/tests/add_cookie/__init__.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/cookies/add_cookie.py b/tests/wpt/web-platform-tests/webdriver/tests/add_cookie/add.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/cookies/add_cookie.py
rename to tests/wpt/web-platform-tests/webdriver/tests/add_cookie/add.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/close_window/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/state/__init__.py
rename to tests/wpt/web-platform-tests/webdriver/tests/close_window/__init__.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/close_window/close.py b/tests/wpt/web-platform-tests/webdriver/tests/close_window/close.py
new file mode 100644
index 000000000000..ba41b3404c44
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/close_window/close.py
@@ -0,0 +1,39 @@
+from tests.support.asserts import assert_error, assert_success
+
+
+def close(session):
+    return session.transport.send(
+        "DELETE", "session/{session_id}/window".format(**vars(session)))
+
+
+def test_no_browsing_context(session, create_window):
+    new_handle = create_window()
+
+    session.window_handle = new_handle
+    session.close()
+    assert new_handle not in session.handles
+
+    response = close(session)
+    assert_error(response, "no such window")
+
+
+def test_close_browsing_context(session, create_window):
+    handles = session.handles
+
+    new_handle = create_window()
+    session.window_handle = new_handle
+
+    response = close(session)
+    value = assert_success(response, handles)
+    assert session.handles == handles
+    assert new_handle not in value
+
+
+def test_close_last_browsing_context(session):
+    assert len(session.handles) == 1
+    response = close(session)
+
+    assert_success(response, [])
+
+    # With no more open top-level browsing contexts, the session is closed.
+    session.session_id = None
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/close_window/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/close_window/user_prompts.py
new file mode 100644
index 000000000000..b68ef7174322
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/close_window/user_prompts.py
@@ -0,0 +1,88 @@
+# META: timeout=long
+
+from tests.support.asserts import assert_error, assert_dialog_handled
+from tests.support.fixtures import create_dialog, create_window
+from tests.support.inline import inline
+
+
+def close(session):
+    return session.transport.send(
+        "DELETE", "session/{session_id}/window".format(**vars(session)))
+
+
+def test_handle_prompt_dismiss_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_accept_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_ignore():
+    """TODO"""
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    original_handle = session.window_handle
+
+    session.window_handle = create_window(session)()
+    session.url = inline("<title>WD doc title</title>")
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+    response = close(session)
+    assert response.status == 200
+
+    # Asserting that the dialog was handled requires valid top-level browsing
+    # context, so we must switch to the original window.
+    session.window_handle = original_handle
+    assert_dialog_handled(session, "dismiss #1")
+
+    session.window_handle = create_window(session)()
+    session.url = inline("<title>WD doc title</title>")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+    response = close(session)
+    assert response.status == 200
+
+    # Asserting that the dialog was handled requires valid top-level browsing
+    # context, so we must switch to the original window.
+    session.window_handle = original_handle
+    assert_dialog_handled(session, "dismiss #2")
+
+    session.window_handle = create_window(session)()
+    session.url = inline("<title>WD doc title</title>")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+    response = close(session)
+    assert response.status == 200
+
+    # Asserting that the dialog was handled requires valid top-level browsing
+    # context, so we must switch to the original window.
+    session.window_handle = original_handle
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_missing_value(session, create_dialog, create_window):
+    session.window_handle = create_window()
+
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    response = close(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    response = close(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    response = close(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/contexts/resizing_and_positioning.py b/tests/wpt/web-platform-tests/webdriver/tests/contexts/resizing_and_positioning.py
deleted file mode 100644
index 66331faa22b1..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/contexts/resizing_and_positioning.py
+++ /dev/null
@@ -1,61 +0,0 @@
-import json
-import pytest
-import webdriver
-
-
-def window_size_supported(session):
-    try:
-        session.window.size = ("a", "b")
-    except webdriver.UnsupportedOperationException:
-        return False
-    except webdriver.InvalidArgumentException:
-        return True
-
-def window_position_supported(session):
-    try:
-        session.window.position = ("a", "b")
-    except webdriver.UnsupportedOperationException:
-        return False
-    except webdriver.InvalidArgumentException:
-        return True
-
-
-def test_window_resize(session):
-    if not window_size_supported(session):
-        pytest.skip()
-
-    # setting the window size by webdriver is synchronous
-    # so we should see the results immediately
-
-    session.window.size = (400, 500)
-    assert session.window.size == (400, 500)
-
-    session.window.size = (500, 600)
-    assert session.window.size == (500, 600)
-
-
-"""
-TODO(ato):
-
-    Disable test because the while statements are wrong.
-    To fix this properly we need to write an explicit wait utility.
-
-def test_window_resize_by_script(session):
-    # setting the window size by JS is asynchronous
-    # so we poll waiting for the results
-
-    size0 = session.window.size
-
-    session.execute_script("window.resizeTo(700, 800)")
-    size1 = session.window.size
-    while size0 == size1:
-        size1 = session.window.size
-    assert size1 == (700, 800)
-
-    session.execute_script("window.resizeTo(800, 900)")
-    size2 = session.window.size
-    while size1 == size2:
-        size2 = session.window.size
-        assert size2 == (800, 900)
-    assert size2 == {"width": 200, "height": 100}
-"""
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/text/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/state/text/__init__.py
rename to tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/__init__.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/delete.py b/tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/delete.py
new file mode 100644
index 000000000000..ee53dc3c3393
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/delete.py
@@ -0,0 +1,21 @@
+from tests.support.asserts import assert_error, assert_success
+
+
+def delete_cookie(session, name):
+    return session.transport.send(
+        "DELETE", "/session/{session_id}/cookie/{name}".format(
+            session_id=session.session_id,
+            name=name))
+
+
+def test_no_browsing_context(session, create_window):
+    session.window_handle = create_window()
+    session.close()
+
+    response = delete_cookie(session, "foo")
+    assert_error(response, "no such window")
+
+
+def test_unknown_cookie(session):
+    response = delete_cookie(session, "stilton")
+    assert_success(response)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/cookies/delete_cookie.py b/tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/user_prompts.py
similarity index 79%
rename from tests/wpt/web-platform-tests/webdriver/tests/cookies/delete_cookie.py
rename to tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/user_prompts.py
index 813ee8840708..46bc3757a639 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/cookies/delete_cookie.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/delete_cookie/user_prompts.py
@@ -1,4 +1,4 @@
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
+from tests.support.asserts import assert_error, assert_dialog_handled
 from tests.support.fixtures import create_dialog
 from tests.support.inline import inline
 
@@ -7,21 +7,6 @@ def delete_cookie(session, name):
     return session.transport.send("DELETE", "/session/%s/cookie/%s" % (session.session_id, name))
 
 
-# 16.4 Delete Cookie
-
-
-def test_no_browsing_context(session, create_window):
-    """
-    1. If the current top-level browsing context is no longer open,
-    return error with error code no such window.
-
-    """
-    session.window_handle = create_window()
-    session.close()
-    response = delete_cookie(session, "foo")
-    assert_error(response, "no such window")
-
-
 def test_handle_prompt_dismiss_and_notify():
     """TODO"""
 
@@ -54,7 +39,8 @@ def test_handle_prompt_accept(new_session, add_browser_capabilites):
            Accept the current user prompt.
 
     """
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
     session.url = inline("<title>WD doc title</title>")
 
     create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
@@ -113,10 +99,3 @@ def test_handle_prompt_missing_value(session, create_dialog):
     response = delete_cookie(session, "foo")
     assert_error(response, "unexpected alert open")
     assert_dialog_handled(session, "dismiss #3")
-
-
-def test_unknown_cookie(session):
-    response = delete_cookie(session, "stilton")
-    assert response.status == 200
-    assert "value" in response.body
-    assert response.body["value"] is None
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/.gitkeep b/tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/html/browsers/origin/.gitkeep
rename to tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/__init__.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/dismiss_alert.py b/tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/dismiss.py
similarity index 89%
rename from tests/wpt/web-platform-tests/webdriver/tests/user_prompts/dismiss_alert.py
rename to tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/dismiss.py
index 6a2049684a6a..6c06c43b75b1 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/dismiss_alert.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/dismiss_alert/dismiss.py
@@ -3,8 +3,8 @@
 
 
 def dismiss_alert(session):
-    return session.transport.send("POST", "session/{session_id}/alert/dismiss"
-                                  .format(session_id=session.session_id))
+    return session.transport.send(
+        "POST", "session/{session_id}/alert/dismiss".format(**vars(session)))
 
 
 # 18.1 Dismiss Alert
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/document_handling/page_source.py b/tests/wpt/web-platform-tests/webdriver/tests/document_handling/page_source.py
deleted file mode 100644
index 04eae6f83bee..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/document_handling/page_source.py
+++ /dev/null
@@ -1,14 +0,0 @@
-import pytest
-
-from tests.support.inline import inline
-
-
-# 15.1.3 "Let source be the result returned from the outerHTML IDL attribute
-#         of the document element"
-def test_source_matches_outer_html(session):
-    session.url = inline("<html><head><title>Cheese</title><body>Peas")
-    expected_source = session.execute_script(
-        "return document.documentElement.outerHTML")
-
-    assert session.source == expected_source
-
diff --git a/tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/.gitkeep b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/__init__.py
similarity index 100%
rename from tests/wpt/web-platform-tests/html/browsers/origin/relaxing-the-same-origin-restriction/.gitkeep
rename to tests/wpt/web-platform-tests/webdriver/tests/element_clear/__init__.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/interaction/element_clear.py b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
similarity index 98%
rename from tests/wpt/web-platform-tests/webdriver/tests/interaction/element_clear.py
rename to tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
index ceec0e282c3f..ddf37ee671e8 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/interaction/element_clear.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_clear/clear.py
@@ -9,13 +9,23 @@
 )
 from tests.support.inline import inline
 
+
+def element_clear(session, element):
+    return session.transport.send(
+        "POST", "/session/{session_id}/element/{element_id}/clear".format(
+            session_id=session.session_id,
+            element_id=element.id))
+
+
 def add_event_listeners(element):
     element.session.execute_script("""
         var target = arguments[0];
         window.events = [];
         var expectedEvents = ["focus", "blur", "change"];
         for (var i = 0; i < expectedEvents.length; i++) {
-          target.addEventListener(expectedEvents[i], function (eventObject) { window.events.push(eventObject.type) });
+          target.addEventListener(expectedEvents[i], function (eventObject) {
+            window.events.push(eventObject.type)
+          });
         }
         """, args=(element,))
 
@@ -31,11 +41,6 @@ def text_file(tmpdir_factory):
     return fh
 
 
-def element_clear(session, element):
-    return session.transport.send("POST", "/session/%s/element/%s/clear" %
-                                  (session.session_id, element.id))
-
-
 def test_closed_context(session, create_window):
     new_window = create_window()
     session.window_handle = new_window
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py
index a5377dd8dbf9..2b08be1f9837 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/bubbling.py
@@ -2,7 +2,7 @@
 from tests.support.inline import inline
 
 
-def click(session, element):
+def element_click(session, element):
     return session.transport.send(
         "POST", "/session/{session_id}/element/{element_id}/click".format(
             session_id=session.session_id,
@@ -154,5 +154,5 @@ def test_element_disappears_during_click(session):
     over = session.find.css("#over", all=False)
 
     # should not time out
-    response = click(session, over)
+    response = element_click(session, over)
     assert_success(response)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py
index d39e3a3ecb73..cd24dd70603d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/stale.py
@@ -1,16 +1,12 @@
-import pytest
-import webdriver
-
 from tests.support.asserts import assert_error
 from tests.support.inline import inline
 
 
-def click_element(session, element):
+def element_click(session, element):
     return session.transport.send(
-        "POST", "/session/{session_id}/element/{element_id}/click".format(**{
-            "session_id": session.session_id,
-            "element_id": element.id,
-        }))
+        "POST", "/session/{session_id}/element/{element_id}/click".format(
+            session_id=session.session_id,
+            element_id=element.id))
 
 
 def test_is_stale(session):
@@ -18,5 +14,5 @@ def test_is_stale(session):
     button = session.find.css("button", all=False)
     session.url = inline("<button>bar</button>")
 
-    response = click_element(session, button)
+    response = element_click(session, button)
     assert_error(response, "stale element reference")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/get_active_element.py b/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/get_active_element.py
deleted file mode 100644
index af3e1257a174..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/get_active_element.py
+++ /dev/null
@@ -1,259 +0,0 @@
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_same_element
-from tests.support.fixtures import create_dialog
-from tests.support.inline import inline
-
-
-def read_global(session, name):
-    return session.execute_script("return %s;" % name)
-
-
-def get_active_element(session):
-    return session.transport.send("GET", "session/%s/element/active" % session.session_id)
-
-
-def assert_is_active_element(session, response):
-    """Ensure that the provided object is a successful WebDriver
-    response describing an element reference and that the referenced
-    element matches the element returned by the `activeElement`
-    attribute of the current browsing context's active document.
-
-    """
-    assert response.status == 200
-    assert "value" in response.body
-
-    from_js = session.execute_script("return document.activeElement")
-
-    if response.body["value"] is None:
-        assert from_js is None
-    else:
-        assert_same_element(session, response.body["value"], from_js)
-
-
-# > 1. If the current browsing context is no longer open, return error with
-# >    error code no such window.
-def test_closed_context(session, create_window):
-    new_window = create_window()
-    session.window_handle = new_window
-    session.close()
-
-    response = get_active_element(session)
-    assert_error(response, "no such window")
-
-
-# [...]
-# 2. Handle any user prompts and return its value if it is an error.
-# [...]
-# In order to handle any user prompts a remote end must take the following
-# steps:
-# 2. Run the substeps of the first matching user prompt handler:
-#
-#    [...]
-#    - dismiss state
-#      1. Dismiss the current user prompt.
-#    [...]
-#
-# 3. Return success.
-def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    session.url = inline("<body><p>Hello, World!</p></body>")
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-    assert_dialog_handled(session, "dismiss #1")
-    assert session.execute_script("return dismiss1") is None
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-    assert_dialog_handled(session, "dismiss #2")
-    assert read_global(session, "dismiss2") is False
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-    assert_dialog_handled(session, "dismiss #3")
-    assert read_global(session, "dismiss3") is None
-
-
-# [...]
-# 2. Handle any user prompts and return its value if it is an error.
-# [...]
-# In order to handle any user prompts a remote end must take the following
-# steps:
-# 2. Run the substeps of the first matching user prompt handler:
-#
-#    [...]
-#    - accept state
-#      1. Accept the current user prompt.
-#    [...]
-#
-# 3. Return success.
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<body><p>Hello, World!</p></body>")
-    create_dialog(session)("alert", text="accept #1", result_var="accept1")
-
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-    assert_dialog_handled(session, "accept #1")
-    assert read_global(session, "accept1") is None
-
-    create_dialog(session)("confirm", text="accept #2", result_var="accept2")
-
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-    assert_dialog_handled(session, "accept #2")
-    assert read_global(session, "accept2") is True
-
-    create_dialog(session)("prompt", text="accept #3", result_var="accept3")
-
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-    assert_dialog_handled(session, "accept #3")
-    assert read_global(session, "accept3") == "" or read_global(session, "accept3") == "undefined"
-
-
-# [...]
-# 2. Handle any user prompts and return its value if it is an error.
-# [...]
-# In order to handle any user prompts a remote end must take the following
-# steps:
-# 2. Run the substeps of the first matching user prompt handler:
-#
-#    [...]
-#    - missing value default state
-#    - not in the table of simple dialogs
-#      1. Dismiss the current user prompt.
-#      2. Return error with error code unexpected alert open.
-def test_handle_prompt_missing_value(session, create_dialog):
-    session.url = inline("<body><p>Hello, World!</p></body>")
-
-    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
-
-    response = get_active_element(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-    assert session.execute_script("return dismiss1") is None
-
-    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
-
-    response = get_active_element(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-    assert session.execute_script("return dismiss2") is False
-
-    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
-
-    response = get_active_element(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-    assert session.execute_script("return dismiss3") is None
-
-
-# > [...]
-# > 3. Let active element be the active element of the current browsing
-# >    context's document element.
-# > 4. Let active web element be the JSON Serialization of active element.
-# > 5. Return success with data active web element.
-def test_success_document(session):
-    session.url = inline("""
-        <body>
-            <h1>Heading</h1>
-            <input />
-            <input />
-            <input style="opacity: 0" />
-            <p>Another element</p>
-        </body>""")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-
-def test_sucess_input(session):
-    session.url = inline("""
-        <body>
-            <h1>Heading</h1>
-            <input autofocus />
-            <input style="opacity: 0" />
-            <p>Another element</p>
-        </body>""")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-
-def test_sucess_input_non_interactable(session):
-    session.url = inline("""
-        <body>
-            <h1>Heading</h1>
-            <input />
-            <input style="opacity: 0" autofocus />
-            <p>Another element</p>
-        </body>""")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-
-def test_success_explicit_focus(session):
-    session.url = inline("""
-        <body>
-            <h1>Heading</h1>
-            <input />
-            <iframe></iframe>
-        </body>""")
-
-    session.execute_script("document.body.getElementsByTagName('h1')[0].focus()")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-    session.execute_script("document.body.getElementsByTagName('input')[0].focus()")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-    session.execute_script("document.body.getElementsByTagName('iframe')[0].focus()")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-    session.execute_script("document.body.getElementsByTagName('iframe')[0].focus();")
-    session.execute_script("""
-        var iframe = document.body.getElementsByTagName('iframe')[0];
-        if (iframe.remove) {
-          iframe.remove();
-        } else {
-          iframe.removeNode(true);
-        }""")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-    session.execute_script("document.body.appendChild(document.createElement('textarea'))")
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-
-def test_success_iframe_content(session):
-    session.url = inline("<body></body>")
-    session.execute_script("""
-        let iframe = document.createElement('iframe');
-        document.body.appendChild(iframe);
-        let input = iframe.contentDocument.createElement('input');
-        iframe.contentDocument.body.appendChild(input);
-        input.focus();
-        """)
-
-    response = get_active_element(session)
-    assert_is_active_element(session, response)
-
-
-def test_missing_document_element(session):
-    session.url = inline("<body></body>")
-    session.execute_script("""
-        if (document.body.remove) {
-          document.body.remove();
-        } else {
-          document.body.removeNode(true);
-        }""")
-
-    response = get_active_element(session)
-    assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/interaction/send_keys_content_editable.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/content_editable.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/interaction/send_keys_content_editable.py
rename to tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/content_editable.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py
index 28df05fb5819..a3ff68804470 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/form_controls.py
@@ -9,10 +9,9 @@
 from tests.support.inline import inline
 
 
-def element_send_keys(session, element, text):
+def send_keys_to_element(session, element, text):
     return session.transport.send(
-        "POST",
-        "/session/{session_id}/element/{element_id}/value".format(
+        "POST", "/session/{session_id}/element/{element_id}/value".format(
             session_id=session.session_id,
             element_id=element.id),
         {"text": text})
@@ -37,7 +36,7 @@ def test_input(session):
     element = session.find.css("input", all=False)
     assert element.property("value") == ""
 
-    element_send_keys(session, element, "foo")
+    send_keys_to_element(session, element, "foo")
     assert element.property("value") == "foo"
     assert_element_has_focus(element)
 
@@ -47,7 +46,7 @@ def test_textarea(session):
     element = session.find.css("textarea", all=False)
     assert element.property("value") == ""
 
-    element_send_keys(session, element, "foo")
+    send_keys_to_element(session, element, "foo")
     assert element.property("value") == "foo"
     assert_element_has_focus(element)
 
@@ -57,10 +56,10 @@ def test_input_append(session):
     element = session.find.css("input", all=False)
     assert element.property("value") == "a"
 
-    element_send_keys(session, element, "b")
+    send_keys_to_element(session, element, "b")
     assert element.property("value") == "ab"
 
-    element_send_keys(session, element, "c")
+    send_keys_to_element(session, element, "c")
     assert element.property("value") == "abc"
 
 
@@ -69,10 +68,10 @@ def test_textarea_append(session):
     element = session.find.css("textarea", all=False)
     assert element.property("value") == "a"
 
-    element_send_keys(session, element, "b")
+    send_keys_to_element(session, element, "b")
     assert element.property("value") == "ab"
 
-    element_send_keys(session, element, "c")
+    send_keys_to_element(session, element, "c")
     assert element.property("value") == "abc"
 
 
@@ -82,7 +81,7 @@ def test_events(session, tag):
     element = session.find.css(tag, all=False)
     add_event_listeners(element)
 
-    element_send_keys(session, element, "foo")
+    send_keys_to_element(session, element, "foo")
     assert element.property("value") == "foo"
     assert get_events(session) == ["focus",
                                    "keydown",
@@ -104,5 +103,5 @@ def test_not_blurred(session, tag):
     session.url = inline("<%s>" % tag)
     element = session.find.css(tag, all=False)
 
-    element_send_keys(session, element, "")
+    send_keys_to_element(session, element, "")
     assert_element_has_focus(element)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
index f0746e42f621..3a809aac6939 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
@@ -2,10 +2,9 @@
 from tests.support.inline import iframe, inline
 
 
-def send_keys_to_element(session, element, text):
+def element_send_keys(session, element, text):
     return session.transport.send(
-        "POST",
-        "/session/{session_id}/element/{element_id}/value".format(
+        "POST", "/session/{session_id}/element/{element_id}/value".format(
             session_id=session.session_id,
             element_id=element.id),
         {"text": text})
@@ -24,7 +23,7 @@ def test_body_is_interactable(session):
     # By default body is the active element
     assert session.active_element is element
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
     assert session.active_element is element
     assert result.property("value") == "foo"
@@ -44,7 +43,7 @@ def test_document_element_is_interactable(session):
     # By default body is the active element
     assert session.active_element is body
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
     assert session.active_element is element
     assert result.property("value") == "foo"
@@ -63,7 +62,7 @@ def test_iframe_is_interactable(session):
     # By default the body has the focus
     assert session.active_element is body
 
-    response = send_keys_to_element(session, frame, "foo")
+    response = element_send_keys(session, frame, "foo")
     assert_success(response)
     assert session.active_element is frame
 
@@ -78,7 +77,7 @@ def test_transparent_element(session):
     session.url = inline("""<input style="opacity: 0">""")
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
     assert element.property("value") == "foo"
 
@@ -87,7 +86,7 @@ def test_readonly_element(session):
     session.url = inline("<input readonly>")
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
     assert element.property("value") == ""
 
@@ -99,7 +98,7 @@ def test_obscured_element(session):
     """)
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
     assert element.property("value") == "foo"
 
@@ -108,7 +107,7 @@ def test_not_a_focusable_element(session):
     session.url = inline("<div>foo</div>")
     element = session.find.css("div", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_error(response, "element not interactable")
 
 
@@ -116,7 +115,7 @@ def test_not_displayed_element(session):
     session.url = inline("""<input style="display: none">""")
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_error(response, "element not interactable")
 
 
@@ -124,7 +123,7 @@ def test_hidden_element(session):
     session.url = inline("""<input style="visibility: hidden">""")
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_error(response, "element not interactable")
 
 
@@ -132,5 +131,5 @@ def test_disabled_element(session):
     session.url = inline("""<input disabled>""")
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_error(response, "element not interactable")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py
index a1d454d1fe23..9ff0a9e25788 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/scroll_into_view.py
@@ -3,10 +3,9 @@
 from tests.support.inline import inline
 
 
-def send_keys_to_element(session, element, text):
+def element_send_keys(session, element, text):
     return session.transport.send(
-        "POST",
-        "/session/{session_id}/element/{element_id}/value".format(
+        "POST", "/session/{session_id}/element/{element_id}/value".format(
             session_id=session.session_id,
             element_id=element.id),
         {"text": text})
@@ -16,7 +15,7 @@ def test_element_outside_of_not_scrollable_viewport(session):
     session.url = inline("<input style=\"position: relative; left: -9999px;\">")
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
 
     assert not is_element_in_viewport(session, element)
@@ -26,7 +25,7 @@ def test_element_outside_of_scrollable_viewport(session):
     session.url = inline("<input style=\"margin-top: 102vh;\">")
     element = session.find.css("input", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
 
     assert is_element_in_viewport(session, element)
@@ -42,7 +41,7 @@ def test_option_select_container_outside_of_scrollable_viewport(session):
     element = session.find.css("option#bar", all=False)
     select = session.find.css("select", all=False)
 
-    response = send_keys_to_element(session, element, "bar")
+    response = element_send_keys(session, element, "bar")
     assert_success(response)
 
     assert is_element_in_viewport(session, select)
@@ -60,7 +59,7 @@ def test_option_stays_outside_of_scrollable_viewport(session):
     option_foo = session.find.css("option#foo", all=False)
     option_bar = session.find.css("option#bar", all=False)
 
-    response = send_keys_to_element(session, option_bar, "bar")
+    response = element_send_keys(session, option_bar, "bar")
     assert_success(response)
 
     assert is_element_in_viewport(session, select)
@@ -72,7 +71,7 @@ def test_contenteditable_element_outside_of_scrollable_viewport(session):
     session.url = inline("<div contenteditable style=\"margin-top: 102vh;\"></div>")
     element = session.find.css("div", all=False)
 
-    response = send_keys_to_element(session, element, "foo")
+    response = element_send_keys(session, element, "foo")
     assert_success(response)
 
     assert is_element_in_viewport(session, element)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py
index 5affdc9af352..b8602afc0a4f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/collections.py
@@ -8,9 +8,9 @@ def execute_async_script(session, script, args=None):
     if args is None:
         args = []
     body = {"script": script, "args": args}
+
     return session.transport.send(
-        "POST",
-        "/session/{session_id}/execute/async".format(**vars(session)),
+        "POST", "/session/{session_id}/execute/async".format(**vars(session)),
         body)
 
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/user_prompts.py
index 67f5512841b4..7daf2a996620 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_async_script/user_prompts.py
@@ -2,70 +2,94 @@
 
 from webdriver import error
 
+from tests.support.asserts import assert_success
+
+
+def execute_async_script(session, script, args=None):
+    if args is None:
+        args = []
+    body = {"script": script, "args": args}
+
+    return session.transport.send(
+        "POST", "/session/{session_id}/execute/async".format(**vars(session)),
+        body)
 
-# 15.2 Executing Script
 
 def test_handle_prompt_accept(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    value = session.execute_async_script("window.alert('Hello');")
-    assert value is None
-    title = session.title
+
+    response = execute_async_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
+    session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.accept()
 
 
 def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    value = session.execute_async_script("window.alert('Hello');")
-    assert value is None
-    title = session.title
+
+    response = execute_async_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
+    session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.dismiss()
 
 
 def test_handle_prompt_dismiss_and_notify(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss and notify"})}})
-    value = session.execute_async_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_async_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.dismiss()
 
 
 def test_handle_prompt_accept_and_notify(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept and notify"})}})
-    value = session.execute_async_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_async_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.accept()
 
 
 def test_handle_prompt_ignore(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "ignore"})}})
-    value = session.execute_async_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_async_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     session.alert.dismiss()
 
 
 def test_handle_prompt_default(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
-    value = session.execute_async_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_async_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.dismiss()
 
 
 def test_handle_prompt_twice(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    value = session.execute_async_script("window.alert('Hello');window.alert('Bye');")
-    assert value is None
+
+    response = execute_async_script(session, "window.alert('Hello');window.alert('Bye');")
+    assert_success(response, None)
+
     session.alert.dismiss()
     # The first alert has been accepted by the user prompt handler, the second one remains.
     # FIXME: this is how browsers currently work, but the spec should clarify if this is the
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py
index d96c7fe3a675..edee1e5532b8 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/collections.py
@@ -8,9 +8,9 @@ def execute_script(session, script, args=None):
     if args is None:
         args = []
     body = {"script": script, "args": args}
+
     return session.transport.send(
-        "POST",
-        "/session/{session_id}/execute/sync".format(**vars(session)),
+        "POST", "/session/{session_id}/execute/sync".format(**vars(session)),
         body)
 
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py
index 4df9c41065b2..bc52b4736859 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/cyclic.py
@@ -5,9 +5,9 @@ def execute_script(session, script, args=None):
     if args is None:
         args = []
     body = {"script": script, "args": args}
+
     return session.transport.send(
-        "POST",
-        "/session/{session_id}/execute/sync".format(
+        "POST", "/session/{session_id}/execute/sync".format(
             session_id=session.session_id),
         body)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/contexts/json_serialize_windowproxy.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/json_serialize_windowproxy.py
similarity index 61%
rename from tests/wpt/web-platform-tests/webdriver/tests/contexts/json_serialize_windowproxy.py
rename to tests/wpt/web-platform-tests/webdriver/tests/execute_script/json_serialize_windowproxy.py
index 49507c857253..9864227374e3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/contexts/json_serialize_windowproxy.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/json_serialize_windowproxy.py
@@ -1,14 +1,27 @@
-# META: timeout=long
-
 import json
 
+from tests.support.asserts import assert_success
+
 
 _window_id = "window-fcc6-11e5-b4f8-330a88ab9d7f"
 _frame_id = "frame-075b-4da1-b6ba-e579c2d3230a"
 
+
+def execute_script(session, script, args=None):
+    if args is None:
+        args = []
+    body = {"script": script, "args": args}
+
+    return session.transport.send(
+        "POST", "/session/{session_id}/execute/sync".format(**vars(session)),
+        body)
+
+
 def test_initial_window(session):
     # non-auxiliary top-level browsing context
-    raw_json = session.execute_script("return window;")
+    response = execute_script(session, "return window;")
+    raw_json = assert_success(response)
+
     obj = json.loads(raw_json)
     assert len(obj) == 1
     assert _window_id in obj
@@ -19,7 +32,10 @@ def test_initial_window(session):
 def test_window_open(session):
     # auxiliary browsing context
     session.execute_script("window.foo = window.open()")
-    raw_json = session.execute_script("return window.foo;")
+
+    response = execute_script(session, "return window.foo;")
+    raw_json = assert_success(response)
+
     obj = json.loads(raw_json)
     assert len(obj) == 1
     assert _window_id in obj
@@ -34,7 +50,10 @@ def test_frame(session):
         document.body.appendChild(frame);
     """
     session.execute_script(append)
-    raw_json = session.execute_script("return frame.contentWindow;")
+
+    response = execute_script(session, "return frame.contentWindow;")
+    raw_json = assert_success(response)
+
     obj = json.loads(raw_json)
     assert len(obj) == 1
     assert _frame_id in obj
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/user_prompts.py
index befa8d827e8b..a4cc680de98d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/user_prompts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/user_prompts.py
@@ -2,70 +2,95 @@
 
 from webdriver import error
 
+from tests.support.asserts import assert_success
+
+
+def execute_script(session, script, args=None):
+    if args is None:
+        args = []
+    body = {"script": script, "args": args}
+
+    return session.transport.send(
+        "POST", "/session/{session_id}/execute/sync".format(
+            session_id=session.session_id),
+        body)
 
-# 15.2 Executing Script
 
 def test_handle_prompt_accept(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    value = session.execute_script("window.alert('Hello');")
-    assert value is None
-    title = session.title
+
+    response = execute_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
+    session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.accept()
 
 
 def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    value = session.execute_script("window.alert('Hello');")
-    assert value is None
-    title = session.title
+
+    response = execute_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
+    session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.dismiss()
 
 
 def test_handle_prompt_dismiss_and_notify(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss and notify"})}})
-    value = session.execute_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.dismiss()
 
 
 def test_handle_prompt_accept_and_notify(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept and notify"})}})
-    value = session.execute_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.accept()
 
 
 def test_handle_prompt_ignore(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "ignore"})}})
-    value = session.execute_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     session.alert.dismiss()
 
 
 def test_handle_prompt_default(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
-    value = session.execute_script("window.alert('Hello');")
-    assert value is None
+
+    response = execute_script(session, "window.alert('Hello');")
+    assert_success(response, None)
+
     with pytest.raises(error.UnexpectedAlertOpenException):
-        title = session.title
+        session.title
     with pytest.raises(error.NoSuchAlertException):
         session.alert.dismiss()
 
 
 def test_handle_prompt_twice(new_session, add_browser_capabilites):
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    value = session.execute_script("window.alert('Hello');window.alert('Bye');")
-    assert value is None
+
+    response = execute_script(session, "window.alert('Hello');window.alert('Bye');")
+    assert_success(response, None)
+
     session.alert.dismiss()
     # The first alert has been accepted by the user prompt handler, the second one remains.
     # FIXME: this is how browsers currently work, but the spec should clarify if this is the
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element/find.py
similarity index 95%
rename from tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element.py
rename to tests/wpt/web-platform-tests/webdriver/tests/find_element/find.py
index dddb28cb333f..7563179e2eac 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element/find.py
@@ -5,9 +5,9 @@
 
 
 def find_element(session, using, value):
-    return session.transport.send("POST",
-                                  "session/%s/element" % session.session_id,
-                                  {"using": using, "value": value})
+    return session.transport.send(
+        "POST", "session/{session_id}/element".format(**vars(session)),
+        {"using": using, "value": value})
 
 
 # 12.2 Find Element
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element_from_element.py b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/find.py
similarity index 94%
rename from tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element_from_element.py
rename to tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/find.py
index f6b985848aa0..d5713b36aee6 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_element_from_element.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_element_from_element/find.py
@@ -4,10 +4,12 @@
 from tests.support.inline import inline
 
 
-def find_element(session, element, using, value):
-    return session.transport.send("POST",
-                                  "session/%s/element/%s/element" % (session.session_id, element),
-                                  {"using": using, "value": value})
+def find_element(session, element_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/element/{element_id}/element".format(
+            session_id=session.session_id,
+            element_id=element_id),
+        {"using": using, "value": value})
 
 
 @pytest.mark.parametrize("using", ["a", True, None, 1, [], {}])
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements/find.py
similarity index 96%
rename from tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements.py
rename to tests/wpt/web-platform-tests/webdriver/tests/find_elements/find.py
index 781dd3b6408e..1dac2a34a2ee 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements/find.py
@@ -5,9 +5,9 @@
 
 
 def find_elements(session, using, value):
-    return session.transport.send("POST",
-                                  "session/%s/elements" % session.session_id,
-                                  {"using": using, "value": value})
+    return session.transport.send(
+        "POST", "session/{session_id}/elements".format(**vars(session)),
+        {"using": using, "value": value})
 
 
 @pytest.mark.parametrize("using", ["a", True, None, 1, [], {}])
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements_from_element.py b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/find.py
similarity index 94%
rename from tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements_from_element.py
rename to tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/find.py
index 4dd8a4a538ae..d24d45a7a44e 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_retrieval/find_elements_from_element.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/find_elements_from_element/find.py
@@ -4,10 +4,13 @@
 from tests.support.inline import inline
 
 
-def find_elements(session, element, using, value):
-    return session.transport.send("POST",
-                                  "session/%s/element/%s/elements" % (session.session_id, element),
-                                  {"using": using, "value": value})
+def find_elements(session, element_id, using, value):
+    return session.transport.send(
+        "POST", "session/{session_id}/element/{element_id}/elements".format(
+            session_id=session.session_id,
+            element_id=element_id),
+        {"using": using, "value": value})
+
 
 @pytest.mark.parametrize("using", [("a"), (True), (None), (1), ([]), ({})])
 def test_invalid_using_argument(session, using):
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window.py b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window.py
deleted file mode 100644
index 36dd78f8c796..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window.py
+++ /dev/null
@@ -1,210 +0,0 @@
-# META: timeout=long
-
-from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.fixtures import create_dialog
-from tests.support.inline import inline
-
-
-alert_doc = inline("<script>window.alert()</script>")
-
-
-def read_global(session, name):
-    return session.execute_script("return %s;" % name)
-
-
-def fullscreen(session):
-    return session.transport.send("POST", "session/%s/window/fullscreen" % session.session_id)
-
-
-def is_fullscreen(session):
-    # At the time of writing, WebKit does not conform to the Fullscreen API specification.
-    # Remove the prefixed fallback when https://bugs.webkit.org/show_bug.cgi?id=158125 is fixed.
-    return session.execute_script("return !!(window.fullScreen || document.webkitIsFullScreen)")
-
-
-# 10.7.5 Fullscreen Window
-
-
-def test_no_browsing_context(session, create_window):
-    """
-    1. If the current top-level browsing context is no longer open,
-    return error with error code no such window.
-
-    """
-    session.window_handle = create_window()
-    session.close()
-    response = fullscreen(session)
-    assert_error(response, "no such window")
-
-
-def test_handle_prompt_dismiss_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_accept_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_ignore():
-    """TODO"""
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - accept state
-           Accept the current user prompt.
-
-    """
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<title>WD doc title</title>")
-    create_dialog(session)("alert", text="accept #1", result_var="accept1")
-
-    response = fullscreen(session)
-
-    assert_dialog_handled(session, "accept #1")
-    assert read_global(session, "accept1") == None
-
-    expected_title = read_global(session, "document.title")
-    create_dialog(session)("confirm", text="accept #2", result_var="accept2")
-
-    response = fullscreen(session)
-
-    assert_dialog_handled(session, "accept #2")
-    assert read_global(session, "accept2"), True
-
-    create_dialog(session)("prompt", text="accept #3", result_var="accept3")
-
-    response = fullscreen(session)
-
-    assert_dialog_handled(session, "accept #3")
-    assert read_global(session, "accept3") == "" or read_global(session, "accept3") == "undefined"
-
-
-def test_handle_prompt_missing_value(session, create_dialog):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - missing value default state
-           1. Dismiss the current user prompt.
-           2. Return error with error code unexpected alert open.
-
-    """
-    session.url = inline("<title>WD doc title</title>")
-    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
-
-    response = fullscreen(session)
-
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-    assert read_global(session, "dismiss1") == None
-
-    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
-
-    response = fullscreen(session)
-
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-    assert read_global(session, "dismiss2") == False
-
-    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
-
-    response = fullscreen(session)
-
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-    assert read_global(session, "dismiss3") == None
-
-
-def test_fullscreen(session):
-    """
-    4. Call fullscreen an element with the current top-level browsing
-    context's active document's document element.
-
-    """
-    response = fullscreen(session)
-    assert_success(response)
-
-    assert is_fullscreen(session) is True
-
-
-def test_payload(session):
-    """
-    5. Return success with the JSON serialization of the current top-level
-    browsing context's window rect.
-
-    [...]
-
-    A top-level browsing context's window rect is defined as a
-    dictionary of the screenX, screenY, width and height attributes of
-    the WindowProxy. Its JSON representation is the following:
-
-    "x"
-        WindowProxy's screenX attribute.
-
-    "y"
-        WindowProxy's screenY attribute.
-
-    "width"
-        Width of the top-level browsing context's outer dimensions,
-        including any browser chrome and externally drawn window
-        decorations in CSS reference pixels.
-
-    "height"
-        Height of the top-level browsing context's outer dimensions,
-        including any browser chrome and externally drawn window
-        decorations in CSS reference pixels.
-
-    """
-    response = fullscreen(session)
-
-    # step 5
-    assert response.status == 200
-    assert isinstance(response.body["value"], dict)
-
-    value = response.body["value"]
-    assert "width" in value
-    assert "height" in value
-    assert "x" in value
-    assert "y" in value
-    assert isinstance(value["width"], int)
-    assert isinstance(value["height"], int)
-    assert isinstance(value["x"], int)
-    assert isinstance(value["y"], int)
-
-
-def test_fullscreen_twice_is_idempotent(session):
-    assert is_fullscreen(session) is False
-
-    first_response = fullscreen(session)
-    assert_success(first_response)
-    assert is_fullscreen(session) is True
-
-    second_response = fullscreen(session)
-    assert_success(second_response)
-    assert is_fullscreen(session) is True
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/fullscreen.py b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/fullscreen.py
new file mode 100644
index 000000000000..de7d942bdb0e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/fullscreen.py
@@ -0,0 +1,96 @@
+from tests.support.asserts import assert_error, assert_success
+
+
+def fullscreen(session):
+    return session.transport.send(
+        "POST", "session/{session_id}/window/fullscreen".format(**vars(session)))
+
+
+def is_fullscreen(session):
+    # At the time of writing, WebKit does not conform to the Fullscreen API specification.
+    # Remove the prefixed fallback when https://bugs.webkit.org/show_bug.cgi?id=158125 is fixed.
+    return session.execute_script("return !!(window.fullScreen || document.webkitIsFullScreen)")
+
+
+# 10.7.5 Fullscreen Window
+
+
+def test_no_browsing_context(session, create_window):
+    """
+    1. If the current top-level browsing context is no longer open,
+    return error with error code no such window.
+
+    """
+    session.window_handle = create_window()
+    session.close()
+    response = fullscreen(session)
+    assert_error(response, "no such window")
+
+
+def test_fullscreen(session):
+    """
+    4. Call fullscreen an element with the current top-level browsing
+    context's active document's document element.
+
+    """
+    response = fullscreen(session)
+    assert_success(response)
+
+    assert is_fullscreen(session) is True
+
+
+def test_payload(session):
+    """
+    5. Return success with the JSON serialization of the current top-level
+    browsing context's window rect.
+
+    [...]
+
+    A top-level browsing context's window rect is defined as a
+    dictionary of the screenX, screenY, width and height attributes of
+    the WindowProxy. Its JSON representation is the following:
+
+    "x"
+        WindowProxy's screenX attribute.
+
+    "y"
+        WindowProxy's screenY attribute.
+
+    "width"
+        Width of the top-level browsing context's outer dimensions,
+        including any browser chrome and externally drawn window
+        decorations in CSS reference pixels.
+
+    "height"
+        Height of the top-level browsing context's outer dimensions,
+        including any browser chrome and externally drawn window
+        decorations in CSS reference pixels.
+
+    """
+    response = fullscreen(session)
+
+    # step 5
+    assert response.status == 200
+    assert isinstance(response.body["value"], dict)
+
+    value = response.body["value"]
+    assert "width" in value
+    assert "height" in value
+    assert "x" in value
+    assert "y" in value
+    assert isinstance(value["width"], int)
+    assert isinstance(value["height"], int)
+    assert isinstance(value["x"], int)
+    assert isinstance(value["y"], int)
+
+
+def test_fullscreen_twice_is_idempotent(session):
+    assert is_fullscreen(session) is False
+
+    first_response = fullscreen(session)
+    assert_success(first_response)
+    assert is_fullscreen(session) is True
+
+    second_response = fullscreen(session)
+    assert_success(second_response)
+    assert is_fullscreen(session) is True
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/user_prompts.py
new file mode 100644
index 000000000000..421ce8105f13
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/fullscreen_window/user_prompts.py
@@ -0,0 +1,116 @@
+from tests.support.asserts import assert_error, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+def read_global(session, name):
+    return session.execute_script("return %s;" % name)
+
+
+def fullscreen(session):
+    return session.transport.send("POST", "session/%s/window/fullscreen" % session.session_id)
+
+
+def test_handle_prompt_dismiss_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_accept_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_ignore():
+    """TODO"""
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    """
+    2. Handle any user prompts and return its value if it is an error.
+
+    [...]
+
+    In order to handle any user prompts a remote end must take the
+    following steps:
+
+      [...]
+
+      2. Perform the following substeps based on the current session's
+      user prompt handler:
+
+        [...]
+
+        - accept state
+           Accept the current user prompt.
+
+    """
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog(session)("alert", text="accept #1", result_var="accept1")
+
+    fullscreen(session)
+
+    assert_dialog_handled(session, "accept #1")
+    assert read_global(session, "accept1") is None
+
+    read_global(session, "document.title")
+    create_dialog(session)("confirm", text="accept #2", result_var="accept2")
+
+    fullscreen(session)
+
+    assert_dialog_handled(session, "accept #2")
+    assert read_global(session, "accept2"), True
+
+    create_dialog(session)("prompt", text="accept #3", result_var="accept3")
+
+    fullscreen(session)
+
+    assert_dialog_handled(session, "accept #3")
+    assert read_global(session, "accept3") == "" or read_global(session, "accept3") == "undefined"
+
+
+def test_handle_prompt_missing_value(session, create_dialog):
+    """
+    2. Handle any user prompts and return its value if it is an error.
+
+    [...]
+
+    In order to handle any user prompts a remote end must take the
+    following steps:
+
+      [...]
+
+      2. Perform the following substeps based on the current session's
+      user prompt handler:
+
+        [...]
+
+        - missing value default state
+           1. Dismiss the current user prompt.
+           2. Return error with error code unexpected alert open.
+
+    """
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    response = fullscreen(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+    assert read_global(session, "dismiss1") is None
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    response = fullscreen(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+    assert read_global(session, "dismiss2") is False
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    response = fullscreen(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
+    assert read_global(session, "dismiss3") is None
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/get.py
new file mode 100644
index 000000000000..d13effb81f40
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_active_element/get.py
@@ -0,0 +1,149 @@
+from tests.support.asserts import assert_error, assert_same_element
+from tests.support.inline import inline
+
+
+def read_global(session, name):
+    return session.execute_script("return %s;" % name)
+
+
+def get_active_element(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/active".format(**vars(session)))
+
+
+def assert_is_active_element(session, response):
+    """Ensure that the provided object is a successful WebDriver
+    response describing an element reference and that the referenced
+    element matches the element returned by the `activeElement`
+    attribute of the current browsing context's active document.
+
+    """
+    assert response.status == 200
+    assert "value" in response.body
+
+    from_js = session.execute_script("return document.activeElement")
+
+    if response.body["value"] is None:
+        assert from_js is None
+    else:
+        assert_same_element(session, response.body["value"], from_js)
+
+
+def test_closed_context(session, create_window):
+    """
+    > 1. If the current browsing context is no longer open, return error with
+    >    error code no such window.
+    """
+    new_window = create_window()
+    session.window_handle = new_window
+    session.close()
+
+    response = get_active_element(session)
+    assert_error(response, "no such window")
+
+
+def test_success_document(session):
+    """
+    > [...]
+    > 3. Let active element be the active element of the current browsing
+    >    context's document element.
+    > 4. Let active web element be the JSON Serialization of active element.
+    > 5. Return success with data active web element.
+    """
+    session.url = inline("""
+        <body>
+            <h1>Heading</h1>
+            <input />
+            <input />
+            <input style="opacity: 0" />
+            <p>Another element</p>
+        </body>""")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+
+def test_sucess_input(session):
+    session.url = inline("""
+        <body>
+            <h1>Heading</h1>
+            <input autofocus />
+            <input style="opacity: 0" />
+            <p>Another element</p>
+        </body>""")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+
+def test_sucess_input_non_interactable(session):
+    session.url = inline("""
+        <body>
+            <h1>Heading</h1>
+            <input />
+            <input style="opacity: 0" autofocus />
+            <p>Another element</p>
+        </body>""")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+
+def test_success_explicit_focus(session):
+    session.url = inline("""
+        <body>
+            <h1>Heading</h1>
+            <input />
+            <iframe></iframe>
+        </body>""")
+
+    session.execute_script("document.body.getElementsByTagName('h1')[0].focus()")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+    session.execute_script("document.body.getElementsByTagName('input')[0].focus()")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+    session.execute_script("document.body.getElementsByTagName('iframe')[0].focus()")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+    session.execute_script("document.body.getElementsByTagName('iframe')[0].focus();")
+    session.execute_script("""
+        var iframe = document.body.getElementsByTagName('iframe')[0];
+        if (iframe.remove) {
+          iframe.remove();
+        } else {
+          iframe.removeNode(true);
+        }""")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+    session.execute_script("document.body.appendChild(document.createElement('textarea'))")
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+
+def test_success_iframe_content(session):
+    session.url = inline("<body></body>")
+    session.execute_script("""
+        let iframe = document.createElement('iframe');
+        document.body.appendChild(iframe);
+        let input = iframe.contentDocument.createElement('input');
+        iframe.contentDocument.body.appendChild(input);
+        input.focus();
+        """)
+
+    response = get_active_element(session)
+    assert_is_active_element(session, response)
+
+
+def test_missing_document_element(session):
+    session.url = inline("<body></body>")
+    session.execute_script("""
+        if (document.body.remove) {
+          document.body.remove();
+        } else {
+          document.body.removeNode(true);
+        }""")
+
+    response = get_active_element(session)
+    assert_error(response, "no such element")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/get_alert_text.py b/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/get.py
similarity index 79%
rename from tests/wpt/web-platform-tests/webdriver/tests/user_prompts/get_alert_text.py
rename to tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/get.py
index 7b71f7f4fd10..28f8671e5a91 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/get_alert_text.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_alert_text/get.py
@@ -2,9 +2,9 @@
 from tests.support.inline import inline
 
 
-def get_dialog_text(session):
-    return session.transport.send("GET", "session/{session_id}/alert/text"
-                                  .format(session_id=session.session_id))
+def get_alert_text(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/alert/text".format(**vars(session)))
 
 
 # 18.3 Get Alert Text
@@ -14,20 +14,20 @@ def test_no_browsing_context(session, create_window):
     session.window_handle = create_window()
     session.close()
 
-    response = get_dialog_text(session)
+    response = get_alert_text(session)
     assert_error(response, "no such window")
 
 
 def test_no_user_prompt(session):
     # 18.3 step 2
-    response = get_dialog_text(session)
+    response = get_alert_text(session)
     assert_error(response, "no such alert")
 
 
 def test_get_alert_text(session):
     # 18.3 step 3
     session.url = inline("<script>window.alert('Hello');</script>")
-    response = get_dialog_text(session)
+    response = get_alert_text(session)
     assert_success(response)
     assert isinstance(response.body, dict)
     assert "value" in response.body
@@ -39,7 +39,7 @@ def test_get_alert_text(session):
 def test_get_confirm_text(session):
     # 18.3 step 3
     session.url = inline("<script>window.confirm('Hello');</script>")
-    response = get_dialog_text(session)
+    response = get_alert_text(session)
     assert_success(response)
     assert isinstance(response.body, dict)
     assert "value" in response.body
@@ -51,7 +51,7 @@ def test_get_confirm_text(session):
 def test_get_prompt_text(session):
     # 18.3 step 3
     session.url = inline("<script>window.prompt('Enter Your Name: ', 'Federer');</script>")
-    response = get_dialog_text(session)
+    response = get_alert_text(session)
     assert_success(response)
     assert isinstance(response.body, dict)
     assert "value" in response.body
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/navigation/current_url.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
similarity index 72%
rename from tests/wpt/web-platform-tests/webdriver/tests/navigation/current_url.py
rename to tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
index b3dfe1ffbd7a..2b7965f176f7 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/navigation/current_url.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/get.py
@@ -12,6 +12,11 @@
 two_frames_doc = inline("<iframe src='%s'></iframe>" % one_frame_doc)
 
 
+def get_current_url(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/url".format(**vars(session)))
+
+
 # TODO(ato): 7.1 Get
 
 
@@ -20,38 +25,28 @@ def test_get_current_url_no_browsing_context(session, create_window):
     session.window_handle = create_window()
     session.close()
 
-    result = session.transport.send("GET", "session/%s/url" % session.session_id)
-
+    result = get_current_url(session)
     assert_error(result, "no such window")
 
-
-def test_get_current_url_alert_prompt(session):
-    # 7.2 step 2
-    session.url = alert_doc
-
-    result = session.transport.send("GET", "session/%s/url" % session.session_id)
-
-    assert_error(result, "unexpected alert open")
-
 def test_get_current_url_matches_location(session):
     # 7.2 step 3
     url = session.execute_script("return window.location.href")
-    assert session.url == url
+
+    result = get_current_url(session)
+    assert_success(result, url)
 
 def test_get_current_url_payload(session):
     # 7.2 step 4-5
     session.start()
 
-    result = session.transport.send("GET", "session/%s/url" % session.session_id)
-
+    result = get_current_url(session)
     assert result.status == 200
     assert isinstance(result.body["value"], basestring)
 
 def test_get_current_url_special_pages(session):
     session.url = "about:blank"
 
-    result = session.transport.send("GET", "session/%s/url" % session.session_id)
-
+    result = get_current_url(session)
     assert_success(result, "about:blank")
 
 # TODO(ato): This test requires modification to pass on Windows
@@ -60,8 +55,7 @@ def test_get_current_url_file_protocol(session):
     # when navigated privileged documents
     session.url = "file:///"
 
-    result = session.transport.send("GET", "session/%s/url" % session.session_id)
-
+    result = get_current_url(session)
     assert_success(result, "file:///")
 
 # TODO(ato): Test for http:// and https:// protocols.
@@ -76,21 +70,20 @@ def test_set_malformed_url(session):
     assert_error(result, "invalid argument")
 
 def test_get_current_url_after_modified_location(session):
-    start = session.transport.send("GET", "session/%s/url" % session.session_id)
+    start = get_current_url(session)
     session.execute_script("window.location.href = 'about:blank#wd_test_modification'")
     wait(session,
-         lambda s: s.transport.send("GET", "session/%s/url" % session.session_id) != start.body["value"],
+         lambda _: get_current_url(session).body["value"] != start.body["value"],
          "URL did not change")
-    result = session.transport.send("GET", "session/%s/url" % session.session_id)
 
+    result = get_current_url(session)
     assert_success(result, "about:blank#wd_test_modification")
 
 def test_get_current_url_nested_browsing_context(session, create_frame):
     session.url = "about:blank#wd_from_within_frame"
     session.switch_frame(create_frame())
 
-    result = session.transport.send("GET", "session/%s/url" % session.session_id)
-
+    result = get_current_url(session)
     assert_success(result, "about:blank#wd_from_within_frame")
 
 def test_get_current_url_nested_browsing_contexts(session):
@@ -103,4 +96,5 @@ def test_get_current_url_nested_browsing_contexts(session):
     inner_frame = session.find.css("iframe", all=False)
     session.switch_frame(inner_frame)
 
-    assert session.url == top_level_url
+    result = get_current_url(session)
+    assert_success(result, top_level_url)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/user_prompts.py
new file mode 100644
index 000000000000..8bf2867078b0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_current_url/user_prompts.py
@@ -0,0 +1,77 @@
+from tests.support.asserts import assert_error, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+def read_global(session, name):
+    return session.execute_script("return %s;" % name)
+
+
+def get_current_url(session):
+    return session.transport.send("GET", "session/%s/url" % session.session_id)
+
+
+def test_handle_prompt_dismiss_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_accept_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_ignore():
+    """TODO"""
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog(session)("alert", text="accept #1", result_var="accept1")
+
+    get_current_url(session)
+
+    assert_dialog_handled(session, "accept #1")
+    assert read_global(session, "accept1") is None
+
+    read_global(session, "document.title")
+    create_dialog(session)("confirm", text="accept #2", result_var="accept2")
+
+    get_current_url(session)
+
+    assert_dialog_handled(session, "accept #2")
+    assert read_global(session, "accept2"), True
+
+    create_dialog(session)("prompt", text="accept #3", result_var="accept3")
+
+    get_current_url(session)
+
+    assert_dialog_handled(session, "accept #3")
+    assert read_global(session, "accept3") == "" or read_global(session, "accept3") == "undefined"
+
+
+def test_handle_prompt_missing_value(session, create_dialog):
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    response = get_current_url(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+    assert read_global(session, "dismiss1") is None
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    response = get_current_url(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+    assert read_global(session, "dismiss2") is False
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    response = get_current_url(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
+    assert read_global(session, "dismiss3") is None
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
new file mode 100644
index 000000000000..3fcc01a7ffa4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_attribute/get.py
@@ -0,0 +1,101 @@
+import pytest
+
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+
+
+def get_element_attribute(session, element, attr):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/attribute/{attr}".format(
+            session_id=session.session_id,
+            element_id=element,
+            attr=attr))
+
+
+def test_no_browsing_context(session, create_window):
+    session.window_handle = create_window()
+    session.close()
+
+    result = get_element_attribute(session, "foo", "id")
+    assert_error(result, "no such window")
+
+def test_element_not_found(session):
+    # 13.2 Step 3
+    result = get_element_attribute(session, "foo", "id")
+    assert_error(result, "no such element")
+
+
+def test_element_stale(session):
+    session.url = inline("<input id=foo>")
+    element = session.find.css("input", all=False)
+    session.refresh()
+    result = get_element_attribute(session, element.id, "id")
+    assert_error(result, "stale element reference")
+
+
+def test_normal(session):
+    # 13.2 Step 5
+    session.url = inline("<input type=checkbox>")
+    element = session.find.css("input", all=False)
+    result = get_element_attribute(session, element.id, "input")
+    assert_success(result, None)
+
+    # Check we are not returning the property which will have a different value
+    assert session.execute_script("return document.querySelector('input').checked") is False
+    element.click()
+    assert True == session.execute_script("return document.querySelector('input').checked")
+    result = get_element_attribute(session, element.id, "input")
+    assert_success(result, None)
+
+
+@pytest.mark.parametrize("tag,attrs", [
+    ("audio", ["autoplay", "controls", "loop", "muted"]),
+    ("button", ["autofocus", "disabled", "formnovalidate"]),
+    ("details", ["open"]),
+    ("dialog", ["open"]),
+    ("fieldset", ["disabled"]),
+    ("form", ["novalidate"]),
+    ("iframe", ["allowfullscreen"]),
+    ("img", ["ismap"]),
+    ("input", ["autofocus", "checked", "disabled", "formnovalidate", "multiple", "readonly", "required"]),
+    ("menuitem", ["checked", "default", "disabled"]),
+    ("object", ["typemustmatch"]),
+    ("ol", ["reversed"]),
+    ("optgroup", ["disabled"]),
+    ("option", ["disabled", "selected"]),
+    ("script", ["async", "defer"]),
+    ("select", ["autofocus", "disabled", "multiple", "required"]),
+    ("textarea", ["autofocus", "disabled", "readonly", "required"]),
+    ("track", ["default"]),
+    ("video", ["autoplay", "controls", "loop", "muted"])
+])
+def test_boolean_attribute(session, tag, attrs):
+    for attr in attrs:
+        session.url = inline("<{0} {1}>".format(tag, attr))
+        element = session.find.css(tag, all=False)
+        result = result = get_element_attribute(session, element.id, attr)
+        assert_success(result, "true")
+
+
+def test_global_boolean_attributes(session):
+    session.url = inline("<p hidden>foo")
+    element = session.find.css("p", all=False)
+    result = result = get_element_attribute(session, element.id, "hidden")
+
+    assert_success(result, "true")
+
+    session.url = inline("<p>foo")
+    element = session.find.css("p", all=False)
+    result = result = get_element_attribute(session, element.id, "hidden")
+    assert_success(result, None)
+
+    session.url = inline("<p itemscope>foo")
+    element = session.find.css("p", all=False)
+    result = result = get_element_attribute(session, element.id, "itemscope")
+
+    assert_success(result, "true")
+
+    session.url = inline("<p>foo")
+    element = session.find.css("p", all=False)
+    result = result = get_element_attribute(session, element.id, "itemscope")
+    assert_success(result, None)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
new file mode 100644
index 000000000000..f8df2822a6c3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/get.py
@@ -0,0 +1,55 @@
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+
+_input = inline("<input id=i1>")
+
+
+def get_element_property(session, element_id, prop):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/property/{prop}".format(
+            session_id=session.session_id,
+            element_id=element_id,
+            prop=prop))
+
+
+def test_no_browsing_context(session, create_window):
+    session.window_handle = create_window()
+    session.close()
+
+    result = get_element_property(session, "foo", "id")
+    assert_error(result, "no such window")
+
+
+def test_element_not_found(session):
+    # 13.3 Step 3
+    result = get_element_property(session, "foo", "id")
+    assert_error(result, "no such element")
+
+
+def test_element_stale(session):
+    session.url = _input
+    element = session.find.css("input", all=False)
+    session.refresh()
+
+    result = get_element_property(session, element.id, "id")
+    assert_error(result, "stale element reference")
+
+
+def test_property_non_existent(session):
+    session.url = _input
+    element = session.find.css("input", all=False)
+
+    result = get_element_property(session, element.id, "foo")
+    assert_success(result, None)
+
+    assert session.execute_script("return arguments[0].foo", args=[element]) is None
+
+
+def test_element(session):
+    session.url = inline("<input type=checkbox>")
+    element = session.find.css("input", all=False)
+    element.click()
+    assert session.execute_script("return arguments[0].hasAttribute('checked')", args=(element,)) is False
+
+    result = get_element_property(session, element.id, "checked")
+    assert_success(result, True)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/user_prompts.py
new file mode 100644
index 000000000000..8d46d02073b6
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_property/user_prompts.py
@@ -0,0 +1,87 @@
+from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+def read_global(session, name):
+    return session.execute_script("return %s;" % name)
+
+
+def get_property(session, element_id, name):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/property/{name}".format(
+            session_id=session.session_id, element_id=element_id, name=name))
+
+
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
+    # 13.3 step 2
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_property(session, element.id, "id")
+    assert_success(result, "foo")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_property(session, element.id, "id")
+    assert_success(result, "foo")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_property(session, element.id, "id")
+    assert_success(result, "foo")
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_property(session, element.id, "id")
+    assert_success(result, "foo")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_property(session, element.id, "id")
+    assert_success(result, "foo")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_property(session, element.id, "id")
+    assert_success(result, "foo")
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_missing_value(session):
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_property(session, element.id, "id")
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_property(session, element.id, "id")
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_property(session, element.id, "id")
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
new file mode 100644
index 000000000000..2b1663fc221e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/get.py
@@ -0,0 +1,43 @@
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+
+
+def get_element_tag_name(session, element_id):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/name".format(
+            session_id=session.session_id,
+            element_id=element_id))
+
+
+def test_no_browsing_context(session, create_window):
+    # 13.6 step 1
+    session.window_handle = create_window()
+    session.close()
+
+    result = get_element_tag_name(session, "foo")
+    assert_error(result, "no such window")
+
+
+def test_element_not_found(session):
+    # 13.6 Step 3
+    result = get_element_tag_name(session, "foo")
+    assert_error(result, "no such element")
+
+
+def test_element_stale(session):
+    # 13.6 step 4
+    session.url = inline("<input id=foo>")
+    element = session.find.css("input", all=False)
+    session.refresh()
+
+    result = get_element_tag_name(session, element.id)
+    assert_error(result, "stale element reference")
+
+
+def test_get_element_tag_name(session):
+    # 13.6 step 6
+    session.url = inline("<input id=foo>")
+    element = session.find.css("input", all=False)
+
+    result = get_element_tag_name(session, element.id)
+    assert_success(result, "input")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/user_prompts.py
new file mode 100644
index 000000000000..71828c66c205
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_tag_name/user_prompts.py
@@ -0,0 +1,85 @@
+from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+def read_global(session, name):
+    return session.execute_script("return %s;" % name)
+
+
+def get_tag_name(session, element_id):
+    return session.transport.send("GET", "session/{session_id}/element/{element_id}/name".format(
+        session_id=session.session_id, element_id=element_id))
+
+
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_tag_name(session, element.id)
+    assert_success(result, "input")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_tag_name(session, element.id)
+    assert_success(result, "input")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_tag_name(session, element.id)
+    assert_success(result, "input")
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_tag_name(session, element.id)
+    assert_success(result, "input")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_tag_name(session, element.id)
+    assert_success(result, "input")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_tag_name(session, element.id)
+    assert_success(result, "input")
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_missing_value(session):
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_tag_name(session, element.id)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_tag_name(session, element.id)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_tag_name(session, element.id)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/text/get_text.py b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
similarity index 53%
rename from tests/wpt/web-platform-tests/webdriver/tests/state/text/get_text.py
rename to tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
index aa07b8dc1f44..4d1eb18a352f 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/text/get_text.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_element_text/get.py
@@ -1,5 +1,4 @@
 import pytest
-import uuid
 
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
@@ -7,15 +6,19 @@
 # For failing tests, the Get Element Text end-point is used
 # directly. In all other cases, the Element.text() function is used.
 
-def test_getting_text_of_a_non_existant_element_is_an_error(session):
-   session.url = inline("""<body>Hello world</body>""")
-   id = uuid.uuid4()
 
-   result = session.transport.send(
-       "GET",
-       "session/%s/element/%s/text" % (session.session_id, id))
+def get_element_text(session, element_id):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/text".format(
+            session_id=session.session_id,
+            element_id=element_id))
+
+
+def test_getting_text_of_a_non_existant_element_is_an_error(session):
+    session.url = inline("""<body>Hello world</body>""")
 
-   assert_error(result, "no such element")
+    result = get_element_text(session, "foo")
+    assert_error(result, "no such element")
 
 
 def test_read_element_text(session):
@@ -26,4 +29,5 @@ def test_read_element_text(session):
 
     element = session.find.css("#id", all=False)
 
-    assert element.text == "This has an ID"
+    result = get_element_text(session, element.id)
+    assert_success(result, "This has an ID")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/cookies/get_named_cookie.py b/tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/get.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/cookies/get_named_cookie.py
rename to tests/wpt/web-platform-tests/webdriver/tests/get_named_cookie/get.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_timeouts/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_timeouts/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/get_timeouts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_timeouts/get.py
similarity index 87%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/get_timeouts.py
rename to tests/wpt/web-platform-tests/webdriver/tests/get_timeouts/get.py
index 96767e981212..17f8dfd2a403 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/get_timeouts.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_timeouts/get.py
@@ -2,12 +2,10 @@
 
 
 def get_timeouts(session):
-    return session.transport.send("GET", "session/{session_id}/timeouts"
-                                  .format(session_id=session.session_id))
+    return session.transport.send(
+        "GET", "session/{session_id}/timeouts".format(**vars(session)))
 
 
-# 8.4 Get Timeouts
-
 def test_get_timeouts(session):
     # 8.4 step 1
     response = get_timeouts(session)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
new file mode 100644
index 000000000000..3b1673c3dd59
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_title/get.py
@@ -0,0 +1,69 @@
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+from tests.support.wait import wait
+
+
+def read_global(session, name):
+    return session.execute_script("return %s;" % name)
+
+
+def get_title(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/title".format(**vars(session)))
+
+
+def test_no_browsing_context(session, create_window):
+    new_window = create_window()
+    session.window_handle = new_window
+    session.close()
+
+    result = get_title(session)
+    assert_error(result, "no such window")
+
+
+def test_title_from_top_context(session):
+    session.url = inline("<title>Foobar</title><h2>Hello</h2>")
+
+    result = get_title(session)
+    assert_success(result, read_global(session, "document.title"))
+
+
+def test_title_with_duplicate_element(session):
+    session.url = inline("<title>First</title><title>Second</title>")
+
+    result = get_title(session)
+    assert_success(result, read_global(session, "document.title"))
+
+
+def test_title_without_element(session):
+    session.url = inline("<h2>Hello</h2>")
+
+    result = get_title(session)
+    assert_success(result, read_global(session, "document.title"))
+
+
+def test_title_after_modification(session):
+    session.url = inline("<title>Initial</title><h2>Hello</h2>")
+    session.execute_script("document.title = 'Updated'")
+
+    wait(session,
+         lambda s: assert_success(get_title(s)) == read_global(session, "document.title"),
+         "Document title doesn't match '{}'".format(read_global(session, "document.title")))
+
+
+def test_title_strip_and_collapse(session):
+    document = "<title>   a b\tc\nd\t \n e\t\n </title><h2>Hello</h2>"
+    session.url = inline(document)
+
+    result = get_title(session)
+    assert_success(result, read_global(session, "document.title"))
+
+
+def test_title_from_frame(session, create_frame):
+    session.url = inline("<title>Parent</title>parent")
+
+    session.switch_frame(create_frame())
+    session.switch_frame(create_frame())
+
+    result = get_title(session)
+    assert_success(result, "Parent")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_title/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_title/user_prompts.py
new file mode 100644
index 000000000000..39afeb565f5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_title/user_prompts.py
@@ -0,0 +1,118 @@
+from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+def read_global(session, name):
+    return session.execute_script("return %s;" % name)
+
+
+def get_title(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/title".format(**vars(session)))
+
+
+def test_title_handle_prompt_dismiss(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
+    session.url = inline("<title>WD doc title</title>")
+
+    expected_title = read_global(session, "document.title")
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_title(session)
+    assert_success(result, expected_title)
+    assert_dialog_handled(session, "dismiss #1")
+    assert read_global(session, "dismiss1") is None
+
+    expected_title = read_global(session, "document.title")
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_title(session)
+    assert_success(result, expected_title)
+    assert_dialog_handled(session, "dismiss #2")
+    assert read_global(session, "dismiss2") is False
+
+    expected_title = read_global(session, "document.title")
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_title(session)
+    assert_success(result, expected_title)
+    assert_dialog_handled(session, "dismiss #3")
+    assert read_global(session, "dismiss3") is None
+
+
+def test_title_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {
+        "alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog(session)("alert", text="accept #1", result_var="accept1")
+
+    expected_title = read_global(session, "document.title")
+
+    result = get_title(session)
+    assert_success(result, expected_title)
+    assert_dialog_handled(session, "accept #1")
+    assert read_global(session, "accept1") is None
+
+    expected_title = read_global(session, "document.title")
+    create_dialog(session)("confirm", text="accept #2", result_var="accept2")
+
+    result = get_title(session)
+    assert_success(result, expected_title)
+    assert_dialog_handled(session, "accept #2")
+    assert read_global(session, "accept2") is True
+
+    expected_title = read_global(session, "document.title")
+    create_dialog(session)("prompt", text="accept #3", result_var="accept3")
+
+    result = get_title(session)
+    assert_success(result, expected_title)
+    assert_dialog_handled(session, "accept #3")
+    assert read_global(session, "accept3") == "" or read_global(session, "accept3") == "undefined"
+
+
+def test_title_handle_prompt_missing_value(session, create_dialog):
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = get_title(session)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+    assert read_global(session, "dismiss1") is None
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = get_title(session)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+    assert read_global(session, "dismiss2") is False
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = get_title(session)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
+    assert read_global(session, "dismiss3") is None
+
+
+# The behavior of the `window.print` function is platform-dependent and may not
+# trigger the creation of a dialog at all. Therefore, this test should only be
+# run in contexts that support the dialog (a condition that may not be
+# determined automatically).
+# def test_title_with_non_simple_dialog(session):
+#    document = "<title>With non-simple dialog</title><h2>Hello</h2>"
+#    spawn = """
+#        var done = arguments[0];
+#        setTimeout(function() {
+#            done();
+#        }, 0);
+#        setTimeout(function() {
+#            window['print']();
+#        }, 0);
+#    """
+#    session.url = inline(document)
+#    session.execute_async_script(spawn)
+#
+#    result = get_title(session)
+#    assert_error(result, "unexpected alert open")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect.py b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect.py
deleted file mode 100644
index cb3398ecccc7..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect.py
+++ /dev/null
@@ -1,160 +0,0 @@
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.fixtures import create_dialog
-from tests.support.inline import inline
-
-
-alert_doc = inline("<script>window.alert()</script>")
-
-
-def get_window_rect(session):
-    return session.transport.send("GET", "session/%s/window/rect" % session.session_id)
-
-
-# 10.7.1 Get Window Rect
-
-
-def test_no_browsing_context(session, create_window):
-    """
-    1. If the current top-level browsing context is no longer open,
-    return error with error code no such window.
-
-    """
-    session.window_handle = create_window()
-    session.close()
-    response = get_window_rect(session)
-    assert_error(response, "no such window")
-
-
-def test_handle_prompt_dismiss_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_accept_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_ignore():
-    """TODO"""
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - accept state
-           Accept the current user prompt.
-
-    """
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<title>WD doc title</title>")
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-    response = get_window_rect(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-    response = get_window_rect(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-    response = get_window_rect(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_missing_value(session, create_dialog):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - missing value default state
-           1. Dismiss the current user prompt.
-           2. Return error with error code unexpected alert open.
-
-    """
-    session.url = inline("<title>WD doc title</title>")
-    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
-
-    response = get_window_rect(session)
-
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
-
-    response = get_window_rect(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
-
-    response = get_window_rect(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_payload(session):
-    """
-    3. Return success with the JSON serialization of the current top-level
-    browsing context's window rect.
-
-    [...]
-
-    A top-level browsing context's window rect is defined as a
-    dictionary of the screenX, screenY, width and height attributes of
-    the WindowProxy. Its JSON representation is the following:
-
-    "x"
-        WindowProxy's screenX attribute.
-
-    "y"
-        WindowProxy's screenY attribute.
-
-    "width"
-        Width of the top-level browsing context's outer dimensions,
-        including any browser chrome and externally drawn window
-        decorations in CSS reference pixels.
-
-    "height"
-        Height of the top-level browsing context's outer dimensions,
-        including any browser chrome and externally drawn window
-        decorations in CSS reference pixels.
-
-    """
-    response = get_window_rect(session)
-
-    assert response.status == 200
-    assert isinstance(response.body["value"], dict)
-    value = response.body["value"]
-    expected = session.execute_script("""return {
-         x: window.screenX,
-         y: window.screenY,
-         width: window.outerWidth,
-         height: window.outerHeight
-    }""")
-    assert expected == value
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/get.py b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/get.py
new file mode 100644
index 000000000000..ae493b7a1654
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/get.py
@@ -0,0 +1,64 @@
+from tests.support.asserts import assert_error
+from tests.support.inline import inline
+
+
+alert_doc = inline("<script>window.alert()</script>")
+
+
+def get_window_rect(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/window/rect".format(**vars(session)))
+
+
+def test_no_browsing_context(session, create_window):
+    """
+    1. If the current top-level browsing context is no longer open,
+    return error with error code no such window.
+
+    """
+    session.window_handle = create_window()
+    session.close()
+    response = get_window_rect(session)
+    assert_error(response, "no such window")
+
+
+def test_payload(session):
+    """
+    3. Return success with the JSON serialization of the current top-level
+    browsing context's window rect.
+
+    [...]
+
+    A top-level browsing context's window rect is defined as a
+    dictionary of the screenX, screenY, width and height attributes of
+    the WindowProxy. Its JSON representation is the following:
+
+    "x"
+        WindowProxy's screenX attribute.
+
+    "y"
+        WindowProxy's screenY attribute.
+
+    "width"
+        Width of the top-level browsing context's outer dimensions,
+        including any browser chrome and externally drawn window
+        decorations in CSS reference pixels.
+
+    "height"
+        Height of the top-level browsing context's outer dimensions,
+        including any browser chrome and externally drawn window
+        decorations in CSS reference pixels.
+
+    """
+    response = get_window_rect(session)
+
+    assert response.status == 200
+    assert isinstance(response.body["value"], dict)
+    value = response.body["value"]
+    expected = session.execute_script("""return {
+         x: window.screenX,
+         y: window.screenY,
+         width: window.outerWidth,
+         height: window.outerHeight
+    }""")
+    assert expected == value
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/user_prompts.py
new file mode 100644
index 000000000000..f2e8dddb8bdf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/get_window_rect/user_prompts.py
@@ -0,0 +1,65 @@
+from tests.support.asserts import assert_error, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+alert_doc = inline("<script>window.alert()</script>")
+
+
+def get_window_rect(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/window/rect".format(**vars(session)))
+
+
+def test_handle_prompt_dismiss_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_accept_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_ignore():
+    """TODO"""
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<title>WD doc title</title>")
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+    response = get_window_rect(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+    response = get_window_rect(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+    response = get_window_rect(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_missing_value(session, create_dialog):
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    response = get_window_rect(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    response = get_window_rect(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    response = get_window_rect(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
new file mode 100644
index 000000000000..16939b58f40d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/selected.py
@@ -0,0 +1,72 @@
+from tests.support.asserts import assert_error, assert_success
+from tests.support.inline import inline
+
+
+check_doc = inline("<input id=checked type=checkbox checked/><input id=notChecked type=checkbox/>")
+option_doc = inline("""<select>
+                        <option id=notSelected>r-</option>
+                        <option id=selected selected>r+</option>
+                       </select>
+                    """)
+
+
+def is_element_selected(session, element_id):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/selected".format(
+            session_id=session.session_id,
+            element_id=element_id))
+
+
+def test_no_browsing_context(session, create_window):
+    # 13.1 step 1
+    session.window_handle = create_window()
+    session.close()
+
+    result = is_element_selected(session, "foo")
+    assert_error(result, "no such window")
+
+
+def test_element_stale(session):
+    # 13.1 step 4
+    session.url = check_doc
+    element = session.find.css("#checked", all=False)
+    session.refresh()
+
+    result = is_element_selected(session, element.id)
+    assert_error(result, "stale element reference")
+
+
+def test_element_checked(session):
+    # 13.1 step 5
+    session.url = check_doc
+    element = session.find.css("#checked", all=False)
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, True)
+
+
+def test_checkbox_not_selected(session):
+    # 13.1 step 5
+    session.url = check_doc
+    element = session.find.css("#notChecked", all=False)
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
+
+
+def test_element_selected(session):
+    # 13.1 step 5
+    session.url = option_doc
+    element = session.find.css("#selected", all=False)
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, True)
+
+
+def test_element_not_selected(session):
+    # 13.1 step 5
+    session.url = option_doc
+    element = session.find.css("#notSelected", all=False)
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/user_prompts.py
new file mode 100644
index 000000000000..b1a181a108be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/is_element_selected/user_prompts.py
@@ -0,0 +1,84 @@
+from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
+from tests.support.inline import inline
+from tests.support.fixtures import create_dialog
+
+
+def is_element_selected(session, element_id):
+    return session.transport.send(
+        "GET", "session/{session_id}/element/{element_id}/selected".format(
+            session_id=session.session_id,
+            element_id=element_id))
+
+
+def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
+    # 13.1 step 2
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    # 13.1 step 2
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = is_element_selected(session, element.id)
+    assert_success(result, False)
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_missing_value(session):
+    # 13.1 step 2
+    session.url = inline("<input id=foo>")
+    element = session.find.css("#foo", all=False)
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = is_element_selected(session, element.id)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = is_element_selected(session, element.id)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = is_element_selected(session, element.id)
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/maximize_window/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/maximize_window/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/contexts/maximize_window.py b/tests/wpt/web-platform-tests/webdriver/tests/maximize_window/maximize.py
similarity index 65%
rename from tests/wpt/web-platform-tests/webdriver/tests/contexts/maximize_window.py
rename to tests/wpt/web-platform-tests/webdriver/tests/maximize_window/maximize.py
index 6143dc15924b..00d6bc9880df 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/contexts/maximize_window.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/maximize_window/maximize.py
@@ -1,15 +1,10 @@
-# META: timeout=long
-
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.fixtures import create_dialog
+from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
 
 
-alert_doc = inline("<script>window.alert()</script>")
-
-
 def maximize(session):
-    return session.transport.send("POST", "session/%s/window/maximize" % session.session_id)
+    return session.transport.send(
+        "POST", "session/{session_id}/window/maximize".format(**vars(session)))
 
 
 def is_fullscreen(session):
@@ -33,99 +28,6 @@ def test_no_browsing_context(session, create_window):
     assert_error(response, "no such window")
 
 
-def test_handle_prompt_dismiss_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_accept_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_ignore():
-    """TODO"""
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    """
-    3. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - accept state
-           Accept the current user prompt.
-
-    """
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<title>WD doc title</title>")
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-    response = maximize(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-    response = maximize(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-    response = maximize(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_missing_value(session, create_dialog):
-    """
-    3. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - missing value default state
-           1. Dismiss the current user prompt.
-           2. Return error with error code unexpected alert open.
-
-    """
-    session.url = inline("<title>WD doc title</title>")
-    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
-
-    response = maximize(session)
-
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
-
-    response = maximize(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
-
-    response = maximize(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-
 def test_fully_exit_fullscreen(session):
     """
     4. Fully exit fullscreen.
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/maximize_window/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/maximize_window/user_prompts.py
new file mode 100644
index 000000000000..41ef3beaa84f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/maximize_window/user_prompts.py
@@ -0,0 +1,62 @@
+from tests.support.asserts import assert_error, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+def maximize(session):
+    return session.transport.send(
+        "POST", "session/{session_id}/window/maximize".format(**vars(session)))
+
+
+def test_handle_prompt_dismiss_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_accept_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_ignore():
+    """TODO"""
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<title>WD doc title</title>")
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+    response = maximize(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+    response = maximize(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+    response = maximize(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_missing_value(session, create_dialog):
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    response = maximize(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    response = maximize(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    response = maximize(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/minimize_window/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/minimize_window/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/minimize_window.py b/tests/wpt/web-platform-tests/webdriver/tests/minimize_window/minimize.py
similarity index 57%
rename from tests/wpt/web-platform-tests/webdriver/tests/minimize_window.py
rename to tests/wpt/web-platform-tests/webdriver/tests/minimize_window/minimize.py
index ff451de9d759..b80b67821079 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/minimize_window.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/minimize_window/minimize.py
@@ -1,13 +1,10 @@
-from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.fixtures import create_dialog
+from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
 
 
-alert_doc = inline("<script>window.alert()</script>")
-
-
 def minimize(session):
-    return session.transport.send("POST", "session/%s/window/minimize" % session.session_id)
+    return session.transport.send(
+        "POST", "session/{session_id}/window/minimize".format(**vars(session)))
 
 
 def is_fullscreen(session):
@@ -30,99 +27,6 @@ def test_no_browsing_context(session, create_window):
     assert_error(response, "no such window")
 
 
-def test_handle_prompt_dismiss_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_accept_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_ignore():
-    """TODO"""
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - accept state
-           Accept the current user prompt.
-
-    """
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<title>WD doc title</title>")
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-    response = minimize(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-    response = minimize(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-    response = minimize(session)
-    assert response.status == 200
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_missing_value(session, create_dialog):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - missing value default state
-           1. Dismiss the current user prompt.
-           2. Return error with error code unexpected alert open.
-
-    """
-    session.url = inline("<title>WD doc title</title>")
-    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
-
-    response = minimize(session)
-
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
-
-    response = minimize(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
-
-    response = minimize(session)
-    assert_error(response, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-
 def test_fully_exit_fullscreen(session):
     """
     4. Fully exit fullscreen.
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/minimize_window/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/minimize_window/user_prompts.py
new file mode 100644
index 000000000000..406862b23c78
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/minimize_window/user_prompts.py
@@ -0,0 +1,62 @@
+from tests.support.asserts import assert_error, assert_dialog_handled
+from tests.support.fixtures import create_dialog
+from tests.support.inline import inline
+
+
+def minimize(session):
+    return session.transport.send(
+        "POST", "session/{session_id}/window/minimize".format(**vars(session)))
+
+
+def test_handle_prompt_dismiss_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_accept_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_ignore():
+    """TODO"""
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    session.url = inline("<title>WD doc title</title>")
+
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+    response = minimize(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+    response = minimize(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+    response = minimize(session)
+    assert response.status == 200
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_missing_value(session, create_dialog):
+    session.url = inline("<title>WD doc title</title>")
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    response = minimize(session)
+
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    response = minimize(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    response = minimize(session)
+    assert_error(response, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/navigation/get_title.py b/tests/wpt/web-platform-tests/webdriver/tests/navigation/get_title.py
deleted file mode 100644
index 3edee84618ef..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/navigation/get_title.py
+++ /dev/null
@@ -1,282 +0,0 @@
-import pytest
-import time
-
-from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.fixtures import create_dialog
-from tests.support.inline import inline
-
-def read_global(session, name):
-    return session.execute_script("return %s;" % name)
-
-# 1. If the current top-level browsing context is no longer open, return error
-#    with error code no such window.
-def test_title_from_closed_context(session, create_window):
-    new_window = create_window()
-    session.window_handle = new_window
-    session.close()
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_error(result, "no such window")
-
-# [...]
-# 2. Handle any user prompts and return its value if it is an error.
-# [...]
-# In order to handle any user prompts a remote end must take the following
-# steps:
-# 2. Run the substeps of the first matching user prompt handler:
-#
-#    [...]
-#    - dismiss state
-#      1. Dismiss the current user prompt.
-#    [...]
-#
-# 3. Return success.
-def test_title_handle_prompt_dismiss(new_session, add_browser_capabilites):
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    session.url = inline("<title>WD doc title</title>")
-
-    expected_title = read_global(session, "document.title")
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, expected_title)
-    assert_dialog_handled(session, "dismiss #1")
-    assert read_global(session, "dismiss1") == None
-
-    expected_title = read_global(session, "document.title")
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, expected_title)
-    assert_dialog_handled(session, "dismiss #2")
-    assert read_global(session, "dismiss2") == False
-
-    expected_title = read_global(session, "document.title")
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, expected_title)
-    assert_dialog_handled(session, "dismiss #3")
-    assert read_global(session, "dismiss3") == None
-
-# [...]
-# 2. Handle any user prompts and return its value if it is an error.
-# [...]
-# In order to handle any user prompts a remote end must take the following
-# steps:
-# 2. Run the substeps of the first matching user prompt handler:
-#
-#    [...]
-#    - accept state
-#      1. Accept the current user prompt.
-#    [...]
-#
-# 3. Return success.
-def test_title_handle_prompt_accept(new_session, add_browser_capabilites):
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<title>WD doc title</title>")
-    create_dialog(session)("alert", text="accept #1", result_var="accept1")
-
-    expected_title = read_global(session, "document.title")
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, expected_title)
-    assert_dialog_handled(session, "accept #1")
-    assert read_global(session, "accept1") == None
-
-    expected_title = read_global(session, "document.title")
-    create_dialog(session)("confirm", text="accept #2", result_var="accept2")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, expected_title)
-    assert_dialog_handled(session, "accept #2")
-    assert read_global(session, "accept2") == True
-
-    expected_title = read_global(session, "document.title")
-    create_dialog(session)("prompt", text="accept #3", result_var="accept3")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, expected_title)
-    assert_dialog_handled(session, "accept #3")
-    assert read_global(session, "accept3") == "" or read_global(session, "accept3") == "undefined"
-
-# [...]
-# 2. Handle any user prompts and return its value if it is an error.
-# [...]
-# In order to handle any user prompts a remote end must take the following
-# steps:
-# 2. Run the substeps of the first matching user prompt handler:
-#
-#    [...]
-#    - missing value default state
-#    - not in the table of simple dialogs
-#      1. Dismiss the current user prompt.
-#      2. Return error with error code unexpected alert open.
-def test_title_handle_prompt_missing_value(session, create_dialog):
-    session.url = inline("<title>WD doc title</title>")
-    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-    assert read_global(session, "dismiss1") == None
-
-    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-    assert read_global(session, "dismiss2") == False
-
-    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-    assert read_global(session, "dismiss3") == None
-
-# The behavior of the `window.print` function is platform-dependent and may not
-# trigger the creation of a dialog at all. Therefore, this test should only be
-# run in contexts that support the dialog (a condition that may not be
-# determined automatically).
-#def test_title_with_non_simple_dialog(session):
-#    document = "<title>With non-simple dialog</title><h2>Hello</h2>"
-#    spawn = """
-#        var done = arguments[0];
-#        setTimeout(function() {
-#            done();
-#        }, 0);
-#        setTimeout(function() {
-#            window['print']();
-#        }, 0);
-#    """
-#    session.url = inline(document)
-#    session.execute_async_script(spawn)
-#
-#    result = session.transport.send("GET",
-#                                    "session/%s/title" % session.session_id)
-#    assert_error(result, "unexpected alert open")
-
-# [...]
-# 3. Let title be the initial value of the title IDL attribute of the current
-#    top-level browsing context's active document.
-# 4. Return success with data title.
-# [...]
-# The title attribute must, on getting, run the following algorithm:
-# [...]
-# 2. Otherwise, let value be the child text content of the title element [...]
-# [...]
-# 4. Return value.
-def test_title_from_top_context(session):
-    session.url = inline("<title>Foobar</title><h2>Hello</h2>")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-    assert_success(result, read_global(session, "document.title"))
-
-# [...]
-# 3. Let title be the initial value of the title IDL attribute of the current
-#    top-level browsing context's active document.
-# 4. Return success with data title.
-# [...]
-# The title attribute must, on getting, run the following algorithm:
-# [...]
-# 2. Otherwise, let value be the child text content of the title element [...]
-#
-#    The title element of a document is the first title element in the document
-#    (in tree order), if there is one, or null otherwise.
-#
-# [...]
-# 4. Return value.
-def test_title_with_duplicate_element(session):
-    session.url = inline("<title>First</title><title>Second</title>")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, read_global(session, "document.title"))
-
-# [...]
-# 3. Let title be the initial value of the title IDL attribute of the current
-#    top-level browsing context's active document.
-# 4. Return success with data title.
-# [...]
-# The title attribute must, on getting, run the following algorithm:
-# [...]
-# 2. Otherwise, let value be the child text content of the title element, or
-#    the empty string if the title element is null.
-# [...]
-# 4. Return value.
-def test_title_without_element(session):
-    session.url = inline("<h2>Hello</h2>")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, read_global(session, "document.title"))
-
-# [...]
-# 3. Let title be the initial value of the title IDL attribute of the current
-#    top-level browsing context's active document.
-# 4. Return success with data title.
-def test_title_after_modification(session):
-    session.url = inline("<title>Initial</title><h2>Hello</h2>")
-    session.execute_script("document.title = 'updated'")
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, read_global(session, "document.title"))
-
-# [...]
-# 3. Let title be the initial value of the title IDL attribute of the current
-#    top-level browsing context's active document.
-# 4. Return success with data title.
-# [...]
-# The title attribute must, on getting, run the following algorithm:
-# [...]
-# 2. Otherwise, let value be the child text content of the title element [...]
-# 3. Strip and collapse ASCII whitespace in value.
-# 4. Return value.
-def test_title_strip_and_collapse(session):
-    document = "<title>   a b\tc\nd\t \n e\t\n </title><h2>Hello</h2>"
-    session.url = inline(document)
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, read_global(session, "document.title"))
-
-# [...]
-# 3. Let title be the initial value of the title IDL attribute of the current
-#    top-level browsing context's active document.
-# 4. Return success with data title.
-def test_title_from_frame(session, create_frame):
-    session.url = inline("<title>Parent</title>parent")
-
-    session.switch_frame(create_frame())
-    session.switch_frame(create_frame())
-
-    result = session.transport.send("GET",
-                                    "session/%s/title" % session.session_id)
-
-    assert_success(result, "Parent")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_session/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/conftest.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/conftest.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/conftest.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/conftest.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/create_alwaysMatch.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_alwaysMatch.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/create_alwaysMatch.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_firstMatch.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/create_firstMatch.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/create_firstMatch.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/create_firstMatch.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/default_values.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/default_values.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/default_values.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/default_values.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/invalid_capabilities.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/invalid_capabilities.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/invalid_capabilities.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/invalid_capabilities.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/merge.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/merge.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/merge.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/merge.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/response.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/response.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/response.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/response.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_session/support/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/support/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/create.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/support/create.py
similarity index 100%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/new_session/support/create.py
rename to tests/wpt/web-platform-tests/webdriver/tests/new_session/support/create.py
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/page_source/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/page_source/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/page_source/source.py b/tests/wpt/web-platform-tests/webdriver/tests/page_source/source.py
new file mode 100644
index 000000000000..97e4e1eff255
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/page_source/source.py
@@ -0,0 +1,16 @@
+from tests.support.asserts import assert_success
+from tests.support.inline import inline
+
+
+def get_page_source(session):
+    return session.transport.send(
+        "GET", "session/{session_id}/source".format(**vars(session)))
+
+
+def test_source_matches_outer_html(session):
+    session.url = inline("<html><head><title>Cheese</title><body>Peas")
+
+    expected = session.execute_script("return document.documentElement.outerHTML")
+
+    response = get_page_source(session)
+    assert_success(response, expected)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/send_alert_text.py b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
similarity index 94%
rename from tests/wpt/web-platform-tests/webdriver/tests/user_prompts/send_alert_text.py
rename to tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
index 6769b556f1ac..5b38b6ff9e56 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/user_prompts/send_alert_text.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/send_alert_text/send.py
@@ -3,9 +3,11 @@
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
 
+
 def send_alert_text(session, body=None):
-    return session.transport.send("POST", "session/{session_id}/alert/text"
-                                  .format(session_id=session.session_id), body)
+    return session.transport.send(
+        "POST", "session/{session_id}/alert/text".format(**vars(session)),
+        body)
 
 
 # 18.4 Send Alert Text
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect.py b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/set.py
similarity index 77%
rename from tests/wpt/web-platform-tests/webdriver/tests/set_window_rect.py
rename to tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/set.py
index d032b9b26eac..ca5056f6d1ae 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/set.py
@@ -2,16 +2,14 @@
 
 import pytest
 
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.fixtures import create_dialog
-from tests.support.inline import inline
-
-
-alert_doc = inline("<script>window.alert()</script>")
+from tests.support.asserts import assert_error, assert_success
 
 
 def set_window_rect(session, rect):
-    return session.transport.send("POST", "session/%s/window/rect" % session.session_id, rect)
+    return session.transport.send(
+        "POST", "session/{session_id}/window/rect".format(**vars(session)),
+        rect)
+
 
 def is_fullscreen(session):
     # At the time of writing, WebKit does not conform to the Fullscreen API specification.
@@ -34,112 +32,6 @@ def test_current_top_level_browsing_context_no_longer_open(session, create_windo
     assert_error(response, "no such window")
 
 
-def test_handle_prompt_dismiss():
-    """TODO"""
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - accept state
-           Accept the current user prompt.
-
-    """
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    original = session.window.rect
-
-    # step 2
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-    result = set_window_rect(session, {"x": original["x"],
-                                       "y": original["y"]})
-    assert result.status == 200
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-    result = set_window_rect(session, {"x": original["x"],
-                                       "y": original["y"]})
-    assert result.status == 200
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-    result = set_window_rect(session, {"x": original["x"],
-                                       "y": original["y"]})
-    assert_success(result)
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_dismiss_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_accept_and_notify():
-    """TODO"""
-
-
-def test_handle_prompt_ignore():
-    """TODO"""
-
-
-def test_handle_prompt_missing_value(session, create_dialog):
-    """
-    2. Handle any user prompts and return its value if it is an error.
-
-    [...]
-
-    In order to handle any user prompts a remote end must take the
-    following steps:
-
-      [...]
-
-      2. Perform the following substeps based on the current session's
-      user prompt handler:
-
-        [...]
-
-        - missing value default state
-           1. Dismiss the current user prompt.
-           2. Return error with error code unexpected alert open.
-
-    """
-
-    original = session.window.rect
-
-    # step 2
-    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = set_window_rect(session, {"x": original["x"],
-                                       "y": original["y"]})
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = set_window_rect(session, {"x": original["x"],
-                                       "y": original["y"]})
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = set_window_rect(session, {"x": original["x"],
-                                       "y": original["y"]})
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-
 @pytest.mark.parametrize("rect", [
     {"width": "a"},
     {"height": "b"},
@@ -493,6 +385,33 @@ def test_resize_to_same_height(session):
     assert size == (456, original_height)
 
 
+"""
+TODO(ato):
+
+    Disable test because the while statements are wrong.
+    To fix this properly we need to write an explicit wait utility.
+
+def test_resize_by_script(session):
+    # setting the window size by JS is asynchronous
+    # so we poll waiting for the results
+
+    size0 = session.window.size
+
+    session.execute_script("window.resizeTo(700, 800)")
+    size1 = session.window.size
+    while size0 == size1:
+        size1 = session.window.size
+    assert size1 == (700, 800)
+
+    session.execute_script("window.resizeTo(800, 900)")
+    size2 = session.window.size
+    while size1 == size2:
+        size2 = session.window.size
+        assert size2 == (800, 900)
+    assert size2 == {"width": 200, "height": 100}
+"""
+
+
 def test_payload(session):
     # step 14
     response = set_window_rect(session, {"x": 400, "y": 400})
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/user_prompts.py b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/user_prompts.py
new file mode 100644
index 000000000000..85249d9202be
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/set_window_rect/user_prompts.py
@@ -0,0 +1,73 @@
+from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
+from tests.support.fixtures import create_dialog
+
+
+def set_window_rect(session, rect):
+    return session.transport.send(
+        "POST", "session/{session_id}/window/rect".format(**vars(session)),
+        rect)
+
+
+def test_handle_prompt_dismiss():
+    """TODO"""
+
+
+def test_handle_prompt_accept(new_session, add_browser_capabilites):
+    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
+    original = session.window.rect
+
+    # step 2
+    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
+    result = set_window_rect(session, {"x": original["x"],
+                                       "y": original["y"]})
+    assert result.status == 200
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
+    result = set_window_rect(session, {"x": original["x"],
+                                       "y": original["y"]})
+    assert result.status == 200
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
+    result = set_window_rect(session, {"x": original["x"],
+                                       "y": original["y"]})
+    assert_success(result)
+    assert_dialog_handled(session, "dismiss #3")
+
+
+def test_handle_prompt_dismiss_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_accept_and_notify():
+    """TODO"""
+
+
+def test_handle_prompt_ignore():
+    """TODO"""
+
+
+def test_handle_prompt_missing_value(session, create_dialog):
+    original = session.window.rect
+
+    create_dialog("alert", text="dismiss #1", result_var="dismiss1")
+
+    result = set_window_rect(session, {"x": original["x"],
+                                       "y": original["y"]})
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #1")
+
+    create_dialog("confirm", text="dismiss #2", result_var="dismiss2")
+
+    result = set_window_rect(session, {"x": original["x"],
+                                       "y": original["y"]})
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #2")
+
+    create_dialog("prompt", text="dismiss #3", result_var="dismiss3")
+
+    result = set_window_rect(session, {"x": original["x"],
+                                       "y": original["y"]})
+    assert_error(result, "unexpected alert open")
+    assert_dialog_handled(session, "dismiss #3")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_attribute.py b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_attribute.py
deleted file mode 100644
index ce78e11d3ff2..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_attribute.py
+++ /dev/null
@@ -1,197 +0,0 @@
-# META: timeout=long
-
-import pytest
-
-from tests.support.asserts import assert_error, assert_success, assert_dialog_handled
-from tests.support.fixtures import create_dialog
-from tests.support.inline import inline
-
-
-def get_attribute(session, element, attr):
-    return session.transport.send("GET", "session/{session_id}/element/{element_id}/attribute/{attr}"
-                                  .format(session_id=session.session_id,
-                                          element_id=element,
-                                          attr=attr))
-
-
-# 13.2 Get Element Attribute
-
-def test_no_browsing_context(session, create_window):
-    # 13.2 step 1
-    session.window_handle = create_window()
-    session.close()
-
-    result = get_attribute(session, "foo", "id")
-
-    assert_error(result, "no such window")
-
-
-def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
-    # 13.2 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    # 13.2 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_missing_value(session):
-    # 13.2 step 2
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = get_attribute(session, element.id, "id")
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_element_not_found(session):
-    # 13.2 Step 3
-    result = get_attribute(session, "foo", "id")
-
-    assert_error(result, "no such element")
-
-
-def test_element_stale(session):
-    # 13.2 step 4
-    session.url = inline("<input id=foo>")
-    element = session.find.css("input", all=False)
-    session.refresh()
-    result = get_attribute(session, element.id, "id")
-
-    assert_error(result, "stale element reference")
-
-
-def test_normal(session):
-    # 13.2 Step 5
-    session.url = inline("<input type=checkbox>")
-    element = session.find.css("input", all=False)
-    result = get_attribute(session, element.id, "input")
-    assert_success(result, None)
-    assert False == session.execute_script("return document.querySelector('input').checked")
-
-    # Check we are not returning the property which will have a different value
-    element.click()
-    assert True == session.execute_script("return document.querySelector('input').checked")
-    result = get_attribute(session, element.id, "input")
-    assert_success(result, None)
-
-
-@pytest.mark.parametrize("tag,attrs", [
-    ("audio", ["autoplay", "controls", "loop", "muted"]),
-    ("button", ["autofocus", "disabled", "formnovalidate"]),
-    ("details", ["open"]),
-    ("dialog", ["open"]),
-    ("fieldset", ["disabled"]),
-    ("form", ["novalidate"]),
-    ("iframe", ["allowfullscreen"]),
-    ("img", ["ismap"]),
-    ("input", ["autofocus", "checked", "disabled", "formnovalidate", "multiple", "readonly", "required"]),
-    ("menuitem", ["checked", "default", "disabled"]),
-    ("object", ["typemustmatch"]),
-    ("ol", ["reversed"]),
-    ("optgroup", ["disabled"]),
-    ("option", ["disabled", "selected"]),
-    ("script", ["async", "defer"]),
-    ("select", ["autofocus", "disabled", "multiple", "required"]),
-    ("textarea", ["autofocus", "disabled", "readonly", "required"]),
-    ("track", ["default"]),
-    ("video", ["autoplay", "controls", "loop", "muted"])
-])
-def test_boolean_attribute(session, tag, attrs):
-    # 13.2 Step 5
-    for attr in attrs:
-        session.url = inline("<{0} {1}>".format(tag, attr))
-
-        element = session.find.css(tag, all=False)
-        result = result = get_attribute(session, element.id, attr)
-        assert_success(result, "true")
-
-
-def test_global_boolean_attributes(session):
-    # 13.2 Step 5
-    session.url = inline("<p hidden>foo")
-    element = session.find.css("p", all=False)
-    result = result = get_attribute(session, element.id, "hidden")
-
-    assert_success(result, "true")
-
-    session.url = inline("<p>foo")
-    element = session.find.css("p", all=False)
-    result = result = get_attribute(session, element.id, "hidden")
-    assert_success(result, None)
-
-    session.url = inline("<p itemscope>foo")
-    element = session.find.css("p", all=False)
-    result = result = get_attribute(session, element.id, "itemscope")
-
-    assert_success(result, "true")
-
-    session.url = inline("<p>foo")
-    element = session.find.css("p", all=False)
-    result = result = get_attribute(session, element.id, "itemscope")
-    assert_success(result, None)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_property.py b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_property.py
deleted file mode 100644
index e0d7801c23cf..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_property.py
+++ /dev/null
@@ -1,168 +0,0 @@
-# META: timeout=long
-
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.inline import inline
-from tests.support.fixtures import create_dialog
-
-_input = inline("<input id=i1>")
-
-
-# 13.3 Get Element Property
-
-def test_no_browsing_context(session, create_window):
-    # 13.3 step 1
-    session.window_handle = create_window()
-    session.close()
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id="foo"))
-
-    assert_error(result, "no such window")
-
-
-def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
-    # 13.3 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    # 13.3 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "foo")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_missing_value(session):
-    # 13.3 step 2
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-def test_element_not_found(session):
-    # 13.3 Step 3
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id="foo"))
-
-    assert_error(result, "no such element")
-
-
-def test_element_stale(session):
-    # 13.3 step 4
-    session.url = _input
-    element = session.find.css("input", all=False)
-    session.refresh()
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/id"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "stale element reference")
-
-
-def test_element_non_existent(session):
-    # 13.3 step 5-7
-    session.url = _input
-    element = session.find.css("input", all=False)
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/foo"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, None)
-    assert None == session.execute_script("return arguments[0].foo",
-                                          args=[element])
-
-
-def test_element(session):
-    # 13.3 step 5-7
-    session.url = inline("<input type=checkbox>")
-    element = session.find.css("input", all=False)
-    element.click()
-    assert session.execute_script("return arguments[0].hasAttribute('checked')", args=(element,)) is False
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/property/checked"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-    assert_success(result, True)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_tag_name.py b/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_tag_name.py
deleted file mode 100644
index e3ed83f3f20e..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/get_element_tag_name.py
+++ /dev/null
@@ -1,151 +0,0 @@
-# META: timeout=long
-
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.inline import inline
-from tests.support.fixtures import create_dialog
-
-
-# 13.6 Get Element Tag Name
-
-def test_no_browsing_context(session, create_window):
-    # 13.6 step 1
-    session.window_handle = create_window()
-    session.close()
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id="foo"))
-
-    assert_error(result, "no such window")
-
-
-def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
-    # 13.6 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "input")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "input")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "input")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    # 13.6 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "input")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "input")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, "input")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_missing_value(session):
-    # 13.6 step 2
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_element_not_found(session):
-    # 13.6 Step 3
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id="foo"))
-
-    assert_error(result, "no such element")
-
-
-def test_element_stale(session):
-    # 13.6 step 4
-    session.url = inline("<input id=foo>")
-    element = session.find.css("input", all=False)
-    session.refresh()
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "stale element reference")
-
-
-def test_get_element_tag_name(session):
-    # 13.6 step 6
-    session.url = inline("<input id=foo>")
-    element = session.find.css("input", all=False)
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/name"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-    assert_success(result, "input")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/state/is_element_selected.py b/tests/wpt/web-platform-tests/webdriver/tests/state/is_element_selected.py
deleted file mode 100644
index b51ba020fa4c..000000000000
--- a/tests/wpt/web-platform-tests/webdriver/tests/state/is_element_selected.py
+++ /dev/null
@@ -1,185 +0,0 @@
-# META: timeout=long
-
-from tests.support.asserts import assert_error, assert_dialog_handled, assert_success
-from tests.support.inline import inline
-from tests.support.fixtures import create_dialog
-
-
-alert_doc = inline("<script>window.alert()</script>")
-check_doc = inline("<input id=checked type=checkbox checked/><input id=notChecked type=checkbox/>")
-option_doc = inline("""<select>
-                        <option id=notSelected>r-</option>
-                        <option id=selected selected>r+</option>
-                       </select>
-                    """)
-
-
-# 13.1 Is Element Selected
-
-def test_no_browsing_context(session, create_window):
-    # 13.1 step 1
-    session.window_handle = create_window()
-    session.close()
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id="foo"))
-
-    assert_error(result, "no such window")
-
-
-def test_handle_prompt_dismiss(new_session, add_browser_capabilites):
-    # 13.1 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "dismiss"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_accept(new_session, add_browser_capabilites):
-    # 13.1 step 2
-    _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({"unhandledPromptBehavior": "accept"})}})
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_handle_prompt_missing_value(session):
-    # 13.1 step 2
-    session.url = inline("<input id=foo>")
-    element = session.find.css("#foo", all=False)
-
-    create_dialog(session)("alert", text="dismiss #1", result_var="dismiss1")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #1")
-
-    create_dialog(session)("confirm", text="dismiss #2", result_var="dismiss2")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #2")
-
-    create_dialog(session)("prompt", text="dismiss #3", result_var="dismiss3")
-
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "unexpected alert open")
-    assert_dialog_handled(session, "dismiss #3")
-
-
-def test_element_stale(session):
-    # 13.1 step 4
-    session.url = check_doc
-    element = session.find.css("#checked", all=False)
-    session.refresh()
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_error(result, "stale element reference")
-
-
-def test_element_checked(session):
-    # 13.1 step 5
-    session.url = check_doc
-    element = session.find.css("#checked", all=False)
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, True)
-
-
-def test_checkbox_not_selected(session):
-    # 13.1 step 5
-    session.url = check_doc
-    element = session.find.css("#notChecked", all=False)
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
-
-
-def test_element_selected(session):
-    # 13.1 step 5
-    session.url = option_doc
-    element = session.find.css("#selected", all=False)
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, True)
-
-
-def test_element_not_selected(session):
-    # 13.1 step 5
-    session.url = option_doc
-    element = session.find.css("#notSelected", all=False)
-    result = session.transport.send("GET", "session/{session_id}/element/{element_id}/selected"
-                                    .format(session_id=session.session_id,
-                                            element_id=element.id))
-
-    assert_success(result, False)
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/status/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/status/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/sessions/status.py b/tests/wpt/web-platform-tests/webdriver/tests/status/status.py
similarity index 79%
rename from tests/wpt/web-platform-tests/webdriver/tests/sessions/status.py
rename to tests/wpt/web-platform-tests/webdriver/tests/status/status.py
index 892ce927145d..95b264353bac 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/sessions/status.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/status/status.py
@@ -1,6 +1,11 @@
-import pytest
 import json
 
+from tests.support.asserts import assert_success
+
+
+def get_status(session):
+    return session.transport.send("GET", "/status")
+
 
 def test_get_status_no_session(http):
     with http.get("/status") as response:
@@ -28,9 +33,10 @@ def test_status_with_session_running_on_endpoint_node(new_session, add_browser_c
     # 8.3 step 1.
 
     _, session = new_session({"capabilities": {"alwaysMatch": add_browser_capabilites({})}})
-    value = session.send_command("GET", "status")
 
-    assert value["ready"] == False
+    response = get_status(session)
+    value = assert_success(response)
+    assert value["ready"] is False
     assert "message" in value
 
     session.end()
@@ -38,8 +44,7 @@ def test_status_with_session_running_on_endpoint_node(new_session, add_browser_c
     # Active session count is 0, meaning that the
     # readiness state of the server should be True
     # 8.3 step 1. Again
-    value = session.send_command("GET", "status")
-
-    assert value["ready"] == True
+    response = get_status(session)
+    value = assert_success(response)
+    assert value["ready"] is True
     assert "message" in value
-
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
index 6a20fec2a401..dbf9f1d5e565 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/fixtures.py
@@ -76,6 +76,7 @@ def _restore_windows(session):
     session.window_handle = current_window
 
 
+@ignore_exceptions
 def _switch_to_top_level_browsing_context(session):
     """If the current browsing context selected by WebDriver is a
     `<frame>` or an `<iframe>`, switch it back to the top-level
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py b/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py
index cdb6dc1384c4..2f8fe9b79e3b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/support/inline.py
@@ -40,5 +40,9 @@ def main(request, response):
     if doc is None:
         rv = 404, [("Content-Type", "text/plain")], "Missing doc parameter in query"
     else:
-        rv = [("Content-Type", content_type)], doc
+        response.headers.update([
+          ("Content-Type", content_type),
+          ("X-XSS-Protection", "0")
+        ])
+        rv = doc
     return rv
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/__init__.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/__init__.py
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame.py b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/switch.py
similarity index 67%
rename from tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame.py
rename to tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/switch.py
index 2e5c4e9ffb5f..215c2a4f4f7e 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/switch_to_parent_frame/switch.py
@@ -1,11 +1,13 @@
 import pytest
 from webdriver import StaleElementReferenceException
 
+from tests.support.asserts import assert_success
 from tests.support.inline import inline, iframe
 
 
 def switch_to_parent_frame(session):
-    return session.transport.send("POST", "session/%s/frame/parent" % session.session_id)
+    return session.transport.send(
+        "POST", "session/{session_id}/frame/parent".format(**vars(session)))
 
 
 def test_stale_element_from_iframe(session):
@@ -13,6 +15,9 @@ def test_stale_element_from_iframe(session):
     frame_element = session.find.css("iframe", all=False)
     session.switch_frame(frame_element)
     stale_element = session.find.css("p", all=False)
-    switch_to_parent_frame(session)
+
+    result = switch_to_parent_frame(session)
+    assert_success(result)
+
     with pytest.raises(StaleElementReferenceException):
         stale_element.text
diff --git a/tests/wpt/web-platform-tests/webgl/OWNERS b/tests/wpt/web-platform-tests/webgl/OWNERS
new file mode 100644
index 000000000000..a02b1cb501ec
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webgl/OWNERS
@@ -0,0 +1 @@
+@kenrussell
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-insertDTMF.https.html b/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-insertDTMF.https.html
index 383977c52e17..7a45e5daba7e 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-insertDTMF.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCDTMFSender-insertDTMF.https.html
@@ -148,7 +148,7 @@
 
       7.  Set the object's toneBuffer attribute to tones.
    */
-  promise_test(() => {
+  promise_test(t => {
     return createDtmfSender()
     .then(dtmfSender => {
       dtmfSender.insertDTMF('123');
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html b/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html
index 57ecf07f7b12..9163285ac5b7 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html
@@ -118,7 +118,7 @@
     validateCandidateParameter(iceTransport.getRemoteParameters());
   }
 
-  promise_test(() => {
+  promise_test(t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
 
@@ -163,7 +163,7 @@
     });
   }, 'Two connected iceTransports should has matching local/remote candidates returned');
 
-  promise_test(() => {
+  promise_test(t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
     pc1.createDataChannel('');
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html
new file mode 100644
index 000000000000..0bf58d947ca7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-add-track-no-deadlock.https.html
@@ -0,0 +1,30 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCPeerConnection addTrack does not deadlock</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  'use strict';
+
+  // This test sets up two peer connections using a sequence of operations
+  // that triggered a deadlock in Chrome. See https://crbug.com/736725.
+  // If a deadlock is introduced again, this test times out.
+  promise_test(async t => {
+    const pc1 = new RTCPeerConnection();
+    t.add_cleanup(() => pc1.close());
+    const stream = await navigator.mediaDevices.getUserMedia(
+      {audio: false, video: true});
+    const videoTrack = stream.getVideoTracks()[0];
+    t.add_cleanup(() => videoTrack.stop());
+    pc1.addTrack(videoTrack, stream);
+    const offer = await pc1.createOffer();
+    await pc1.setLocalDescription(offer);
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc2.close());
+    const srdPromise = pc2.setRemoteDescription(offer);
+    pc2.addTrack(videoTrack, stream);
+    // The deadlock encountered in https://crbug.com/736725 occured here.
+    await srdPromise;
+    await pc2.createAnswer();
+  }, 'RTCPeerConnection addTrack does not deadlock.');
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html
index 63dac8f37798..38c8b632cd12 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-canTrickleIceCandidates.html
@@ -35,7 +35,7 @@
     assert_equals(pc.canTrickleIceCandidates, null, 'canTrickleIceCandidates property is null');
   }, 'canTrickleIceCandidates property is null prior to setRemoteDescription');
 
-  promise_test(function() {
+  promise_test(function(t) {
     var pc = new RTCPeerConnection();
 
     return pc.setRemoteDescription(new RTCSessionDescription({type: 'offer', sdp: sdp}))
@@ -44,7 +44,7 @@
     })
   }, 'canTrickleIceCandidates property is true after setRemoteDescription with a=ice-options:trickle');
 
-  promise_test(function() {
+  promise_test(function(t) {
     var pc = new RTCPeerConnection();
 
     return pc.setRemoteDescription(new RTCSessionDescription({type: 'offer', sdp: sdp.replace('a=ice-options:trickle\r\n', '')}))
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getIdentityAssertion.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getIdentityAssertion.html
index 2ecce8363b38..d600816bf03b 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getIdentityAssertion.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getIdentityAssertion.html
@@ -36,7 +36,7 @@
         DOMString peerIdentity;
       };
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     const port = window.location.port;
 
@@ -95,7 +95,7 @@
 
   // When generating assertion, the RTCPeerConnection doesn't care if the returned assertion
   // represents identity of different domain
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     const port = window.location.port;
 
@@ -217,7 +217,7 @@
   promise_test(t => {
     const pc = new RTCPeerConnection();
 
-    pc.setIdentityProvider('nonexistent-origin.web-platform.test', {
+    pc.setIdentityProvider('nonexistent.web-platform.test', {
       protocol: `non-existent`,
       usernameHint: `alice@example.org`,
     });
@@ -278,7 +278,7 @@
         value is provided for the peerIdentity member of RTCConfiguration, the value from
         RTCConfiguration is used.
   */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection({
       peerIdentity: 'bob@example.net'
     });
@@ -302,7 +302,7 @@
     9.6.  setIdentityProvider
       3.  If any identity provider value has changed, discard any stored identity assertion.
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     const port = window.location.port;
     const [idpDomain] = getIdpDomains();
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html
index 73138507d4f1..ac69ee5e28df 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-getStats.https.html
@@ -39,12 +39,12 @@
         1.  Gather the stats indicated by selector according to the stats selection algorithm.
         2.  Resolve p with the resulting RTCStatsReport object, containing the gathered stats.
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     return pc.getStats();
   }, 'getStats() with no argument should succeed');
 
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     return pc.getStats(null);
   }, 'getStats(null) should succeed');
@@ -160,7 +160,7 @@
         - All stats objects referenced directly or indirectly by the RTCOutboundRTPStreamStats
           objects added.
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     return getTrackFromUserMedia('audio')
     .then(([track, mediaStream]) => {
@@ -183,7 +183,7 @@
         - All stats objects referenced directly or indirectly by the RTCInboundRTPStreamStats
           added.
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     const transceiver = pc.addTransceiver('audio');
 
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-peerIdentity.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-peerIdentity.html
index d5f9db9d5d08..2d93880aea5c 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-peerIdentity.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-peerIdentity.html
@@ -54,7 +54,7 @@
       is, there is a current value for peerIdentity ), then this also establishes a
       target peer identity.
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
 
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver.html
index ed41d66319e1..d19b4747df1d 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setDescription-transceiver.html
@@ -64,7 +64,7 @@
         2.  Set transceiver's mid value to the mid of the corresponding media
             description.
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     const transceiver = pc.addTransceiver('audio');
     assert_equals(transceiver.mid, null);
@@ -97,7 +97,7 @@
               transceiver be the result.
         3.  Set transceiver's mid value to the mid of the corresponding media description.
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
 
@@ -109,7 +109,7 @@
     .then(offer => {
       return Promise.all([
         pc1.setLocalDescription(offer),
-        pc2.setRemoteDescrption(offer)
+        pc2.setRemoteDescription(offer)
       ])
       .then(() => {
         const transceivers = pc2.getTransceivers();
@@ -137,7 +137,7 @@
             the RTCSessionDescription that is being rolled back, set the mid value
             of that transceiver to null, as described by [JSEP] (section 4.1.8.2.).
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     const transceiver = pc.addTransceiver('audio');
     assert_equals(transceiver.mid, null);
@@ -157,7 +157,7 @@
     });
   }, 'setLocalDescription(rollback) should unset transceiver.mid');
 
-  promise_test(() => {
+  promise_test(t => {
     const pc = new RTCPeerConnection();
     const transceiver1 = pc.addTransceiver('audio');
     assert_equals(transceiver1.mid, null);
@@ -202,7 +202,7 @@
             addTrack, remove that transceiver from connection's set of transceivers,
             as described by [JSEP] (section 4.1.8.2.).
    */
-  promise_test(() => {
+  promise_test(t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
 
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription.html
index 2efd30190031..3ceafe094d6c 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription.html
@@ -11,11 +11,8 @@
   // https://w3c.github.io/webrtc-pc/archives/20170605/webrtc.html
 
   // The following helper functions are called from RTCPeerConnection-helper.js:
-  //   generateOffer()
-  //   generateAnswer()
   //   assert_session_desc_not_equals()
   //   assert_session_desc_equals()
-  //   test_state_change_event()
 
   /*
     4.3.2.  Interface Definition
@@ -48,76 +45,101 @@
   /*
     4.6.1.  enum RTCSdpType
    */
-  promise_test(t => {
+  promise_test(async t => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
 
     // SDP is validated after WebIDL validation
-    return promise_rejects(t, new TypeError(),
-      pc.setRemoteDescription({
-        type: 'bogus',
-        sdp: 'bogus'
-      }));
+    try {
+      await pc.setRemoteDescription({ type: 'bogus', sdp: 'bogus' });
+      t.unreached_func("Should have rejected.");
+    } catch (e) {
+      assert_throws(new TypeError(), () => { throw e });
+    }
   }, 'setRemoteDescription with invalid type and invalid SDP should reject with TypeError');
 
-  promise_test(t => {
+  promise_test(async t => {
     const pc = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
 
     // SDP is validated after validating type
-    return promise_rejects(t, 'InvalidStateError',
-      pc.setRemoteDescription({
-        type: 'answer',
-        sdp: 'invalid'
-      }));
+    try {
+      await pc.setRemoteDescription({ type: 'answer', sdp: 'invalid' });
+      t.unreached_func("Should have rejected.");
+    } catch (e) {
+      assert_throws('InvalidStateError', () => { throw e });
+    }
   }, 'setRemoteDescription() with invalid SDP and stable state should reject with InvalidStateError');
 
-  /* Operations after returning to stable state */
+  /* Dedicated signalingstate events test. */
 
-  promise_test(t => {
+  promise_test(async t => {
     const pc = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    t.add_cleanup(() => pc2.close());
+
+    let eventCount = 0;
+    const states = [
+      'stable', 'have-local-offer', 'stable', 'have-remote-offer', 'closed'
+    ];
+    pc.onsignalingstatechange = () =>
+        assert_equals(pc.signalingState, states[++eventCount]);
+
+    const assert_state = state => {
+      assert_equals(state, pc.signalingState);
+      assert_equals(state, states[eventCount]);
+    };
+
+    const offer = await pc.createOffer({ offerToReceiveAudio: true });
+    assert_state('stable');
+    await pc.setLocalDescription(offer);
+    assert_state('have-local-offer');
+    await pc2.setRemoteDescription(offer);
+    await pc2.setLocalDescription(await pc2.createAnswer());
+    await pc.setRemoteDescription(pc2.localDescription);
+    assert_state('stable');
+    await pc.setRemoteDescription(await pc2.createOffer());
+    assert_state('have-remote-offer');
+    pc.close();
+    assert_state('closed');
+  }, 'Negotiation should fire signalingsstate events');
 
-    test_state_change_event(t, pc,
-      ['have-remote-offer', 'stable', 'have-remote-offer']);
-
-    return pc2.createOffer({ offerToReceiveAudio: true })
-    .then(offer1 =>
-      pc.setRemoteDescription(offer1)
-      .then(() => pc.createAnswer())
-      .then(answer => pc.setLocalDescription(answer))
-      .then(() => pc2.createOffer({ offerToReceiveVideo: true }))
-      .then(offer2 => {
-        return pc.setRemoteDescription(offer2)
-        .then(() => {
-          assert_equals(pc.signalingState, 'have-remote-offer');
-          assert_session_desc_not_equals(offer1, offer2);
-          assert_session_desc_equals(pc.remoteDescription, offer2);
-          assert_session_desc_equals(pc.currentRemoteDescription, offer1);
-          assert_session_desc_equals(pc.pendingRemoteDescription, offer2);
-        });
-      }));
-  }, 'Calling setRemoteDescription() again after one round of remote-offer/local-answer should succeed');
+  /* Operations after returning to stable state */
 
-  promise_test(t => {
+  promise_test(async t => {
     const pc = new RTCPeerConnection();
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    t.add_cleanup(() => pc2.close());
+
+    const offer1 = await pc2.createOffer({ offerToReceiveAudio: true });
+    await pc.setRemoteDescription(offer1);
+    await pc.setLocalDescription(await pc.createAnswer());
+    const offer2 = await pc2.createOffer({ offerToReceiveVideo: true });
+    await pc.setRemoteDescription(offer2);
+    assert_session_desc_not_equals(offer1, offer2);
+    assert_session_desc_equals(pc.remoteDescription, offer2);
+    assert_session_desc_equals(pc.currentRemoteDescription, offer1);
+    assert_session_desc_equals(pc.pendingRemoteDescription, offer2);
+  }, 'Calling setRemoteDescription() again after one round of remote-offer/local-answer should succeed');
 
-    test_state_change_event(t, pc,
-       ['have-local-offer', 'stable', 'have-remote-offer']);
-
-    return pc.createOffer({ offerToReceiveAudio: true })
-    .then(offer =>
-      pc.setLocalDescription(offer)
-      .then(() => generateAnswer(offer)))
-    .then(answer =>
-      pc.setRemoteDescription(answer)
-      .then(() => generateOffer({ pc, data: true }))
-      .then(offer =>
-        pc.setRemoteDescription(offer)
-        .then(() => {
-          assert_equals(pc.signalingState, 'have-remote-offer');
-          assert_session_desc_equals(pc.remoteDescription, offer);
-          assert_session_desc_equals(pc.currentRemoteDescription, answer);
-          assert_session_desc_equals(pc.pendingRemoteDescription, offer);
-        })));
+  promise_test(async t => {
+    const pc = new RTCPeerConnection();
+    const pc2 = new RTCPeerConnection();
+    t.add_cleanup(() => pc.close());
+    t.add_cleanup(() => pc2.close());
+
+    const offer = await pc.createOffer({ offerToReceiveAudio: true });
+    await pc.setLocalDescription(offer);
+    await pc2.setRemoteDescription(offer);
+    const answer = await pc2.createAnswer();
+    await pc2.setLocalDescription(answer);
+    await pc.setRemoteDescription(answer);
+    await pc.setRemoteDescription(await pc2.createOffer());
+    assert_equals(pc.remoteDescription.sdp, pc.pendingRemoteDescription.sdp);
+    assert_session_desc_equals(pc.remoteDescription, offer);
+    assert_session_desc_equals(pc.currentRemoteDescription, answer);
   }, 'Switching role from offerer to answerer after going back to stable state should succeed');
 
   /*
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getContributingSources.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getContributingSources.https.html
index de1e143a6ad3..7ddc7e822f30 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getContributingSources.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getContributingSources.https.html
@@ -38,7 +38,7 @@
         possibly encode, and 127 represents silence.
    */
 
-  promise_test(() => {
+  promise_test(t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
 
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html
index f36c85967bba..4da0b0ac6235 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getStats.https.html
@@ -44,7 +44,7 @@
           added.
    */
 
-  promise_test(async () => {
+  promise_test(async t => {
     const caller = new RTCPeerConnection();
     const callee = new RTCPeerConnection();
     const { receiver } = caller.addTransceiver('audio');
@@ -55,7 +55,7 @@
     assert_stats_report_has_stats(statsReport, ['inbound-rtp']);
   }, 'receiver.getStats() via addTransceiver should return stats report containing inbound-rtp stats');
 
-  promise_test(async () => {
+  promise_test(async t => {
     const caller = new RTCPeerConnection();
     const callee = new RTCPeerConnection();
     const stream = await navigator.mediaDevices.getUserMedia({audio:true});
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
index 3494a911c874..236ec8b630ea 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpReceiver-getSynchronizationSources.https.html
@@ -25,7 +25,7 @@
       };
    */
 
-  promise_test(() => {
+  promise_test(t => {
     const pc1 = new RTCPeerConnection();
     const pc2 = new RTCPeerConnection();
 
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html b/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html
index 5342625ea0cc..a20304d6300d 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCRtpSender-getStats.https.html
@@ -39,7 +39,7 @@
           objects added.
    */
 
-  promise_test(async () => {
+  promise_test(async t => {
     const caller = new RTCPeerConnection();
     const callee = new RTCPeerConnection();
     const { sender } = caller.addTransceiver('audio');
@@ -50,7 +50,7 @@
     assert_stats_report_has_stats(statsReport, ['outbound-rtp']);
   }, 'sender.getStats() via addTransceiver should return stats report containing outbound-rtp stats');
 
-  promise_test(async () => {
+  promise_test(async t => {
     const caller = new RTCPeerConnection();
     const callee = new RTCPeerConnection();
     const stream = await navigator.mediaDevices.getUserMedia({audio:true});
diff --git a/tests/wpt/web-platform-tests/webrtc/identity-helper.js b/tests/wpt/web-platform-tests/webrtc/identity-helper.js
index bd35d0fbbe93..16e5d35a3d35 100644
--- a/tests/wpt/web-platform-tests/webrtc/identity-helper.js
+++ b/tests/wpt/web-platform-tests/webrtc/identity-helper.js
@@ -8,7 +8,7 @@
     127.0.0.1   www2.web-platform.test
     127.0.0.1   xn--n8j6ds53lwwkrqhv28a.web-platform.test
     127.0.0.1   xn--lve-6lad.web-platform.test
-    0.0.0.0     nonexistent-origin.web-platform.test
+    0.0.0.0     nonexistent.web-platform.test
  */
 
 /*
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/README.txt b/tests/wpt/web-platform-tests/webrtc/protocol/README.txt
new file mode 100644
index 000000000000..062db8540f43
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/README.txt
@@ -0,0 +1,21 @@
+This directory contains files that test for behavior relevant to webrtc,
+but which is specified in protocol specifications from the IETF, not in
+API recommendations from the W3C.
+
+The main specifications are given in the following internet-drafts:
+
+- draft-ietf-rtcweb-overview
+- draft-ietf-rtcweb-transports
+- draft-ietf-rtcweb-security-arch
+- draft-ietf-rtcweb-security
+- draft-ietf-rtcweb-rtp-usage
+- draft-ietf-rtcweb-jsep
+- draft-ietf-rtcweb-ip-handling
+- draft-ietf-rtcweb-fec
+- draft-ietf-rtcweb-data-protocol
+- draft-ietf-rtcweb-data-channel
+
+- RFC 7742, "WebRTC Video Processing and Codec Requirements"
+- RFC 7874, "WebRTC Audio Codec and Processing Requirements"
+
+An overview of the dependencies involved is in draft-jennings-rtcweb-deps
diff --git a/tests/wpt/web-platform-tests/webrtc/protocol/video-codecs.html b/tests/wpt/web-platform-tests/webrtc/protocol/video-codecs.html
new file mode 100644
index 000000000000..cc15cedf34aa
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webrtc/protocol/video-codecs.html
@@ -0,0 +1,63 @@
+<!doctype html>
+<meta charset=utf-8>
+<title>RTCPeerConnection.prototype.createOffer</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/webrtc/RTCPeerConnection-helper.js"></script>
+<script>
+'use strict';
+
+// Tests for conformance to RFC 7742,
+// "WebRTC Video Processing and Codec Requirements"
+// The document was formerly known as draft-ietf-rtcweb-video-codecs.
+//
+// This tests that the browser is a WebRTC Browser as defined there.
+
+// TODO: Section 3.2: screen capture video MUST be prepared
+// to handle resolution changes.
+
+// TODO: Section 4: MUST support generating CVO (orientation)
+
+// Section 5: Browsers MUST implement VP8 and H.264 Constrained Baseline
+promise_test(async t => {
+  const pc = new RTCPeerConnection();
+  const offer = await pc.createOffer({offerToReceiveVideo: true});
+  let video_section_found = false;
+  for (let section of offer.sdp.split(/\r\nm=/)) {
+    if (section.search('video') != 0) {
+      continue;
+    }
+    video_section_found = true;
+    // RTPMAP lines have the format a=rtpmap:<pt> <codec>/<clock rate>
+    let rtpmap_regex = /\r\na=rtpmap:(\d+) (\S+)\/\d+\r\n/g;
+    let match = rtpmap_regex.exec(offer.sdp);
+    let payload_type_map = new Array();
+    while (match) {
+      payload_type_map[match[1]] = match[2];
+      match = rtpmap_regex.exec(offer.sdp);
+    }
+    assert_true(payload_type_map.indexOf('VP8') > -1,
+                'VP8 is supported');
+    assert_true(payload_type_map.indexOf('H264') > -1,
+                'H.264 is supported');
+    // TODO: Verify that one of the H.264 PTs supports constrained baseline
+  }
+  assert_true(video_section_found);
+}, 'H.264 and VP8 should be supported in initial offer');
+
+// TODO: Section 6: Recipients MUST be able to decode 320x240@20 fps
+// TODO: Section 6.1: VP8 MUST support RFC 7741 payload formats
+// TODO: Section 6.1: VP8 MUST respect max-fr/max-fs
+// TODO: Section 6.1: VP8 MUST encode and decode square pixels
+// TODO: Section 6.2: H.264 MUST support RFC 6184 payload formats
+// TODO: Section 6.2: MUST support Constrained Baseline level 1.2
+// TODO: Section 6.2: SHOULD support Constrained High level 1.3
+// TODO: Section 6.2: MUST support packetization mode 1.
+// TODO: Section 6.2: MUST include profile-level-id
+// TODO: Section 6.2: SHOULD interpret max-mbps, max-smbps, max-fs et al
+// TODO: Section 6.2: MUST NOT include sprop-parameter-sets
+// TODO: Section 6.2: MUST support SEI "filler payload"
+// TODO: Section 6.2: MUST support SEI "full frame freeze"
+// TODO: Section 6.2: MUST be prepared to receive User Data messages
+// TODO: Section 6.2: MUST encode and decode square pixels unless signaled
+</script>
diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js b/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
index d3b0501eeb15..81a712c1c652 100644
--- a/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
+++ b/tests/wpt/web-platform-tests/webusb/resources/usb-helpers.js
@@ -24,6 +24,11 @@ let loadChromiumResources = Promise.resolve().then(() => {
     '/resources/chromium/chooser_service.mojom.js',
     '/resources/chromium/webusb-test.js',
   ].forEach(path => {
+    // Use importScripts for workers.
+    if (typeof document === 'undefined') {
+      chain = chain.then(() => importScripts(path));
+      return;
+    }
     let script = document.createElement('script');
     script.src = path;
     script.async = false;
diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb.dedicatedworker.sharedworker.js b/tests/wpt/web-platform-tests/webusb/resources/usb.dedicatedworker.sharedworker.js
new file mode 100644
index 000000000000..b1b2a439e342
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webusb/resources/usb.dedicatedworker.sharedworker.js
@@ -0,0 +1,59 @@
+'use strict';
+importScripts('/resources/testharness.js');
+importScripts('/webusb/resources/fake-devices.js');
+importScripts('/webusb/resources/usb-helpers.js');
+
+let usbDevice, devicesFirstTime, fakeDevice, removedDevice;
+
+test(() => {
+  assert_true(navigator.usb instanceof USB,
+      'navigator.usb should be defined as a USB object');
+  assert_true(navigator.usb.getDevices instanceof Function,
+      'navigator.usb.getDevices should be defined as a function');
+  assert_equals(typeof navigator.usb.requestDevice, 'undefined',
+      'navigator.usb.requestDevice should not be defined');
+}, 'Web workers should have the WebUSB API exposed as defined in the spec.');
+
+usb_test(() => getFakeDevice()
+    .then(_ => usbDevice = _.device)
+    .then(() => navigator.usb.getDevices())
+    .then(devices => {
+      assert_equals(devices.length, 1);
+      assert_equals(usbDevice, devices[0]);
+      assertDeviceInfoEquals(devices[0], fakeDeviceInit);
+    }), 'getDevices returns devices that are connected');
+
+usb_test(() => getFakeDevice()
+    .then(() => navigator.usb.getDevices())
+    .then(_ => devicesFirstTime = _)
+    .then(() => assert_equals(devicesFirstTime.length, 1))
+    .then(() => navigator.usb.getDevices())
+    .then(devicesSecondTime => assert_array_equals(devicesSecondTime,
+        devicesFirstTime)),
+    'getDevices returns the same objects for each USB device');
+
+usb_test(() => getFakeDevice()
+    .then(_ => usbDevice = _.device)
+    .then(() => assertDeviceInfoEquals(usbDevice, fakeDeviceInit))
+    .then(() => usbDevice.open())
+    .then(() => usbDevice.close()),
+    'onconnect event is trigged by adding a device');
+
+usb_test(() => getFakeDevice()
+    .then(_ => {
+      usbDevice = _.device;
+      fakeDevice = _.fakeDevice;
+    })
+    .then(() => waitForDisconnect(fakeDevice))
+    .then(_ => removedDevice = _)
+    .then(() => {
+      assertDeviceInfoEquals(removedDevice, fakeDeviceInit);
+      assert_equals(removedDevice, usbDevice);
+    })
+    .then(() => removedDevice.open())
+    .then(() =>
+        assert_unreachable('should not be able to open a disconnected device'),
+        error => assert_equals(error.code, DOMException.NOT_FOUND_ERR)),
+    'ondisconnect event is triggered by removing a device');
+
+done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webusb/resources/usb.serviceworker.js b/tests/wpt/web-platform-tests/webusb/resources/usb.serviceworker.js
new file mode 100644
index 000000000000..c509adfef0d4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webusb/resources/usb.serviceworker.js
@@ -0,0 +1,9 @@
+'use strict';
+importScripts('/resources/testharness.js');
+
+test(() => {
+  assert_equals(typeof navigator.usb, 'undefined',
+      'navigator.usb should not be a USB object');
+}, 'Service workers should not have access to the WebUSB API.');
+
+done();
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webusb/worker/usb.dedicatedworker.https.html b/tests/wpt/web-platform-tests/webusb/worker/usb.dedicatedworker.https.html
new file mode 100644
index 000000000000..e3a0f9853ef3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webusb/worker/usb.dedicatedworker.https.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+'use strict';
+
+fetch_tests_from_worker(new Worker(
+    '/webusb/resources/usb.dedicatedworker.sharedworker.js'));
+
+</script>
diff --git a/tests/wpt/web-platform-tests/webusb/worker/usb.serviceworker.https.html b/tests/wpt/web-platform-tests/webusb/worker/usb.serviceworker.https.html
new file mode 100644
index 000000000000..a5600e3a679f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webusb/worker/usb.serviceworker.https.html
@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/service-workers/service-worker/resources/test-helpers.sub.js"></script>
+<div id="log"></div>
+<script>
+'use strict';
+
+service_worker_test('/webusb/resources/usb.serviceworker.js',
+    'Ensure that WebUSB is inaccessible from a service worker.');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/webusb/worker/usb.sharedworker.https.html b/tests/wpt/web-platform-tests/webusb/worker/usb.sharedworker.https.html
new file mode 100644
index 000000000000..5779b7fe63f5
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webusb/worker/usb.sharedworker.https.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="log"></div>
+<script>
+'use strict';
+
+fetch_tests_from_worker(new SharedWorker(
+    '/webusb/resources/usb.dedicatedworker.sharedworker.js'));
+
+</script>
diff --git a/tests/wpt/web-platform-tests/webxr/interfaces.https.html b/tests/wpt/web-platform-tests/webxr/interfaces.https.html
index e04764e5f616..385f835fdb6a 100644
--- a/tests/wpt/web-platform-tests/webxr/interfaces.https.html
+++ b/tests/wpt/web-platform-tests/webxr/interfaces.https.html
@@ -17,6 +17,7 @@
   idl_array.add_untested_idls(dom_idl);
   idl_array.add_untested_idls("interface Navigator {};");
   idl_array.add_idls(webxr_idl);
+  idl_array.add_idls("dictionary WebGLContextAttributes {};");
   idl_array.add_objects({
     Navigator:['navigator'],
   });
diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-meta.html b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-meta.html
index ae59fdaa5707..6960cbe57702 100644
--- a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-meta.html
+++ b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import-meta.html
@@ -20,4 +20,19 @@
       .then(msg_event => assert_true(msg_event.data.endsWith(script_url)));
 }, 'Test import.meta.url on the imported module script.');
 
+promise_test(() => {
+  const script_url = 'import-meta-url-worker.js';
+  const worker = new Worker('resources/dynamic-import-given-url-worker.js',
+                            { type: 'module' });
+  worker.postMessage('./' + script_url);
+
+  return new Promise(resolve => worker.onmessage = resolve)
+      .then(msg_event => assert_true(msg_event.data.endsWith(script_url)))
+      .then(() => {
+        worker.postMessage('./' + script_url + '#1');
+        return new Promise(resolve => worker.onmessage = resolve);
+      })
+      .then(msg_event => assert_true(msg_event.data.endsWith(script_url)));
+}, 'Test import.meta.url on the imported module script with a fragment.');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import.html b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import.html
index 3d4236393ee6..9ca6f3c864a5 100644
--- a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import.html
+++ b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-import.html
@@ -45,4 +45,32 @@
       'resources/dynamic-import-and-then-static-import-worker.js', 3);
 }, 'Test dynamic import and then static import on DedicatedWorkerGlobalScope.');
 
+promise_test(() => {
+  const scriptURL = 'resources/import-scripts-worker.js';
+  const worker = new Worker(scriptURL, { type: 'module' });
+  return (new Promise(resolve => worker.onmessage = resolve))
+      .then(e => assert_equals(e.data, 'TypeError'));
+}, 'importScripts() on module worker should throw an exception.');
+
+promise_test(() => {
+  const scriptURL = 'resources/non-existent-worker.js';
+  const worker = new Worker(scriptURL, { type: 'module' });
+  return new Promise(resolve => worker.onerror = resolve);
+}, 'Worker construction for non-existent script should throw an exception.');
+
+promise_test(() => {
+  const scriptURL = 'resources/static-import-non-existent-script-worker.js';
+  const worker = new Worker(scriptURL, { type: 'module' });
+  return new Promise(resolve => worker.onerror = resolve);
+}, 'Static import for non-existent script should throw an exception.');
+
+promise_test(() => {
+  const script_url = './non-existent-worker.js';
+  const worker = new Worker('resources/dynamic-import-given-url-worker.js',
+                            { type: 'module' });
+  worker.postMessage(script_url);
+  return new Promise(resolve => worker.onmessage = resolve)
+      .then(msg_event => assert_equals(msg_event.data, 'ERROR'));
+}, 'Dynamic import for non-existent script should throw an exception.');
+
 </script>
diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html
new file mode 100644
index 000000000000..316b01d789c7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html
@@ -0,0 +1,78 @@
+<!DOCTYPE html>
+<title>DedicatedWorker: WorkerOptions 'credentials'</title>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+// Determines the expected cookie value to be reported by a dedicated worker
+// based on the given option. The worker reports an empty string as the actual
+// cookie value if the cookie wasn't sent to the server. Otherwise, it's the
+// value set by the headers file:
+// "dedicated-worker-options-credentials.html.headers"
+function DetermineExpectedCookieValue(options) {
+  // Classic script loading should always send credentials regardless of the
+  // 'credentials' option because the spec says the option takes effect only
+  // for module script loading.
+  if (options.type == 'classic')
+    return 'COOKIE_VALUE';
+  assert_equals(options.type, 'module');
+
+  if (!options.credentials || options.credentials == 'omit')
+    return '';
+  if (options.credentials == 'same-origin' || options.credentials == 'include')
+    return 'COOKIE_VALUE';
+  assert_unreached('Invalid credentials option was specified: ' +
+                   options.credentials);
+}
+
+// Runs a credentials test with the given WorkerOptions.
+async function runCredentialsTest(options) {
+  const worker = new Worker('resources/credentials.py', options);
+
+  // Wait until the worker sends the actual cookie value.
+  const msg_event = await new Promise(resolve => worker.onmessage = resolve);
+
+  const expectedCookieValue = DetermineExpectedCookieValue(options);
+  assert_equals(msg_event.data, expectedCookieValue);
+}
+
+// Tests for module scripts.
+
+promise_test(() => runCredentialsTest({ type: 'module'}),
+    'new Worker() with the default credentials option should not send ' +
+    'the credentials');
+
+promise_test(() => runCredentialsTest({ credentials: 'omit',
+                                        type: 'module' }),
+    'new Worker() with credentials=omit should not send the credentials');
+
+promise_test(() => runCredentialsTest({ credentials: 'same-origin',
+                                        type: 'module' }),
+    'new Worker() with credentials=same-origin should send the credentials');
+
+promise_test(() => runCredentialsTest({ credentials: 'include',
+                                        type: 'module' }),
+    'new Worker() with credentials=include should send the credentials');
+
+// Tests for classic scripts.
+
+promise_test(() => runCredentialsTest({ type: 'classic' }),
+    'new Worker() with type=classic should always send the credentials ' +
+    'regardless of the credentials option (default).');
+
+promise_test(() => runCredentialsTest({ credentials: 'omit',
+                                        type: 'classic' }),
+    'new Worker() with type=classic should always send the credentials ' +
+    'regardless of the credentials option (omit).');
+
+promise_test(() => runCredentialsTest({ credentials: 'same-origin',
+                                        type: 'classic' }),
+    'new Worker() with type=classic should always send the credentials ' +
+    'regardless of the credentials option (same-origin).');
+
+promise_test(() => runCredentialsTest({ credentials: 'include',
+                                        type: 'classic' }),
+    'new Worker() with type=classic should always send the credentials ' +
+    'regardless of the credentials option (include).');
+
+</script>
diff --git a/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html.headers b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html.headers
new file mode 100644
index 000000000000..6f53744a6ae7
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/modules/dedicated-worker-options-credentials.html.headers
@@ -0,0 +1,2 @@
+Set-Cookie: COOKIE_NAME=COOKIE_VALUE
+Access-Control-Allow-Credentials: true
diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/credentials.py b/tests/wpt/web-platform-tests/workers/modules/resources/credentials.py
new file mode 100644
index 000000000000..8f79563fb5ff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/modules/resources/credentials.py
@@ -0,0 +1,10 @@
+def main(request, response):
+    cookie = request.cookies.first("COOKIE_NAME", None)
+
+    response_headers = [("Content-Type", "text/javascript"),
+                        ("Access-Control-Allow-Credentials", "true")]
+
+    cookie_value = '';
+    if cookie:
+        cookie_value = cookie.value;
+    return (200, response_headers, "postMessage('"+cookie_value+"');")
diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-given-url-worker.js b/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-given-url-worker.js
index 888f60421104..444baddbcc44 100644
--- a/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-given-url-worker.js
+++ b/tests/wpt/web-platform-tests/workers/modules/resources/dynamic-import-given-url-worker.js
@@ -1,4 +1,4 @@
 // Dynamically import the script URL sent by postMessage().
 self.addEventListener('message', e => {
-  import(e.data);
+  import(e.data).catch(error_event => postMessage('ERROR'));
 });
diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/empty-worker.js b/tests/wpt/web-platform-tests/workers/modules/resources/empty-worker.js
new file mode 100644
index 000000000000..49ceb2648a93
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/modules/resources/empty-worker.js
@@ -0,0 +1 @@
+// Do nothing.
diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/import-scripts-worker.js b/tests/wpt/web-platform-tests/workers/modules/resources/import-scripts-worker.js
new file mode 100644
index 000000000000..c2a2489bbb42
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/modules/resources/import-scripts-worker.js
@@ -0,0 +1,6 @@
+try {
+  importScripts('empty-worker.js');
+  postMessage('LOADED');
+} catch (e) {
+  postMessage(e.name);
+}
diff --git a/tests/wpt/web-platform-tests/workers/modules/resources/static-import-non-existent-script-worker.js b/tests/wpt/web-platform-tests/workers/modules/resources/static-import-non-existent-script-worker.js
new file mode 100644
index 000000000000..16f70e9daf49
--- /dev/null
+++ b/tests/wpt/web-platform-tests/workers/modules/resources/static-import-non-existent-script-worker.js
@@ -0,0 +1 @@
+import './non-existent-script.js';
diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.html b/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.html
index 5dd8c3561e96..2f1732c13b3d 100644
--- a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.html
+++ b/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.html
@@ -2,8 +2,31 @@
 <title>structured clone to dedicated worker</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src=/html/webappapis/structured-clone/structured-clone-battery-of-tests.js></script>
+<script src=/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js></script>
+<script src=/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js></script>
 <div id=log></div>
 <script>
-var type = 'dedicated';
+  runStructuredCloneBatteryOfTests({
+    setup() {
+      const blob = new Blob([`
+        onmessage = ev => postMessage(ev.data, ev.data.transfer);
+      `], {type: 'text/javascript'});
+      this.blobURL = URL.createObjectURL(blob);
+      this.worker = new Worker(this.blobURL);
+    },
+    structuredClone(data, transfer) {
+      return new Promise(resolve => {
+        this.worker.addEventListener('message', function f(ev) {
+          this.worker.removeEventListener('message', f);
+          resolve(ev.data.data);
+        }.bind(this));
+        this.worker.postMessage({data, transfer}, transfer);
+      });
+    },
+    teardown() {
+      this.worker.terminate();
+      URL.revokeObjectURL(this.blobURL);
+    }
+  });
 </script>
-<script src="common.js"></script>
diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.js b/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.js
deleted file mode 100644
index 4744578b2295..000000000000
--- a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/dedicated.js
+++ /dev/null
@@ -1,4 +0,0 @@
-importScripts('worker-common.js');
-onmessage = function(ev) {
-  check(ev.data, self);
-};
diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.html b/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.html
index 6f74354d4828..793da8ff3a75 100644
--- a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.html
+++ b/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.html
@@ -2,8 +2,35 @@
 <title>structured clone to shared worker</title>
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
+<script src=/html/webappapis/structured-clone/structured-clone-battery-of-tests.js></script>
+<script src=/html/webappapis/structured-clone/structured-clone-battery-of-tests-with-transferables.js></script>
+<script src=/html/webappapis/structured-clone/structured-clone-battery-of-tests-harness.js></script>
 <div id=log></div>
 <script>
-var type = 'shared';
+  runStructuredCloneBatteryOfTests({
+    setup() {
+      const blob = new Blob([`
+        onconnect = ev => {
+          const port = ev.ports[0];
+          port.onmessage = ev => port.postMessage(ev.data, ev.data.transfer);
+        };
+      `], {type: 'text/javascript'});
+      this.blobURL = URL.createObjectURL(blob);
+      this.worker = new SharedWorker(this.blobURL);
+      this.port = this.worker.port;
+    },
+    structuredClone(data, transfer) {
+      return new Promise(resolve => {
+        this.port.addEventListener('message', function f(ev) {
+          this.port.removeEventListener('message', f);
+          resolve(ev.data.data);
+        }.bind(this));
+        this.port.start();
+        this.port.postMessage({data, transfer}, transfer);
+      });
+    },
+    teardown() {
+      URL.revokeObjectURL(this.blobURL);
+    }
+  });
 </script>
-<script src="common.js"></script>
diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.js b/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.js
deleted file mode 100644
index 372a9ec98d63..000000000000
--- a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/shared.js
+++ /dev/null
@@ -1,6 +0,0 @@
-importScripts('worker-common.js');
-onconnect = function(connect_ev) {
-  connect_ev.ports[0].onmessage = function(message_ev) {
-    check(message_ev.data, this);
-  };
-};
diff --git a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/worker-common.js b/tests/wpt/web-platform-tests/workers/semantics/structured-clone/worker-common.js
deleted file mode 100644
index fd63ff5a5d71..000000000000
--- a/tests/wpt/web-platform-tests/workers/semantics/structured-clone/worker-common.js
+++ /dev/null
@@ -1,1018 +0,0 @@
-var msg = decodeURIComponent(location.hash.substr(1));
-
-var log = [];
-function check_true(actual, msg) {
-  if (actual !== true) {
-    log.push(msg);
-    return false;
-  }
-  return true;
-}
-
-function check_Blob(msg, input, port, expect_File, orig_input) {
-  expect_File = !!expect_File;
-  orig_input = orig_input || input;
-  try {
-    var expected;
-    switch (msg) {
-      case 'Blob basic':
-      case 'File basic':
-        expected = [0x66, 0x6F, 0x6F];
-        expected.type = 'text/x-bar';
-        if (expect_File) {
-          expected.name = 'bar';
-          expected.lastModified = 42;
-        }
-        break;
-      case 'Blob unpaired high surrogate (invalid utf-8)':
-        expected = [0xED, 0xA0, 0x80];
-        expected.type = '';
-        break;
-      case 'Blob unpaired low surrogate (invalid utf-8)':
-        expected = [0xED, 0xB0, 0x80];
-        expected.type = '';
-        break;
-      case 'Blob paired surrogates (invalid utf-8)':
-        expected = [0xED, 0xA0, 0x80, 0xED, 0xB0, 0x80];
-        expected.type = '';
-        break;
-      case 'Blob empty':
-        expected = [];
-        expected.type = '';
-        break;
-      case 'Blob NUL':
-        var expected = [0x00];
-        expected.type = '';
-        break;
-      default:
-        check_true(false, 'check_Blob: unknown test');
-        return;
-        break;
-    }
-    if (check_true(input instanceof Blob, 'input instanceof Blob') &&
-        check_true((input instanceof File) == expect_File, '(input instanceof File) == expect_File') &&
-        check_true(input.size === expected.length, 'input.size === expected.length') &&
-        check_true(input.type === expected.type, 'input.type === expected.type')) {
-      if (!expect_File || (check_true(input.name === expected.name, 'input.name === expected.name') &&
-                           check_true(input.lastModified === expected.lastModified))) {
-        var reader = new FileReader();
-        var read_done = function() {
-          try {
-            var result = reader.result;
-            check_true(result.byteLength === expected.length, 'result.byteLength === expected.length')
-            var view = new DataView(result);
-            for (var i = 0; i < result.byteLength; ++i) {
-              check_true(view.getUint8(i) === expected[i], 'view.getUint8('+i+') === expected['+i+']')
-            }
-            if (log.length === 0) {
-              port.postMessage(orig_input);
-            } else {
-              port.postMessage('FAIL '+log);
-            }
-            close();
-          } catch(ex) {
-            postMessage('FAIL '+ex);
-            close();
-          }
-        }
-        var read_error = function() { port.postMessage('FAIL (got FileReader error)'); close(); };
-        reader.readAsArrayBuffer(input);
-        reader.onload = read_done;
-        reader.onabort = reader.onerror = read_error;
-      }
-    } else {
-      port.postMessage('FAIL '+log);
-      close();
-    }
-  } catch(ex) {
-    postMessage('FAIL '+ex);
-    close();
-  }
-}
-
-function check_ImageData(input, expected) {
-  if (check_true(input instanceof ImageData, 'input instanceof ImageData') &&
-      check_true(input.width === expected.width, 'input.width === '+expected.width) &&
-      check_true(input.height === expected.height, 'input.height === '+expected.height) &&
-      check_true(input.data instanceof Uint8ClampedArray, 'input.data instanceof Uint8ClampedArray') &&
-      check_true(input.data.length === expected.data.length, 'input.data.length === '+expected.data.length) &&
-      check_true(!('CanvasPixelArray' in self), "!('CanvasPixelArray' in self)")) {
-    for (var i = 0; i < input.length; ++i) {
-      if (!(check_true(input.data[i] === expected.data[i], 'input.data['+i+'] === '+expected.data[i]))) {
-        return false;
-      }
-    }
-    return true;
-  }
-  return false;
-}
-
-function check_ImageBitmap(input, expected) {
-  return check_true(input instanceof ImageBitmap, 'input instanceof ImageBitmap');
-  // XXX paint it on a proxy canvas and check the data
-}
-
-function check_RegExp(msg, input) {
-  // XXX ES6 spec doesn't define exact serialization for `source` (it allows several ways to escape)
-  switch (msg) {
-    case 'RegExp flags and lastIndex':
-      return check_true(input instanceof RegExp, "input instanceof RegExp") &&
-             check_true(input.source === 'foo', "input.source === 'foo'") &&
-             check_true(input.global === true, "input.global === true") &&
-             check_true(input.ignoreCase === true, "input.ignoreCase === true") &&
-             check_true(input.multiline === true, "input.multiline === true") &&
-             check_true(input.lastIndex === 0, "input.lastIndex === 0");
-      break;
-    case 'RegExp sticky flag':
-      return check_true(input instanceof RegExp, "input instanceof RegExp") &&
-             check_true(input.source === 'foo', "input.source === 'foo'") &&
-             check_true(input.global === false, "input.global === false") &&
-             check_true(input.ignoreCase === false, "input.ignoreCase === false") &&
-             check_true(input.multiline === false, "input.multiline === false") &&
-             check_true(input.sticky === true, "input.sticky === true") &&
-             check_true(input.unicode === false, "input.unicode === false") &&
-             check_true(input.lastIndex === 0, "input.lastIndex === 0");
-      break;
-    case 'RegExp unicode flag':
-      return check_true(input instanceof RegExp, "input instanceof RegExp") &&
-             check_true(input.source === 'foo', "input.source === 'foo'") &&
-             check_true(input.global === false, "input.global === false") &&
-             check_true(input.ignoreCase === false, "input.ignoreCase === false") &&
-             check_true(input.multiline === false, "input.multiline === false") &&
-             check_true(input.sticky === false, "input.sticky === false") &&
-             check_true(input.unicode === true, "input.unicode === true") &&
-             check_true(input.lastIndex === 0, "input.lastIndex === 0");
-      break;
-    case 'RegExp empty':
-      return check_true(input instanceof RegExp, "input instanceof RegExp") &&
-             check_true(input.source === '(?:)', "input.source === '(?:)'") &&
-             check_true(input.global === false, "input.global === false") &&
-             check_true(input.ignoreCase === false, "input.ignoreCase === false") &&
-             check_true(input.multiline === false, "input.multiline === false") &&
-             check_true(input.lastIndex === 0, "input.lastIndex === 0");
-      break;
-    case 'RegExp slash':
-      return check_true(input instanceof RegExp, "input instanceof RegExp") &&
-             check_true(input.source === '\\/', "input.source === '\\\\/'") &&
-             check_true(input.global === false, "input.global === false") &&
-             check_true(input.ignoreCase === false, "input.ignoreCase === false") &&
-             check_true(input.multiline === false, "input.multiline === false") &&
-             check_true(input.lastIndex === 0, "input.lastIndex === 0");
-      break;
-    case 'RegExp new line':
-      return check_true(input instanceof RegExp, "input instanceof RegExp") &&
-             check_true(input.source === '\\n', "input.source === '\\\\n'") &&
-             check_true(input.global === false, "input.global === false") &&
-             check_true(input.ignoreCase === false, "input.ignoreCase === false") &&
-             check_true(input.multiline === false, "input.multiline === false") &&
-             check_true(input.lastIndex === 0, "input.lastIndex === 0");
-      break;
-    default:
-      check_true(false, 'check_RegExp: unknown test');
-      return false;
-      break;
-  }
-}
-
-function check_FileList(msg, input) {
-  try {
-    return check_true(input instanceof FileList, 'input instanceof FileList') &&
-           check_true(input.length === 0, 'input.length === 0');
-  } catch(ex) {
-    return check_true(false, ex);
-  }
-}
-
-function check(input, port) {
-  try {
-    switch (msg) {
-      case 'primitive undefined':
-        if (check_true(input === undefined, 'input === undefined')) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive null':
-        if (check_true(input === null, 'input === null')) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive true':
-        if (check_true(input === true, 'input === true')) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive false':
-        if (check_true(input === false, 'input === false')) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive string, empty string':
-        if (check_true(input === '', "input === ''")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive string, lone high surrogate':
-        if (check_true(input === '\uD800', "input === '\uD800'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive string, lone low surrogate':
-        if (check_true(input === '\uDC00', "input === '\uDC00'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive string, NUL':
-        if (check_true(input === '\u0000', "input === '\u0000'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive string, astral character':
-        if (check_true(input === '\uDBFF\uDFFD', "input === '\uDBFF\uDFFD'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, 0.2':
-        if (check_true(input === 0.2, "input === 0.2")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, 0':
-        if (check_true(input === 0, "input === 0") &&
-            check_true(1/input === Infinity, "1/input === Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, -0':
-        if (check_true(input === 0, "input === 0") &&
-            check_true(1/input === -Infinity, "1/input === -Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, NaN':
-        if (check_true(input !== input, "input !== input")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, Infinity':
-        if (check_true(input === Infinity, "input === Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, -Infinity':
-        if (check_true(input === -Infinity, "input === -Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, 9007199254740992':
-        if (check_true(input === 9007199254740992, "input === 9007199254740992")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, -9007199254740992':
-        if (check_true(input === -9007199254740992, "input === -9007199254740992")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, 9007199254740994':
-        if (check_true(input === 9007199254740994, "input === 9007199254740994")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'primitive number, -9007199254740994':
-        if (check_true(input === -9007199254740994, "input === -9007199254740994")) {
-          port.postMessage(input);
-          close();
-          break;
-        }
-      case 'Array primitives':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 19, 'input.length === 19') &&
-            check_true(input[0] === undefined, 'input[0] === undefined') &&
-            check_true(input[1] === null, 'input[1] === null') &&
-            check_true(input[2] === true, 'input[2] === true') &&
-            check_true(input[3] === false, 'input[3] === false') &&
-            check_true(input[4] === '', "input[4] === ''") &&
-            check_true(input[5] === '\uD800', "input[5] === '\\uD800'") &&
-            check_true(input[6] === '\uDC00', "input[6] === '\\uDC00'") &&
-            check_true(input[7] === '\u0000', "input[7] === '\\u0000'") &&
-            check_true(input[8] === '\uDBFF\uDFFD', "input[8] === '\\uDBFF\\uDFFD'") &&
-            check_true(input[9] === 0.2, "input[9] === 0.2") &&
-            check_true(1/input[10] === Infinity, "1/input[10] === Infinity") &&
-            check_true(1/input[11] === -Infinity, "1/input[11] === -Infinity") &&
-            check_true(input[12] !== input[11], "input[12] !== input[11]") &&
-            check_true(input[13] === Infinity, "input[13] === Infinity") &&
-            check_true(input[14] === -Infinity, "input[14] === -Infinity") &&
-            check_true(input[15] === 9007199254740992, "input[15] === 9007199254740992") &&
-            check_true(input[16] === -9007199254740992, "input[16] === -9007199254740992") &&
-            check_true(input[17] === 9007199254740994, "input[17] === 9007199254740994") &&
-            check_true(input[18] === -9007199254740994, "input[18] === -9007199254740994")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object primitives':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_true(input['undefined'] === undefined, "input['undefined'] === undefined") &&
-              check_true(input['null'] === null, "input['null'] === null") &&
-              check_true(input['true'] === true, "input['true'] === true") &&
-              check_true(input['false'] === false, "input['false'] === false") &&
-              check_true(input['empty'] === '', "input['empty'] === ''") &&
-              check_true(input['high surrogate'] === '\uD800', "input['high surrogate'] === '\uD800'") &&
-              check_true(input['low surrogate'] === '\uDC00', "input['low surrogate'] === '\uDC00'") &&
-              check_true(input['nul'] === '\u0000', "input['nul'] === '\u0000'") &&
-              check_true(input['astral'] === '\uDBFF\uDFFD', "input['astral'] === '\uDBFF\uDFFD'") &&
-              check_true(input['0.2'] === 0.2, "input['0.2'] === 0.2") &&
-              check_true(1/input['0'] === Infinity, "1/input['0'] === Infinity") &&
-              check_true(1/input['-0'] === -Infinity, "1/input['-0'] === -Infinity") &&
-              check_true(input['NaN'] !== input['NaN'], "input['NaN'] !== input['NaN']") &&
-              check_true(input['Infinity'] === Infinity, "input['Infinity'] === Infinity") &&
-              check_true(input['-Infinity'] === -Infinity, "input['-Infinity'] === -Infinity") &&
-              check_true(input['9007199254740992'] === 9007199254740992, "input['9007199254740992'] === 9007199254740992") &&
-              check_true(input['-9007199254740992'] === -9007199254740992, "input['-9007199254740992'] === -9007199254740992") &&
-              check_true(input['9007199254740994'] === 9007199254740994, "input['9007199254740994'] === 9007199254740994") &&
-              check_true(input['-9007199254740994'] === -9007199254740994, "input['9007199254740994'] === -9007199254740994")) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 19, 'i === 19')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'Boolean true':
-        if (check_true(input instanceof Boolean, "input instanceof Boolean") &&
-            check_true(String(input) === 'true', "String(input) === 'true'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Boolean false':
-        if (check_true(input instanceof Boolean, "input instanceof Boolean") &&
-            check_true(String(input) === 'false', "String(input) === 'false'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array Boolean objects':
-        (function() {
-          if (check_true(input instanceof Array, 'input instanceof Array') &&
-              check_true(input.length === 2, 'input.length === 2') &&
-              check_true(String(input[0]) === 'true', "String(input[0]) === 'true'") &&
-              check_true(String(input[1]) === 'false', "String(input[1]) === 'false'")) {
-            for (var i = 0; i < input.length; ++i) {
-              if (!check_true(input[i] instanceof Boolean, 'input['+i+'] instanceof Boolean'))
-                return;
-            }
-            port.postMessage(input);
-            close();
-          }
-        })();
-        break;
-      case 'Object Boolean objects':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_true(String(input['true']) === 'true', "String(input['true']) === 'true'") &&
-              check_true(String(input['false']) === 'false', "String(input['false']) === 'false'")) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-              if (!check_true(input[x] instanceof Boolean, 'input['+x+'] instanceof Boolean'))
-                return;
-            }
-            if (check_true(i === 2, 'i === 2')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'String empty string':
-        if (check_true(input instanceof String, "input instanceof String") &&
-            check_true(String(input) === '', "String(input) === ''")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'String lone high surrogate':
-        if (check_true(input instanceof String, "input instanceof String") &&
-            check_true(String(input) === '\uD800', "String(input) === '\\uD800'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'String lone low surrogate':
-        if (check_true(input instanceof String, "input instanceof String") &&
-            check_true(String(input) === '\uDC00', "String(input) === '\\uDC00'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'String NUL':
-        if (check_true(input instanceof String, "input instanceof String") &&
-            check_true(String(input) === '\u0000', "String(input) === '\\u0000'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'String astral character':
-        if (check_true(input instanceof String, "input instanceof String") &&
-            check_true(String(input) === '\uDBFF\uDFFD', "String(input) === '\\uDBFF\\uDFFD'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array String objects':
-        (function() {
-          if (check_true(input instanceof Array, 'input instanceof Array') &&
-              check_true(input.length === 5, 'input.length === 5') &&
-              check_true(String(input[0]) === '', "String(input[0]) === ''") &&
-              check_true(String(input[1]) === '\uD800', "String(input[1]) === '\\uD800'") &&
-              check_true(String(input[2]) === '\uDC00', "String(input[1]) === '\\uDC00'") &&
-              check_true(String(input[3]) === '\u0000', "String(input[2]) === '\\u0000'") &&
-              check_true(String(input[4]) === '\uDBFF\uDFFD', "String(input[3]) === '\\uDBFF\\uDFFD'")) {
-            for (var i = 0; i < input.length; ++i) {
-              if (!check_true(input[i] instanceof String, 'input['+i+'] instanceof String'))
-                return;
-            }
-            port.postMessage(input);
-            close();
-          }
-        })();
-        break;
-      case 'Object String objects':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_true(String(input['empty']) === '', "String(input['empty']) === ''") &&
-              check_true(String(input['high surrogate']) === '\uD800', "String(input['high surrogate']) === '\\uD800'") &&
-              check_true(String(input['low surrogate']) === '\uDC00', "String(input['low surrogate']) === '\\uDC00'") &&
-              check_true(String(input['nul']) === '\u0000', "String(input['nul']) === '\\u0000'") &&
-              check_true(String(input['astral']) === '\uDBFF\uDFFD', "String(input['astral']) === '\\uDBFF\\uDFFD'")) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-              if (!check_true(input[x] instanceof String, 'input['+x+'] instanceof Boolean'))
-                return;
-            }
-            if (check_true(i === 5, 'i === 5')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'Number 0.2':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(Number(input) === 0.2, "Number(input) === 0.2")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number 0':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(1/Number(input) === Infinity, "1/Number(input) === Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number -0':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(1/Number(input) === -Infinity, "1/Number(input) === -Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number NaN':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(Number(input) !== Number(input), "Number(input) !== Number(input)")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number Infinity':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(Number(input) === Infinity, "Number(input) === Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number -Infinity':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(Number(input) === -Infinity, "Number(input) === -Infinity")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number 9007199254740992':
-        if (check_true(input instanceof Number) &&
-            check_true(Number(input) === 9007199254740992, "Number(input) === 9007199254740992")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number -9007199254740992':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(Number(input) === -9007199254740992, "Number(input) === -9007199254740992")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number 9007199254740994':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(Number(input) === 9007199254740994, "Number(input) === 9007199254740994")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Number -9007199254740994':
-        if (check_true(input instanceof Number, "input instanceof Number") &&
-            check_true(Number(input) === -9007199254740994, "Number(input) === -9007199254740994")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array Number objects':
-        (function() {
-          if (check_true(input instanceof Array, 'input instanceof Array') &&
-              check_true(input.length === 10, 'input.length === 10') &&
-              check_true(Number(input[0]) === 0.2, "Number(input[0]) === 0.2") &&
-              check_true(1/Number(input[1]) === Infinity, "1/Number(input[1]) === Infinity") &&
-              check_true(1/Number(input[2]) === -Infinity, "1/Number(input[2]) === -Infinity") &&
-              check_true(Number(input[3]) !== Number(input[3]), "Number(input[3]) !== Number(input[3])") &&
-              check_true(Number(input[4]) === Infinity, "Number(input[4]) === Infinity") &&
-              check_true(Number(input[5]) === -Infinity, "Number(input[5]) === -Infinity") &&
-              check_true(Number(input[6]) === 9007199254740992, "Number(input[6]) === 9007199254740992") &&
-              check_true(Number(input[7]) === -9007199254740992, "Number(input[7]) === -9007199254740992") &&
-              check_true(Number(input[8]) === 9007199254740994, "Number(input[8]) === 9007199254740994") &&
-              check_true(Number(input[9]) === -9007199254740994, "Number(input[9]) === -9007199254740994")) {
-            for (var i = 0; i < input.length; ++i) {
-              if (!check_true(input[i] instanceof Number, 'input['+i+'] instanceof Number'))
-                return;
-            }
-            port.postMessage(input);
-            close();
-          }
-        })();
-        break;
-      case 'Object Number objects':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_true(Number(input['0.2']) === 0.2, "Number(input['0.2']) === 0.2") &&
-              check_true(1/Number(input['0']) === Infinity, "1/Number(input['0']) === Infinity") &&
-              check_true(1/Number(input['-0']) === -Infinity, "1/Number(input['-0']) === -Infinity") &&
-              check_true(Number(input['NaN']) !== Number(input['NaN']), "Number(input['NaN']) !== Number(input['NaN'])") &&
-              check_true(Number(input['Infinity']) === Infinity, "Number(input['Infinity']) === Infinity") &&
-              check_true(Number(input['-Infinity']) === -Infinity, "Number(input['-Infinity']) === -Infinity") &&
-              check_true(Number(input['9007199254740992']) === 9007199254740992, "Number(input['9007199254740992']) === 9007199254740992") &&
-              check_true(Number(input['-9007199254740992']) === -9007199254740992, "Number(input['-9007199254740992']) === -9007199254740992") &&
-              check_true(Number(input['9007199254740994']) === 9007199254740994, "Number(input['9007199254740994']) === 9007199254740994") &&
-              check_true(Number(input['-9007199254740994']) === -9007199254740994, "Number(input['-9007199254740994']) === -9007199254740994")) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-              if (!check_true(input[x] instanceof Number, 'input['+x+'] instanceof Number'))
-                return;
-            }
-            if (check_true(i === 10, 'i === 10')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'Date 0':
-        if (check_true(input instanceof Date, "input instanceof Date") &&
-            check_true(1/Number(input) === 1/Number(new Date(0)), "1/Number(input) === 1/Number(new Date(0))")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Date -0':
-        if (check_true(input instanceof Date, "input instanceof Date") &&
-            check_true(1/Number(input) === 1/Number(new Date(-0)), "1/Number(input) === 1/Number(new Date(-0))")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Date -8.64e15':
-        if (check_true(input instanceof Date, "input instanceof Date") &&
-            check_true(Number(input) === -8.64e15, "Number(input) === -8.64e15")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Date 8.64e15':
-        if (check_true(input instanceof Date, "input instanceof Date") &&
-            check_true(Number(input) === 8.64e15, "Number(input) === 8.64e15")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array Date objects':
-        (function() {
-          if (check_true(input instanceof Array, 'input instanceof Array') &&
-              check_true(input.length === 4, 'input.length === 4') &&
-              check_true(1/Number(input[0]) === 1/new Date(0), '1/Number(input[0]) === 1/new Date(0)') &&
-              check_true(1/Number(input[1]) === 1/new Date(-0), '1/Number(input[1]) === 1/new Date(-0)') &&
-              check_true(Number(input[2]) === -8.64e15, 'Number(input[2]) === -8.64e15') &&
-              check_true(Number(input[3]) === 8.64e15, 'Number(input[3]) === 8.64e15')) {
-            for (var i = 0; i < input.length; ++i) {
-              if (!check_true(input[i] instanceof Date, 'input['+i+'] instanceof Date'))
-                return;
-            }
-            port.postMessage(input);
-            close();
-          }
-        })();
-        break;
-      case 'Object Date objects':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_true(1/Number(input['0']) === 1/new Date(0), "1/Number(input['0']) === 1/new Date(0)") &&
-              check_true(1/Number(input['-0']) === 1/new Date(-0), "1/Number(input[1]) === 1/new Date(-0)") &&
-              check_true(Number(input['-8.64e15']) === -8.64e15, "Number(input['-8.64e15']) === -8.64e15") &&
-              check_true(Number(input['8.64e15']) === 8.64e15, "Number(input['8.64e15']) === 8.64e15")) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-              if (!check_true(input[x] instanceof Date, 'input['+x+'] instanceof Date'))
-                return;
-            }
-            port.postMessage(input);
-            close();
-          }
-        })();
-        break;
-      case 'RegExp flags and lastIndex':
-      case 'RegExp empty':
-      case 'RegExp slash':
-      case 'RegExp new line':
-        if (check_RegExp(msg, input)) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array RegExp object, RegExp flags and lastIndex':
-      case 'Array RegExp object, RegExp empty':
-      case 'Array RegExp object, RegExp slash':
-      case 'Array RegExp object, RegExp new line':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1') &&
-            check_RegExp(msg.substr('Array RegExp object, '.length), input[0])) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object RegExp object, RegExp flags and lastIndex':
-      case 'Object RegExp object, RegExp empty':
-      case 'Object RegExp object, RegExp slash':
-      case 'Object RegExp object, RegExp new line':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_RegExp(msg.substr('Object RegExp object, '.length), input['x'])) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 1, 'i === 1')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'Blob basic':
-      case 'Blob unpaired high surrogate (invalid utf-8)':
-      case 'Blob unpaired low surrogate (invalid utf-8)':
-      case 'Blob paired surrogates (invalid utf-8)':
-      case 'Blob empty':
-      case 'Blob NUL':
-        check_Blob(msg, input, port);
-        // no postMessage or close here, check_Blob takes care of that
-        break;
-      case 'Array Blob object, Blob basic':
-      case 'Array Blob object, Blob unpaired high surrogate (invalid utf-8)':
-      case 'Array Blob object, Blob unpaired low surrogate (invalid utf-8)':
-      case 'Array Blob object, Blob paired surrogates (invalid utf-8)':
-      case 'Array Blob object, Blob empty':
-      case 'Array Blob object, Blob NUL':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1')) {
-          check_Blob(msg.substr('Array Blob object, '.length), input[0], port, false, input);
-          // no postMessage or close here, check_Blob takes care of that
-        }
-        break;
-      case 'Object Blob object, Blob basic':
-      case 'Object Blob object, Blob unpaired high surrogate (invalid utf-8)':
-      case 'Object Blob object, Blob unpaired low surrogate (invalid utf-8)':
-      case 'Object Blob object, Blob paired surrogates (invalid utf-8)':
-      case 'Object Blob object, Blob empty':
-      case 'Object Blob object, Blob NUL':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)')) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 1, 'i === 1')) {
-              check_Blob(msg.substr('Object Blob object, '.length), input['x'], port, false, input);
-              // no postMessage or close here, check_Blob takes care of that
-            }
-          }
-        })();
-        break;
-      case 'File basic':
-        check_Blob(msg, input, port, true);
-        // no postMessage or close here, check_Blob takes care of that
-        break;
-      case 'FileList empty':
-        if (check_FileList(msg, input)) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array FileList object, FileList empty':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1') &&
-            check_FileList(msg.substr('Array FileList object, '.length), input[0])) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object FileList object, FileList empty':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_FileList(msg.substr('Array FileList object, '.length), input['x'])) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 1, 'i === 1')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'ImageData 1x1 transparent black':
-        if (check_ImageData(input, {width:1, height:1, data:[0,0,0,0]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'ImageData 1x1 non-transparent non-black':
-        if (check_ImageData(input, {width:1, height:1, data:[100, 101, 102, 103]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array ImageData object, ImageData 1x1 transparent black':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1') &&
-            check_ImageData(input[0], {width:1, height:1, data:[0,0,0,0]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array ImageData object, ImageData 1x1 non-transparent non-black':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1') &&
-            check_ImageData(input[0], {width:1, height:1, data:[100, 101, 102, 103]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object ImageData object, ImageData 1x1 transparent black':
-        (function(){
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_ImageData(input['x'], {width:1, height:1, data:[0,0,0,0]})) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 1, 'i === 1')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'Object ImageData object, ImageData 1x1 non-transparent non-black':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_ImageData(input['x'], {width:1, height:1, data:[100, 101, 102, 103]})) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 1, 'i === 1')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'ImageBitmap 1x1 transparent black':
-        if (check_ImageBitmap(input, {width:1, height:1, data:[0, 0, 0, 0]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'ImageBitmap 1x1 non-transparent non-black':
-        if (check_ImageBitmap(input, {width:1, height:1, data:[100, 101, 102, 103]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array ImageBitmap object, ImageBitmap 1x1 transparent black':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1') &&
-            check_ImageBitmap(input[0], {width:1, height:1, data:[0, 0, 0, 0]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array ImageBitmap object, ImageBitmap 1x1 non-transparent non-black':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1') &&
-            check_ImageBitmap(input[0], {width:1, height:1, data:[100, 101, 102, 103]})) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object ImageBitmap object, ImageBitmap 1x1 transparent black':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_ImageBitmap(input['x'], {width:1, height:1, data:[0, 0, 0, 0]})) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 1, 'i === 1')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'Object ImageBitmap object, ImageBitmap 1x1 non-transparent non-black':
-        (function() {
-          if (check_true(input instanceof Object, 'input instanceof Object') &&
-              check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-              check_ImageBitmap(input['x'], {width:1, height:1, data:[100, 101, 102, 103]})) {
-            var i = 0;
-            for (var x in input) {
-              i++;
-            }
-            if (check_true(i === 1, 'i === 1')) {
-              port.postMessage(input);
-              close();
-            }
-          }
-        })();
-        break;
-      case 'Array sparse':
-        (function() {
-          if (check_true(input instanceof Array, 'input instanceof Array') &&
-              check_true(input.length === 10, 'input.length === 10')) {
-            for (var x in input) {
-              check_true(false, 'unexpected enumerable property '+x);
-              return;
-            }
-            port.postMessage(input);
-            close();
-          }
-        })();
-        break;
-      case 'Array with non-index property':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 0, 'input.length === 0') &&
-            check_true(input.foo === 'bar', "input.foo === 'bar'")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object with index property and length':
-        if (check_true(input instanceof Object, 'input instanceof Object') &&
-            check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-            check_true(input[0] === 'foo', "input[0] === 'foo'") &&
-            check_true(input.length === 1, 'input.length === 1')) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array with circular reference':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 1, 'input.length === 1') &&
-            check_true(input[0] === input, "input[0] === input")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object with circular reference':
-        if (check_true(input instanceof Object, 'input instanceof Object') &&
-            check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-            check_true(input['x'] === input, "input['x'] === input")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Array with identical property values':
-        if (check_true(input instanceof Array, 'input instanceof Array') &&
-            check_true(input.length === 2, 'input.length === 2') &&
-            check_true(input[0] === input[1], "input[0] === input[1]")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object with identical property values':
-        if (check_true(input instanceof Object, 'input instanceof Object') &&
-            check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-            check_true(input['x'] === input['y'], "input['x'] === input['y']")) {
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object with property on prototype':
-      case 'Object with non-enumerable property':
-        if (check_true(input instanceof Object, 'input instanceof Object') &&
-            check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-            check_true(!('foo' in input), "!('foo' in input)")) {
-          input = {};
-          Object.defineProperty(input, 'foo', {value:'bar', enumerable:false, writable:true, configurable:true});
-          port.postMessage(input);
-          close();
-        }
-        break;
-      case 'Object with non-writable property':
-        if (check_true(input instanceof Object, 'input instanceof Object') &&
-            check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-            check_true(input.foo === 'bar', "input.foo === bar")) {
-          input.foo += ' baz';
-          if (check_true(input.foo === 'bar baz', "input.foo === 'bar baz'")) {
-            input = {};
-            Object.defineProperty(input, 'foo', {value:'bar', enumerable:true, writable:false, configurable:true});
-            port.postMessage(input);
-            close();
-          }
-        }
-        break;
-      case 'Object with non-configurable property':
-        if (check_true(input instanceof Object, 'input instanceof Object') &&
-            check_true(!(input instanceof Array), '!(input instanceof Array)') &&
-            check_true(input.foo === 'bar', "input.foo === bar")) {
-          delete input.foo;
-          if (check_true(!('foo' in input), "!('foo' in input)")) {
-            input = {};
-            Object.defineProperty(input, 'foo', {value:'bar', enumerable:true, writable:true, configurable:false});
-            port.postMessage(input);
-            close();
-          }
-        }
-        break;
-
-      default:
-        port.postMessage('FAIL: unknown test');
-        close();
-    }
-    if (log.length > 0) {
-      port.postMessage('FAIL '+log);
-      close();
-    }
-  } catch (ex) {
-    port.postMessage('FAIL '+ex);
-    close();
-  }
-}
diff --git a/tests/wpt/web-platform-tests/worklets/OWNERS b/tests/wpt/web-platform-tests/worklets/OWNERS
new file mode 100644
index 000000000000..ddff13357daf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/worklets/OWNERS
@@ -0,0 +1 @@
+@bfgeek
diff --git a/tests/wpt/web-platform-tests/worklets/resources/credentials-tests.js b/tests/wpt/web-platform-tests/worklets/resources/credentials-tests.js
index ef3f29bca582..ec0b7014bfc9 100644
--- a/tests/wpt/web-platform-tests/worklets/resources/credentials-tests.js
+++ b/tests/wpt/web-platform-tests/worklets/resources/credentials-tests.js
@@ -68,9 +68,9 @@ function runCredentialsTests(worklet_type) {
     return runCredentialsTest({ workletType: worklet_type,
                                 credentials: '',
                                 origin: 'same',
-                                expectCredentialsSent: false });
+                                expectCredentialsSent: true });
   }, 'Importing a same-origin script with the default WorkletOptions should ' +
-     'not send the credentials');
+     'send the credentials');
 
   promise_test(() => {
     return runCredentialsTest({ workletType: worklet_type,
diff --git a/tests/wpt/web-platform-tests/worklets/resources/service-worker-interception-tests.js b/tests/wpt/web-platform-tests/worklets/resources/service-worker-interception-tests.js
index 310b26d1e7e4..16d298737772 100644
--- a/tests/wpt/web-platform-tests/worklets/resources/service-worker-interception-tests.js
+++ b/tests/wpt/web-platform-tests/worklets/resources/service-worker-interception-tests.js
@@ -120,6 +120,4 @@ function runServiceWorkerInterceptionTests(worklet_type) {
             })
           .then(msg_event => assert_equals(msg_event.data, 'RESOLVED'));
     }, 'Static import should be intercepted by a service worker.');
-
-    // TODO(nhiroki): Add tests for dynamic import.
 }
diff --git a/tests/wpt/web-platform-tests/x-frame-options/README.md b/tests/wpt/web-platform-tests/x-frame-options/README.md
new file mode 100644
index 000000000000..7b35f0f1d144
--- /dev/null
+++ b/tests/wpt/web-platform-tests/x-frame-options/README.md
@@ -0,0 +1,2 @@
+This directory contains tests for
+[HTTP Header Field X-Frame-Options](https://tools.ietf.org/html/rfc7034).
diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-denied.htm b/tests/wpt/web-platform-tests/xhr/access-control-basic-denied.htm
index 3bcd2517245f..535762d0edaf 100644
--- a/tests/wpt/web-platform-tests/xhr/access-control-basic-denied.htm
+++ b/tests/wpt/web-platform-tests/xhr/access-control-basic-denied.htm
@@ -22,12 +22,8 @@
       const xhr = new XMLHttpRequest;
 
       xhr.open("GET", get_host_info().HTTP_REMOTE_ORIGIN + path, false);
-      try {
-        xhr.send();
-        assert_unreached("Error should occur here");
-      } catch(e) {
-        assert_equals(xhr.status, 0);
-      }
+      assert_throws("NetworkError", () => xhr.send());
+      assert_equals(xhr.status, 0);
     }, "Cross-origin request denied");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm b/tests/wpt/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm
index 38f7a34d5a42..a4fe23460d12 100644
--- a/tests/wpt/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm
+++ b/tests/wpt/web-platform-tests/xhr/access-control-basic-get-fail-non-simple.htm
@@ -18,13 +18,8 @@
       xhr.setRequestHeader("x-test", "foobar");
 
       // This fails because the server-side script is not prepared for an OPTIONS request
-      try {
-        xhr.send();
-      } catch(e) {
-        assert_equals(xhr.status, 0);
-        return;
-      }
-      assert_unreached("Preflighted request was not denied.");
+      assert_throws("NetworkError", () => xhr.send());
+      assert_equals(xhr.status, 0);
     }, "Preflighted cross-origin request denied");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm b/tests/wpt/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm
index b1cf9c8ac076..062f8b0bb5b4 100644
--- a/tests/wpt/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm
+++ b/tests/wpt/web-platform-tests/xhr/access-control-basic-non-cors-safelisted-content-type.htm
@@ -22,13 +22,8 @@
           "/xhr/resources/access-control-basic-put-allow.py", false);
       xhr.setRequestHeader("Content-Type", "application/xml");
 
-      try {
-        xhr.send("FAIL: PUT data received");
-      } catch(e) {
-        assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
-        return;
-      }
-      assert_unreached("Cross-domain access was not denied in 'send'.");
+      assert_throws("NetworkError", () => xhr.send("FAIL: PUT data received"));
+      assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
     }, "Deny cross-origin request with non-CORS-safelisted content type");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm b/tests/wpt/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
index 9b3bc54af21f..0a6df932aa44 100644
--- a/tests/wpt/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
+++ b/tests/wpt/web-platform-tests/xhr/access-control-basic-post-with-non-cors-safelisted-content-type.htm
@@ -29,13 +29,8 @@
 
       xhr.setRequestHeader("Content-Type", "application/xml");
 
-      try {
-        xhr.send();
-      } catch(e) {
-        assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
-        return;
-      }
-      assert_unreached("Cross-domain access was not denied in 'send'.");
+      assert_throws("NetworkError", () => xhr.send());
+      assert_equals(xhr.status, 0, "Cross-domain access was denied in 'send'.");
     }, "CORS request with non-safelisted content type sends preflight and fails");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm b/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm
index f400985b6beb..7948c18a2efc 100644
--- a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm
+++ b/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-header-denied.htm
@@ -22,17 +22,12 @@
   xhr.open("GET", url + "&command=header", false);
   xhr.setRequestHeader("x-test", "foo");
 
-  try {
-    xhr.send();
-  } catch(e) {
-    xhr = new XMLHttpRequest;
-    xhr.open("GET", url + "&command=complete", false);
-    xhr.send();
-    assert_equals(xhr.responseText, "Request successfully blocked.");
-    return;
-  }
+  assert_throws("NetworkError", () => xhr.send());
 
-  assert_unreached("Cross-domain access with custom header allowed without throwing exception");
+  xhr = new XMLHttpRequest;
+  xhr.open("GET", url + "&command=complete", false);
+  xhr.send();
+  assert_equals(xhr.responseText, "Request successfully blocked.");
 }, "Sync request denied at preflight");
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm b/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm
index 021f9e37d6ee..a54c308d9f11 100644
--- a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm
+++ b/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-method-denied.htm
@@ -21,17 +21,12 @@
   xhr = new XMLHttpRequest;
   xhr.open("DELETE", url + "&command=method", false);
 
-  try {
-    xhr.send();
-  } catch(e) {
-    xhr = new XMLHttpRequest;
-    xhr.open("GET", url + "&command=complete", false);
-    xhr.send();
-    assert_equals(xhr.responseText, "Request successfully blocked.");
-    return;
-  }
+  assert_throws("NetworkError", () => xhr.send());
 
-  assert_unreached("Cross-domain access with non-CORS-safelisted method allowed without throwing exception");
+  xhr = new XMLHttpRequest;
+  xhr.open("GET", url + "&command=complete", false);
+  xhr.send();
+  assert_equals(xhr.responseText, "Request successfully blocked.");
 });
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm b/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm
index c5ff94bc8f6d..bb08296304f9 100644
--- a/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm
+++ b/tests/wpt/web-platform-tests/xhr/access-control-preflight-sync-not-supported.htm
@@ -21,17 +21,12 @@
   xhr = new XMLHttpRequest;
   xhr.open("PUT", url, false);
 
-  try {
-    xhr.send("");
-  } catch(e) {
-    xhr = new XMLHttpRequest;
-    xhr.open("GET", url + "&command=complete", false);
-    xhr.send();
-    assert_equals(xhr.responseText, "Request successfully blocked.");
-    return;
-  }
+  assert_throws("NetworkError", () => xhr.send(""));
 
-  assert_unreached("Cross-domain access allowed without throwing exception");
+  xhr = new XMLHttpRequest;
+  xhr.open("GET", url + "&command=complete", false);
+  xhr.send();
+  assert_equals(xhr.responseText, "Request successfully blocked.");
 });
     </script>
   </body>
diff --git a/tests/wpt/web-platform-tests/xhr/event-error-order.sub.html b/tests/wpt/web-platform-tests/xhr/event-error-order.sub.html
index 9be8b4a1b293..252a90bb6214 100644
--- a/tests/wpt/web-platform-tests/xhr/event-error-order.sub.html
+++ b/tests/wpt/web-platform-tests/xhr/event-error-order.sub.html
@@ -27,7 +27,7 @@
                 });
             });
 
-            xhr.open("POST", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}", true);
+            xhr.open("POST", "http://nonexistent.{{host}}:{{ports[http][0]}}", true);
             xhr.send("Test Message");
         });
     </script>
diff --git a/tests/wpt/web-platform-tests/xhr/event-error.sub.html b/tests/wpt/web-platform-tests/xhr/event-error.sub.html
index 3171c49d7a8d..5f2756000063 100644
--- a/tests/wpt/web-platform-tests/xhr/event-error.sub.html
+++ b/tests/wpt/web-platform-tests/xhr/event-error.sub.html
@@ -18,7 +18,7 @@
     t.done();
   });
 
-  client.open("GET", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}");
+  client.open("GET", "http://nonexistent.{{host}}:{{ports[http][0]}}");
   client.send("null");
 }, document.title);
 
diff --git a/tests/wpt/web-platform-tests/xhr/send-network-error-async-events.sub.htm b/tests/wpt/web-platform-tests/xhr/send-network-error-async-events.sub.htm
index c803efa7d0e4..c51a05cd2010 100644
--- a/tests/wpt/web-platform-tests/xhr/send-network-error-async-events.sub.htm
+++ b/tests/wpt/web-platform-tests/xhr/send-network-error-async-events.sub.htm
@@ -39,7 +39,7 @@
             xhr.upload.onloadend   = test.step_func(e => { actual.push("upload." + e.type); })
             xhr.upload.onerror     = test.step_func(e => { actual.push("upload." + e.type); })
 
-            xhr.open("POST", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}", true);
+            xhr.open("POST", "http://nonexistent.{{host}}:{{ports[http][0]}}", true);
             xhr.send("Test Message");
         });
     </script>
diff --git a/tests/wpt/web-platform-tests/xhr/send-network-error-sync-events.sub.htm b/tests/wpt/web-platform-tests/xhr/send-network-error-sync-events.sub.htm
index b89958060f35..b9f4fdf99de7 100644
--- a/tests/wpt/web-platform-tests/xhr/send-network-error-sync-events.sub.htm
+++ b/tests/wpt/web-platform-tests/xhr/send-network-error-sync-events.sub.htm
@@ -17,7 +17,7 @@
         {
             var xhr = new XMLHttpRequest();
 
-            xhr.open("POST", "http://nonexistent-origin.{{host}}:{{ports[http][0]}}", false);
+            xhr.open("POST", "http://nonexistent.{{host}}:{{ports[http][0]}}", false);
 
             assert_throws("NetworkError", function()
             {
diff --git a/tests/wpt/web-platform-tests/xhr/sync-no-progress.any.js b/tests/wpt/web-platform-tests/xhr/sync-no-progress.any.js
new file mode 100644
index 000000000000..a915e4d4129f
--- /dev/null
+++ b/tests/wpt/web-platform-tests/xhr/sync-no-progress.any.js
@@ -0,0 +1,12 @@
+test(t => {
+  let xhr = new XMLHttpRequest();
+  let loadEventFired = false;
+  xhr.onprogress = t.unreached_func('progress event should not be fired');
+  xhr.onload = () => {
+    loadEventFired = true;
+  };
+  xhr.open('GET', 'resources/trickle.py?count=4&delay=150', false);
+  xhr.send();
+  // Check the load event as a sanity check that the test is working.
+  assert_true(loadEventFired, 'load event should have fired');
+}, 'progress event should not be fired by sync XHR');