diff --git a/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/css/css-text/word-break/word-break-break-all-032.html.ini b/tests/wpt/metadata-layout-2020/css/css-text/word-break/word-break-break-all-032.html.ini
new file mode 100644
index 00000000000..049c34b1ac4
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/css/css-text/word-break/word-break-break-all-032.html.ini
@@ -0,0 +1,2 @@
+[word-break-break-all-032.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
index 5b05315ae86..c495e1becc7 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-001.html.ini
@@ -326,303 +326,3 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
index 9a2dceb401b..492f1b2bd2e 100644
--- a/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
+++ b/tests/wpt/metadata-layout-2020/css/css-transitions/properties-value-inherit-002.html.ini
@@ -326,303 +326,3 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
index 3ca36761a4e..6bb85151d12 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/response.window.js.ini
@@ -309,12 +309,12 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
index d2df9b78483..5c001592859 100644
--- a/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata-layout-2020/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata-layout-2020/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
new file mode 100644
index 00000000000..7ed9cadf302
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
@@ -0,0 +1,58 @@
+[fieldset-display.html]
+  [fieldset with display: table]
+    expected: FAIL
+
+  [fieldset with display: table-row-group]
+    expected: FAIL
+
+  [fieldset with display: table-header-group]
+    expected: FAIL
+
+  [fieldset with display: table-footer-group]
+    expected: FAIL
+
+  [fieldset with display: table-row]
+    expected: FAIL
+
+  [fieldset with display: table-cell]
+    expected: FAIL
+
+  [fieldset with display: table-column-group]
+    expected: FAIL
+
+  [fieldset with display: table-column]
+    expected: FAIL
+
+  [fieldset with display: table-caption]
+    expected: FAIL
+
+  [fieldset with display: list-item]
+    expected: FAIL
+
+  [fieldset with display: flow-root]
+    expected: FAIL
+
+  [fieldset with display: run-in]
+    expected: FAIL
+
+  [fieldset with display: block ruby]
+    expected: FAIL
+
+  [fieldset with display: inline-table]
+    expected: FAIL
+
+  [fieldset with display: ruby]
+    expected: FAIL
+
+  [fieldset with display: ruby-base]
+    expected: FAIL
+
+  [fieldset with display: ruby-text]
+    expected: FAIL
+
+  [fieldset with display: ruby-base-container]
+    expected: FAIL
+
+  [fieldset with display: ruby-text-container]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 88f4ddd0e9a..42ebcc9d57e 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,5 +1,5 @@
 [iframe_sandbox_popups_escaping-1.html]
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index 338d283eb0e..93673c2a0db 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,4 +1,5 @@
 [iframe_sandbox_popups_escaping-3.html]
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
index 7a6c55c6c6e..f266b56edb9 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,13 +1,4 @@
 [select-event.html]
-  [input type text: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -17,21 +8,9 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -41,12 +20,6 @@
   [input type password: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
@@ -56,27 +29,36 @@
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
+  [input type text: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index e6268369cf5..b1aa0f1f1c4 100644
--- a/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,5 +1,4 @@
 [htmlanchorelement_noopener.html]
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name reuses an existing window with that name]
     expected: FAIL
 
@@ -10,5 +9,5 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
deleted file mode 100644
index 178680e5d14..00000000000
--- a/tests/wpt/metadata-layout-2020/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[script-onerror-insertion-point-2.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata-layout-2020/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index dbec6f2c2ff..450c88bd32b 100644
--- a/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata-layout-2020/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -3,3 +3,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata-layout-2020/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 333edb3a26e..650c91da4a6 100644
--- a/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata-layout-2020/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,4 +1,5 @@
 [sharedworker-in-worker.html]
+  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 4c54f475e2f..1fccbd30f7e 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -139339,6 +139339,19 @@
        {}
       ]
      ],
+     "display-contents-dynamic-fieldset-legend-001.html": [
+      "ed787594f5d15dd024710f444056cbb099fe8cdc",
+      [
+       null,
+       [
+        [
+         "/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "display-contents-dynamic-flex-001-inline.html": [
       "2d797795b074635d7cc9bf41f73915bd56c6874d",
       [
@@ -139573,6 +139586,19 @@
        {}
       ]
      ],
+     "display-contents-fieldset-002.html": [
+      "612d483d7ccde68724097996ce10bda3c596a574",
+      [
+       null,
+       [
+        [
+         "/css/css-display/display-contents-fieldset-002-ref.html",
+         "=="
+        ]
+       ],
+       {}
+      ]
+     ],
      "display-contents-fieldset-nested-legend.html": [
       "a3bd2fc9983aabd8f046b4d4e51511bd65295a5b",
       [
@@ -204144,6 +204170,32 @@
         {}
        ]
       ],
+      "word-break-break-all-031.html": [
+       "d60a677f58ac01ee107e88559a71cd8826efd2ce",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-break-all-ref-031.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-break-break-all-032.html": [
+       "08c89d94cc1edbe87a9e22e63076b543d07453d8",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-break-all-ref-032.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "word-break-break-all-062.html": [
        "6d2f25abc820ff16c4ada0d6f3fedc3ba3e692cb",
        [
@@ -204408,6 +204460,32 @@
         {}
        ]
       ],
+      "word-break-keep-all-009.html": [
+       "d6df63f4e72cd87875094c76b1172e06db6bc2af",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-keep-all-ref-009.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
+      "word-break-keep-all-010.html": [
+       "c288f943a2a6d66a9141654d74224151080175be",
+       [
+        null,
+        [
+         [
+          "/css/css-text/word-break/reference/word-break-keep-all-ref-010.html",
+          "=="
+         ]
+        ],
+        {}
+       ]
+      ],
       "word-break-keep-all-063.html": [
        "3fa827b487060f6343c141ef0103ce2d70c1eb45",
        [
@@ -308927,6 +309005,10 @@
       "fc078b8150ca50dadfe6693514fd86e2cadfb521",
       []
      ],
+     "display-contents-dynamic-fieldset-legend-001-ref.html": [
+      "ad698b47db0e814352c86389de586b976de59990",
+      []
+     ],
      "display-contents-dynamic-generated-content-fieldset-001-ref.html": [
       "651bc19b83e90ee7d9801d915ad481cde0aed522",
       []
@@ -308935,6 +309017,10 @@
       "38dd74a744d5af37b3e3f87c64d310547192f95f",
       []
      ],
+     "display-contents-fieldset-002-ref.html": [
+      "ff8fd9dea7044ab041331e4bdf47ad18e7e939b4",
+      []
+     ],
      "display-contents-fieldset-nested-legend-ref.html": [
       "c4afe0e53ba02d47bc0704eb71801aec602759be",
       []
@@ -328603,6 +328689,14 @@
         "0499f82e799e76f757eb17f81733447d2186481f",
         []
        ],
+       "word-break-break-all-ref-031.html": [
+        "1e28e2d3588b060e093eb473210bc98ed7acc64d",
+        []
+       ],
+       "word-break-break-all-ref-032.html": [
+        "8b7b3b6c394e7e3a7dbe8514e39e08f27ac61783",
+        []
+       ],
        "word-break-keep-all-005-ref.html": [
         "2a33ce75e23f6c65ec98a2a808633349b1ae465e",
         []
@@ -328627,6 +328721,14 @@
         "5aba6783f4ed6a2ef19a5a3f59c862ce4584faeb",
         []
        ],
+       "word-break-keep-all-ref-009.html": [
+        "4dcdf2dd2b8502dca2a5bf3c25ba2784c4d0d498",
+        []
+       ],
+       "word-break-keep-all-ref-010.html": [
+        "cbfd3476089a962634e21ead1122f105f3f58c92",
+        []
+       ],
        "word-break-normal-ar-ref-000.html": [
         "f7479d69176f4ee62a2abdb374bb73996fe733b8",
         []
@@ -346737,6 +346839,10 @@
       "63b60e490f47f4db77d33d7a4ca2f5b9a4181de8",
       []
      ],
+     "coop-coep-sandbox.https.html.headers": [
+      "4fff9d9fba4c81f953826ffea010a75be626b95d",
+      []
+     ],
      "coop-navigated-popup.https.html.headers": [
       "d83ed86fb9b5d159b9f380424887402edc96cb75",
       []
@@ -376782,15 +376888,15 @@
         []
        ],
        "android_weblayer.py": [
-        "972e5517b1cff6d1635b35bef512f3589e22933e",
+        "ec05c768ffccbab2e125a7da95e99db0e77c7408",
         []
        ],
        "android_webview.py": [
-        "b40f8b90c03ced381182e26d592ec982b5717cf5",
+        "54dd1281fd8d4abc14d9dca30c0f21f19869a13d",
         []
        ],
        "base.py": [
-        "dd6621cb72b33840696d0ba2f6725623519176e8",
+        "f7388ad7e6f554b4412b475060f4aa97cc9d185e",
         []
        ],
        "chrome.py": [
@@ -376798,7 +376904,7 @@
         []
        ],
        "chrome_android.py": [
-        "178183b4028393703c0e691f875531423cf86c60",
+        "7580bedddb000eb919a82554fba59cce24968177",
         []
        ],
        "chrome_ios.py": [
@@ -377093,7 +377199,7 @@
        []
       ],
       "testrunner.py": [
-       "be8acec1c616ae5204e48377f79ea81b950b249b",
+       "e217f8d43d68cc26115b503405ff88b65a4984bb",
        []
       ],
       "tests": {
@@ -377195,7 +377301,7 @@
        []
       ],
       "wptcommandline.py": [
-       "29d6fe5070f72aa298ffe9981f3ede7098baeb1e",
+       "7d4074e4b716700438da8b0c2bd575ddc0b8d4e9",
        []
       ],
       "wptlogging.py": [
@@ -377633,7 +377739,7 @@
        []
       ],
       "utils.py": [
-       "e8b607bd5e09471da096bd5c4b88234c51f907ef",
+       "f1f7dd286bc7c75cbee31eebeb5abdd4b25dbfed",
        []
       ],
       "wptserve.py": [
@@ -426547,7 +426653,7 @@
       ]
      ],
      "table-model-fixup-2.html": [
-      "1bc4a2f681915b748d0d8b05cba7d63e4f1938e0",
+      "9f14e7ecc3eca05358797ab5884f292cffb5e355",
       [
        null,
        {}
@@ -426597,7 +426703,7 @@
        ]
       ],
       "table-fixed-minmax.html": [
-       "7c15b2a749dce5419e26784a585c540051c3799c",
+       "e7b9c5c7d13845e3befb982ddc4ac55533fc94c5",
        [
         null,
         {}
@@ -489245,6 +489351,13 @@
         {}
        ]
       ],
+      "iframe-load-cookie.tentative.https.html": [
+       "b4520f8b952f33252a236f9b15ff708c07799c84",
+       [
+        null,
+        {}
+       ]
+      ],
       "image.tentative.https.html": [
        "d0cbf472a3ce07781457967c385eb73503922f0b",
        [
@@ -489532,6 +489645,13 @@
        }
       ]
      ],
+     "coop-coep-sandbox.https.html": [
+      "4b94435119c17609d1b9830446d19f41de64f97a",
+      [
+       null,
+       {}
+      ]
+     ],
      "coop-csp-sandbox-navigate.https.html": [
       "bd3a55a2d8fdb046c66abb9da51abd433104dbe8",
       [
@@ -493048,7 +493168,7 @@
         ]
        ],
        "fieldset-display.html": [
-        "953328982032dae2d508619b90188534179a26a8",
+        "a8a553c836c1a3c3be56b8dbd44029bb283a5546",
         [
          null,
          {}
@@ -499819,7 +499939,7 @@
       },
       "the-label-element": {
        "clicking-interactive-content.html": [
-        "c448df0a38073019112f7f805904a6ec3bd6ef20",
+        "300d09cdda89d6c9d4a5c75b96437678696ba6ca",
         [
          null,
          {}
@@ -499833,7 +499953,7 @@
         ]
        ],
        "clicking-noninteractive-unlabelable-content.html": [
-        "be74ed68330c1f97069e05ed70a2e4908ef6f3c2",
+        "285cd8c04100e37ac348320917ac302ada4c363a",
         [
          null,
          {}
@@ -521917,9 +522037,15 @@
      ]
     ],
     "pointerevent_click_is_a_pointerevent.html": [
-     "2f5dfd4dbfdd81e45868517632a41998aed8f21d",
+     "022fcffabfd98ff85f753ab7dc9bee9b8aa52a0f",
      [
-      null,
+      "pointerevents/pointerevent_click_is_a_pointerevent.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_click_is_a_pointerevent.html?pen",
       {
        "testdriver": true
       }
@@ -521951,9 +522077,21 @@
      ]
     ],
     "pointerevent_disabled_form_control.html": [
-     "13f6e31cb41c5fe6cdb8eee6928174debe06a5ed",
+     "83ad053a146a9fb7035ed47fc4fb910c37211621",
      [
-      null,
+      "pointerevents/pointerevent_disabled_form_control.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_disabled_form_control.html?pen",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_disabled_form_control.html?touch",
       {
        "testdriver": true
       }
@@ -521978,9 +522116,21 @@
      ]
     ],
     "pointerevent_fractional_coordinates.html": [
-     "b106340efd5d05ba4ab4281863a476dbe6134a64",
+     "f794797704484dbecb22089219bdeef4637bf45d",
      [
-      null,
+      "pointerevents/pointerevent_fractional_coordinates.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_fractional_coordinates.html?pen",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_fractional_coordinates.html?touch",
       {
        "testdriver": true
       }
@@ -522117,9 +522267,21 @@
      ]
     ],
     "pointerevent_pointercapture_in_frame.html": [
-     "a4107fd707a2ec4cb40d22fcad786db0b42471d6",
+     "c581210a3eff99cfa9a5ecb235203cd21118adbf",
      [
-      null,
+      "pointerevents/pointerevent_pointercapture_in_frame.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_pointercapture_in_frame.html?pen",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_pointercapture_in_frame.html?touch",
       {
        "testdriver": true
       }
@@ -522235,9 +522397,21 @@
      ]
     ],
     "pointerevent_releasepointercapture_events_to_original_target.html": [
-     "6f6d30e16e1c5376a1a5b57c0c65bc683e075334",
+     "325b58c85ccdf60a517698330e729f3930634269",
      [
-      null,
+      "pointerevents/pointerevent_releasepointercapture_events_to_original_target.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_releasepointercapture_events_to_original_target.html?pen",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_releasepointercapture_events_to_original_target.html?touch",
       {
        "testdriver": true
       }
@@ -522313,9 +522487,21 @@
      ]
     ],
     "pointerevent_sequence_at_implicit_release_on_click.html": [
-     "4b424f27643a95f4170da5d7fb794ca3dbef1ce4",
+     "bfcc8ad54a8d74bbc5a1a0fa7ae756b0f32c5d1b",
      [
-      null,
+      "pointerevents/pointerevent_sequence_at_implicit_release_on_click.html?mouse",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_sequence_at_implicit_release_on_click.html?pen",
+      {
+       "testdriver": true
+      }
+     ],
+     [
+      "pointerevents/pointerevent_sequence_at_implicit_release_on_click.html?touch",
       {
        "testdriver": true
       }
@@ -539331,10 +539517,12 @@
       ]
      ],
      "claim-fetch.https.html": [
-      "400b593ac961942f6e9274aee98bac22856eaf22",
+      "ae0082df06bf794d02990a7c0b7213e0d81114cb",
       [
        null,
-       {}
+       {
+        "timeout": "long"
+       }
       ]
      ],
      "claim-not-using-registration.https.html": [
@@ -540450,10 +540638,12 @@
       ]
      ],
      "registration-schedule-job.https.html": [
-      "18589e0aa0b32e130934a65b1b065d5c7f79e36e",
+      "8ac5d49e8c3d352f204f35695bb467fa62eef326",
       [
        null,
-       {}
+       {
+        "timeout": "long"
+       }
       ]
      ],
      "registration-scope-module-static-import.https.html": [
@@ -541049,21 +541239,21 @@
        {}
       ]
      ],
-     "innerhtml-before-closing-tag.html": [
+     "innerhtml-before-closing-tag.tentative.html": [
       "653c41918d1a2a35bdd3e736f4c7a6c36c130431",
       [
        null,
        {}
       ]
      ],
-     "innerhtml-on-ordinary-template.html": [
+     "innerhtml-on-ordinary-template.tentative.html": [
       "988acc0ac791bd67aaa00d5e12ab5cc188d40540",
       [
        null,
        {}
       ]
      ],
-     "move-template-before-closing-tag.html": [
+     "move-template-before-closing-tag.tentative.html": [
       "88b75e754eb45f35b3fa329efbb334e5997c46d3",
       [
        null,
@@ -541195,12 +541385,10 @@
       ]
      ],
      "focus-selector-delegatesFocus.html": [
-      "3702f8e2ba63228cba5c483a76f2b77372e68c4d",
+      "b8cac92564748752f7cfe2c0bdff4dfebcb904f4",
       [
        null,
-       {
-        "testdriver": true
-       }
+       {}
       ]
      ],
      "focus-tabindex-order-shadow-negative-delegatesFocus.html": [
diff --git a/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
new file mode 100644
index 00000000000..f29da48a2a0
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/floats/hit-test-floats-003.html.ini
@@ -0,0 +1,4 @@
+[hit-test-floats-003.html]
+  [Miss float below something else]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-032.html.ini b/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-032.html.ini
new file mode 100644
index 00000000000..049c34b1ac4
--- /dev/null
+++ b/tests/wpt/metadata/css/css-text/word-break/word-break-break-all-032.html.ini
@@ -0,0 +1,2 @@
+[word-break-break-all-032.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
index 5b05315ae86..c495e1becc7 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-001.html.ini
@@ -326,303 +326,3 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
index 9a2dceb401b..492f1b2bd2e 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
@@ -326,303 +326,3 @@
   [margin-right length(mm) / values]
     expected: FAIL
 
-  [margin-right length(cm) / values]
-    expected: FAIL
-
-  [margin-right length(in) / values]
-    expected: FAIL
-
-  [margin-top length(pt) / values]
-    expected: FAIL
-
-  [margin-top length(pc) / values]
-    expected: FAIL
-
-  [margin-top length(px) / values]
-    expected: FAIL
-
-  [margin-top length(em) / values]
-    expected: FAIL
-
-  [margin-top length(ex) / values]
-    expected: FAIL
-
-  [margin-top length(mm) / values]
-    expected: FAIL
-
-  [margin-top length(cm) / values]
-    expected: FAIL
-
-  [margin-top length(in) / values]
-    expected: FAIL
-
-  [height length(pt) / values]
-    expected: FAIL
-
-  [height length(pc) / values]
-    expected: FAIL
-
-  [height length(px) / values]
-    expected: FAIL
-
-  [height length(em) / values]
-    expected: FAIL
-
-  [height length(ex) / values]
-    expected: FAIL
-
-  [height length(mm) / values]
-    expected: FAIL
-
-  [height length(cm) / values]
-    expected: FAIL
-
-  [height length(in) / values]
-    expected: FAIL
-
-  [height percentage(%) / values]
-    expected: FAIL
-
-  [width length(pt) / values]
-    expected: FAIL
-
-  [width length(pc) / values]
-    expected: FAIL
-
-  [width length(px) / values]
-    expected: FAIL
-
-  [width length(em) / values]
-    expected: FAIL
-
-  [width length(ex) / values]
-    expected: FAIL
-
-  [width length(mm) / values]
-    expected: FAIL
-
-  [width length(cm) / values]
-    expected: FAIL
-
-  [width length(in) / values]
-    expected: FAIL
-
-  [width percentage(%) / values]
-    expected: FAIL
-
-  [min-height length(pt) / values]
-    expected: FAIL
-
-  [min-height length(pc) / values]
-    expected: FAIL
-
-  [min-height length(px) / values]
-    expected: FAIL
-
-  [min-height length(em) / values]
-    expected: FAIL
-
-  [min-height length(ex) / values]
-    expected: FAIL
-
-  [min-height length(mm) / values]
-    expected: FAIL
-
-  [min-height length(cm) / values]
-    expected: FAIL
-
-  [min-height length(in) / values]
-    expected: FAIL
-
-  [min-height percentage(%) / values]
-    expected: FAIL
-
-  [min-width length(pt) / values]
-    expected: FAIL
-
-  [min-width length(pc) / values]
-    expected: FAIL
-
-  [min-width length(px) / values]
-    expected: FAIL
-
-  [min-width length(em) / values]
-    expected: FAIL
-
-  [min-width length(ex) / values]
-    expected: FAIL
-
-  [min-width length(mm) / values]
-    expected: FAIL
-
-  [min-width length(cm) / values]
-    expected: FAIL
-
-  [min-width length(in) / values]
-    expected: FAIL
-
-  [min-width percentage(%) / values]
-    expected: FAIL
-
-  [max-height length(pt) / values]
-    expected: FAIL
-
-  [max-height length(pc) / values]
-    expected: FAIL
-
-  [max-height length(px) / values]
-    expected: FAIL
-
-  [max-height length(em) / values]
-    expected: FAIL
-
-  [color color(rgba) / values]
-    expected: FAIL
-
-  [font-size length(pt) / values]
-    expected: FAIL
-
-  [font-size length(pc) / values]
-    expected: FAIL
-
-  [font-size length(px) / values]
-    expected: FAIL
-
-  [font-size length(em) / values]
-    expected: FAIL
-
-  [font-size length(ex) / values]
-    expected: FAIL
-
-  [font-size length(mm) / values]
-    expected: FAIL
-
-  [font-size length(cm) / values]
-    expected: FAIL
-
-  [font-size length(in) / values]
-    expected: FAIL
-
-  [font-size percentage(%) / values]
-    expected: FAIL
-
-  [font-weight font-weight(keyword) / values]
-    expected: FAIL
-
-  [font-weight font-weight(numeric) / values]
-    expected: FAIL
-
-  [line-height number(integer) / values]
-    expected: FAIL
-
-  [line-height number(decimal) / values]
-    expected: FAIL
-
-  [line-height length(pt) / values]
-    expected: FAIL
-
-  [line-height length(pc) / values]
-    expected: FAIL
-
-  [line-height length(px) / values]
-    expected: FAIL
-
-  [line-height length(em) / values]
-    expected: FAIL
-
-  [line-height length(ex) / values]
-    expected: FAIL
-
-  [line-height length(mm) / values]
-    expected: FAIL
-
-  [line-height length(cm) / values]
-    expected: FAIL
-
-  [line-height length(in) / values]
-    expected: FAIL
-
-  [line-height percentage(%) / values]
-    expected: FAIL
-
-  [letter-spacing length(pt) / values]
-    expected: FAIL
-
-  [letter-spacing length(pc) / values]
-    expected: FAIL
-
-  [letter-spacing length(px) / values]
-    expected: FAIL
-
-  [letter-spacing length(em) / values]
-    expected: FAIL
-
-  [letter-spacing length(ex) / values]
-    expected: FAIL
-
-  [letter-spacing length(mm) / values]
-    expected: FAIL
-
-  [letter-spacing length(cm) / values]
-    expected: FAIL
-
-  [letter-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing length(pt) / values]
-    expected: FAIL
-
-  [word-spacing length(pc) / values]
-    expected: FAIL
-
-  [word-spacing length(px) / values]
-    expected: FAIL
-
-  [word-spacing length(em) / values]
-    expected: FAIL
-
-  [word-spacing length(ex) / values]
-    expected: FAIL
-
-  [word-spacing length(mm) / values]
-    expected: FAIL
-
-  [word-spacing length(cm) / values]
-    expected: FAIL
-
-  [word-spacing length(in) / values]
-    expected: FAIL
-
-  [word-spacing percentage(%) / values]
-    expected: FAIL
-
-  [text-indent length(pt) / values]
-    expected: FAIL
-
-  [text-indent length(pc) / values]
-    expected: FAIL
-
-  [text-indent length(px) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
-  [text-indent length(ex) / values]
-    expected: FAIL
-
-  [text-indent length(mm) / values]
-    expected: FAIL
-
-  [text-indent length(cm) / values]
-    expected: FAIL
-
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index f973f8239c4..272df47ec31 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -309,12 +309,12 @@
   [fetch(): separate response Content-Type: text/plain ]
     expected: NOTRUN
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
+  [<iframe>: separate response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: */* text/html]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index d2df9b78483..5c001592859 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
new file mode 100644
index 00000000000..51f8272a6de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_3.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini b/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
deleted file mode 100644
index 735a9a75a2a..00000000000
--- a/tests/wpt/metadata/html/browsers/origin/cross-origin-objects/cross-origin-objects-on-new-window.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[cross-origin-objects-on-new-window.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
index d4af9337d23..b740087c8a4 100644
--- a/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
+++ b/tests/wpt/metadata/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html.ini
@@ -56,3 +56,6 @@
   [fieldset with display: ruby-text-container]
     expected: FAIL
 
+  [fieldset with display: block ruby]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
index 2a166bb97b7..fc37df7e3fa 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-1.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_escaping-1.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: TIMEOUT
 
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
index f6a7aca3306..cb0211f1d21 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_escaping-3.html.ini
@@ -1,5 +1,6 @@
 [iframe_sandbox_popups_escaping-3.html]
   type: testharness
+  expected: CRASH
   [Check that popups from a sandboxed iframe escape the sandbox if\n       allow-popups-to-escape-sandbox is used]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini b/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
deleted file mode 100644
index 633a99517d3..00000000000
--- a/tests/wpt/metadata/html/semantics/forms/form-submission-0/form-double-submit-2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[form-double-submit-2.html]
-  [preventDefault should allow onclick submit() to succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
index 7a6c55c6c6e..f266b56edb9 100644
--- a/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
+++ b/tests/wpt/metadata/html/semantics/forms/textfieldselection/select-event.html.ini
@@ -1,13 +1,4 @@
 [select-event.html]
-  [input type text: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: selectionEnd a second time (must not fire select)]
     expected: FAIL
 
@@ -17,21 +8,9 @@
   [textarea: selectionDirection a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: selectionStart out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type search: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
   [input type search: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: select() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type url: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
@@ -41,12 +20,6 @@
   [input type password: selectionStart out of range a second time (must not fire select)]
     expected: FAIL
 
-  [textarea: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [textarea: selectionEnd out of range a second time (must not fire select)]
-    expected: FAIL
-
   [input type text: selectionStart a second time (must not fire select)]
     expected: FAIL
 
@@ -56,27 +29,36 @@
   [input type search: setRangeText() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: selectionDirection a second time (must not fire select)]
-    expected: FAIL
-
   [input type tel: setSelectionRange() a second time (must not fire select)]
     expected: FAIL
 
-  [input type tel: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: selectionStart a second time (must not fire select)]
-    expected: FAIL
-
-  [input type url: setSelectionRange out of range a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setSelectionRange() a second time (must not fire select)]
-    expected: FAIL
-
-  [input type password: setRangeText() a second time (must not fire select)]
-    expected: FAIL
-
   [input type password: setSelectionRange out of range a second time (must not fire select)]
     expected: FAIL
 
+  [input type text: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionDirection a second time (must not fire select)]
+    expected: FAIL
+
+  [input type text: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionStart a second time (must not fire select)]
+    expected: FAIL
+
+  [input type search: selectionEnd a second time (must not fire select)]
+    expected: FAIL
+
+  [input type tel: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
+  [input type url: setRangeText() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: select() a second time (must not fire select)]
+    expected: FAIL
+
+  [input type password: selectionEnd out of range a second time (must not fire select)]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
index 47d8a8e4cfe..a057142bbc5 100644
--- a/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
+++ b/tests/wpt/metadata/html/semantics/links/links-created-by-a-and-area-elements/htmlanchorelement_noopener.html.ini
@@ -1,6 +1,5 @@
 [htmlanchorelement_noopener.html]
   type: testharness
-  expected: TIMEOUT
   [Check that targeting of rel=noopener with a given name ignores an existing window with that name]
     expected: NOTRUN
 
@@ -14,5 +13,5 @@
     expected: FAIL
 
   [Check that rel=noopener with target=_self does a normal load]
-    expected: NOTRUN
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini b/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
deleted file mode 100644
index 178680e5d14..00000000000
--- a/tests/wpt/metadata/html/semantics/scripting-1/the-script-element/script-onerror-insertion-point-2.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[script-onerror-insertion-point-2.html]
-  expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
deleted file mode 100644
index 59a54fe88e4..00000000000
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/document-write/module-delayed.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[module-delayed.html]
-  [async document.write in a module]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
index 0cef5158fae..01f7b72cbe7 100644
--- a/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
+++ b/tests/wpt/metadata/html/webappapis/scripting/events/compile-event-handler-settings-objects.html.ini
@@ -4,3 +4,6 @@
   [The incumbent settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
     expected: TIMEOUT
 
+  [The entry settings object while executing the compiled callback via Web IDL's invoke must be that of the node document]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
new file mode 100644
index 00000000000..064cf47545b
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
@@ -0,0 +1,5 @@
+[017.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, about:blank]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/webmessaging/without-ports/018.html.ini b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
new file mode 100644
index 00000000000..663a1f8fa30
--- /dev/null
+++ b/tests/wpt/metadata/webmessaging/without-ports/018.html.ini
@@ -0,0 +1,5 @@
+[018.html]
+  expected: TIMEOUT
+  [origin of the script that invoked the method, javascript:]
+    expected: TIMEOUT
+
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 333edb3a26e..650c91da4a6 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,4 +1,5 @@
 [sharedworker-in-worker.html]
+  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html b/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html
new file mode 100644
index 00000000000..ad698b47db0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001-ref.html
@@ -0,0 +1,74 @@
+<!doctype html>
+<title>Reference: display:contents on fieldset/legend</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1694459">
+<style>
+  body { font-size: 10px; }
+  fieldset {
+    border:1px solid;
+    padding: 1px 0;
+  }
+</style>
+<fieldset>
+<fieldset id='test1'>
+<legend>LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<fieldset id='test2'>
+<legend>LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<legend>OUTER LEGEND</legend>
+<fieldset id='test3'>
+<legend>INNER LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<legend id='test4'>LEGEND</legend>
+<legend>NOT LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<legend>LEGEND</legend>
+<legend id='test5'>NOT LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<legend id='test6'>LEGEND</legend>
+<legend>NOT LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<legend>LEGEND</legend>
+<legend>NOT LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<legend>LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<div id='test9'><legend>NOT LEGEND</legend></div>
+</fieldset>
+
+<fieldset>
+<legend>LEGEND</legend>
+<div>NOT LEGEND</div>
+</fieldset>
+
+<fieldset id='test11'>
+<legend>LEGEND</legend>
+<legend>NOT LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<legend id='test12'>LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<legend id='test13'>LEGEND</legend>
+</fieldset>
diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001.html b/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001.html
new file mode 100644
index 00000000000..ed787594f5d
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-display/display-contents-dynamic-fieldset-legend-001.html
@@ -0,0 +1,153 @@
+<!doctype html>
+<title>CSS Display Module Test: display:contents on fieldset/legend</title>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1694459">
+<link rel="help" href="https://drafts.csswg.org/css-display/#box-generation">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1694459">
+<link rel="match" href="display-contents-dynamic-fieldset-legend-001-ref.html">
+<style>
+  body { font-size: 10px; }
+  fieldset {
+    border:1px solid;
+    padding: 1px 0;
+  }
+  #test10 { padding: 0; }
+</style>
+<script>
+window.onload = () => {
+  document.body.getClientRects();
+  o = document.getElementById("test1")
+  o.setAttribute("style", "display:contents")
+  o.getClientRects()
+  o.style.cssText = ""
+  o.getClientRects()
+
+  o = document.getElementById("test2")
+  o.setAttribute("style", "")
+  o.getClientRects()
+
+  o = document.getElementById("test3")
+  o.setAttribute("style", "")
+  o.getClientRects()
+
+  o = document.getElementById("test4")
+  o.setAttribute("style", "")
+  o.getClientRects()
+
+  o = document.getElementById("test5")
+  o.setAttribute("style", "")
+  o.getClientRects()
+
+  o = document.getElementById("test6")
+  o.setAttribute("style", "")
+  o.getClientRects()
+
+  o = document.getElementById("test7")
+  o.setAttribute("style", "display:contents")
+  o.getClientRects()
+
+  o = document.getElementById("test8")
+  o.setAttribute("style", "display:contents")
+  o.getClientRects()
+
+  o = document.getElementById("test9")
+  o.setAttribute("style", "display:contents")
+  o.getClientRects()
+  o.style.cssText = ""
+  o.getClientRects()
+
+  o = document.getElementById("test10")
+  o.setAttribute("style", "display:contents")
+  o.getClientRects()
+
+  o = document.getElementById("test11")
+  set = document.createDocumentFragment()
+  set.append(document.createElement("div"))
+  legend = document.createElement("legend")
+  legend.append(document.createTextNode("LEGEND"))
+  set.append(legend)
+  legend = document.createElement("legend")
+  legend.append(document.createTextNode("NOT LEGEND"))
+  set.append(legend)
+  o.append(set)
+  o.getClientRects()
+
+  o = document.getElementById("test12")
+  o.setAttribute("style", "")
+  o.getClientRects()
+
+  o = document.getElementById("test13")
+  o.setAttribute("style", "")
+  o.getClientRects()
+}
+</script>
+<fieldset>
+<fieldset id='test1'>
+<legend>LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<fieldset id='test2' style="display:contents">
+<legend>LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<legend>OUTER LEGEND</legend>
+<fieldset id='test3' style="display:contents">
+<legend>INNER LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<fieldset style="display:contents">
+<legend id='test4' style="display:contents">LEGEND</legend>
+<legend>NOT LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<legend>LEGEND</legend>
+<fieldset style="display:contents">
+<legend id='test5' style="display:contents">NOT LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<legend id='test6' style="display:contents">LEGEND</legend>
+<fieldset style="display:contents">
+<legend>NOT LEGEND</legend>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<div id='test7'><legend>LEGEND</legend></div>
+<legend>NOT LEGEND</legend>
+</fieldset>
+
+<fieldset>
+<fieldset style="display:contents">
+<div id='test8'><legend>LEGEND</legend></div>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<fieldset style="display:contents">
+<div id='test9'><legend>NOT LEGEND</legend></div>
+</fieldset>
+</fieldset>
+
+<fieldset>
+<div style="display:contents"><legend id='test10'>NOT LEGEND</legend></div>
+<legend>LEGEND</legend>
+</fieldset>
+
+<fieldset id='test11'></fieldset>
+
+<fieldset>
+    <legend id='test12' style="display:none">LEGEND</legend>
+</fieldset>
+
+<fieldset>
+    <div style="display:contents"><legend id='test13' style="display:none">LEGEND</legend></div>
+</fieldset>
diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002-ref.html b/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002-ref.html
new file mode 100644
index 00000000000..ff8fd9dea70
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002-ref.html
@@ -0,0 +1,60 @@
+<!DOCTYPE HTML>
+<html><head>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1140160">
+<style>
+fieldset { padding:0; }
+span { display:block; width:10px; height:10px; background:lime; }
+.contents { }
+legend { border: 1px solid; }
+.test2 legend { }
+.test2 legend::after, .test3 legend::after { content:"legend"; }
+.test2 legend.static, .test3 legend.static { display:block; }
+.test2 legend.static::before, .test3 legend.static::before { content:"static "; }
+.test2 legend.static::before { content:"static "; }
+.after::after { content:"::after"; }
+.before::before { content:"::before"; }
+.nb legend.static  { border: 1px solid; }
+.nb legend { border-style:none; }
+</style>
+</head>
+<body>
+<fieldset><div class="test contents"></div></fieldset>
+<fieldset><div class="test contents">x</div></fieldset>
+<fieldset><div class="test contents after"></div></fieldset>
+<fieldset><div class="test contents before"></div></fieldset>
+<fieldset><div class="test contents before after"></div></fieldset>
+<fieldset><span></span></fieldset>
+<fieldset><span></span></fieldset>
+<fieldset><span></span></fieldset>
+<fieldset class="test2"></fieldset>
+<fieldset class="test2 after"></fieldset>
+<fieldset class="test2"><legend class="static"></legend></fieldset>
+<fieldset class="test2"><legend class="static contents"></legend></fieldset>
+<fieldset class="test2"><legend class="static"></legend></fieldset>
+<fieldset class="test2"></fieldset>
+<fieldset class="test3"></fieldset>
+<fieldset class="test2"><legend class="static"></legend></fieldset>
+<fieldset class="test3"><legend class="static"></legend></fieldset>
+<script>
+document.body.offsetHeight;
+var tests = document.querySelectorAll('.test');
+for (i=0; i < tests.length; ++i) {
+  test = tests[i];
+  test.appendChild(document.createElement('span'));
+}
+var tests = document.querySelectorAll('.test2');
+for (i=0; i < tests.length; ++i) {
+  test = tests[i];
+  let span = document.createElement('dummy-inline');
+  span.innerHTML = "legend";
+  test.appendChild(span);
+}
+
+var tests = document.querySelectorAll('.test3');
+for (i=0; i < tests.length; ++i) {
+  test = tests[i];
+  test.appendChild(document.createElement('legend'));
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002.html b/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002.html
new file mode 100644
index 00000000000..612d483d7cc
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-display/display-contents-fieldset-002.html
@@ -0,0 +1,52 @@
+<!DOCTYPE HTML>
+<html><head>
+<link rel="author" title="Mats Palmgren" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1140160">
+<link rel="help" href="https://drafts.csswg.org/css-display/#box-generation">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1140160">
+<link rel="match" href="display-contents-fieldset-002-ref.html">
+<style>
+fieldset { padding:0; }
+span { display:block; width:10px; height:10px; background:lime; }
+.contents { display: contents; }
+legend { border: 1px solid; }
+.test2 legend { display:contents; }
+.test2 legend::after, .test3 legend::after { content:"legend"; }
+.test2 legend.static, .test3 legend.static { display:block; }
+.test2 legend.static::before, .test3 legend.static::before { content:"static "; }
+.after::after { content:"::after"; }
+.before::before { content:"::before"; }
+</style>
+</head>
+<body>
+<fieldset><div class="test contents"></div></fieldset>
+<fieldset><div class="test contents">x</div></fieldset>
+<fieldset><div class="test contents after"></div></fieldset>
+<fieldset><div class="test contents before"></div></fieldset>
+<fieldset><div class="test contents before after"></div></fieldset>
+<fieldset><legend class="test contents"></legend></fieldset>
+<fieldset><div class="contents"><legend class="test contents"></legend></div></fieldset>
+<fieldset><legend class="contents"><div class="test contents"></div></legend></fieldset>
+<fieldset class="test2"></fieldset>
+<fieldset class="test2 after"></fieldset>
+<fieldset class="test2"><legend class="static"></legend></fieldset>
+<fieldset class="test2"><legend class="static contents"></legend></fieldset>
+<fieldset class="test2"><div class="contents"><legend class="static"></legend></div></fieldset>
+<fieldset><div class="test2 contents"></div></fieldset>
+<fieldset><div class="test3 contents"></div></fieldset>
+<fieldset><div class="test2 contents"><legend class="static"></legend></div></fieldset>
+<fieldset><div class="test3 contents"><legend class="static"></legend></div></fieldset>
+<script>
+document.body.offsetHeight;
+var tests = document.querySelectorAll('.test');
+for (i=0; i < tests.length; ++i) {
+  test = tests[i];
+  test.appendChild(document.createElement('span'));
+}
+var tests = document.querySelectorAll('.test2,.test3');
+for (i=0; i < tests.length; ++i) {
+  test = tests[i];
+  test.appendChild(document.createElement('legend'));
+}
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html b/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
index 1bc4a2f6819..9f14e7ecc3e 100644
--- a/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
+++ b/tests/wpt/web-platform-tests/css/css-tables/table-model-fixup-2.html
@@ -3,6 +3,15 @@
 <script src='/resources/testharnessreport.js'></script>
 <link rel='stylesheet' href='./support/base.css' />
 <link rel="help" href="https://drafts.csswg.org/css-tables-3/#table-structure">
+<!--
+Quote from the spec link above:
+
+"Authors should not assign a display type from the previous list to replaced elements (eg: input fields or images). When the display property of a replaced element computes to one of these values, it is handled instead as though the author had declared either block (for table display) or inline (for all other values). Whitespace collapsing and box generation must happen around those replaced elements like if they never had any table-internal display value applied to them, and had always been block or inline."
+
+So, all the replaced elements tested below should behave as 'inline', except the ones with a computed value of 'table' which should behave as 'block'.
+
+Per CSSWG resolution in: https://github.com/w3c/csswg-drafts/issues/508#issuecomment-319891999
+-->
 <style>
     [inline] { display: inline !important; }
     [block] { display: block !important; }
@@ -15,6 +24,7 @@
     [table-header-group] { display: table-header-group !important; }
     [table-footer-group] { display: table-footer-group !important; }
     [table-column-group] { display: table-column-group !important; }
+    [table-caption] { display: table-caption !important; }
     div > x-table { background: yellow; border-spacing: 10px }
     div input { width: 100px; }
 </style>
@@ -50,67 +60,120 @@
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both input fields should look identical, on their own line:</p>
-    <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input elements</p>
+    <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- input elements (width)</p>
     <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><input block target=a /></x-tr>
             <input table-row target=b />
         </x-table>
     </div>
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both input fields should look identical and be on the same line:</p>
+    <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- input elements (top)</p>
+    <div offset=top>
+        <x-table style="width: 400px">
+            <x-tr><x-td></x-tr>
+            <input table-row target=a /><input table-row target=b />
+        </x-table>
+    </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should look identical, on their own line:</p>
-    <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- img elements</p>
+    <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- img elements (width)</p>
     <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><img block src="../support/blue32x32.ico" target=a /></x-tr>
             <img src="../support/blue32x32.ico" table-row target=b />
         </x-table>
     </div>
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both images should look identical and be on the same line:</p>
+    <p>Replaced elements inside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- img elements (top)</p>
+    <div offset=top>
+        <x-table style="width: 400px">
+            <x-tr><x-td></x-tr>
+            <img table-row src="../support/blue32x32.ico" target=a /><img src="../support/blue32x32.ico" table-row target=b />
+        </x-table>
+    </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both input fields should look identical, on their own line:</p>
-    <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- input elements</p>
+    <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- input elements (width)</p>
     <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><input inline target=a /></x-tr>
             <input table-column target=b />
         </x-table>
     </div>
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both input fields should look identical and be on the same line:</p>
+    <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- input elements (top)</p>
+    <div offset=top>
+        <x-table style="width: 400px">
+            <x-tr><x-td></x-tr>
+            <input table-column target=a /><input table-column target=b />
+        </x-table>
+    </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should look identical, on their own line:</p>
-    <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- img elements</p>
+    <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- img elements (width)</p>
     <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><img inline src="../support/blue32x32.ico" target=a /></x-tr>
             <img src="../support/blue32x32.ico" table-column target=b />
         </x-table>
     </div>
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both images should look identical and be on the same line:</p>
+    <p>Replaced elements inside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> -- img elements (top)</p>
+    <div offset=top>
+        <x-table style="width: 400px">
+            <x-tr><x-td></x-tr>
+            <img table-column src="../support/blue32x32.ico" target=a /><img src="../support/blue32x32.ico" table-column target=b />
+        </x-table>
+    </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both input fields should look identical, on their own line:</p>
-    <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- input elements</p>
+    <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- input elements (width)</p>
     <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><input inline target=a /></x-tr>
             <x-tr><input table-cell target=b /></x-tr>
         </x-table>
     </div>
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both input fields should look identical and be on the same line:</p>
+    <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- input elements (top)</p>
+    <div offset=top>
+        <x-table style="width: 400px">
+            <x-tr><input table-cell target=a /><input table-cell target=b /></x-tr>
+        </x-table>
+    </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both images should look identical, on their own line:</p>
-    <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- img elements</p>
+    <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- img elements (width)</p>
     <div offset=width>
         <x-table style="width: 400px">
             <x-tr><x-td><img inline src="../support/blue32x32.ico" target=a /></x-tr>
             <x-tr><img src="../support/blue32x32.ico" table-cell target=b /></x-tr>
         </x-table>
     </div>
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both images should look identical and be on the same line:</p>
+    <p>Replaced elements inside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- img elements (top)</p>
+    <div offset=top>
+        <x-table style="width: 400px">
+            <x-tr><x-td></x-tr>
+            <x-tr><img table-cell src="../support/blue32x32.ico" target=a /><img src="../support/blue32x32.ico" table-cell target=b /></x-tr>
+        </x-table>
+    </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should share the same line:</p>
-    <p>Replaced elements outside a table cannot be <mark>inline-table</mark> and are <mark>considered</mark> inline -- input=text elements</p>
+    <p>Replaced elements outside a table cannot be <mark>inline-table</mark> and are considered <mark>inline</mark> -- input=text elements</p>
     <div offset=top>
         <input inline-table target=a />
         <input inline-table target=b />
@@ -173,72 +236,72 @@
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both text inputs should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input=text elements</p>
-    <div offset=top unequal>
+    <p>Both text inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- input=text elements</p>
+    <div offset=top>
         <input type=text table-row target=a />
         <input type=text table-row target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both button inputs should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input=button elements</p>
-    <div offset=top unequal>
+    <p>Both button inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- input=button elements</p>
+    <div offset=top>
         <input type=button table-row target=a />
         <input type=button table-row target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both file inputs should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- input=file elements</p>
-    <div offset=top unequal>
+    <p>Both file inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- input=file elements</p>
+    <div offset=top>
         <input type=file table-row target=a />
         <input type=file table-row target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both images should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>block</mark> -- img elements</p>
-    <div offset=top unequal>
+    <p>Both images should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row</mark> and are considered <mark>inline</mark> -- img elements</p>
+    <div offset=top>
         <img src="../support/blue32x32.ico" table-row target=a />
         <img src="../support/blue32x32.ico" table-row target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both text inputs should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- input=text elements</p>
-    <div offset=top unequal>
+    <p>Both text inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>inline</mark> -- input=text elements</p>
+    <div offset=top>
         <input type=text table-row-group target=a />
         <input type=text table-row-group target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both button inputs should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- input=button elements</p>
-    <div offset=top unequal>
+    <p>Both button inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>inline</mark> -- input=button elements</p>
+    <div offset=top>
         <input type=button table-row-group target=a />
         <input type=button table-row-group target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both file inputs should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- input=file elements</p>
-    <div offset=top unequal>
+    <p>Both file inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>inline</mark> -- input=file elements</p>
+    <div offset=top>
         <input type=file table-row-group target=a />
         <input type=file table-row-group target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
-    <p>Both images should stand on their own line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>block</mark> -- img elements</p>
-    <div offset=top unequal>
+    <p>Both images should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-row-group</mark> and are considered <mark>inline</mark> -- img elements</p>
+    <div offset=top>
         <img src="../support/blue32x32.ico" table-row-group target=a />
         <img src="../support/blue32x32.ico" table-row-group target=b />
     </div>
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should share the same line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-column</mark> and are <mark>considered</mark> inline -- input=text elements</p>
+    <p>Replaced elements outside a table cannot be <mark>table-column</mark> and are considered <mark>inline</mark> inline -- input=text elements</p>
     <div offset=top>
         <input table-column target=a />
         <input table-column target=b />
@@ -270,7 +333,7 @@
 
     <hr/><!------------------------------------------------------------------------------------------------------------>
     <p>Both text inputs should share the same line:</p>
-    <p>Replaced elements outside a table cannot be <mark>table-cell</mark> and are <mark>considered</mark> inline -- input=text elements</p>
+    <p>Replaced elements outside a table cannot be <mark>table-cell</mark> and are considered <mark>inline</mark> -- input=text elements</p>
     <div offset=top>
         <input table-cell target=a />
         <input table-cell target=b />
@@ -300,4 +363,36 @@
         <img src="../support/blue32x32.ico" table-cell target=b />
     </div>
 
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both text inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-caption</mark> and are considered <mark>inline</mark> -- input=text elements</p>
+    <div offset=top>
+        <input table-caption target=a />
+        <input table-caption target=b />
+    </div>
+
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both button inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-caption</mark> and are considered <mark>inline</mark> -- input=button elements</p>
+    <div offset=top>
+        <input type=button table-caption target=a />
+        <input type=button table-caption target=b />
+    </div>
+
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both file inputs should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-caption</mark> and are considered <mark>inline</mark> -- input=file elements</p>
+    <div offset=top>
+        <input type=file table-caption target=a />
+        <input type=file table-caption target=b />
+    </div>
+
+    <hr/><!------------------------------------------------------------------------------------------------------------>
+    <p>Both images should share the same line:</p>
+    <p>Replaced elements outside a table cannot be <mark>table-caption</mark> and are considered <mark>inline</mark> -- img elements</p>
+    <div offset=top>
+        <img src="../support/blue32x32.ico" table-caption target=a />
+        <img src="../support/blue32x32.ico" table-caption target=b />
+    </div>
+
 </main>
diff --git a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html b/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html
index 7c15b2a749d..e7b9c5c7d13 100644
--- a/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html
+++ b/tests/wpt/web-platform-tests/css/css-tables/tentative/table-fixed-minmax.html
@@ -82,37 +82,36 @@ default to regular max size.</p>
     assert_equals(div.offsetWidth, 100);
     assert_equals(flexbox.offsetWidth, document.body.offsetWidth);
     assert_equals(flexbox.offsetWidth, table.offsetWidth + div.offsetWidth);
-  }, "table's max width inside flexbox width:auto is not infinite");
+  }, "table's width inside flexbox width:auto is not infinite");
 
   test(_ => {
     let flexbox = document.querySelector("#flextest_max");
     let table = flexbox.querySelector("table");
-    assert_equals(table.offsetWidth, 100);
-  }, "table's max width inside flexbox width:max-content is not infinite");
+    assert_greater_than(table.offsetWidth, document.body.offsetWidth);
+  }, "table's width inside flexbox width:max-content is infinite");
 
   test(_ => {
     let grid = document.querySelector("#grid");
     let table = grid.querySelector("table");
     assert_equals(grid.offsetWidth, document.body.offsetWidth);
     assert_equals(grid.offsetWidth, table.offsetWidth);
-  }, "table's max width inside grid width:auto is not infinite");
+  }, "table's width inside grid width:auto is not infinite");
 
   test(_ => {
     let grid = document.querySelector("#grid_max");
     let table = grid.querySelector("table");
-    assert_equals(grid.offsetWidth, 100);
-    assert_equals(table.offsetWidth, 100);
-  }, "table's max width inside grid width:max-content is not infinite");
+    assert_greater_than(table.offsetWidth, document.body.offsetWidth);
+  }, "table's width inside grid width:max-content is infinite");
 
   test(_ => {
     let table = document.querySelector("#table_container");
     assert_equals(table.offsetWidth, document.body.offsetWidth);
-  }, "table's max width inside a table cell is infinite");
+  }, "table's width inside a table cell is infinite");
 
   test(_ => {
     let abs = document.querySelector("#absolute");
     let table = abs.querySelector("table");
     assert_equals(table.offsetWidth, abs.offsetWidth);
-  }, "table's max width inside an absolute block is infinite");
+  }, "table's width inside an absolute block is infinite");
 
 </script>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-031.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-031.html
new file mode 100644
index 00000000000..1e28e2d3588
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-031.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>word-break: break-all, ID and CJ</title>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: break-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="ref" lang="ja"><span>フォ フ<br/>ォ</span></div>
+<div class="ref" lang="ja"><span>フォ フ<br/>ォ</span></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-032.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-032.html
new file mode 100644
index 00000000000..8b7b3b6c394
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-break-all-ref-032.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en" >
+<head>
+<meta charset="utf-8">
+<title>word-break: keep-all, korean (Hangul Jamos)</title>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: break-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="ref" lang="ko"><span>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161; &#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;<br/>&#x1103;&#x1161;</span></div>
+<div class="ref" lang="ko"><span>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161; &#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;<br/>&#x1103;&#x1161;</span></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-009.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-009.html
new file mode 100644
index 00000000000..4dcdf2dd2b8
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-009.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>word-break: keep-all, ID and CJ</title>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: keep-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="ref" lang="ja"><span>フォ<br/>フォ</span></div>
+<div class="ref" lang="ja"><span>フォ<br/>フォ</span></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-010.html b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-010.html
new file mode 100644
index 00000000000..cbfd3476089
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/reference/word-break-keep-all-ref-010.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html lang="en" >
+<head>
+<meta charset="utf-8">
+<title>word-break: keep-all, korean (Hangul Jamos)</title>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: keep-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="ref" lang="ko"><span>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;<br/>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;</span></div>
+<div class="ref" lang="ko"><span>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;<br/>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;</span></div>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-031.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-031.html
new file mode 100644
index 00000000000..d60a677f58a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-031.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en" >
+<head>
+<meta charset="utf-8">
+<title>word-break: break-all, ID and CJ</title>
+<meta name="assert" content="word-break: break-all means lines may break between ID and CJ.">
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#word-break-property'>
+<link rel='match' href='reference/word-break-break-all-ref-031.html'>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: break-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="test" lang="ja"><div id="testdiv"><span id="testspan">フォ フォ</span></div></div>
+<div class="ref" lang="ja"><span>フォ フ<br/>ォ</span></div>
+<script>
+var sentenceWidth = document.getElementById('testspan').offsetWidth;
+document.getElementById('testdiv').style.width = String(sentenceWidth - 5)+'px';
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-032.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-032.html
new file mode 100644
index 00000000000..08c89d94cc1
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-break-all-032.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<meta charset="utf-8">
+<title>word-break: break-all, korean (Hangul Jamos)</title>
+<meta name="assert" content="word-break: break-all means lines may break between any two typographic letter units.">
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#word-break-property'>
+<link rel='match' href='reference/word-break-break-all-ref-032.html'>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: break-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="test" lang="ko"><div id="testdiv"><span id="testspan">&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161; &#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;</span></div></div>
+<div class="ref" lang="ko"><span>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161; &#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;<br/>&#x1103;&#x1161;</span></div>
+<script>
+var sentenceWidth = document.getElementById('testspan').offsetWidth;
+document.getElementById('testdiv').style.width = String(sentenceWidth - 5)+'px';
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-009.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-009.html
new file mode 100644
index 00000000000..d6df63f4e72
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-009.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html lang="en" >
+<head>
+<meta charset="utf-8">
+<title>word-break: keep-all, ID and CJ</title>
+<meta name="assert" content="word-break: keep-all means breaking is forbidden within 'words'.  In this style, sequences of CJK characters do not break.">
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#word-break-property'>
+<link rel='match' href='reference/word-break-keep-all-ref-009.html'>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: keep-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="test" lang="ja"><div id="testdiv"><span id="testspan">フォ フォ</span></div></div>
+<div class="ref" lang="ja"><span>フォ<br/>フォ</span></div>
+<script>
+var sentenceWidth = document.getElementById('testspan').offsetWidth;
+document.getElementById('testdiv').style.width = String(sentenceWidth - 5)+'px';
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-010.html b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-010.html
new file mode 100644
index 00000000000..c288f943a2a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-text/word-break/word-break-keep-all-010.html
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html  lang="en" >
+<head>
+<meta charset="utf-8">
+<title>word-break: keep-all, korean (Hangul Jamos)</title>
+<meta name="assert" content="word-break: keep-all means breaking is forbidden within 'words'.  In this style, sequences of CJK characters do not break.">
+<link rel='help' href='https://drafts.csswg.org/css-text-3/#word-break-property'>
+<link rel='match' href='reference/word-break-keep-all-ref-010.html'>
+<link rel='author' title='Makoto Kato' href='mailto:m_kato@ga2.so-net.ne.jp'>
+<style type='text/css'>
+.test { word-break: keep-all; }
+/* the CSS below is not part of the test */
+.test, .ref { border: 1px solid orange;  margin: 20px;  padding: 10px; width: 390px; font: 36px/1 sans-serif; }
+</style>
+</head>
+<body>
+<div id='instructions'>Test passes if the two orange boxes are the same.</div>
+<div class="test" lang="ko"><div id="testdiv"><span id="testspan">&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161; &#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;</span></div></div>
+<div class="ref" lang="ko"><span>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;<br/>&#x110B;&#x1162;&#x1100;&#x1175;&#x1111;&#x1161;&#x11AB;&#x1103;&#x1161;</span></div>
+<script>
+var sentenceWidth = document.getElementById('testspan').offsetWidth;
+document.getElementById('testdiv').style.width = String(sentenceWidth - 5)+'px';
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-load-cookie.tentative.https.html b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-load-cookie.tentative.https.html
new file mode 100644
index 00000000000..b4520f8b952
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-embedder-policy/credentialless/iframe-load-cookie.tentative.https.html
@@ -0,0 +1,108 @@
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/common/get-host-info.sub.js"></script>
+<script src="/common/utils.js"></script>
+<script src="./resources/common.js"></script>
+<script src="./resources/dispatcher.js"></script>
+<script>
+
+const same_origin = get_host_info().HTTPS_ORIGIN;
+const cross_origin = get_host_info().HTTPS_REMOTE_ORIGIN;
+const cookie_key = "coep_credentialless_iframe_load_cookie";
+const cookie_same_origin = "same_origin";
+const cookie_cross_origin = "cross_origin";
+
+// Open a new window with a given |origin|, loaded with COEP:credentialless. The
+// new document will execute any scripts sent toward the token it returns.
+const newCredentiallessWindow = (origin) => {
+  const main_document_token = token();
+  const url = origin + executor_path + coep_credentialless +
+    `&uuid=${main_document_token}`;
+  const w = window.open(url);
+  add_completion_callback(() => w.close());
+  return main_document_token;
+};
+
+// Create a new iframe, loaded with COEP:credentialless.
+// The new document will execute any scripts sent toward the token it returns.
+const newCredentiallessIframe = (parent_token, child_origin) => {
+  const sub_document_token = token();
+  const iframe_url = child_origin + executor_path + coep_credentialless +
+    `&uuid=${sub_document_token}`;
+  send(parent_token, `
+    let iframe = document.createElement("iframe");
+    iframe.src = "${iframe_url}";
+    document.body.appendChild(iframe);
+  `)
+  return sub_document_token;
+};
+
+// Fetch a resource, returns the HTTP request cookies.
+const cookieFromResource = async (document_token, resource_origin) => {
+  const resource_token = token();
+  send(document_token, `
+    let img = document.createElement("img");
+    img.src = "${showRequestHeaders(resource_origin, resource_token)}";
+    document.body.appendChild(img);
+  `);
+  let headers = JSON.parse(await receive(resource_token));
+  return parseCookies(headers)[cookie_key];
+};
+
+promise_test_parallel(async test => {
+  // Set cookie on same_origin.
+  document.cookie = `${cookie_key}=${cookie_same_origin}`;
+
+  // Set cookie on cross_origin.
+  {
+    const w_token = token();
+    const w_url = cross_origin + executor_path + `&uuid=${w_token}`;
+    const w = window.open(w_url);
+
+    const reply_token = token();
+    send(w_token, `
+      document.cookie = "${cookie_key}=${cookie_cross_origin}";
+      send("${reply_token}", "done");
+    `);
+    assert_equals(await receive(reply_token), "done");
+    w.close();
+  }
+
+  let credentialless_window = newCredentiallessWindow(same_origin);
+
+  let iframe_same_origin =
+    newCredentiallessIframe(credentialless_window, same_origin);
+  let iframe_cross_origin =
+    newCredentiallessIframe(credentialless_window, cross_origin);
+
+  promise_test_parallel(async test => {
+    assert_equals(
+      await cookieFromResource(iframe_same_origin, same_origin),
+      cookie_same_origin
+    );
+  }, "same_origin iframe can send same_origin credentials");
+
+  promise_test_parallel(async test => {
+    assert_equals(
+      await cookieFromResource(iframe_same_origin, cross_origin),
+      undefined
+    );
+  }, "same_origin iframe can't send cross_origin credentials");
+
+  promise_test_parallel(async test => {
+    assert_equals(
+      await cookieFromResource(iframe_cross_origin, cross_origin),
+      undefined
+    );
+  }, "cross_origin iframe can send cross_origin credentials");
+
+  promise_test_parallel(async test => {
+    assert_equals(
+      await cookieFromResource(iframe_cross_origin, same_origin),
+      undefined
+    );
+  }, "Cross origin iframe can't send same_origin credentials");
+
+}, "Setup")
+
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html
new file mode 100644
index 00000000000..4b94435119c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<title>Sandboxed Cross-Origin-Opener-Policy popup should result in a network error</title>
+<script src=/resources/testharness.js></script>
+<script src=/resources/testharnessreport.js></script>
+<script src="/common/utils.js"></script> <!-- Use token() to allow running tests in parallel -->
+<div id=log>
+<script>
+[
+  "allow-popups allow-scripts allow-same-origin",
+  "allow-popups allow-scripts",
+].forEach(sandboxValue => {
+  async_test(t => {
+    const frame = document.createElement("iframe");
+    const channel = new BroadcastChannel(token());
+    channel.onmessage = t.unreached_func("A COOP popup was created from a sandboxed frame");
+    t.add_cleanup(() => frame.remove());
+    frame.sandbox = sandboxValue;
+    frame.srcdoc = `<script>
+  const popup = window.open("resources/coop-coep.py?coop=same-origin&coep=&channel=${channel.name}");
+  <\/script>`;
+    document.body.append(frame);
+    addEventListener('load', t.step_func(() => {
+      // This uses a timeout to give some time for incorrect implementations to broadcast. A
+      // theoretical testdriver.js API for browsing contexts could be used to speed this up.
+      t.step_timeout(() => {
+        t.done()
+      }, 1500);
+    }));
+  }, `<iframe sandbox="${sandboxValue}"> ${document.title}`);
+});
+
+// Verify that the popup does not have sandboxing flags set
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const channel = new BroadcastChannel(token());
+  channel.onmessage = t.step_func_done();
+  t.add_cleanup(() => frame.remove());
+  frame.sandbox = "allow-popups allow-scripts allow-popups-to-escape-sandbox";
+  frame.srcdoc = `<script>
+window.open("resources/coop-coep.py?coop=same-origin&coep=require-corp&channel=${channel.name}");
+<\/script>`;
+  document.body.append(frame);
+}, `<iframe sandbox="allow-popups allow-scripts allow-popups-to-escape-sandbox"> ${document.title}`);
+
+async_test(t => {
+  const frame = document.createElement("iframe");
+  const channel = new BroadcastChannel(token());
+  frame.sandbox = "allow-scripts allow-same-origin";
+  frame.name = `iframe-${channel.name}`;
+  frame.src = `resources/coop-coep.py?coop=same-origin&coep=require-corp&channel=${channel.name}`;
+  channel.onmessage = t.step_func( event => {
+    const payload = event.data;
+    assert_equals(payload.name, frame.name, "name");
+    t.done();
+  });
+  t.add_cleanup(() => frame.remove());
+  document.body.append(frame);
+}, `Iframe with sandbox and COOP must load.`);
+</script>
diff --git a/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html.headers b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html.headers
new file mode 100644
index 00000000000..4fff9d9fba4
--- /dev/null
+++ b/tests/wpt/web-platform-tests/html/cross-origin-opener-policy/coop-coep-sandbox.https.html.headers
@@ -0,0 +1,2 @@
+Cross-Origin-Opener-Policy: same-origin
+Cross-Origin-Embedder-Policy: require-corp
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html
index 95332898203..a8a553c836c 100644
--- a/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html
+++ b/tests/wpt/web-platform-tests/html/rendering/non-replaced-elements/the-fieldset-and-legend-elements/fieldset-display.html
@@ -12,8 +12,9 @@
   const blockWidth = getComputedStyle(document.querySelector('#block-ref')).width;
   const inlineWidth = getComputedStyle(document.querySelector('#inline-ref')).width;
   const testElm = document.querySelector('#test');
+  // Please only add canonical values to these lists:
   const blocks = ['block', 'table', 'table-row-group', 'table-header-group', 'table-footer-group', 'table-row', 'table-cell',
-                  'table-column-group', 'table-column', 'table-caption', 'list-item', 'flow', 'flow-root','run-in'];
+                  'table-column-group', 'table-column', 'table-caption', 'list-item', 'flow-root', 'run-in', 'block ruby'];
   const inlines = ['inline', 'inline-block', 'inline-table', 'ruby', 'ruby-base', 'ruby-text', 'ruby-base-container', 'ruby-text-container'];
 
   function test_display(val, expectedWidth) {
@@ -21,11 +22,6 @@
       testElm.style.removeProperty('display');
       testElm.style.display = val;
       const computed = getComputedStyle(testElm);
-      // Note that computed value is different from the used value.
-      // E.g., if ruby is not supported, the following assertion will
-      // fail as the computed value of display will be block.
-      // If ruby is supported, computed.display will return "ruby",
-      // but the used value is supposed to be "inline".
       assert_equals(computed.display, val, `display: ${val} is not supported`);
       assert_equals(computed.width, expectedWidth);
     }, `fieldset with display: ${val}`);
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-interactive-content.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-interactive-content.html
index c448df0a380..300d09cdda8 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-interactive-content.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-interactive-content.html
@@ -15,7 +15,6 @@
   <img usemap="">
   <input>
   <label>label</label>
-  <object usemap=""></object>
   <select></select>
   <textarea></textarea>
   <video controls></video>
diff --git a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html b/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html
index be74ed68330..285cd8c0410 100644
--- a/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html
+++ b/tests/wpt/web-platform-tests/html/semantics/forms/the-label-element/clicking-noninteractive-unlabelable-content.html
@@ -15,7 +15,6 @@
   <audio></audio>
   <img>
   <input type=hidden>
-  <object></object>
   <video></video>
 
   <!-- These are considered interactive content for the purpose of <label> in a
@@ -25,7 +24,9 @@
   <div tabindex=""></div>
   <img tabindex="">
   <input type=hidden tabindex="">
+  <object></object>
   <object tabindex=""></object>
+  <object usemap=""></object>
   <video tabindex=""></video>
 </template>
 
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent.html
index 2f5dfd4dbfd..022fcffabfd 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_click_is_a_pointerevent.html
@@ -1,5 +1,7 @@
 <!DOCTYPE HTML>
 <title>click is a PointerEvent</title>
+<meta name="variant" content="?mouse">
+<meta name="variant" content="?pen">
 <link rel="help" href="https://github.com/w3c/pointerevents/pull/317">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
@@ -14,6 +16,7 @@
 let target = document.getElementById("target");
 let pointerId = 0;
 let pointerType = "";
+let inputSource = location.search.substring(1);
 
 target.addEventListener("pointerdown", (e)=>{
   pointerId = e.pointerId;
@@ -50,7 +53,6 @@ function run_test(pointerType){
   }), "click using " + pointerType + " is a PointerEvent");
 }
 
-run_test("mouse");
-run_test("pen");
+run_test(inputSource);
 // TODO(crbug.com/1150593): Add wpt test for touch (reuse run_test)
 </script>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_disabled_form_control.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_disabled_form_control.html
index 13f6e31cb41..83ad053a146 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_disabled_form_control.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_disabled_form_control.html
@@ -3,6 +3,9 @@
     <head>
         <title>Pointer Events properties tests</title>
         <meta name="viewport" content="width=device-width">
+        <meta name="variant" content="?mouse">
+        <meta name="variant" content="?touch">
+        <meta name="variant" content="?pen">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
@@ -12,6 +15,7 @@
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
         <script>
+            var inputSource = location.search.substring(1);
             var detected_pointertypes = {};
             var detected_eventTypes = {};
             var eventList = ['pointerout', 'pointerover', 'pointerenter', 'pointermove', 'pointerdown', 'pointerup', 'pointerleave'];
@@ -20,7 +24,7 @@
                 detected_eventTypes = {};
             }
             function run() {
-                var test_pointerEvent = setup_pointerevent_test("pointerevent attributes", ALL_POINTERS);
+                var test_pointerEvent = setup_pointerevent_test("pointerevent attributes", [inputSource]);
                 var target = document.getElementById("target0");
                 var actions_promise;
 
@@ -41,22 +45,21 @@
                     assert_unreached("click should not fire on disabled element");
                 });
 
-                // Inject touch inputs.
-                actions_promise = clickInTarget("mouse", target).then(function() {
-                    return new test_driver.Actions()
-                        .addPointer("mousePointer1", "mouse")
-                        .pointerMove(0, 0)
-                        .send();
-                }).then(function() {
-                    return pointerDragInTarget('touch', target, 'right');
-                }).then(function() {
-                    return clickInTarget("pen", target);
-                }).then(function() {
-                    return new test_driver.Actions()
-                        .addPointer("penPointer1", "pen")
-                        .pointerMove(0, 0)
-                        .send();
-                });
+                // Inject inputs.
+                switch (inputSource) {
+                    case "touch":
+                        actions_promise = pointerDragInTarget(inputSource, target, 'right');
+                        break;
+                    case "mouse":
+                    case "pen":
+                        actions_promise = clickInTarget(inputSource, target).then(function() {
+                            return new test_driver.Actions()
+                                .addPointer(inputSource + "Pointer1", inputSource)
+                                .pointerMove(0, 0)
+                                .send();
+                        });
+                        break;
+                }
             }
         </script>
         <style>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html
index b106340efd5..f7947977044 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_fractional_coordinates.html
@@ -3,6 +3,9 @@
     <head>
         <title>Pointer Events coordinates can have fractional value<</title>
         <meta name="viewport" content="width=device-width">
+        <meta name="variant" content="?mouse">
+        <meta name="variant" content="?touch">
+        <meta name="variant" content="?pen">
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
         <script src="/resources/testharness.js"></script>
         <script src="/resources/testharnessreport.js"></script>
@@ -21,6 +24,7 @@
             }
         </style>
         <script>
+            var input = location.search.substring(1);
             var eventList = [
                   "pointerdown",
                   "pointerup",
@@ -89,7 +93,7 @@
             }
 
             function run() {
-                var test_pointerEvent = setup_pointerevent_test("pointerevent events in capturing", ALL_POINTERS);
+                var test_pointerEvent = setup_pointerevent_test("pointerevent events in capturing", [input]);
                 var innerFrame = document.getElementById('innerFrame');
                 var innerDocument = innerFrame.contentDocument;
                 ['s1', 's2', 's3'].forEach(function(id){
@@ -116,11 +120,7 @@
                     });
                 });
 
-                testInputType("mouse").then(function() {
-                    return testInputType("touch");
-                }).then(function() {
-                    return testInputType("pen");
-                });
+                testInputType(input);
             }
         </script>
     </head>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture_in_frame.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture_in_frame.html
index a4107fd707a..c581210a3ef 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture_in_frame.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_pointercapture_in_frame.html
@@ -1,3 +1,6 @@
+<meta name="variant" content="?mouse">
+<meta name="variant" content="?touch">
+<meta name="variant" content="?pen">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="/resources/testdriver.js"></script>
@@ -60,101 +63,100 @@ function Reset() {
 }
 
 function run() {
-    ALL_POINTERS.forEach(function(pointerType) {
-        promise_test (async() => {
-            Reset();
-            document.setPointerCaptureOnPointerDown = true;
-            expectedEventList = ["innerFrame received pointerdown",
-                                 "innerFrame received gotpointercapture",
-                                 "innerFrame received pointermove",
-                                 "innerFrame received pointermove",
-                                 "innerFrame received pointerup",
-                                 "innerFrame received lostpointercapture"];
-            var pointerId = pointerType + "Pointer1";
-            await new test_driver.Actions()
-                                 .addPointer(pointerId, pointerType)
-                                 .pointerMove(200, 200)
-                                 .pointerDown()
-                                 .pointerMove(150, 150)
-                                 .pointerMove(50, 50)
-                                 .pointerUp()
-                                 .send();
-            assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
-            document.setPointerCaptureOnPointerDown = false;
-        }, "Test " + pointerType + "pointer capture in same-origin frame: Pointer down at inner frame and set pointer capture.");
+    var pointerType = location.search.substring(1);
+    promise_test (async() => {
+        Reset();
+        document.setPointerCaptureOnPointerDown = true;
+        expectedEventList = ["innerFrame received pointerdown",
+                             "innerFrame received gotpointercapture",
+                             "innerFrame received pointermove",
+                             "innerFrame received pointermove",
+                             "innerFrame received pointerup",
+                             "innerFrame received lostpointercapture"];
+        var pointerId = pointerType + "Pointer1";
+        await new test_driver.Actions()
+                             .addPointer(pointerId, pointerType)
+                             .pointerMove(200, 200)
+                             .pointerDown()
+                             .pointerMove(150, 150)
+                             .pointerMove(50, 50)
+                             .pointerUp()
+                             .send();
+        assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
+        document.setPointerCaptureOnPointerDown = false;
+    }, "Test " + pointerType + "pointer capture in same-origin frame: Pointer down at inner frame and set pointer capture.");
 
-        promise_test (async() => {
-            Reset();
-            document.setPointerCaptureOnPointerDown = true;
-            expectedEventList = ["outerFrame received pointerdown",
-                                 "outerFrame received gotpointercapture",
-                                 "outerFrame received pointermove",
-                                 "outerFrame received pointerup",
-                                 "outerFrame received lostpointercapture"];
-            var pointerId = pointerType + "Pointer1";
-            await new test_driver.Actions()
-                                 .addPointer(pointerId, pointerType)
-                                 .pointerMove(25, 25)
-                                 .pointerDown()
-                                 .pointerMove(200, 200)
-                                 .pointerUp()
-                                 .send();
-            assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
-            document.setPointerCaptureOnPointerDown = false;
-        }, "Test " + pointerType + "pointer capture in same-origin frame: Pointer down at outer frame body and set pointer capture.");
+    promise_test (async() => {
+        Reset();
+        document.setPointerCaptureOnPointerDown = true;
+        expectedEventList = ["outerFrame received pointerdown",
+                             "outerFrame received gotpointercapture",
+                             "outerFrame received pointermove",
+                             "outerFrame received pointerup",
+                             "outerFrame received lostpointercapture"];
+        var pointerId = pointerType + "Pointer1";
+        await new test_driver.Actions()
+                             .addPointer(pointerId, pointerType)
+                             .pointerMove(25, 25)
+                             .pointerDown()
+                             .pointerMove(200, 200)
+                             .pointerUp()
+                             .send();
+        assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
+        document.setPointerCaptureOnPointerDown = false;
+    }, "Test " + pointerType + "pointer capture in same-origin frame: Pointer down at outer frame body and set pointer capture.");
 
 
-        promise_test (async() => {
-            Reset();
-            document.setPointerCaptureOnPointerDown = true;
-            document.releasePointerCaptureOnFirstMove = true;
-            // Mouse event has the frame capture, so after pointer capture released, events are
-            // dispatched to innerFrameDocument.
-            expectedEventList = ["innerFrame received pointerdown",
-                                 "innerFrame received gotpointercapture",
-                                 "innerFrame received pointermove",
-                                 "innerFrame received lostpointercapture",
-                                 (pointerType == "touch" ? "outerFrame": "innerFrameDocument") + " received pointermove",
-                                 (pointerType == "touch" ? "outerFrame": "innerFrameDocument") + " received pointerup",];
-            var pointerId = pointerType + "Pointer1";
-            await new test_driver.Actions()
-                                 .addPointer(pointerId, pointerType)
-                                 .pointerMove(200, 200)
-                                 .pointerDown()
-                                 .pointerMove(150, 150)
-                                 .pointerMove(50, 50)
-                                 .pointerUp()
-                                 .send();
-            assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
-            document.releasePointerCaptureOnFirstMove = false;
-            document.setPointerCaptureOnPointerDown = false;
-        }, "Test " + pointerType + "pointer capture in same-origin frame: Pointerdown with set capture at inner frame, then release on next pointermove.");
+    promise_test (async() => {
+        Reset();
+        document.setPointerCaptureOnPointerDown = true;
+        document.releasePointerCaptureOnFirstMove = true;
+        // Mouse event has the frame capture, so after pointer capture released, events are
+        // dispatched to innerFrameDocument.
+        expectedEventList = ["innerFrame received pointerdown",
+                             "innerFrame received gotpointercapture",
+                             "innerFrame received pointermove",
+                             "innerFrame received lostpointercapture",
+                             (pointerType == "touch" ? "outerFrame": "innerFrameDocument") + " received pointermove",
+                             (pointerType == "touch" ? "outerFrame": "innerFrameDocument") + " received pointerup",];
+        var pointerId = pointerType + "Pointer1";
+        await new test_driver.Actions()
+                             .addPointer(pointerId, pointerType)
+                             .pointerMove(200, 200)
+                             .pointerDown()
+                             .pointerMove(150, 150)
+                             .pointerMove(50, 50)
+                             .pointerUp()
+                             .send();
+        assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
+        document.releasePointerCaptureOnFirstMove = false;
+        document.setPointerCaptureOnPointerDown = false;
+    }, "Test " + pointerType + "pointer capture in same-origin frame: Pointerdown with set capture at inner frame, then release on next pointermove.");
 
 
-        promise_test (async() => {
-            Reset();
-            document.setPointerCaptureOnPointerDown = true;
-            document.releasePointerCaptureOnFirstMove = true;
-            expectedEventList = ["outerFrame received pointerdown",
-                                 "outerFrame received gotpointercapture",
-                                 "outerFrame received pointermove",
-                                 "outerFrame received lostpointercapture",
-                                 "innerFrame received pointermove",
-                                 "innerFrame received pointerup"];
-            var pointerId = pointerType + "Pointer1";
-            await new test_driver.Actions()
-                                 .addPointer(pointerId, pointerType)
-                                 .pointerMove(50, 50)
-                                 .pointerDown()
-                                 .pointerMove(200, 200)
-                                 .pointerMove(250, 250)
-                                 .pointerUp()
-                                 .send();
-            assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
-            document.releasePointerCaptureOnFirstMove = false;
-            document.setPointerCaptureOnPointerDown = false;
-        }, "Test " + pointerType + "pointer capture in same-origin frame: Pointerdown with set capture at outer frame, then release on next pointermove.");
-    });
+    promise_test (async() => {
+        Reset();
+        document.setPointerCaptureOnPointerDown = true;
+        document.releasePointerCaptureOnFirstMove = true;
+        expectedEventList = ["outerFrame received pointerdown",
+                             "outerFrame received gotpointercapture",
+                             "outerFrame received pointermove",
+                             "outerFrame received lostpointercapture",
+                             "innerFrame received pointermove",
+                             "innerFrame received pointerup"];
+        var pointerId = pointerType + "Pointer1";
+        await new test_driver.Actions()
+                             .addPointer(pointerId, pointerType)
+                             .pointerMove(50, 50)
+                             .pointerDown()
+                             .pointerMove(200, 200)
+                             .pointerMove(250, 250)
+                             .pointerUp()
+                             .send();
+        assert_array_equals(receivedEventList, expectedEventList, "Received events: " + receivedEventList);
+        document.releasePointerCaptureOnFirstMove = false;
+        document.setPointerCaptureOnPointerDown = false;
+    }, "Test " + pointerType + "pointer capture in same-origin frame: Pointerdown with set capture at outer frame, then release on next pointermove.");
 }
 </script>
 
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html
index 6f6d30e16e1..325b58c85cc 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_releasepointercapture_events_to_original_target.html
@@ -3,6 +3,9 @@
     <head>
         <title>Pointer Event: releasePointerCapture() - subsequent events follow normal hitting testing mechanisms</title>
         <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+        <meta name="variant" content="?mouse">
+        <meta name="variant" content="?touch">
+        <meta name="variant" content="?pen">
         <link rel="author" title="Microsoft" href="http://www.microsoft.com/"/>
         <meta name="assert" content="After invoking the releasePointerCapture method on an element, subsequent events for the specified pointer must follow normal hit testing mechanisms for determining the event target"/>
         <link rel="stylesheet" type="text/css" href="pointerevent_styles.css">
@@ -14,6 +17,7 @@
         <!-- Additional helper script for common checks across event types -->
         <script type="text/javascript" src="pointerevent_support.js"></script>
         <script type="text/javascript">
+            var inputSource = location.search.substring(1);
             var test_pointerEvent;
             var detected_pointertypes = {};
             var captured_event = null;
@@ -22,7 +26,6 @@
             var outLeaveEventsFail = false;
             var f_gotPointerCapture = false;
             var f_lostPointerCapture = false;
-            var index = 0;
             var actions_promise;
 
             function resetTestState() {
@@ -102,12 +105,6 @@
                         test_done = true;
                         // Make sure the test finishes after all the input actions are completed.
                         actions_promise.then( () => {
-                            if (index == 0) {
-                                actions_promise =  pointerDragInTarget('touch', target0, 'right');
-                            } else if (index == 1) {
-                                actions_promise =  pointerDragInTarget('pen', target0, 'right');
-                            }
-                            index++;
                             test_pointerEvent.done();
                         });
                     }
@@ -115,7 +112,7 @@
             }
 
             function run() {
-                test_pointerEvent = setup_pointerevent_test("got/lost pointercapture: subsequent events to target", ALL_POINTERS);  // set up test harness
+                test_pointerEvent = setup_pointerevent_test("got/lost pointercapture: subsequent events to target", [inputSource]);  // set up test harness
                 var listener = document.getElementById("listener");
                 var target0 = document.getElementById("target0");
                 target0.style["touchAction"] = "none";
@@ -127,7 +124,7 @@
                 }
 
                 // Inject pointer inputs.
-                actions_promise = pointerDragInTarget('mouse', target0, 'right');
+                actions_promise = pointerDragInTarget(inputSource, target0, 'right');
             }
         </script>
     </head>
