diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index 3a3d15b8406..6a3af4e2ece 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -37,6 +37,3 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 5931c483b21..fb50280b0fd 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -109585,6 +109585,42 @@
      {}
     ]
    ],
+   "css/css-conditional/at-supports-040.html": [
+    [
+     "/css/css-conditional/at-supports-040.html",
+     [
+      [
+       "/css/css-conditional/at-supports-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-conditional/at-supports-041.html": [
+    [
+     "/css/css-conditional/at-supports-041.html",
+     [
+      [
+       "/css/css-conditional/at-supports-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
+   "css/css-conditional/at-supports-042.html": [
+    [
+     "/css/css-conditional/at-supports-042.html",
+     [
+      [
+       "/css/css-conditional/at-supports-001-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-contain/contain-animation-001.html": [
     [
      "/css/css-contain/contain-animation-001.html",
@@ -113629,6 +113665,18 @@
      {}
     ]
    ],
+   "css/css-display/select-4-option-optgroup-display-none.html": [
+    [
+     "/css/css-display/select-4-option-optgroup-display-none.html",
+     [
+      [
+       "/css/css-display/select-4-option-optgroup-display-none-ref.html",
+       "=="
+      ]
+     ],
+     {}
+    ]
+   ],
    "css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01.xht": [
     [
      "/css/css-exclusions/css3-exclusions/exclusions-wrap-flow-01.xht",
@@ -250328,6 +250376,11 @@
      {}
     ]
    ],
+   "css/css-display/select-4-option-optgroup-display-none-ref.html": [
+    [
+     {}
+    ]
+   ],
    "css/css-display/support/acid.css": [
     [
      {}
@@ -334920,6 +334973,12 @@
      {}
     ]
    ],
+   "css/css-flexbox/flex-minimum-height-flex-items-010.html": [
+    [
+     "/css/css-flexbox/flex-minimum-height-flex-items-010.html",
+     {}
+    ]
+   ],
    "css/css-flexbox/flexbox_first-letter.html": [
     [
      "/css/css-flexbox/flexbox_first-letter.html",
@@ -344212,6 +344271,12 @@
      {}
     ]
    ],
+   "css/cssom-view/screenLeftTop.html": [
+    [
+     "/css/cssom-view/screenLeftTop.html",
+     {}
+    ]
+   ],
    "css/cssom-view/scroll-behavior-default-css.html": [
     [
      "/css/cssom-view/scroll-behavior-default-css.html",
@@ -387818,12 +387883,6 @@
      {}
     ]
    ],
-   "payment-request/PaymentItem/type_member.https.html": [
-    [
-     "/payment-request/PaymentItem/type_member.https.html",
-     {}
-    ]
-   ],
    "payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html": [
     [
      "/payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html",
@@ -480120,7 +480179,7 @@
    "reftest"
   ],
   "css/CSS2/borders/border-top-width-003.xht": [
-   "ca0316bfc5b83f7cade603e88b747b67a88cf763",
+   "f08e1c4fd441234f9a5b8a25001e0add48ed44f5",
    "reftest"
   ],
   "css/CSS2/borders/border-top-width-004.xht": [
@@ -506700,19 +506759,19 @@
    "reftest"
   ],
   "css/CSS2/selectors/default-attribute-selector-005.xht": [
-   "6c5543b25b044f883d08ae77d690f9aa14cb6d58",
+   "3bc507ff3c62c0355ea3151491c1689444f1a4c3",
    "visual"
   ],
   "css/CSS2/selectors/default-attribute-selector-006.xht": [
-   "8cf80bf1d1c643fba4b53905c863bff79f4588aa",
+   "2a71aa0dcd196be2ef557e2fcb2e4e4d566a1027",
    "visual"
   ],
   "css/CSS2/selectors/default-attribute-selector-007.xht": [
-   "b2025e5e24b588ad7b3e3189d78c60084a0f0d00",
+   "ef5dc3495c1bff4162ecc965013ffe54a75b32bd",
    "visual"
   ],
   "css/CSS2/selectors/default-attribute-selector-008.xht": [
-   "8aab5bddf3e69b408325dc09f890c96e948682d0",
+   "8c0de163c802e9d412a6b7d948f38dbe605650cb",
    "visual"
   ],
   "css/CSS2/selectors/descendent-selector-001.xht": [
@@ -533539,6 +533598,18 @@
    "58e7ac2f00da80b9147e9dc7280292267a09ebad",
    "reftest"
   ],
+  "css/css-conditional/at-supports-040.html": [
+   "6c4a58f346baa7b7788dd6be5e5926759c279a82",
+   "reftest"
+  ],
+  "css/css-conditional/at-supports-041.html": [
+   "804fb3c383538bc3959ce51744a6b76e25cb5771",
+   "reftest"
+  ],
+  "css/css-conditional/at-supports-042.html": [
+   "47241f37a35792c554545b3f8f6365afc835b07d",
+   "reftest"
+  ],
   "css/css-conditional/idlharness.html": [
    "410466b25230b246c09cd12d1d13b8ef58786abf",
    "testharness"
@@ -536407,6 +536478,14 @@
    "6f493ba85cbc5082b99e0f7e72283651925fb482",
    "visual"
   ],
+  "css/css-display/select-4-option-optgroup-display-none-ref.html": [
+   "230c8a6d4f00157f934ea3bd1ff1d5090575767f",
+   "support"
+  ],
+  "css/css-display/select-4-option-optgroup-display-none.html": [
+   "a6da3d53c71c87a9774af3403ed9f38fb25f75c6",
+   "reftest"
+  ],
   "css/css-display/support/acid.css": [
    "62d1aca2e5147cb849f8a36d616cf7143e9cf055",
    "support"
@@ -537175,6 +537254,10 @@
    "718386af02069fa1a3fff0ee5aaa10415ef4b23a",
    "testharness"
   ],
+  "css/css-flexbox/flex-minimum-height-flex-items-010.html": [
+   "482c062d8df96d5521b6d763bc27d89ec1698e47",
+   "testharness"
+  ],
   "css/css-flexbox/flex-minimum-width-flex-items-001.xht": [
    "b8e2866edaa46af46900c287238894cd8ddef24c",
    "reftest"
@@ -581483,6 +581566,10 @@
    "7bb944c9d59349b3a25ab14981ae34f5ef991bec",
    "support"
   ],
+  "css/cssom-view/screenLeftTop.html": [
+   "58d868866eb275724c996bdc1a636ff6173d75a9",
+   "testharness"
+  ],
   "css/cssom-view/scroll-behavior-default-css.html": [
    "8606b1f3ed40b49c693213e02df69d088d93b979",
    "testharness"
@@ -581808,7 +581895,7 @@
    "testharness"
   ],
   "css/cssom/CSS.html": [
-   "fd2966a104c0804bc66c0e2b7353d9f03631564d",
+   "7d558f04466ffad77e36f8aaa90abd220a24c27b",
    "testharness"
   ],
   "css/cssom/CSSKeyframeRule.html": [
@@ -595020,7 +595107,7 @@
    "support"
   ],
   "docs/_running-tests/safari.md": [
-   "3ef508d3780aae433100702f03bdac9f33190c62",
+   "1fb5cb02359a9e5ee3e07485b547221ccb7faa1c",
    "support"
   ],
   "docs/_writing-tests/ahem.md": [
@@ -597144,7 +597231,7 @@
    "support"
   ],
   "editing/data/insert-list-items-in-table-cells.js": [
-   "e1c1e15c6bd49c90f4587db1d596c350e19dcd88",
+   "6a4d3985a570dd4acbf182c48d5acce2f2c1a0e1",
    "support"
   ],
   "editing/data/inserthorizontalrule.js": [
@@ -597164,7 +597251,7 @@
    "support"
   ],
   "editing/data/insertorderedlist.js": [
-   "31259552cd170dc50c2d301f69f72474c75849b6",
+   "b4f11ecae308780db49369092eed151a61c65bca",
    "support"
   ],
   "editing/data/insertparagraph.js": [
@@ -598544,11 +598631,11 @@
    "support"
   ],
   "encoding/resources/two-boms-utf-16be.html": [
-   "b8c055b1b9c4b9de56cf7644eab6b4e1b18e1829",
+   "6a5b0a5517fd422b7859f8332416523198aebec0",
    "support"
   ],
   "encoding/resources/two-boms-utf-16le.html": [
-   "8042f33eb34c0147ad6812e2a4620d12ccb7b45d",
+   "535a40d398d3b50bba40269639524022ae0c2fcf",
    "support"
   ],
   "encoding/resources/two-boms-utf-8.html": [
@@ -601620,7 +601707,7 @@
    "testharness"
   ],
   "fetch/sec-metadata/fetch.tentative.https.sub.html": [
-   "12072476bebb693233a4cbffcb71019b1d1d5a91",
+   "d18042ca98b083cb7ebe7b42070afe47daa4b47c",
    "testharness"
   ],
   "fetch/sec-metadata/font.tentative.https.sub.html": [
@@ -601660,7 +601747,7 @@
    "testharness"
   ],
   "fetch/sec-metadata/report.tentative.https.sub.html": [
-   "279836457ebe72354ec68525bd92bc533b11b0dd",
+   "a74da6a7a7d60fcdc35dd32873ea25cf5e356dea",
    "testharness"
   ],
   "fetch/sec-metadata/report.tentative.https.sub.html.sub.headers": [
@@ -601680,7 +601767,7 @@
    "support"
   ],
   "fetch/sec-metadata/resources/helper.js": [
-   "55e36d49fac39e814e10df1629e8b8fec0c8ebef",
+   "037f7e1e1deb929322b26ee5436123a7b24db92f",
    "support"
   ],
   "fetch/sec-metadata/resources/post-to-owner.py": [
@@ -622144,7 +622231,7 @@
    "manual"
   ],
   "input-events/input-events-exec-command.html": [
-   "6c512023296ca54df7357576920c15738ca7e068",
+   "d4dea0859e26e024b363dfcc1ee2ab2d263fb062",
    "testharness"
   ],
   "input-events/input-events-get-target-ranges-manual.html": [
@@ -622480,7 +622567,7 @@
    "support"
   ],
   "interfaces/netinfo.idl": [
-   "191e9567b2d57d0632a998f7de4911d933a08c7b",
+   "6b3d5525a4264990433d8492514d9923445aa41c",
    "support"
   ],
   "interfaces/notifications.idl": [
@@ -622560,7 +622647,7 @@
    "support"
   ],
   "interfaces/reporting.idl": [
-   "e9800365c4c03e9d98990de54bdf0fede7690448",
+   "8e88663a700cdb1cdca490048c63ea1e6023b9dc",
    "support"
   ],
   "interfaces/requestidlecallback.idl": [
@@ -622612,7 +622699,7 @@
    "support"
   ],
   "interfaces/touch-events.idl": [
-   "0bedbf89964f12b55feae4d5e4c9512f71a841cd",
+   "5e341bd7b17be06a615142dbccfad22e3e01fb5f",
    "support"
   ],
   "interfaces/trusted-types.tentative.idl": [
@@ -634499,10 +634586,6 @@
    "edde533be6b2e49415b81ae4df167139117a0d7c",
    "manual"
   ],
-  "payment-request/PaymentItem/type_member.https.html": [
-   "dc62a83f597a0b53c686689fb8f549130982242a",
-   "testharness"
-  ],
   "payment-request/PaymentMethodChangeEvent/methodDetails-attribute.https.html": [
    "ec0aa96dddb46b26617064ab54e9d02e2a588cbb",
    "testharness"
@@ -644596,7 +644679,7 @@
    "support"
   ],
   "resources/test/conftest.py": [
-   "dde9e9dc0a76ab2a34bf45913702ab148b31c2b6",
+   "9f59b3826c42e04943c1b7bc23083ac7ce7415de",
    "support"
   ],
   "resources/test/harness.html": [
@@ -645764,7 +645847,7 @@
    "support"
   ],
   "screen-capture/getdisplaymedia.https.html": [
-   "9b66419cb0a1eb149294419ddd3549e4ba032de5",
+   "f5edab5b7adfb70c15efbdea5014c631277484d4",
    "testharness"
   ],
   "screen-capture/idlharness.window.js": [
@@ -654748,7 +654831,7 @@
    "support"
   ],
   "tools/ci/taskcluster-run.py": [
-   "5a720baa2e9bba12c53a8db898273d7a7a6be4fa",
+   "fc6338ed31f73fc4a40703b0c918a60b0e174e20",
    "support"
   ],
   "tools/ci/tcdownload.py": [
@@ -659468,7 +659551,7 @@
    "support"
   ],
   "tools/wpt/browser.py": [
-   "db64c369d54271d28726da4706a9c8c03f4ee94d",
+   "016b76fce89b510ada5568b72a7df2d4d3398a0d",
    "support"
   ],
   "tools/wpt/commands.json": [
@@ -659492,7 +659575,7 @@
    "support"
   ],
   "tools/wpt/run.py": [
-   "02857ed0b0c6d85b41b5b283b56c1480009367e0",
+   "6f7ad1a53def31e22539295bb0c96ff84b742b45",
    "support"
   ],
   "tools/wpt/testfiles.py": [
@@ -659812,7 +659895,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/servodriver.py": [
-   "d788effc469bc2f582ba7ead65700e7a13c37c59",
+   "1632f8f539ced2807ea7fa89258f6db9ef4eb47c",
    "support"
   ],
   "tools/wptrunner/wptrunner/browsers/webkit.py": [
diff --git a/tests/wpt/metadata/css/CSS2/borders/border-top-width-003.xht.ini b/tests/wpt/metadata/css/CSS2/borders/border-top-width-003.xht.ini
deleted file mode 100644
index 3db77eeab9f..00000000000
--- a/tests/wpt/metadata/css/CSS2/borders/border-top-width-003.xht.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[border-top-width-003.xht]
-  type: reftest
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-conditional/at-supports-040.html.ini b/tests/wpt/metadata/css/css-conditional/at-supports-040.html.ini
new file mode 100644
index 00000000000..6869e67b552
--- /dev/null
+++ b/tests/wpt/metadata/css/css-conditional/at-supports-040.html.ini
@@ -0,0 +1,2 @@
+[at-supports-040.html]
+  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-flexbox/flex-minimum-height-flex-items-010.html.ini b/tests/wpt/metadata/css/css-flexbox/flex-minimum-height-flex-items-010.html.ini
new file mode 100644
index 00000000000..ffe22ce6e37
--- /dev/null
+++ b/tests/wpt/metadata/css/css-flexbox/flex-minimum-height-flex-items-010.html.ini
@@ -0,0 +1,7 @@
+[flex-minimum-height-flex-items-010.html]
+  [.container 2]
+    expected: FAIL
+
+  [.container 1]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/screenLeftTop.html.ini b/tests/wpt/metadata/css/cssom-view/screenLeftTop.html.ini
new file mode 100644
index 00000000000..85c52d31302
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom-view/screenLeftTop.html.ini
@@ -0,0 +1,7 @@
+[screenLeftTop.html]
+  [screenTop]
+    expected: FAIL
+
+  [screenLeft]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom/CSS.html.ini b/tests/wpt/metadata/css/cssom/CSS.html.ini
new file mode 100644
index 00000000000..279da1f4d89
--- /dev/null
+++ b/tests/wpt/metadata/css/cssom/CSS.html.ini
@@ -0,0 +1,4 @@
+[CSS.html]
+  [CSS.supports, selector function]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/cross-origin-resource-policy/fetch-in-iframe.html.ini b/tests/wpt/metadata/fetch/cross-origin-resource-policy/fetch-in-iframe.html.ini
index 3951cd266d5..0d630fb814a 100644
--- a/tests/wpt/metadata/fetch/cross-origin-resource-policy/fetch-in-iframe.html.ini
+++ b/tests/wpt/metadata/fetch/cross-origin-resource-policy/fetch-in-iframe.html.ini
@@ -1,4 +1,5 @@
 [fetch-in-iframe.html]
+  expected: CRASH
   [Untitled]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/sec-metadata/report.tentative.https.sub.html.ini b/tests/wpt/metadata/fetch/sec-metadata/report.tentative.https.sub.html.ini
deleted file mode 100644
index 6673e91722b..00000000000
--- a/tests/wpt/metadata/fetch/sec-metadata/report.tentative.https.sub.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[report.tentative.https.sub.html]
-  expected: TIMEOUT
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/history/the-history-interface/traverse_the_history_5.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
new file mode 100644
index 00000000000..dc2e45516de
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_5.html]
+  [Multiple history traversals, last would be aborted]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
index 29b0025a2ae..bed3bccce25 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/environment-changes/viewport-change.html.ini
@@ -11,5 +11,5 @@
     expected: TIMEOUT
 
   [picture: source (max-width:500px) valid image, img valid image, resize to narrow]
-    expected: TIMEOUT
+    expected: FAIL
 
diff --git a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini b/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
deleted file mode 100644
index 9e522297c94..00000000000
--- a/tests/wpt/metadata/html/semantics/interactive-elements/the-details-element/toggleEvent.html.ini
+++ /dev/null
@@ -1,7 +0,0 @@
-[toggleEvent.html]
-  [Calling open twice on 'details' fires only one toggle event]
-    expected: FAIL
-
-  [Setting open=true to opened 'details' element should not fire a toggle event at the 'details' element]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
index 2314441517b..25f0d603b3d 100644
--- a/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
+++ b/tests/wpt/metadata/html/webappapis/dynamic-markup-insertion/opening-the-input-stream/bailout-exception-vs-return-xml.window.js.ini
@@ -9,6 +9,3 @@
   [document.open should throw an InvalidStateError with XML document even when the ignore-opens-during-unload counter is greater than 0 (during pagehide event)]
     expected: FAIL
 
-  [document.open should throw an InvalidStateError with XML document even when there is an active parser executing script]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini
deleted file mode 100644
index c7e9c7434f5..00000000000
--- a/tests/wpt/metadata/quirks/unitless-length/limited-quirks.html.ini
+++ /dev/null
@@ -1,283 +0,0 @@
-[limited-quirks.html]
-  [top: -\\31 .5]
-    expected: FAIL
-
-  [bottom: -1A]
-    expected: FAIL
-
-  [bottom: -1a]
-    expected: FAIL
-
-  [top: @1]
-    expected: FAIL
-
-  [top: "1a"]
-    expected: FAIL
-
-  [top: @a]
-    expected: FAIL
-
-  [bottom: "1"]
-    expected: FAIL
-
-  [bottom: -/**/1]
-    expected: FAIL
-
-  [top: +/**/1]
-    expected: FAIL
-
-  [bottom: @1a]
-    expected: FAIL
-
-  [top: 1\\31 ]
-    expected: FAIL
-
-  [top: url('1')]
-    expected: FAIL
-
-  [bottom: -\\31 ]
-    expected: FAIL
-
-  [top: calc(1)]
-    expected: FAIL
-
-  [top: \\31 ]
-    expected: FAIL
-
-  [bottom: +1\\31 ]
-    expected: FAIL
-
-  [bottom: 1\\31 .5]
-    expected: FAIL
-
-  [bottom: #0001]
-    expected: FAIL
-
-  [top: calc(2 * 2px)]
-    expected: FAIL
-
-  [bottom: 1a]
-    expected: FAIL
-
-  [bottom: A]
-    expected: FAIL
-
-  [bottom: #01]
-    expected: FAIL
-
-  [top: +\\31 .5]
-    expected: FAIL
-
-  [bottom: #1]
-    expected: FAIL
-
-  [top: -/**/1]
-    expected: FAIL
-
-  [bottom: +\\31 .5]
-    expected: FAIL
-
-  [bottom: \\31 ]
-    expected: FAIL
-
-  [bottom: calc(1)]
-    expected: FAIL
-
-  [top: #001]
-    expected: FAIL
-
-  [top: +\\31 ]
-    expected: FAIL
-
-  [bottom: +\\31 ]
-    expected: FAIL
-
-  [top: +1.5]
-    expected: FAIL
-
-  [top: +1\\31 ]
-    expected: FAIL
-
-  [bottom: @a]
-    expected: FAIL
-
-  [bottom: @1]
-    expected: FAIL
-
-  [top: #1]
-    expected: FAIL
-
-  [top: 1a]
-    expected: FAIL
-
-  [bottom: +1a]
-    expected: FAIL
-
-  [bottom: +1A]
-    expected: FAIL
-
-  [bottom: "a"]
-    expected: FAIL
-
-  [top: #00001]
-    expected: FAIL
-
-  [bottom: -1\\31 .5]
-    expected: FAIL
-
-  [top: "1"]
-    expected: FAIL
-
-  [bottom: 1.5]
-    expected: FAIL
-
-  [bottom: -\\31 .5]
-    expected: FAIL
-
-  [bottom: url('1')]
-    expected: FAIL
-
-  [bottom: -1.5]
-    expected: FAIL
-
-  [top: \\31 .5]
-    expected: FAIL
-
-  [bottom: "1a"]
-    expected: FAIL
-
-  [bottom: calc(2 * 2px)]
-    expected: FAIL
-
-  [bottom: +1\\31 .5]
-    expected: FAIL
-
-  [bottom: 1\\31 ]
-    expected: FAIL
-
-  [bottom: +/**/1]
-    expected: FAIL
-
-  [bottom: #00001]
-    expected: FAIL
-
-  [top: url(1)]
-    expected: FAIL
-
-  [bottom: #001]
-    expected: FAIL
-
-  [top: +1\\31 .5]
-    expected: FAIL
-
-  [top: -1a]
-    expected: FAIL
-
-  [top: -1A]
-    expected: FAIL
-
-  [bottom: url(1)]
-    expected: FAIL
-
-  [top: a]
-    expected: FAIL
-
-  [top: A]
-    expected: FAIL
-
-  [top: #000001]
-    expected: FAIL
-
-  [top: 1]
-    expected: FAIL
-
-  [top: 1\\31 .5]
-    expected: FAIL
-
-  [bottom: a]
-    expected: FAIL
-
-  [bottom: 1]
-    expected: FAIL
-
-  [bottom: +1]
-    expected: FAIL
-
-  [bottom: #000001]
-    expected: FAIL
-
-  [bottom: +a]
-    expected: FAIL
-
-  [bottom: +A]
-    expected: FAIL
-
-  [top: 1.5]
-    expected: FAIL
-
-  [top: +A]
-    expected: FAIL
-
-  [top: +a]
-    expected: FAIL
-
-  [top: +1]
-    expected: FAIL
-
-  [top: -1.5]
-    expected: FAIL
-
-  [top: -1\\31 .5]
-    expected: FAIL
-
-  [top: +1a]
-    expected: FAIL
-
-  [top: +1A]
-    expected: FAIL
-
-  [top: @1a]
-    expected: FAIL
-
-  [bottom: \\31 .5]
-    expected: FAIL
-
-  [top: "a"]
-    expected: FAIL
-
-  [top: #01]
-    expected: FAIL
-
-  [bottom: +1.5]
-    expected: FAIL
-
-  [bottom: -A]
-    expected: FAIL
-
-  [bottom: -a]
-    expected: FAIL
-
-  [bottom: -1\\31 ]
-    expected: FAIL
-
-  [top: #0001]
-    expected: FAIL
-
-  [bottom: -1]
-    expected: FAIL
-
-  [top: -\\31 ]
-    expected: FAIL
-
-  [top: -A]
-    expected: FAIL
-
-  [top: -a]
-    expected: FAIL
-
-  [top: -1]
-    expected: FAIL
-
-  [top: -1\\31 ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini
deleted file mode 100644
index 818a429ed39..00000000000
--- a/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini
+++ /dev/null
@@ -1,283 +0,0 @@
-[no-quirks.html]
-  [top: -\\31 .5]
-    expected: FAIL
-
-  [bottom: -1A]
-    expected: FAIL
-
-  [bottom: -1a]
-    expected: FAIL
-
-  [top: @1]
-    expected: FAIL
-
-  [top: "1a"]
-    expected: FAIL
-
-  [top: @a]
-    expected: FAIL
-
-  [bottom: "1"]
-    expected: FAIL
-
-  [bottom: -/**/1]
-    expected: FAIL
-
-  [top: +/**/1]
-    expected: FAIL
-
-  [bottom: @1a]
-    expected: FAIL
-
-  [top: 1\\31 ]
-    expected: FAIL
-
-  [top: url('1')]
-    expected: FAIL
-
-  [bottom: -\\31 ]
-    expected: FAIL
-
-  [top: calc(1)]
-    expected: FAIL
-
-  [top: \\31 ]
-    expected: FAIL
-
-  [bottom: +1\\31 ]
-    expected: FAIL
-
-  [bottom: 1\\31 .5]
-    expected: FAIL
-
-  [bottom: #0001]
-    expected: FAIL
-
-  [top: calc(2 * 2px)]
-    expected: FAIL
-
-  [bottom: 1a]
-    expected: FAIL
-
-  [bottom: A]
-    expected: FAIL
-
-  [bottom: #01]
-    expected: FAIL
-
-  [top: +\\31 .5]
-    expected: FAIL
-
-  [bottom: #1]
-    expected: FAIL
-
-  [top: -/**/1]
-    expected: FAIL
-
-  [bottom: +\\31 .5]
-    expected: FAIL
-
-  [bottom: \\31 ]
-    expected: FAIL
-
-  [bottom: calc(1)]
-    expected: FAIL
-
-  [top: #001]
-    expected: FAIL
-
-  [top: +\\31 ]
-    expected: FAIL
-
-  [bottom: +\\31 ]
-    expected: FAIL
-
-  [top: +1.5]
-    expected: FAIL
-
-  [top: +1\\31 ]
-    expected: FAIL
-
-  [bottom: @a]
-    expected: FAIL
-
-  [bottom: @1]
-    expected: FAIL
-
-  [top: #1]
-    expected: FAIL
-
-  [top: 1a]
-    expected: FAIL
-
-  [bottom: +1a]
-    expected: FAIL
-
-  [bottom: +1A]
-    expected: FAIL
-
-  [bottom: "a"]
-    expected: FAIL
-
-  [top: #00001]
-    expected: FAIL
-
-  [bottom: -1\\31 .5]
-    expected: FAIL
-
-  [top: "1"]
-    expected: FAIL
-
-  [bottom: 1.5]
-    expected: FAIL
-
-  [bottom: -\\31 .5]
-    expected: FAIL
-
-  [bottom: url('1')]
-    expected: FAIL
-
-  [bottom: -1.5]
-    expected: FAIL
-
-  [top: \\31 .5]
-    expected: FAIL
-
-  [bottom: "1a"]
-    expected: FAIL
-
-  [bottom: calc(2 * 2px)]
-    expected: FAIL
-
-  [bottom: +1\\31 .5]
-    expected: FAIL
-
-  [bottom: 1\\31 ]
-    expected: FAIL
-
-  [bottom: +/**/1]
-    expected: FAIL
-
-  [bottom: #00001]
-    expected: FAIL
-
-  [top: url(1)]
-    expected: FAIL
-
-  [bottom: #001]
-    expected: FAIL
-
-  [top: +1\\31 .5]
-    expected: FAIL
-
-  [top: -1a]
-    expected: FAIL
-
-  [top: -1A]
-    expected: FAIL
-
-  [bottom: url(1)]
-    expected: FAIL
-
-  [top: a]
-    expected: FAIL
-
-  [top: A]
-    expected: FAIL
-
-  [top: #000001]
-    expected: FAIL
-
-  [top: 1]
-    expected: FAIL
-
-  [top: 1\\31 .5]
-    expected: FAIL
-
-  [bottom: a]
-    expected: FAIL
-
-  [bottom: 1]
-    expected: FAIL
-
-  [bottom: +1]
-    expected: FAIL
-
-  [bottom: #000001]
-    expected: FAIL
-
-  [bottom: +a]
-    expected: FAIL
-
-  [bottom: +A]
-    expected: FAIL
-
-  [top: 1.5]
-    expected: FAIL
-
-  [top: +A]
-    expected: FAIL
-
-  [top: +a]
-    expected: FAIL
-
-  [top: +1]
-    expected: FAIL
-
-  [top: -1.5]
-    expected: FAIL
-
-  [top: -1\\31 .5]
-    expected: FAIL
-
-  [top: +1a]
-    expected: FAIL
-
-  [top: +1A]
-    expected: FAIL
-
-  [top: @1a]
-    expected: FAIL
-
-  [bottom: \\31 .5]
-    expected: FAIL
-
-  [top: "a"]
-    expected: FAIL
-
-  [top: #01]
-    expected: FAIL
-
-  [bottom: +1.5]
-    expected: FAIL
-
-  [bottom: -A]
-    expected: FAIL
-
-  [bottom: -a]
-    expected: FAIL
-
-  [bottom: -1\\31 ]
-    expected: FAIL
-
-  [top: #0001]
-    expected: FAIL
-
-  [bottom: -1]
-    expected: FAIL
-
-  [top: -\\31 ]
-    expected: FAIL
-
-  [top: -A]
-    expected: FAIL
-
-  [top: -a]
-    expected: FAIL
-
-  [top: -1]
-    expected: FAIL
-
-  [top: -1\\31 ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/quirks/unitless-length/quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/quirks.html.ini
deleted file mode 100644
index 2ed601c6ff4..00000000000
--- a/tests/wpt/metadata/quirks/unitless-length/quirks.html.ini
+++ /dev/null
@@ -1,283 +0,0 @@
-[quirks.html]
-  [top: -\\31 .5]
-    expected: FAIL
-
-  [bottom: -1A]
-    expected: FAIL
-
-  [bottom: -1a]
-    expected: FAIL
-
-  [top: @1]
-    expected: FAIL
-
-  [top: "1a"]
-    expected: FAIL
-
-  [top: @a]
-    expected: FAIL
-
-  [bottom: "1"]
-    expected: FAIL
-
-  [bottom: -/**/1]
-    expected: FAIL
-
-  [top: +/**/1]
-    expected: FAIL
-
-  [bottom: @1a]
-    expected: FAIL
-
-  [top: 1\\31 ]
-    expected: FAIL
-
-  [top: url('1')]
-    expected: FAIL
-
-  [bottom: -\\31 ]
-    expected: FAIL
-
-  [top: calc(1)]
-    expected: FAIL
-
-  [top: \\31 ]
-    expected: FAIL
-
-  [bottom: +1\\31 ]
-    expected: FAIL
-
-  [bottom: 1\\31 .5]
-    expected: FAIL
-
-  [bottom: #0001]
-    expected: FAIL
-
-  [top: calc(2 * 2px)]
-    expected: FAIL
-
-  [bottom: 1a]
-    expected: FAIL
-
-  [bottom: A]
-    expected: FAIL
-
-  [bottom: #01]
-    expected: FAIL
-
-  [top: +\\31 .5]
-    expected: FAIL
-
-  [bottom: #1]
-    expected: FAIL
-
-  [top: -/**/1]
-    expected: FAIL
-
-  [bottom: +\\31 .5]
-    expected: FAIL
-
-  [bottom: \\31 ]
-    expected: FAIL
-
-  [bottom: calc(1)]
-    expected: FAIL
-
-  [top: #001]
-    expected: FAIL
-
-  [top: +\\31 ]
-    expected: FAIL
-
-  [bottom: +\\31 ]
-    expected: FAIL
-
-  [top: +1.5]
-    expected: FAIL
-
-  [top: +1\\31 ]
-    expected: FAIL
-
-  [bottom: @a]
-    expected: FAIL
-
-  [bottom: @1]
-    expected: FAIL
-
-  [top: #1]
-    expected: FAIL
-
-  [top: 1a]
-    expected: FAIL
-
-  [bottom: +1a]
-    expected: FAIL
-
-  [bottom: +1A]
-    expected: FAIL
-
-  [bottom: "a"]
-    expected: FAIL
-
-  [top: #00001]
-    expected: FAIL
-
-  [bottom: -1\\31 .5]
-    expected: FAIL
-
-  [top: "1"]
-    expected: FAIL
-
-  [bottom: 1.5]
-    expected: FAIL
-
-  [bottom: -\\31 .5]
-    expected: FAIL
-
-  [bottom: url('1')]
-    expected: FAIL
-
-  [bottom: -1.5]
-    expected: FAIL
-
-  [top: \\31 .5]
-    expected: FAIL
-
-  [bottom: "1a"]
-    expected: FAIL
-
-  [bottom: calc(2 * 2px)]
-    expected: FAIL
-
-  [bottom: +1\\31 .5]
-    expected: FAIL
-
-  [bottom: 1\\31 ]
-    expected: FAIL
-
-  [bottom: +/**/1]
-    expected: FAIL
-
-  [bottom: #00001]
-    expected: FAIL
-
-  [top: url(1)]
-    expected: FAIL
-
-  [bottom: #001]
-    expected: FAIL
-
-  [top: +1\\31 .5]
-    expected: FAIL
-
-  [top: -1a]
-    expected: FAIL
-
-  [top: -1A]
-    expected: FAIL
-
-  [bottom: url(1)]
-    expected: FAIL
-
-  [top: a]
-    expected: FAIL
-
-  [top: A]
-    expected: FAIL
-
-  [top: #000001]
-    expected: FAIL
-
-  [top: 1]
-    expected: FAIL
-
-  [top: 1\\31 .5]
-    expected: FAIL
-
-  [bottom: a]
-    expected: FAIL
-
-  [bottom: 1]
-    expected: FAIL
-
-  [bottom: +1]
-    expected: FAIL
-
-  [bottom: #000001]
-    expected: FAIL
-
-  [bottom: +a]
-    expected: FAIL
-
-  [bottom: +A]
-    expected: FAIL
-
-  [top: 1.5]
-    expected: FAIL
-
-  [top: +A]
-    expected: FAIL
-
-  [top: +a]
-    expected: FAIL
-
-  [top: +1]
-    expected: FAIL
-
-  [top: -1.5]
-    expected: FAIL
-
-  [top: -1\\31 .5]
-    expected: FAIL
-
-  [top: +1a]
-    expected: FAIL
-
-  [top: +1A]
-    expected: FAIL
-
-  [top: @1a]
-    expected: FAIL
-
-  [bottom: \\31 .5]
-    expected: FAIL
-
-  [top: "a"]
-    expected: FAIL
-
-  [top: #01]
-    expected: FAIL
-
-  [bottom: +1.5]
-    expected: FAIL
-
-  [bottom: -A]
-    expected: FAIL
-
-  [bottom: -a]
-    expected: FAIL
-
-  [bottom: -1\\31 ]
-    expected: FAIL
-
-  [top: #0001]
-    expected: FAIL
-
-  [bottom: -1]
-    expected: FAIL
-
-  [top: -\\31 ]
-    expected: FAIL
-
-  [top: -A]
-    expected: FAIL
-
-  [top: -a]
-    expected: FAIL
-
-  [top: -1]
-    expected: FAIL
-
-  [top: -1\\31 ]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/touch-events/idlharness.window.js.ini b/tests/wpt/metadata/touch-events/idlharness.window.js.ini
index 83161979656..d47a18855a9 100644
--- a/tests/wpt/metadata/touch-events/idlharness.window.js.ini
+++ b/tests/wpt/metadata/touch-events/idlharness.window.js.ini
@@ -191,3 +191,6 @@
   [HTMLElement interface: attribute ontouchcancel]
     expected: FAIL
 
+  [idl_test setup]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
index 76bfc4275da..fc5f2d2c42b 100644
--- a/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
+++ b/tests/wpt/metadata/url/urlencoded-parser.any.js.ini
@@ -11,23 +11,29 @@
   [response.formData() with input: _charset_=windows-1252&test=%C2x]
     expected: FAIL
 
-  [request.formData() with input: a=b&c=d&]
+  [response.formData() with input: a&b&c]
+    expected: FAIL
+
+  [response.formData() with input: a=b&c=d]
     expected: FAIL
 
 
 [urlencoded-parser.any.worker.html]
-  [response.formData() with input: a=b&c=d&]
-    expected: FAIL
-
   [request.formData() with input: a=b&c=d]
     expected: FAIL
 
   [request.formData() with input: a=b&c=d&]
     expected: FAIL
 
-  [response.formData() with input: a&b&c]
-    expected: FAIL
-
   [request.formData() with input: a&b&c]
     expected: FAIL
 
+  [request.formData() with input: &&&a=b&&&&c=d&]
+    expected: FAIL
+
+  [request.formData() with input: _charset_=windows-1252&test=%C2x]
+    expected: FAIL
+
+  [response.formData() with input: a=b&c=d]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-003.xht b/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-003.xht
index ca0316bfc5b..f08e1c4fd44 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-003.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/borders/border-top-width-003.xht
@@ -25,7 +25,7 @@
         </style>
     </head>
     <body>
-        <p>Test passes if there is a wide and thin horizontal black line and <strong>no red</strong></p>
+        <p>Test passes if there is a wide and thin horizontal black line and <strong>no red</strong>.</p>
         <div id="wrapper">
             <div id="test"></div>
         </div>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-005.xht b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-005.xht
index 6c5543b25b0..3bc507ff3c6 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-005.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-005.xht
@@ -22,7 +22,7 @@
 
  <body>
 
-  <p>Test passes if there is a green stripe and <strong>no red</strong></p>
+  <p>Test passes if there is a green stripe and <strong>no red</strong>.</p>
 
   <p><a>&nbsp; &nbsp;&nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
   &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;</a></p>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-006.xht b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-006.xht
index 8cf80bf1d1c..2a71aa0dcd1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-006.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-006.xht
@@ -22,7 +22,7 @@
 
  <body>
 
-  <p>Test passes if there is a green bar across the page and <strong>no red</strong></p>
+  <p>Test passes if there is a green bar across the page and <strong>no red</strong>.</p>
 
   <form action="">
    <p>&nbsp;</p>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-007.xht b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-007.xht
index b2025e5e24b..ef5dc3495c1 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-007.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-007.xht
@@ -29,7 +29,7 @@
 
  <body>
 
-  <p>Test passes if there is a green square and <strong>no red</strong></p>
+  <p>Test passes if there is a green square and <strong>no red</strong>.</p>
 
   <form action="">
    <p><input></input></p>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-008.xht b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-008.xht
index 8aab5bddf3e..8c0de163c80 100644
--- a/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-008.xht
+++ b/tests/wpt/web-platform-tests/css/CSS2/selectors/default-attribute-selector-008.xht
@@ -29,7 +29,7 @@
 
  <body>
 
-  <p>Test passes if there is a green square and <strong>no red</strong></p>
+  <p>Test passes if there is a green square and <strong>no red</strong>.</p>
 
   <form action="">
    <p><button>&nbsp;</button></p>
diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-040.html b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-040.html
new file mode 100644
index 00000000000..6c4a58f346b
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-040.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<title>CSS Conditional Test: @supports selector() with pseudo-elements.</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="help" href="https://drafts.csswg.org/css-conditional/#at-supports">
+<link rel="match" href="at-supports-001-ref.html">
+<style>
+  div {
+    background-color:red;
+    height:100px;
+    width:100px;
+  }
+  @supports selector(::before) {
+    div { background: green };
+  }
+</style>
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-041.html b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-041.html
new file mode 100644
index 00000000000..804fb3c3835
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-041.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<title>CSS Conditional Test: @supports selector() with -webkit- unknown pseudo-elements and negation.</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="help" href="https://drafts.csswg.org/css-conditional/#at-supports">
+<link rel="match" href="at-supports-001-ref.html">
+<style>
+  div {
+    background-color:red;
+    height:100px;
+    width:100px;
+  }
+  @supports not selector(::-webkit-unknown-pseudo) {
+    div { background: green };
+  }
+</style>
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-conditional/at-supports-042.html b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-042.html
new file mode 100644
index 00000000000..47241f37a35
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-conditional/at-supports-042.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<title>CSS Conditional Test: @supports selector() with multiple selectors doesn't work.</title>
+<link rel="author" title="Emilio Cobos Álvarez" href="mailto:emilio@crisal.io">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="help" href="https://drafts.csswg.org/css-conditional/#at-supports">
+<link rel="match" href="at-supports-001-ref.html">
+<style>
+  div {
+    background-color: green;
+    height: 100px;
+    width: 100px;
+  }
+  @supports selector(div, div) {
+    div { background: red };
+  }
+</style>
+<p>Test passes if there is a <strong>filled green square</strong> and <strong>no red</strong>.</p>
+<div></div>
diff --git a/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none-ref.html b/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none-ref.html
new file mode 100644
index 00000000000..230c8a6d4f0
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none-ref.html
@@ -0,0 +1,41 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>Reference: display:none on OPTION and OPTGROUP</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+  <style>
+
+.none { display:none; }
+.contents { display:contents; }
+.red { color: red; }
+.green { color: green; }
+
+select { -webkit-appearance: none; }
+
+  </style>
+</head>
+<body>
+
+<pre>FAIL if there is any red color</pre>
+
+<optgroup></optgroup>
+<optgroup class="contents red"></optgroup>
+<optgroup class="contents green" label="optgroup"></optgroup>
+
+<br>
+
+<select class="red" size="4"></select>
+<select size="4" class="red"></select>
+<select size="4" class="red"></select>
+<select size="4" class="red"><optgroup></select>
+<select size="4"></select>
+<select size="4" class="red"></select>
+<select size="4" class="red"></select>
+<select size="4" class="red"></select>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none.html b/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none.html
new file mode 100644
index 00000000000..a6da3d53c71
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-display/select-4-option-optgroup-display-none.html
@@ -0,0 +1,48 @@
+<!DOCTYPE HTML>
+<!--
+     Any copyright is dedicated to the Public Domain.
+     http://creativecommons.org/publicdomain/zero/1.0/
+-->
+<html><head>
+  <meta charset="utf-8">
+  <title>CSS Test: display:none on OPTION and OPTGROUP</title>
+  <link rel="author" title="Mats Palmgren" href="mailto:mats@mozilla.com">
+  <link rel="help" href="https://drafts.csswg.org/css-display-3/#valdef-display-none">
+  <link rel="match" href="select-4-option-optgroup-display-none-ref.html">
+  <style>
+
+.none { display:none; }
+.contents { display:contents; }
+.red { color: red; }
+.green { color: green; }
+
+select { -webkit-appearance: none; }
+
+  </style>
+</head>
+<body>
+
+<pre>FAIL if there is any red color</pre>
+
+<option class="none red">text</option>
+<optgroup class="none red">text</optgroup>
+
+<optgroup class="none red"><option>option</option></optgroup>
+<optgroup><option class="none red">option</option></optgroup>
+<optgroup class="contents red"><option class="none">option</option></optgroup>
+<optgroup class="contents green" label="optgroup"><option class="none red">option</option></optgroup>
+<optgroup class="none red" label="optgroup"><option class="red">option</option></optgroup>
+
+<br>
+
+<select class="red" size="4">select</select>
+<select size="4" class="red"><optgroup class="none" label="optgroup"></select>
+<select size="4" class="red"><option class="none">option</select>
+<select size="4" class="red"><optgroup><option class="none">option</select>
+<select size="4"><optgroup class="none"><option class="green">option</select>
+<select size="4" class="red"><optgroup class="none green" label="optgroup"><option>option</select>
+<select size="4" class="red"><optgroup class="none"><option class="none">option</select>
+<select size="4" class="red"><optgroup class="none green" label="optgroup"><option class="none">option</select>
+
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-010.html b/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-010.html
new file mode 100644
index 00000000000..482c062d8df
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/css-flexbox/flex-minimum-height-flex-items-010.html
@@ -0,0 +1,64 @@
+<!DOCTYPE html>
+<title>Tests correct handling of min-height: min-content with dynamic changes</title>
+<link rel="help" href="https://www.w3.org/TR/css-flexbox-1/#resolve-flexible-lengths" title="4.5. Implied Minimum Size of Flex Items" />
+<link rel="author" title="Google Inc." href="http://www.google.com/">
+<link href="support/flexbox.css" rel="stylesheet">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/resources/check-layout-th.js"></script>
+<style>
+.container {
+  height: 300px;
+  outline: 2px solid black;
+}
+
+.inner
+{
+  width: 400px;
+  flex: 1;
+  background-color: green;
+}
+#container2 .flexbox > * { flex-basis: 0; }
+#container2 .column > * { flex-basis: auto; }
+.container .flexbox { min-height: min-content; }
+.container > .flexbox { min-height: 0; }
+</style>
+<script>
+function change() {
+  var container = document.getElementById('container');
+  container.offsetHeight;
+  container.style.height = '80px';
+  container = document.getElementById('container2');
+  container.offsetHeight;
+  container.style.height = '80px';
+  checkLayout('.container');
+}
+</script>
+<body onload="change()">
+<p>Green rectangle should be entirely within the black rectangle</p>
+<div id="log"></div>
+<div id="container" class="container">
+  <div class="flexbox column" style="height: 100%;">
+    <div class="flexbox flex-one">
+        <div class="flexbox column">
+          <div class="flexbox column flex-one">
+            <div class="inner" data-expected-height="80">
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</div>
+
+<div id="container2" class="container">
+  <div class="flexbox column" style="height: 100%;">
+    <div class="flexbox flex-one">
+        <div class="flexbox column">
+          <div class="flexbox column flex-one">
+            <div class="inner" data-expected-height="80">
+            </div>
+          </div>
+        </div>
+    </div>
+  </div>
+</div>
diff --git a/tests/wpt/web-platform-tests/css/cssom-view/screenLeftTop.html b/tests/wpt/web-platform-tests/css/cssom-view/screenLeftTop.html
new file mode 100644
index 00000000000..58d868866eb
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/cssom-view/screenLeftTop.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-window-screenleft">
+<link rel="help" href="https://drafts.csswg.org/cssom-view/#dom-window-screentop">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+test(() => {
+  assert_equals(typeof window.screenLeft, "number", "screenLeft type");
+  assert_equals(window.screenLeft, window.screenX, "alias of screenX");
+}, "screenLeft");
+
+test(() => {
+  assert_equals(typeof window.screenTop, "number", "screenTop type");
+  assert_equals(window.screenTop, window.screenY, "alias of screenY");
+}, "screenTop");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/cssom/CSS.html b/tests/wpt/web-platform-tests/css/cssom/CSS.html
index fd2966a104c..7d558f04466 100644
--- a/tests/wpt/web-platform-tests/css/cssom/CSS.html
+++ b/tests/wpt/web-platform-tests/css/cssom/CSS.html
@@ -35,4 +35,12 @@
         assert_equals(CSS.supports("width", "blah"), false, "CSS.supports: two argument form fails for invalid value");
         assert_equals(CSS.supports("--foo", "blah"), true, "CSS.supports: two argument form succeeds for custom property");
     }, "CSS.supports, two argument form");
+    test(function () {
+        assert_equals(CSS.supports("selector(div)"), true, "CSS.supports: selector() function accepts a selector");
+        assert_equals(CSS.supports("selector(div, div)"), false, "CSS.supports: selector() function doesn't accept a selector list");
+        assert_equals(CSS.supports("selector(::-webkit-unknown-pseudo-element)"), false, "CSS.supports: selector() function rejects unknown webkit pseudo-elements.");
+        assert_equals(CSS.supports("selector(::before)"), true, "CSS.supports: selector() function accepts known pseudo-elements");
+        assert_equals(CSS.supports("selector(div + .c)"), true, "CSS.supports: selector() with simple combinators");
+        assert_equals(CSS.supports("selector(div | .c)"), false, "CSS.supports: selector() with unknown combinators");
+    }, "CSS.supports, selector function");
 </script>
diff --git a/tests/wpt/web-platform-tests/docs/_running-tests/safari.md b/tests/wpt/web-platform-tests/docs/_running-tests/safari.md
index 3ef508d3780..1fb5cb02359 100644
--- a/tests/wpt/web-platform-tests/docs/_running-tests/safari.md
+++ b/tests/wpt/web-platform-tests/docs/_running-tests/safari.md
@@ -12,7 +12,7 @@ To run Safari on macOS, some manual setup is required:
   * Trust the certificate:
     `security add-trusted-cert -k "$(security default-keychain | cut -d\" -f2)" tools/certs/cacert.pem`
 
-  * Set `OBJC_DISABLE_INITIALIZE_FORK_SAFETY=YES` in your environment. This is a
+  * Set `no_proxy='*'` in your environment. This is a
     workaround for a known
     [macOS High Sierra issue](https://github.com/web-platform-tests/wpt/issues/9007).
 
diff --git a/tests/wpt/web-platform-tests/editing/data/insert-list-items-in-table-cells.js b/tests/wpt/web-platform-tests/editing/data/insert-list-items-in-table-cells.js
index e1c1e15c6bd..6a4d3985a57 100644
--- a/tests/wpt/web-platform-tests/editing/data/insert-list-items-in-table-cells.js
+++ b/tests/wpt/web-platform-tests/editing/data/insert-list-items-in-table-cells.js
@@ -2,17 +2,17 @@
 var browserTests = [
 ['<div contenteditable="true"><table><tr><td>[fsdf]</td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></table></div>',
     [["insertOrderedList",""]],
-    '<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf<br></li></ol></td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
+    '<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf</li></ol></td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
     [true],
     {"insertOrderedList":[false,false,"false",false,true,"true"]}],
 ['<div contenteditable="true"><table><tr data-start=0 data-end=2><td>fsdf</td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></table></div>',
     [["insertOrderedList",""]],
-    '<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf<br></li></ol></td><td><ol><li>fsdf<br></li></ol></td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
+    '<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf</li></ol></td><td><ol><li>fsdf</li></ol></td></tr><tr><td>gghfg</td><td>fsfg</td></tr></tbody></table></div>',
     [true],
     {"insertOrderedList":[false,false,"false",false,false,"false"]}],
 ['<div contenteditable="true"><table><tr data-start=0><td>fsdf</td><td>fsdf</td></tr><tr data-end=2><td>gghfg</td><td>fsfg</td></tr></table></div>',
     [["insertOrderedList",""]],
-    '<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf<br></li></ol></td><td><ol><li>fsdf<br></li></ol></td></tr><tr><td><ol><li>gghfg<br></li></ol></td><td><ol><li>fsfg<br></li></ol></td></tr></tbody></table></div>',
+    '<div contenteditable="true"><table><tbody><tr><td><ol><li>fsdf</li></ol></td><td><ol><li>fsdf</li></ol></td></tr><tr><td><ol><li>gghfg</li></ol></td><td><ol><li>fsfg</li></ol></td></tr></tbody></table></div>',
     [true],
     {"insertOrderedList":[false,false,"false",false,false,"false"]}],
 ['<div contenteditable="true"><table data-start=0 data-end=1><tr><td>fsdf</td><td>fsdf</td></tr><tr><td>gghfg</td><td>fsfg</td></tr></table></div>',
diff --git a/tests/wpt/web-platform-tests/editing/data/insertorderedlist.js b/tests/wpt/web-platform-tests/editing/data/insertorderedlist.js
index 31259552cd1..b4f11ecae30 100644
--- a/tests/wpt/web-platform-tests/editing/data/insertorderedlist.js
+++ b/tests/wpt/web-platform-tests/editing/data/insertorderedlist.js
@@ -674,5 +674,20 @@ var browserTests = [
     [["defaultparagraphseparator","p"],["insertorderedlist",""]],
     "<ol><li>foo</li> <li>[bar]</li> <li>baz</li></ol>",
     [true,true],
-    {"defaultparagraphseparator":[false,false,"div",false,false,"p"],"insertorderedlist":[false,false,"",false,true,""]}]
+    {"defaultparagraphseparator":[false,false,"div",false,false,"p"],"insertorderedlist":[false,false,"",false,true,""]}],
+["<div><span style='font-family: times; color: blue'>[bar]</span></div>",
+    [["insertorderedlist",""]],
+    "<ol><li><span style=\"font-family:times; color:rgb(0, 0, 255)\">[bar]</span></li></ol>",
+    [true],
+    {"insertorderedlist":[false,false,"false",false,true,"true"]}],
+["<div><span style='font-family: times; color: blue'>bar</span></div><span style='font-family: italic; color: green'>[baz]</span>",
+    [["insertorderedlist",""]],
+    "<div><span style=\"font-family:times; color:rgb(0, 0, 255)\">bar</span></div><ol><li><span style=\"font-family:italic; color:rgb(0, 128, 0)\">[baz]</span></li></ol>",
+    [true],
+    {"insertorderedlist":[false,false,"false",false,true,"true"]}],
+["<div><ol style='font-family: times; color: blue'><li>bar</li></ol><span style='font-family: italic; color: green'>[baz]</span></div>",
+    [["insertorderedlist",""]],
+    "<ol style=\"font-family:times; color:rgb(0, 0, 255)\"><li>bar</li><li><span style=\"font-family:italic; color:rgb(0, 128, 0)\">[baz]</span></li></ol>",
+    [true],
+    {"insertorderedlist":[false,false,"false",false,true,"true"]}],
 ]
diff --git a/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16be.html b/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16be.html
index b8c055b1b9c..6a5b0a5517f 100644
--- a/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16be.html
+++ b/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16be.html
@@ -1 +1 @@
-������������
\ No newline at end of file
+����
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16le.html b/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16le.html
index 8042f33eb34..535a40d398d 100644
--- a/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16le.html
+++ b/tests/wpt/web-platform-tests/encoding/resources/two-boms-utf-16le.html
@@ -1 +1 @@
-������������
\ No newline at end of file
+����
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/fetch.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/fetch.tentative.https.sub.html
index 12072476beb..d18042ca98b 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/fetch.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/fetch.tentative.https.sub.html
@@ -9,7 +9,7 @@
         .then(j => {
           assert_header_equals(j.header, {
             "cause": undefined,
-            "destination": "",
+            "destination": "empty",
             "site": "same-origin"
           });
         });
@@ -21,7 +21,7 @@
         .then(j => {
           assert_header_equals(j.header, {
             "cause": undefined,
-            "destination": "",
+            "destination": "empty",
             "site": "same-site"
           });
         });
@@ -33,7 +33,7 @@
         .then(j => {
           assert_header_equals(j.header, {
             "cause": undefined,
-            "destination": "",
+            "destination": "empty",
             "site": "cross-site"
           });
         });
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/report.tentative.https.sub.html b/tests/wpt/web-platform-tests/fetch/sec-metadata/report.tentative.https.sub.html
index 279836457eb..a74da6a7a7d 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/report.tentative.https.sub.html
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/report.tentative.https.sub.html
@@ -6,30 +6,26 @@
 <link id="style" href="https://foo.bar" rel="stylesheet">
 <body></body>
 <script>
-  let counter = 0;
-  document.addEventListener("securitypolicyviolation", (e) => {
-    counter++;
-    if (counter == 3) {
-      promise_test(t => {
-        expected = {"destination":"report", "site":"same-origin"};
-        return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-same-origin")
+  function generate_test(expected, name) {
+    async_test(t => {
+      t.step_timeout(_ => {
+        return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-" + name)
             .then(response => response.text())
-            .then(text => assert_header_equals(text, expected));
-      }, "Same-Origin report");
+            .then(text => assert_header_equals(text, expected))
+            .then(_ => t.done());
+      }, 1000);
+    }, name + " report");
+  }
 
-      promise_test(t => {
-        expected = {"destination":"report", "site":"same-site"};
-        return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-same-site")
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected));
-      }, "Same-site report");
-
-      promise_test(t => {
-        expected = {"destination":"report", "site":"cross-site"};
-        return fetch("/fetch/sec-metadata/resources/record-header.py?retrieve=true&file=report-cross-site")
-            .then(response => response.text())
-            .then(text => assert_header_equals(text, expected));
-      }, "Cross-site report");
-    }
-  });
+  test(_ => {
+    let counter = 0;
+    document.addEventListener("securitypolicyviolation", (e) => {
+      counter++;
+      if (counter == 3) {
+        generate_test({"destination":"report", "site":"same-origin"}, "same-origin");
+        generate_test({"destination":"report", "site":"same-site"}, "same-site");
+        generate_test({"destination":"report", "site":"cross-site"}, "cross-site");
+      }
+    });
+  }, "Initialization.");
 </script>
diff --git a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/helper.js b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/helper.js
index 55e36d49fac..037f7e1e1de 100644
--- a/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/helper.js
+++ b/tests/wpt/web-platform-tests/fetch/sec-metadata/resources/helper.js
@@ -2,7 +2,6 @@ function parse_metadata(value) {
   let result = {};
   value.split(',').forEach(item => {
     let parsed = item.trim().split('=');
-    parsed[1] = parsed[1].trim().replace(/^"|"$/g, '');
     result[parsed[0]] = parsed[1];
   });
   return result;
diff --git a/tests/wpt/web-platform-tests/input-events/input-events-exec-command.html b/tests/wpt/web-platform-tests/input-events/input-events-exec-command.html
index 6c512023296..d4dea0859e2 100644
--- a/tests/wpt/web-platform-tests/input-events/input-events-exec-command.html
+++ b/tests/wpt/web-platform-tests/input-events/input-events-exec-command.html
@@ -35,9 +35,9 @@ test(function() {
     testExecCommandInputType('insertText', 'bc', 'insertText');
     assert_equals(txt.innerHTML, 'abc');
     testExecCommandInputType('insertOrderedList', null, 'insertOrderedList');
-    assert_equals(txt.innerHTML, '<ol><li>abc<br></li></ol>');
+    assert_equals(txt.innerHTML, '<ol><li>abc</li></ol>');
     testExecCommandInputType('insertUnorderedList', null, 'insertUnorderedList');
-    assert_equals(txt.innerHTML, '<ul><li>abc<br></li></ul>');
+    assert_equals(txt.innerHTML, '<ul><li>abc</li></ul>');
     testExecCommandInputType('insertLineBreak', null, 'insertLineBreak');
     testExecCommandInputType('insertParagraph', null, 'insertParagraph');
 
diff --git a/tests/wpt/web-platform-tests/interfaces/netinfo.idl b/tests/wpt/web-platform-tests/interfaces/netinfo.idl
index 191e9567b2d..6b3d5525a42 100644
--- a/tests/wpt/web-platform-tests/interfaces/netinfo.idl
+++ b/tests/wpt/web-platform-tests/interfaces/netinfo.idl
@@ -23,12 +23,12 @@ enum EffectiveConnectionType {
 };
 
 [NoInterfaceObject, Exposed=(Window,Worker)]
-interface NavigatorNetworkInformation {
-  readonly attribute NetworkInformation connection;
-};
+  interface NavigatorNetworkInformation {
+    readonly attribute NetworkInformation connection;
+  };
 
-Navigator implements NavigatorNetworkInformation;
-WorkerNavigator implements NavigatorNetworkInformation;
+  Navigator implements NavigatorNetworkInformation;
+  WorkerNavigator implements NavigatorNetworkInformation;
 
 [Exposed=(Window,Worker)]
 interface NetworkInformation : EventTarget {
diff --git a/tests/wpt/web-platform-tests/interfaces/reporting.idl b/tests/wpt/web-platform-tests/interfaces/reporting.idl
index e9800365c4c..8e88663a700 100644
--- a/tests/wpt/web-platform-tests/interfaces/reporting.idl
+++ b/tests/wpt/web-platform-tests/interfaces/reporting.idl
@@ -52,5 +52,5 @@ interface CrashReportBody : ReportBody {
 
 dictionary GenerateTestReportParameters {
   required DOMString message;
-  DOMString group;
+  DOMString group = "default";
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/touch-events.idl b/tests/wpt/web-platform-tests/interfaces/touch-events.idl
index 0bedbf89964..5e341bd7b17 100644
--- a/tests/wpt/web-platform-tests/interfaces/touch-events.idl
+++ b/tests/wpt/web-platform-tests/interfaces/touch-events.idl
@@ -73,10 +73,3 @@ partial interface GlobalEventHandlers {
                     attribute EventHandler ontouchmove;
                     attribute EventHandler ontouchcancel;
 };
-
-partial interface Document {
-  // Deprecated in this specification
-  Touch createTouch(WindowProxy view, EventTarget target, long identifier, double pageX, double pageY, double screenX, double screenY);
-  // Deprecated in this specification
-  TouchList createTouchList(Touch... touches);
-};
diff --git a/tests/wpt/web-platform-tests/payment-request/PaymentItem/type_member.https.html b/tests/wpt/web-platform-tests/payment-request/PaymentItem/type_member.https.html
deleted file mode 100644
index dc62a83f597..00000000000
--- a/tests/wpt/web-platform-tests/payment-request/PaymentItem/type_member.https.html
+++ /dev/null
@@ -1,77 +0,0 @@
-<!doctype html>
-<meta charset="utf8">
-<link rel="help" href="https://w3c.github.io/payment-request/#dom-paymentitem-type">
-<title>
-  PaymentItem type member
-</title>
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script>
-const validMethods = [
-  { supportedMethods: "basic-card" },
-  { supportedMethods: "https://apple.com/apple-pay" },
-];
-const validTotal = {
-  label: "Total",
-  amount: {
-    currency: "USD",
-    value: "5.00",
-  },
-};
-const validDisplayItem = {
-  label: "Item",
-  amount: {
-    currency: "USD",
-    value: "1.00",
-  },
-};
-const validDetails = {
-  total: validTotal,
-  displayItems: [validDisplayItem],
-};
-
-test(() => {
-  new PaymentRequest(validMethods, validDetails);
-}, "Smoke test");
-
-test(() => {
-  // Let's make an invalid DisplayItem for the total
-  const invalidTotal = Object.assign({}, validTotal, {
-    type: "this is not valid",
-  });
-  const invalidDetails = Object.assign({}, validDetails, {
-    total: invalidTotal,
-  });
-  assert_throws(new TypeError(), () => {
-    new PaymentRequest(validMethods, invalidDetails);
-  });
-}, "An invalid enum value for PaymentDetailsInit.total's type throws TypeError");
-
-test(() => {
-  // Let's make an invalid DisplayItem to add to displayItems
-  const invalidDisplayItem = Object.assign({}, validDisplayItem, {
-    type: "this is not valid",
-  });
-  const invalidDetails = Object.assign({}, validDetails, {
-    displayItems: [invalidDisplayItem, validDisplayItem],
-  });
-  assert_throws(new TypeError(), () => {
-    new PaymentRequest(validMethods, invalidDetails);
-  });
-}, "Invalid enum value for PaymentItem.type member throws a TypeError");
-
-test(() => {
-  // Let's make an invalid DisplayItem to add to displayItems
-  const taxDisplayItem = Object.assign({}, validDisplayItem, { type: "tax" });
-  const taxTotal = Object.assign({}, validTotal, { type: "tax" });
-  const validDetailsWithType = Object.assign({}, validDetails, {
-    total: taxTotal,
-    displayItems: [taxDisplayItem],
-  });
-  try {
-    new PaymentRequest(validMethods, validDetailsWithType);
-  } catch (err) {
-    assert_unexpected(err.message);
-  }
-}, "Valid enum values for PaymentItem.type member does not throw");
-</script>
diff --git a/tests/wpt/web-platform-tests/resources/test/conftest.py b/tests/wpt/web-platform-tests/resources/test/conftest.py
index dde9e9dc0a7..9f59b3826c4 100644
--- a/tests/wpt/web-platform-tests/resources/test/conftest.py
+++ b/tests/wpt/web-platform-tests/resources/test/conftest.py
@@ -4,6 +4,7 @@ import os
 import ssl
 
 import html5lib
+import py
 import pytest
 from selenium import webdriver
 from six import text_type
@@ -16,9 +17,11 @@ WPT_ROOT = os.path.normpath(os.path.join(HERE, '..', '..'))
 HARNESS = os.path.join(HERE, 'harness.html')
 TEST_TYPES = ('functional', 'unit')
 
+
 def pytest_addoption(parser):
     parser.addoption("--binary", action="store", default=None, help="path to browser binary")
 
+
 def pytest_collect_file(path, parent):
     if path.ext.lower() != '.html':
         return
@@ -28,6 +31,7 @@ def pytest_collect_file(path, parent):
 
     return HTMLItem(str(path), test_type, parent)
 
+
 def pytest_configure(config):
     config.driver = webdriver.Firefox(firefox_binary=config.getoption("--binary"))
     config.add_cleanup(config.driver.quit)
@@ -46,6 +50,7 @@ def pytest_configure(config):
     config.ssl_context = ssl._create_unverified_context()
     config.add_cleanup(config.server.stop)
 
+
 def resolve_uri(context, uri):
     if uri.startswith('/'):
         base = WPT_ROOT
@@ -56,6 +61,7 @@ def resolve_uri(context, uri):
 
     return os.path.exists(os.path.join(base, path))
 
+
 class HTMLItem(pytest.Item, pytest.Collector):
     def __init__(self, filename, test_type, parent):
         self.url = parent.session.config.server.url(filename)
@@ -116,7 +122,7 @@ class HTMLItem(pytest.Item, pytest.Collector):
         # This cannot use super(HTMLItem, self).__init__(..) because only the
         # Collector constructor takes the fspath argument.
         pytest.Item.__init__(self, name, parent)
-        pytest.Collector.__init__(self, name, parent, fspath=filename)
+        pytest.Collector.__init__(self, name, parent, fspath=py.path.local(filename))
 
 
     def reportinfo(self):
diff --git a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html b/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
index 9b66419cb0a..f5edab5b7ad 100644
--- a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
+++ b/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
@@ -6,19 +6,6 @@
 <script>
   'use strict';
 
-// Constraint parameter has a default value of {audio:false, video: false}.
-promise_test(function() {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
-
-  return navigator.getDisplayMedia()
-      .then(function(s) {
-        fail('getDisplayMedia should have failed');
-      })
-      .catch(function(e) {
-        assert_equals(e.name, 'TypeError');
-      });
-}, 'getDisplayMedia() with no constraints');
-
 promise_test(function() {
   assert_idl_attribute(navigator, 'getDisplayMedia');
 
@@ -28,18 +15,35 @@ promise_test(function() {
   });
 }, 'getDisplayMedia() with video true');
 
+// Empty constraint parameter and boolean values of false defaults to
+// {video: true}.
 promise_test(function() {
   assert_idl_attribute(navigator, 'getDisplayMedia');
 
-  return navigator.getDisplayMedia({video: false})
-      .then(function(s) {
-        fail('getDisplayMedia should have failed');
-      })
-      .catch(function(e) {
-        assert_equals(e.name, 'TypeError');
-      });
+  return navigator.getDisplayMedia().then(function(s) {
+    assert_equals(s.getVideoTracks().length, 1);
+    assert_equals(s.getAudioTracks().length, 0);
+  });
+}, 'getDisplayMedia() with no constraints');
+
+promise_test(function() {
+  assert_idl_attribute(navigator, 'getDisplayMedia');
+
+  return navigator.getDisplayMedia({video: false}).then(function(s) {
+    assert_equals(s.getVideoTracks().length, 1);
+    assert_equals(s.getAudioTracks().length, 0);
+  });
 }, 'getDisplayMedia() with video false');
 
+promise_test(function() {
+  assert_idl_attribute(navigator, 'getDisplayMedia');
+
+  return navigator.getDisplayMedia({audio: false}).then(function(s) {
+    assert_equals(s.getVideoTracks().length, 1);
+    assert_equals(s.getAudioTracks().length, 0);
+  });
+}, 'getDisplayMedia() with audio false');
+
 promise_test(function() {
   assert_idl_attribute(navigator, 'getDisplayMedia');
 
@@ -52,27 +56,52 @@ promise_test(function() {
 promise_test(function() {
   assert_idl_attribute(navigator, 'getDisplayMedia');
 
-  return navigator.getDisplayMedia({audio: false})
+  return navigator
+      .getDisplayMedia({video: {advanced: [{zoom: 1}]}})
       .then(function(s) {
         fail('getDisplayMedia should have failed');
       })
       .catch(function(e) {
         assert_equals(e.name, 'TypeError');
       });
-}, 'getDisplayMedia() with audio false');
+}, 'getDisplayMedia() call with advanced constraint');
 
 promise_test(function() {
   assert_idl_attribute(navigator, 'getDisplayMedia');
 
   return navigator
-      .getDisplayMedia({audio: false, video: {width: 1280, height: 720}})
+      .getDisplayMedia({video: {width: {min: 360}}})
       .then(function(s) {
         fail('getDisplayMedia should have failed');
       })
       .catch(function(e) {
-        assert_equals(e.name, 'InvalidAccessError');
+        assert_equals(e.name, 'TypeError');
       });
-}, 'getDisplayMedia() call with non-bool constraint');
+}, 'getDisplayMedia() call with min constraint');
+
+promise_test(function() {
+  assert_idl_attribute(navigator, 'getDisplayMedia');
+
+  return navigator
+      .getDisplayMedia({video: {width: {exact: 360}}})
+      .then(function(s) {
+        fail('getDisplayMedia should have failed');
+      })
+      .catch(function(e) {
+        assert_equals(e.name, 'TypeError');
+      });
+}, 'getDisplayMedia() call with exact constraint');
+
+promise_test(function() {
+  assert_idl_attribute(navigator, 'getDisplayMedia');
+
+  return navigator
+      .getDisplayMedia({video: {width: {max: 360}}})
+      .then(function(s) {
+        assert_equals(s.getVideoTracks().length, 1);
+        assert_equals(s.getAudioTracks().length, 0);
+      });
+}, 'getDisplayMedia() call with max constraint');
 
 // Content shell picks a fake desktop device by default.
 promise_test(function() {
diff --git a/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py b/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
index 5a720baa2e9..fc6338ed31f 100755
--- a/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
+++ b/tests/wpt/web-platform-tests/tools/ci/taskcluster-run.py
@@ -31,10 +31,12 @@ def find_wptreport(args):
     return parser.parse_known_args(args)[0].log_wptreport
 
 
-def gzip_file(filename):
+def gzip_file(filename, delete_original=True):
     with open(filename, 'rb') as f_in:
         with gzip.open('%s.gz' % filename, 'wb') as f_out:
             shutil.copyfileobj(f_in, f_out)
+    if delete_original:
+        os.unlink(filename)
 
 
 def main(product, commit_range, wpt_args):
@@ -67,9 +69,8 @@ def main(product, commit_range, wpt_args):
         logger.info("Running all tests")
 
     wpt_args += [
-        "--log-tbpl=../artifacts/log_tbpl.log",
         "--log-tbpl-level=info",
-        "--log-mach=-",
+        "--log-tbpl=-",
         "-y",
         "--no-pause",
         "--no-restart-on-unexpected",
diff --git a/tests/wpt/web-platform-tests/tools/wpt/browser.py b/tests/wpt/web-platform-tests/tools/wpt/browser.py
index db64c369d54..016b76fce89 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/browser.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/browser.py
@@ -264,7 +264,7 @@ class Firefox(Browser):
 
         dest = os.path.join(dest, "profiles", channel)
         if version:
-            dest = dest.join(version)
+            dest = os.path.join(dest, version)
         have_cache = False
         if os.path.exists(dest):
             if channel != "nightly":
@@ -711,11 +711,15 @@ class Servo(Browser):
     def version(self, binary):
         """Retrieve the release version of the installed browser."""
         output = call(binary, "--version")
-        m = re.search(r"[0-9\.]+( [a-z]+)?$", output.strip())
+        m = re.search(r"Servo ([0-9\.]+-[a-f0-9]+)?(-dirty)?$", output.strip())
         if m:
             return m.group(0)
 
 
+class ServoWebDriver(Servo):
+    product = "servodriver"
+
+
 class Sauce(Browser):
     """Sauce-specific interface."""
 
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 02857ed0b0c..6f7ad1a53de 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -414,6 +414,11 @@ class Servo(BrowserSetup):
             kwargs["binary"] = binary
 
 
+class ServoWebDriver(Servo):
+    name = "servodriver"
+    browser_cls = browser.ServoWebDriver
+
+
 class WebKit(BrowserSetup):
     name = "webkit"
     browser_cls = browser.WebKit
@@ -436,7 +441,7 @@ product_setup = {
     "safari": Safari,
     "safari_webdriver": SafariWebDriver,
     "servo": Servo,
-    "servodriver": Servo,
+    "servodriver": ServoWebDriver,
     "sauce": Sauce,
     "opera": Opera,
     "webkit": WebKit,
@@ -482,7 +487,7 @@ def setup_wptrunner(venv, prompt=True, install_browser=False, **kwargs):
             if channel != kwargs["channel"]:
                 logger.info("Interpreting channel '%s' as '%s'" % (kwargs["channel"],
                                                                    channel))
-                kwargs["browser_channel"] = channel
+            kwargs["browser_channel"] = channel
         else:
             logger.info("Valid channels for %s not known; using argument unmodified" % kwargs["product"])
     del kwargs["channel"]
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
index d788effc469..1632f8f539c 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/browsers/servodriver.py
@@ -4,7 +4,7 @@ import tempfile
 
 from mozprocess import ProcessHandler
 
-from serve.serve import make_hosts_file
+from tools.serve.serve import make_hosts_file
 
 from .base import Browser, require_arg, get_free_port, browser_command, ExecutorBrowser
 from ..executors import executor_kwargs as base_executor_kwargs