diff --git a/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html b/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html
index 4b424f27643..bfcc8ad54a8 100644
--- a/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html
+++ b/tests/wpt/web-platform-tests/pointerevents/pointerevent_sequence_at_implicit_release_on_click.html
@@ -3,6 +3,9 @@
   <head>
     <title>Pointer Event: Event sequence at implicit release on click</title>
     <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+    <meta name="variant" content="?mouse">
+    <meta name="variant" content="?touch">
+    <meta name="variant" content="?pen">
     <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">
@@ -13,11 +16,11 @@
     <script src="/resources/testdriver-vendor.js"></script>
     <script type="text/javascript" src="pointerevent_support.js"></script>
     <script type="text/javascript">
+      var inputSource = location.search.substring(1);
       var detected_pointertypes = {};
       var event_log = [];
       var start_logging = false;
       var actions_promise;
-      var index = 0;
 
       function resetTestState() {
         detected_eventTypes = {};
@@ -26,7 +29,7 @@
       }
 
       function run() {
-        var test_pointer_event = setup_pointerevent_test("Event sequence at implicit release on click", ALL_POINTERS);
+        var test_pointer_event = setup_pointerevent_test("Event sequence at implicit release on click", [inputSource]);
 
         on_event(document.getElementById("done"), "click", function() {
           test_pointer_event.step(function () {
@@ -35,16 +38,6 @@
           });
           // Make sure the test finishes after all the input actions are completed.
           actions_promise.then( () => {
-            if (index == 0) {
-              actions_promise = clickInTarget("touch", target).then(function() {
-                return clickInTarget("touch", button);
-              });
-            } else if (index == 1) {
-              actions_promise = clickInTarget("pen", target).then(function() {
-                return clickInTarget("pen", button);
-              });
-            }
-            index++;
             test_pointer_event.done();
           });
         });
@@ -69,8 +62,8 @@
         });
 
         // Inject pointer inputs.
-        actions_promise = clickInTarget("mouse", target).then(function() {
-          return clickInTarget("mouse", button);
+        actions_promise = clickInTarget(inputSource, target).then(function() {
+          return clickInTarget(inputSource, button);
         });
       }
     </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-fetch.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/claim-fetch.https.html
index 400b593ac96..ae0082df06b 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/claim-fetch.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/claim-fetch.https.html
@@ -1,52 +1,46 @@
 <!doctype html>
 <meta charset=utf-8>
 <title></title>
+<meta name="timeout" content="long">
 <script src="/resources/testharness.js"></script>
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <body>
 <script>
 
-async function try_fetch(fetch_func, path) {
+async function tryFetch(fetchFunc, path) {
   let response;
   try {
-   response = await fetch_func(path);
+   response = await fetchFunc(path);
   } catch (err) {
     throw (`fetch() threw: ${err}`);
   }
 
-  let response_text;
+  let responseText;
   try {
-   response_text = await response.text();
+   responseText = await response.text();
   } catch (err) {
    throw (`text() threw: ${err}`);
   }
 
-  return response_text;
+  return responseText;
 }
 
 promise_test(async function(t) {
-  let frame;
   const scope = 'resources/';
   const script = 'resources/claim-worker.js';
-  t.add_cleanup(async () => {
-    if (frame)
-      frame.remove();
-    return service_worker_unregister(t, scope);
-  });
-
   const resource = 'simple.txt';
 
   // Create the test frame.
-  await service_worker_unregister(t, scope);
-  frame = await with_iframe('resources/blank.html');
+  const frame = await with_iframe('resources/blank.html');
+  t.add_cleanup(() => frame.remove());
 
   // Check the controller and test with fetch.
   assert_equals(frame.contentWindow.navigator.controller, undefined,
                 'Should have no controller.');
   let response;
   try {
-    response = await try_fetch(frame.contentWindow.fetch, resource);
+    response = await tryFetch(frame.contentWindow.fetch, resource);
   } catch (err) {
     assert_unreached(`uncontrolled fetch failed: ${err}`);
   }
@@ -54,27 +48,37 @@ promise_test(async function(t) {
                 'fetch() should not be intercepted.');
 
   // Register a service worker.
-  const registration = await navigator.serviceWorker.register(script, {scope});
+  const registration =
+    await service_worker_unregister_and_register(t, script, scope);
+  t.add_cleanup(() => registration.unregister());
   const worker = registration.installing;
   await wait_for_state(t, worker, 'activated');
 
+  // Register a controllerchange event to wait until the controller is updated
+  // and check if the frame is controlled by a service worker.
+  const controllerChanged = new Promise((resolve) => {
+    frame.contentWindow.navigator.serviceWorker.oncontrollerchange = () => {
+      resolve(frame.contentWindow.navigator.serviceWorker.controller);
+    };
+  });
+
   // Tell the service worker to claim the iframe.
-  const saw_message = new Promise((resolve) => {
+  const sawMessage = new Promise((resolve) => {
     const channel = new MessageChannel();
     channel.port1.onmessage = t.step_func((event) => {
       resolve(event.data);
     });
     worker.postMessage({port: channel.port2}, [channel.port2]);
   });
-  const data = await saw_message;
+  const data = await sawMessage;
   assert_equals(data, 'PASS', 'Worker call to claim() should fulfill.');
 
-  // Check the controller and test with fetch.
-  const controller = frame.contentWindow.navigator.serviceWorker.controller;
+  // Check if the controller is updated after claim() and test with fetch.
+  const controller = await controllerChanged;
   assert_true(controller instanceof frame.contentWindow.ServiceWorker,
               'iframe should be controlled.');
   try {
-    response = await try_fetch(frame.contentWindow.fetch, resource);
+    response = await tryFetch(frame.contentWindow.fetch, resource);
   } catch (err) {
     assert_unreached(`controlled fetch failed: ${err}`);
   }
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-schedule-job.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-schedule-job.https.html
index 18589e0aa0b..8ac5d49e8c3 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/registration-schedule-job.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/registration-schedule-job.https.html
@@ -1,5 +1,6 @@
 <!DOCTYPE html>
 <meta charset="utf-8">
+<meta name=timeout content=long>
 <title>Service Worker: Schedule Job algorithm</title>
 <script src="/resources/testharness.js"></script>
 <script src="resources/testharness-helpers.js"></script>
@@ -21,7 +22,33 @@ function absolute_url(url) {
   return new URL(url, self.location).toString();
 }
 
-// Test scriptURL and updateViaCache.
+// A helper that returns the newest worker of the registration. This helps the
+// test fail with stable output on browers that incorrectly coalesce
+// register jobs, since then sometimes registration.installing is not
+// a new worker as expected.
+function get_newest_worker(registration) {
+  return registration.installing || registration.waiting || registration.active;
+}
+
+// Test that a change to `script` starts a new register job.
+promise_test(async t => {
+  await cleanup();
+  t.add_cleanup(cleanup);
+
+  // Make a registration.
+  const registration = await
+      navigator.serviceWorker.register(script1, {scope});
+
+  // Schedule two more register jobs.
+  navigator.serviceWorker.register(script1, {scope});
+  await navigator.serviceWorker.register(script2, {scope});
+
+  // The jobs should not have been coalesced.
+  const worker = get_newest_worker(registration);
+  assert_equals(worker.scriptURL, absolute_url(script2));
+}, 'different scriptURL');
+
+// Test that a change to `updateViaCache` starts a new register job.
 promise_test(async t => {
   await cleanup();
   t.add_cleanup(cleanup);
@@ -31,22 +58,17 @@ promise_test(async t => {
       navigator.serviceWorker.register(script1, {scope});
   assert_equals(registration.updateViaCache, 'imports');
 
-  // Schedule several register jobs.
+  // Schedule two more register jobs.
   navigator.serviceWorker.register(script1, {scope});
-  navigator.serviceWorker.register(script2, {scope});
-  await navigator.serviceWorker.register(script2,
-                                         {scope, updateViaCache: 'none'});
+  await navigator.serviceWorker.register(script1, {scope,
+      updateViaCache: 'none'});
 
-  // None of the changes should have been coalesced.
-  assert_equals(registration.installing.scriptURL, absolute_url(script2));
+  // The jobs should not have been coalesced.
   assert_equals(registration.updateViaCache, 'none');
-}, 'different scriptURL and updateViaCache');
+}, 'different updateViaCache');
 
-// Test |type| in another test case because most browsers don't support it.
+// Test that a change to `type` starts a new register job.
 promise_test(async t => {
-  const script1 = 'resources/empty.js';
-  const script2 = 'resources/empty.js?change';
-
   await cleanup();
   t.add_cleanup(cleanup);
 
@@ -55,13 +77,12 @@ promise_test(async t => {
       navigator.serviceWorker.register(script1, {scope});
   assert_equals(registration.installing.type, 'classic');
 
-  // Schedule several register jobs.
+  // Schedule two more register jobs.
   navigator.serviceWorker.register(script1, {scope});
-  navigator.serviceWorker.register(script2, {scope});
-  await navigator.serviceWorker.register(script2, {scope, type: 'module'});
+  await navigator.serviceWorker.register(script1, {scope, type: 'module'});
 
-  // None of the changes should have been coalesced.
-  assert_equals(registration.installing.scriptURL, absolute_url(script2));
-  assert_equals(registration.installing.type, 'module');
+  // The jobs should not have been coalesced.
+  const worker = get_newest_worker(registration.installing);
+  assert_equals(worker.type, 'module');
 }, 'different type');
 </script>
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-before-closing-tag.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-before-closing-tag.tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-before-closing-tag.html
rename to tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-before-closing-tag.tentative.html
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-on-ordinary-template.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-on-ordinary-template.tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-on-ordinary-template.html
rename to tests/wpt/web-platform-tests/shadow-dom/declarative/innerhtml-on-ordinary-template.tentative.html
diff --git a/tests/wpt/web-platform-tests/shadow-dom/declarative/move-template-before-closing-tag.html b/tests/wpt/web-platform-tests/shadow-dom/declarative/move-template-before-closing-tag.tentative.html
similarity index 100%
rename from tests/wpt/web-platform-tests/shadow-dom/declarative/move-template-before-closing-tag.html
rename to tests/wpt/web-platform-tests/shadow-dom/declarative/move-template-before-closing-tag.tentative.html
diff --git a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-selector-delegatesFocus.html b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-selector-delegatesFocus.html
index 3702f8e2ba6..b8cac925647 100644
--- a/tests/wpt/web-platform-tests/shadow-dom/focus/focus-selector-delegatesFocus.html
+++ b/tests/wpt/web-platform-tests/shadow-dom/focus/focus-selector-delegatesFocus.html
@@ -7,8 +7,6 @@
   <link rel="help" href="https://html.spec.whatwg.org/multipage/semantics-other.html#selector-focus" />
   <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 src="resources/shadow-utils.js"></script>
 </head>
 
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py
index 972e5517b1c..ec05c768ffc 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_weblayer.py
@@ -30,7 +30,9 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "device_serial": kwargs["device_serial"],
             "webdriver_binary": kwargs["webdriver_binary"],
-            "webdriver_args": kwargs.get("webdriver_args")}
+            "webdriver_args": kwargs.get("webdriver_args"),
+            "stackparser_script": kwargs.get("stackparser_script"),
+            "output_directory": kwargs.get("output_directory")}
 
 
 def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
@@ -81,10 +83,13 @@ class WeblayerShell(ChromeAndroidBrowserBase):
                  webdriver_binary="chromedriver",
                  remote_queue=None,
                  device_serial=None,
-                 webdriver_args=None):
+                 webdriver_args=None,
+                 stackparser_script=None,
+                 output_directory=None):
         """Creates a new representation of Chrome.  The `binary` argument gives
         the browser binary to use for testing."""
         super(WeblayerShell, self).__init__(logger,
-                webdriver_binary, remote_queue, device_serial, webdriver_args)
+                webdriver_binary, remote_queue, device_serial,
+                webdriver_args, stackparser_script, output_directory)
         self.binary = binary
         self.wptserver_ports = _wptserve_ports
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_webview.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_webview.py
index b40f8b90c03..54dd1281fd8 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_webview.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/android_webview.py
@@ -30,7 +30,9 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"binary": kwargs["binary"],
             "device_serial": kwargs["device_serial"],
             "webdriver_binary": kwargs["webdriver_binary"],
-            "webdriver_args": kwargs.get("webdriver_args")}
+            "webdriver_args": kwargs.get("webdriver_args"),
+            "stackparser_script": kwargs.get("stackparser_script"),
+            "output_directory": kwargs.get("output_directory")}
 
 
 def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
@@ -80,10 +82,13 @@ class SystemWebViewShell(ChromeAndroidBrowserBase):
     def __init__(self, logger, binary, webdriver_binary="chromedriver",
                  remote_queue=None,
                  device_serial=None,
-                 webdriver_args=None):
+                 webdriver_args=None,
+                 stackparser_script=None,
+                 output_directory=None):
         """Creates a new representation of Chrome.  The `binary` argument gives
         the browser binary to use for testing."""
         super(SystemWebViewShell, self).__init__(logger,
-                webdriver_binary, remote_queue, device_serial, webdriver_args)
+                webdriver_binary, remote_queue, device_serial,
+                webdriver_args, stackparser_script, output_directory)
         self.binary = binary
         self.wptserver_ports = _wptserve_ports
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/base.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/base.py
index dd6621cb72b..f7388ad7e6f 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/base.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/base.py
@@ -162,6 +162,10 @@ class Browser(object):
         with which it should be instantiated"""
         return ExecutorBrowser, {}
 
+    def maybe_parse_tombstone(self):
+        """Possibly parse tombstones on Android device for Android target"""
+        pass
+
     def check_crash(self, process, test):
         """Check if a crash occured and output any useful information to the
         log. Returns a boolean indicating whether a crash occured."""
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_android.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
index 178183b4028..7580bedddb0 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/chrome_android.py
@@ -34,7 +34,9 @@ def browser_kwargs(logger, test_type, run_info_data, config, **kwargs):
     return {"package_name": kwargs["package_name"],
             "device_serial": kwargs["device_serial"],
             "webdriver_binary": kwargs["webdriver_binary"],
-            "webdriver_args": kwargs.get("webdriver_args")}
+            "webdriver_args": kwargs.get("webdriver_args"),
+            "stackparser_script": kwargs.get("stackparser_script"),
+            "output_directory": kwargs.get("output_directory")}
 
 
 def executor_kwargs(logger, test_type, server_config, cache_manager, run_info_data,
@@ -123,9 +125,14 @@ class ChromeAndroidBrowserBase(Browser):
     def __init__(self, logger,
                  webdriver_binary="chromedriver",
                  remote_queue = None,
-                 device_serial=None, webdriver_args=None):
+                 device_serial=None,
+                 webdriver_args=None,
+                 stackparser_script=None,
+                 output_directory=None):
         super(ChromeAndroidBrowserBase, self).__init__(logger)
         self.device_serial = device_serial
+        self.stackparser_script = stackparser_script
+        self.output_directory = output_directory
         self.remote_queue = remote_queue
         self.server = ChromeDriverServer(self.logger,
                                          binary=webdriver_binary,
@@ -182,6 +189,16 @@ class ChromeAndroidBrowserBase(Browser):
         cmd.extend(['logcat', '*:D'])
         return cmd
 
+    def maybe_parse_tombstone(self, logger):
+        if self.stackparser_script:
+            cmd = [self.stackparser_script, "-a", "-w"]
+            if self.device_serial:
+                cmd.extend(["--device", self.device_serial])
+            cmd.extend(["--output-directory", self.output_directory])
+            raw_output = subprocess.check_output(cmd)
+            for line in raw_output.splitlines():
+                logger.process_output("TRACE", line, "logcat")
+
     def setup_adb_reverse(self):
         self._adb_run(['wait-for-device'])
         self._adb_run(['forward', '--remove-all'])
@@ -198,8 +215,12 @@ class ChromeAndroidBrowser(ChromeAndroidBrowserBase):
     def __init__(self, logger, package_name,
                  webdriver_binary="chromedriver",
                  remote_queue = None,
-                 device_serial=None, webdriver_args=None):
+                 device_serial=None,
+                 webdriver_args=None,
+                 stackparser_script=None,
+                 output_directory=None):
         super(ChromeAndroidBrowser, self).__init__(logger,
-                webdriver_binary, remote_queue, device_serial, webdriver_args)
+                webdriver_binary, remote_queue, device_serial,
+                webdriver_args, stackparser_script, output_directory)
         self.package_name = package_name
         self.wptserver_ports = _wptserve_ports
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
index be8acec1c61..e217f8d43d6 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/testrunner.py
@@ -615,6 +615,9 @@ class TestRunnerManager(threading.Thread):
             return
         if self.timer is not None:
             self.timer.cancel()
+
+        self.browser.browser.maybe_parse_tombstone()
+
         # Write the result of each subtest
         file_result, test_results = results
         subtest_unexpected = False
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 29d6fe5070f..7d4074e4b71 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/wptcommandline.py
@@ -185,7 +185,10 @@ scheme host and port.""")
                                  help="Path or url to symbols file used to analyse crash minidumps.")
     debugging_group.add_argument("--stackwalk-binary", action="store", type=abs_path,
                                  help="Path to stackwalker program used to analyse minidumps.")
-
+    debugging_group.add_argument("--output-directory", action="store",
+                                 help="Path to chromium output directory.")
+    debugging_group.add_argument("--stackparser-script", action="store", type=abs_path,
+                                 help="Path to stack parser script used to analyse tombstones.")
     debugging_group.add_argument("--pdb", action="store_true",
                                  help="Drop into pdb on python exception")
 
diff --git a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/utils.py b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/utils.py
index e8b607bd5e0..f1f7dd286bc 100644
--- a/tests/wpt/web-platform-tests/tools/wptserve/wptserve/utils.py
+++ b/tests/wpt/web-platform-tests/tools/wptserve/wptserve/utils.py
@@ -1,5 +1,7 @@
 import socket
-import sys
+
+
+from .logger import get_logger
 
 
 def isomorphic_decode(s):
@@ -154,9 +156,18 @@ def get_port(host=''):
     return port
 
 def http2_compatible():
-    # Currently, the HTTP/2.0 server is only working in python 2.7.10+ or 3.6+ and OpenSSL 1.0.2+
+    # The HTTP/2.0 server requires OpenSSL 1.0.2+ (and Python 3.6+, but WPT
+    # requires that anyway so we don't check that here.)
+    #
+    # For systems using other SSL libraries (e.g. LibreSSL), we assume they
+    # have the necessary support.
     import ssl
+    if not ssl.OPENSSL_VERSION.startswith("OpenSSL"):
+        logger = get_logger()
+        logger.warning(
+            'Skipping HTTP/2.0 compatibility check as system is not using '
+            'OpenSSL (found: %s)' % ssl.OPENSSL_VERSION)
+        return True
+
     ssl_v = ssl.OPENSSL_VERSION_INFO
-    py_v = sys.version_info
-    return (((py_v[0] == 2 and py_v[1] == 7 and py_v[2] >= 10) or (py_v[0] == 3 and py_v[1] >= 6)) and
-        (ssl_v[0] == 1 and (ssl_v[1] == 1 or (ssl_v[1] == 0 and ssl_v[2] >= 2))))
+    return ssl_v[0] == 1 and (ssl_v[1] == 1 or (ssl_v[1] == 0 and ssl_v[2] >= 2))