Update web-platform-tests to revision 615bb572c95add74ca4fb9fed4af5269a49cf4ef

162 files changed, 2062 insertions, 629 deletions

diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 3d5875b011c..9bd9e5138fb 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -223699,6 +223699,11 @@
      {}
     ]
    ],
+   "content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
    "content-security-policy/generic/fail-0_1.js": [
     [
      {}
@@ -223734,6 +223739,11 @@
      {}
     ]
    ],
+   "content-security-policy/generic/support/eval.js": [
+    [
+     {}
+    ]
+   ],
    "content-security-policy/generic/support/load_img_and_post_result_header.html": [
     [
      {}
@@ -224214,6 +224224,16 @@
      {}
     ]
    ],
+   "content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
    "content-security-policy/script-src/externalScript.js": [
     [
      {}
@@ -283419,6 +283439,11 @@
      {}
     ]
    ],
+   "feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers": [
+    [
+     {}
+    ]
+   ],
    "feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html.sub.headers": [
     [
      {}
@@ -308554,11 +308579,6 @@
      {}
     ]
    ],
-   "tools/flake8.ini": [
-    [
-     {}
-    ]
-   ],
    "tools/gitignore/__init__.py": [
     [
      {}
@@ -308874,6 +308894,16 @@
      {}
     ]
    ],
+   "tools/py27-flake8.ini": [
+    [
+     {}
+    ]
+   ],
+   "tools/py36-flake8.ini": [
+    [
+     {}
+    ]
+   ],
    "tools/pytest.ini": [
     [
      {}
@@ -332410,6 +332440,12 @@
      {}
     ]
    ],
+   "content-security-policy/generic/cspro-not-enforced-in-worker.html": [
+    [
+     "/content-security-policy/generic/cspro-not-enforced-in-worker.html",
+     {}
+    ]
+   ],
    "content-security-policy/generic/directive-name-case-insensitive.sub.html": [
     [
      "/content-security-policy/generic/directive-name-case-insensitive.sub.html",
@@ -332716,27 +332752,27 @@
      {}
     ]
    ],
-   "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.html": [
+   "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html": [
     [
-     "/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.html",
+     "/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html",
      {}
     ]
    ],
-   "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.html": [
+   "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html": [
     [
-     "/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.html",
+     "/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html",
      {}
     ]
    ],
-   "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.html": [
+   "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html": [
     [
-     "/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.html",
+     "/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html",
      {}
     ]
    ],
-   "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.html": [
+   "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html": [
     [
-     "/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.html",
+     "/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html",
      {}
     ]
    ],
@@ -332896,9 +332932,9 @@
      {}
     ]
    ],
-   "content-security-policy/navigate-to/spv-only-sent-to-initiator.html": [
+   "content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html": [
     [
-     "/content-security-policy/navigate-to/spv-only-sent-to-initiator.html",
+     "/content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html",
      {}
     ]
    ],
@@ -333312,6 +333348,18 @@
      {}
     ]
    ],
+   "content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html": [
+    [
+     "/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html",
+     {}
+    ]
+   ],
+   "content-security-policy/script-src/eval-allowed-in-report-only-mode.html": [
+    [
+     "/content-security-policy/script-src/eval-allowed-in-report-only-mode.html",
+     {}
+    ]
+   ],
    "content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html": [
     [
      "/content-security-policy/script-src/hash-always-converted-to-utf-8/iso-8859-1.html",
@@ -333684,6 +333732,12 @@
      {}
     ]
    ],
+   "content-security-policy/securitypolicyviolation/constructor-required-fields.html": [
+    [
+     "/content-security-policy/securitypolicyviolation/constructor-required-fields.html",
+     {}
+    ]
+   ],
    "content-security-policy/securitypolicyviolation/idlharness.window.js": [
     [
      "/content-security-policy/securitypolicyviolation/idlharness.window.html",
@@ -335018,6 +335072,12 @@
      {}
     ]
    ],
+   "css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html": [
+    [
+     "/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html",
+     {}
+    ]
+   ],
    "css/CSS2/abspos/adjacent-to-relpos-inline-that-had-block.html": [
     [
      "/css/CSS2/abspos/adjacent-to-relpos-inline-that-had-block.html",
@@ -347052,6 +347112,12 @@
      {}
     ]
    ],
+   "css/motion/parsing/offset-rotate-computed.html": [
+    [
+     "/css/motion/parsing/offset-rotate-computed.html",
+     {}
+    ]
+   ],
    "css/motion/parsing/offset-rotate-parsing-invalid.html": [
     [
      "/css/motion/parsing/offset-rotate-parsing-invalid.html",
@@ -359596,6 +359662,12 @@
      {}
     ]
    ],
+   "feature-policy/feature-policy-header-policy-declined.https.sub.html": [
+    [
+     "/feature-policy/feature-policy-header-policy-declined.https.sub.html",
+     {}
+    ]
+   ],
    "feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html": [
     [
      "/feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html",
@@ -404516,6 +404588,12 @@
      {}
     ]
    ],
+   "trusted-types/TrustedTypePolicyFactory-createPolicy-defaultTests.tentative.html": [
+    [
+     "/trusted-types/TrustedTypePolicyFactory-createPolicy-defaultTests.tentative.html",
+     {}
+    ]
+   ],
    "trusted-types/TrustedTypePolicyFactory-createPolicy-exposedTests.tentative.html": [
     [
      "/trusted-types/TrustedTypePolicyFactory-createPolicy-exposedTests.tentative.html",
@@ -436184,6 +436262,12 @@
      {}
     ]
    ],
+   "webdriver/tests/execute_script/promise.py": [
+    [
+     "/webdriver/tests/execute_script/promise.py",
+     {}
+    ]
+   ],
    "webdriver/tests/execute_script/user_prompts.py": [
     [
      "/webdriver/tests/execute_script/user_prompts.py",
@@ -436834,7 +436918,7 @@
  },
  "paths": {
   ".azure-pipelines.yml": [
-   "e4c265e127644d2e3d6d3d10c32c3024f613bd6d",
+   "f2a7b84f358e87013755bc27cc64f3f01c92bab1",
    "support"
   ],
   ".codecov.yml": [
@@ -436850,7 +436934,7 @@
    "support"
   ],
   ".pyup.yml": [
-   "2137f610f7e40938f3bd7d17664f7ef91f6b1014",
+   "2249e1a89dc7687fa04a38e1704ee22c325bd15b",
    "support"
   ],
   ".taskcluster.yml": [
@@ -446782,7 +446866,7 @@
    "testharness"
   ],
   "audio-output/META.yml": [
-   "ea6b29e42f38abeaa5eff6ed6c2fad18eed4e536",
+   "b6a7d4d06259117af8fb843f6a8d252bac01a8f3",
    "support"
   ],
   "audio-output/idlharness.window.js": [
@@ -466449,6 +466533,14 @@
    "b16eadaedc07ca9dbc60310d850d49ded370d22a",
    "testharness"
   ],
+  "content-security-policy/generic/cspro-not-enforced-in-worker.html": [
+   "784cdc88752f0c97226e59007c514d018f737aeb",
+   "testharness"
+  ],
+  "content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers": [
+   "877e192bbff2204ddf56f83e411f17bfb6adab89",
+   "support"
+  ],
   "content-security-policy/generic/directive-name-case-insensitive.sub.html": [
    "c65c59fb23fdc6d21eefc090927c1cfd4cd6702a",
    "testharness"
@@ -466549,6 +466641,10 @@
    "4980937eab7f7d07c80104fa2e73371781366c76",
    "support"
   ],
+  "content-security-policy/generic/support/eval.js": [
+   "d8ba2a5589a1a98abee73dab586414f601aaf6f3",
+   "support"
+  ],
   "content-security-policy/generic/support/load_img_and_post_result_header.html": [
    "c7a2e75dba37c85ae1710d92a2a8071ea229bf85",
    "support"
@@ -466777,20 +466873,20 @@
    "9cb770bcc1be7928b6dad61b29bf6f55c22eda0d",
    "support"
   ],
-  "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.html": [
-   "458373fbc01591c25a901379282a5370989b5084",
+  "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html": [
+   "f58407ac6de2174b1d028d9a3ae7e793f4724c00",
    "testharness"
   ],
-  "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.html": [
-   "3ed4815bff6c363661ab94bdc1796067870aadab",
+  "content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html": [
+   "0ddc8820f94c70b6606970832eb90d089a0e8a10",
    "testharness"
   ],
-  "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.html": [
-   "f3f7896e932aafa137cf11b76c38246a101f4a00",
+  "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html": [
+   "927ebb4d3619f8fb131600b89f00a19afd706116",
    "testharness"
   ],
-  "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.html": [
-   "08e0cbe3fb9b39f8b4945b422c5e459a2f862fb9",
+  "content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html": [
+   "56688fa418baad02bdb5b19008fdb865f6d6f6f6",
    "testharness"
   ],
   "content-security-policy/navigate-to/form-allowed.html": [
@@ -466905,7 +467001,7 @@
    "6784a56c8eb5e84d9434676d2c335173c7de1970",
    "support"
   ],
-  "content-security-policy/navigate-to/spv-only-sent-to-initiator.html": [
+  "content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html": [
    "a09057e71567efa082578541a624b9fe51e13737",
    "testharness"
   ],
@@ -467461,6 +467557,22 @@
    "cb762eff806849df46dc758ef7b98b63f27f54c9",
    "support"
   ],
+  "content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html": [
+   "5357aa2eef2a97122a24a4cced51d340b156995e",
+   "testharness"
+  ],
+  "content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers": [
+   "37a04b5fc2eb66cbe2e7b09f03b9762b65eb2cab",
+   "support"
+  ],
+  "content-security-policy/script-src/eval-allowed-in-report-only-mode.html": [
+   "eebc8f026f9f1b7387614c86f4d5d2af8ab29ddf",
+   "testharness"
+  ],
+  "content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers": [
+   "b9b5d81acc3bc58dc6fdff2f436504810f6f4f6e",
+   "support"
+  ],
   "content-security-policy/script-src/externalScript.js": [
    "2920b03c9bc98d16d4c7ebefaf8bcef268c3796c",
    "support"
@@ -467877,6 +467989,10 @@
    "40c4865185a919135f1fa8b54167192a5773eaef",
    "testharness"
   ],
+  "content-security-policy/securitypolicyviolation/constructor-required-fields.html": [
+   "1260c491fc2501b080850b5e523a847d37200127",
+   "testharness"
+  ],
   "content-security-policy/securitypolicyviolation/idlharness.window.js": [
    "fc5e65d6cfdc59fb8bd3c10e3ed358d5b7f8074d",
    "testharness"
@@ -472037,6 +472153,10 @@
    "4b1baff8b956d706b2f90e67277ccf3a7c4d3458",
    "testharness"
   ],
+  "css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html": [
+   "1859ff83001a23060284e2fa496ebc8f36738260",
+   "testharness"
+  ],
   "css/CSS2/abspos/adjacent-to-relpos-inline-that-had-block.html": [
    "293b88f52088a255bd854eac5577c214847dcd7c",
    "testharness"
@@ -574038,7 +574158,7 @@
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/pointer-events.html": [
-   "3e069e760456b024b3bbf7a6f4df8280597bad0d",
+   "091e985406b98b4a37f006310c56701282656e95",
    "testharness"
   ],
   "css/css-typed-om/the-stylepropertymap/properties/position.html": [
@@ -577234,7 +577354,7 @@
    "reftest"
   ],
   "css/css-values/vh-support-margin.html": [
-   "06b2375a82d2ae0ce28d48a1df2e77d673f6f39f",
+   "57fce2064b0fde347eb806ca0e037aadc4232d27",
    "reftest"
   ],
   "css/css-values/vh-support-transform-origin.html": [
@@ -586277,6 +586397,10 @@
    "d40f70e8c0010cf3f860b3ad760dea5d7b64efdd",
    "testharness"
   ],
+  "css/motion/parsing/offset-rotate-computed.html": [
+   "a29d25ccdf2551503399b0a36089d463e481c0ed",
+   "testharness"
+  ],
   "css/motion/parsing/offset-rotate-parsing-invalid.html": [
    "4e5a9229a0c85b3a2e5bfe59719bad88245d65c5",
    "testharness"
@@ -603081,6 +603205,14 @@
    "c2493a089031aa89fc6c689e0bdc1ea717da81c3",
    "support"
   ],
+  "feature-policy/feature-policy-header-policy-declined.https.sub.html": [
+   "b148df17caf1aba4bd76fef508e0e338add34df8",
+   "testharness"
+  ],
+  "feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers": [
+   "4ac2a4a588c27f69d110a756e901111625ea9133",
+   "support"
+  ],
   "feature-policy/feature-policy-header-policy-disallowed-for-all.https.sub.html": [
    "c025705a36b10e3830cf2f076b34e14f77737129",
    "testharness"
@@ -625258,7 +625390,7 @@
    "support"
   ],
   "interfaces/CSP.idl": [
-   "46fae543cb2d96dfdc0ee03d0470c53464564a80",
+   "4b53e3a3a40386d93abded001ac99bc04ea46b3e",
    "support"
   ],
   "interfaces/CSS-Parser-API.idl": [
@@ -625670,7 +625802,7 @@
    "support"
   ],
   "interfaces/screen-capture.idl": [
-   "b79d09d19dced9e3b77e791e2d543fc9f44742ee",
+   "f00660bd904e8ad3fcdf0fa9cf66c49e5d918767",
    "support"
   ],
   "interfaces/screen-orientation.idl": [
@@ -627486,7 +627618,7 @@
    "testharness"
   ],
   "mediacapture-streams/META.yml": [
-   "9e8b0f46f9b02b3ab1ddb8786eb156d1afafd4ba",
+   "1ed650e97c451ef1266fd8435e2260d6bf617b67",
    "support"
   ],
   "mediacapture-streams/MediaDevices-enumerateDevices.https.html": [
@@ -637746,7 +637878,7 @@
    "testharness"
   ],
   "payment-request/payment-request-abort-method.https.html": [
-   "64886a6b7cc91b3aa05a34e6f8650808d3f1ab0b",
+   "8e561b288d15fa30971dd1f88b930671c83a5887",
    "testharness"
   ],
   "payment-request/payment-request-canmakepayment-method-protection.https.html": [
@@ -637754,7 +637886,7 @@
    "testharness"
   ],
   "payment-request/payment-request-canmakepayment-method.https.html": [
-   "03a9c19fb8fd774ccea9cf2a9740be0971fa4910",
+   "f38caa00b9313dc80f5ab5180dc10e850eb57147",
    "testharness"
   ],
   "payment-request/payment-request-constructor-crash.https.html": [
@@ -637762,7 +637894,7 @@
    "testharness"
   ],
   "payment-request/payment-request-constructor.https.html": [
-   "b5997a0c9be55e2b3b135a4471aa2abc5e7440af",
+   "99c25d1723459bef569ca9e62ec29e0c889534f6",
    "testharness"
   ],
   "payment-request/payment-request-ctor-currency-code-checks.https.html": [
@@ -638454,7 +638586,7 @@
    "testharness"
   ],
   "pointerlock/mouse_buttons_back_forward-manual.html": [
-   "06e0a5daee1c53da990b1290fc4e0951ca55c3c2",
+   "4515ebabcbd3dfef30b89512609078b7d89a2a92",
    "manual"
   ],
   "pointerlock/movementX_Y_basic-manual.html": [
@@ -638782,7 +638914,7 @@
    "testharness"
   ],
   "presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html": [
-   "211e8a01058cdc4c1e4756edcd21cb6369875f25",
+   "ab1bd8089d191cd2971ae5b6b2f2c95b7c62c26d",
    "manual"
   ],
   "presentation-api/controlling-ua/reconnectToPresentation_notfound_error-manual.https.html": [
@@ -648882,15 +649014,15 @@
    "support"
   ],
   "screen-capture/META.yml": [
-   "6e5b23cd9672274d43c8d8bebe9bed66f7e651ee",
+   "47882d3275f1cc928555045b2def8fc90f6bcdb0",
    "support"
   ],
   "screen-capture/getdisplaymedia.https.html": [
-   "06ab72d20bf2668dfc91096afb28c88bd100d2a0",
+   "36e0f22933a08921b7aea57f29191b477f767e1d",
    "testharness"
   ],
   "screen-capture/idlharness.window.js": [
-   "076e89f275c9e5c583780e83bd96f1f79ed80fdd",
+   "527565ea9632e69a6de62efd2be3729c974b93e4",
    "testharness"
   ],
   "screen-orientation/META.yml": [
@@ -650378,7 +650510,7 @@
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-include-uncontrolled.https.html": [
-   "210cbb042125b4032997c8ef35f7b2c091a1e4b9",
+   "d3b5a966d330412562fc6cbc614e4995f3d1260b",
    "testharness"
   ],
   "service-workers/service-worker/clients-matchall-on-evaluation.https.html": [
@@ -650890,7 +651022,7 @@
    "testharness"
   ],
   "service-workers/service-worker/postmessage-to-client.https.html": [
-   "15d2e889337078869e3c3e97d312649e6a8bd8b2",
+   "f834a4bffe20c69cbd57ae4c6bf922083d3554d6",
    "testharness"
   ],
   "service-workers/service-worker/postmessage.https.html": [
@@ -658029,10 +658161,6 @@
    "9bf40ddb9301296e5f22c444ee8efb5bd8ea10d3",
    "support"
   ],
-  "tools/flake8.ini": [
-   "a53cbf49d55fe40959891e68fd330bc4610c0eab",
-   "support"
-  ],
   "tools/gitignore/__init__.py": [
    "e69de29bb2d1d6434b8b29ae775ad8c2e48c5391",
    "support"
@@ -658285,6 +658413,14 @@
    "675eb01714fd82081b2192c74892eb1ccb819285",
    "support"
   ],
+  "tools/py27-flake8.ini": [
+   "1a5ce431ca808eb1683cd3d1eaa70fd5fdf6524f",
+   "support"
+  ],
+  "tools/py36-flake8.ini": [
+   "9b01f22a3cdd25fc02d1334e5da99e71fa35bcb0",
+   "support"
+  ],
   "tools/pytest.ini": [
    "b52e465598ab97faa6b718859617f2194141fbb4",
    "support"
@@ -662682,7 +662818,7 @@
    "support"
   ],
   "tools/tox.ini": [
-   "b0099437be9cb3b818509db7bdf0289199ae0634",
+   "fc66c6c2ac39ce66b915af90a610d420e1278d7a",
    "support"
   ],
   "tools/webdriver/.gitignore": [
@@ -662730,11 +662866,11 @@
    "support"
   ],
   "tools/wpt/install.py": [
-   "9c8feffee3febade919aed0b6e06f46cf43bcc60",
+   "817ad418e80f6127121e0bd4d43f07e9330da646",
    "support"
   ],
   "tools/wpt/markdown.py": [
-   "8b5ff8079df08561ed4f014dea87a58c358692cd",
+   "43020cdafe6e336102acf4986bf3ac1a6b25de0d",
    "support"
   ],
   "tools/wpt/paths": [
@@ -662746,7 +662882,7 @@
    "support"
   ],
   "tools/wpt/run.py": [
-   "093bc013c1b3b1009e15afc8546081504ed8ffd6",
+   "1894492d267532fdfdefc14a96a4eab97b42635a",
    "support"
   ],
   "tools/wpt/testfiles.py": [
@@ -662766,7 +662902,7 @@
    "support"
   ],
   "tools/wpt/tests/test_wpt.py": [
-   "d987242679be1e72392266ff20ff935df6fe91b3",
+   "c5fd9d96c36736680fc218b925f90b9f79768fdb",
    "support"
   ],
   "tools/wpt/tox.ini": [
@@ -662782,7 +662918,7 @@
    "support"
   ],
   "tools/wpt/virtualenv.py": [
-   "b8454c979c2c4ba20995ba8805cebb618fd8baed",
+   "0ce7054ae2227a6dbc46e6215274d776e80494c7",
    "support"
   ],
   "tools/wpt/wpt.py": [
@@ -663178,7 +663314,7 @@
    "support"
   ],
   "tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js": [
-   "279572bfe4d20341cebf3370deb4e5aeec70f2b5",
+   "e78951a260473186c3ea55cc31a91dece7da3c2a",
    "support"
   ],
   "tools/wptrunner/wptrunner/expected.py": [
@@ -663817,6 +663953,10 @@
    "9daf20ec1869919603965942fa6a4c99925ac8e9",
    "testharness"
   ],
+  "trusted-types/TrustedTypePolicyFactory-createPolicy-defaultTests.tentative.html": [
+   "a6dd2d1317aa4df94e693e1ad7d0d0684ea0bbc2",
+   "testharness"
+  ],
   "trusted-types/TrustedTypePolicyFactory-createPolicy-exposedTests.tentative.html": [
    "af6e04941c3b6206602bc7f547a3b0c9ef555a11",
    "testharness"
@@ -663830,7 +663970,7 @@
    "testharness"
   ],
   "trusted-types/Window-TrustedTypes.tentative.html": [
-   "8e20e492e6a8484e386d1a08f854bd9b162bd6be",
+   "5bbb4356c21d249a21c8204aad6c9ba7a353cb4e",
    "testharness"
   ],
   "trusted-types/Window-open.tentative.html": [
@@ -663838,27 +663978,27 @@
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html": [
-   "ec19ebc8db8a727db8f28a69dd82cab15a5d7af9",
+   "4446a58836695355efd0fbf3f9f5a0bd6c60c8a3",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html": [
-   "99e187d45be6cb649e388995a2f775d5bbe6bcf4",
+   "2554ce635607ba06df3d975a0437b0862a30d799",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Document-write.tentative.html": [
-   "5e7039705a82886f369bb7c454b8ed08be25b2d6",
+   "0d9ff61c9b305e193f96cebe18810d597aa75158",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html": [
-   "4eee887a0053c3469d53d0e41ad89739502ca1a0",
+   "ae1ace69bf85853d0f1c3db333e4507ac1896073",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html": [
-   "fde0c172f52cb27837077f8eddbd42d215b24956",
+   "945e3dd2a79b026ad35f379deece04c19eb89d8c",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html": [
-   "26aaa5123e756219d3a47f07f2e5228ac1101407",
+   "646997de472ec98491d2d17fc65aeb77c999c03b",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Element-setAttributeNS.tentative.html": [
@@ -663866,27 +664006,27 @@
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html": [
-   "ceac828d7bdea09bcf79b90c0a623e7d0c4f9735",
+   "2a7edab9db4aec7daa7c4e46769392f25676b07b",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Location-assign.tentative.html": [
-   "c0817d669a189d1b01859e1d821712b115297b0f",
+   "4ad4af9df5ae86b0bc2ab82d3b5ae062b88d70f6",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Location-href.tentative.html": [
-   "2a29e1e233ec16a747c279f0b319732868a6775a",
+   "fd0a4e5ea0e53c5b85f0bfb6d092c4cd63ceb790",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Location-replace.tentative.html": [
-   "8e534bf83827151cbeccfcc147f933e26fa0aefa",
+   "9b8cabe58359e664e1ad9d8c43f604f88c7b3784",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html": [
-   "f44266a3074ee040e6a3e1b16868aa2bef44d110",
+   "4919b7fd4de8dcbe66daa87fdd1285dd96d4580d",
    "testharness"
   ],
   "trusted-types/block-string-assignment-to-Window-open.tentative.html": [
-   "7b917dbf642302e0d21e5a688850d8f822f0c318",
+   "fd30b6edfbaf40c09cabe98d1bd8891446b16e65",
    "testharness"
   ],
   "trusted-types/idlharness.window.js": [
@@ -663894,7 +664034,7 @@
    "testharness"
   ],
   "trusted-types/support/helper.sub.js": [
-   "75874e5b3c2ed90f0ebfbfca2da701d027d2d832",
+   "9ad605975555df539e6444d3b8935197c7925aef",
    "support"
   ],
   "uievents/META.yml": [
@@ -664250,7 +664390,7 @@
    "manual"
   ],
   "uievents/mouse/mouse_buttons_back_forward-manual.html": [
-   "7a676db4c4464eb74e95a19a3b98ac94f44b1c77",
+   "aa4e944b95cb2e0932ffa042c3f47ec1ccaf4653",
    "manual"
   ],
   "uievents/mouse/mouseevent_move_button-manual.html": [
@@ -667966,7 +668106,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_click/interactability.py": [
-   "3c5615ebdfaeb1a8a8f81e068f58f45d26880a50",
+   "702468599f3a379aa184821c84911531ba06ad31",
    "wdspec"
   ],
   "webdriver/tests/element_click/navigate.py": [
@@ -668014,7 +668154,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/file_upload.py": [
-   "d1a8b81da78e9f809d36fa68b4f2d5acee73c615",
+   "7fbab8a66aa4e53f0fd207bc3b0d4bfea0147efa",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/form_controls.py": [
@@ -668022,7 +668162,7 @@
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/interactability.py": [
-   "4145f8b1e32df7c237cd2713559b470989f58cf0",
+   "0717537ae5d802e3fd71a47cb45aac452c513e77",
    "wdspec"
   ],
   "webdriver/tests/element_send_keys/scroll_into_view.py": [
@@ -668073,6 +668213,10 @@
    "9864227374e328514d54596f611c474c6f0fe3f3",
    "wdspec"
   ],
+  "webdriver/tests/execute_script/promise.py": [
+   "1eab7822c5c2f3c8d3fa51ac0713ebdc2c19269c",
+   "wdspec"
+  ],
   "webdriver/tests/execute_script/user_prompts.py": [
    "ec6895b74f8e110120f2e3067e2c35b94d2a532d",
    "wdspec"
@@ -668438,7 +668582,7 @@
    "wdspec"
   ],
   "webdriver/tests/new_session/response.py": [
-   "3e8520718237e6d74fe368d68c4a7bf2ead08c9e",
+   "16c526ae10bea0540c91a9f7c2291488e4a26119",
    "wdspec"
   ],
   "webdriver/tests/new_session/support/__init__.py": [
@@ -668446,7 +668590,7 @@
    "support"
   ],
   "webdriver/tests/new_session/support/create.py": [
-   "475fe5a424fe609f0a7e55164e56378e229e4885",
+   "a0d0ce37b57d396621729c2966748514039e84ad",
    "support"
   ],
   "webdriver/tests/new_session/timeouts.py": [
@@ -669258,7 +669402,7 @@
    "testharness"
   ],
   "webrtc-identity/META.yml": [
-   "900769b9d4334bb38d6413beea6a28235d8c927c",
+   "940144cee1da5f2f0f2bdd27a8dfc8f5bfcc6a1d",
    "support"
   ],
   "webrtc-identity/RTCPeerConnection-constructor.html": [
@@ -669278,7 +669422,7 @@
    "support"
   ],
   "webrtc-stats/META.yml": [
-   "489264f23d6e8c096652620e6e7732a94644353f",
+   "10bcf856eb9258e0845f2fdcb6e08c43ebcdf78a",
    "support"
   ],
   "webrtc-stats/README.md": [
@@ -669290,7 +669434,7 @@
    "testharness"
   ],
   "webrtc/META.yml": [
-   "ea2846e97af01817f06343322efab3d941060f4c",
+   "2025a11f3810042bcef24acae751ce5ffd3a3ee8",
    "support"
   ],
   "webrtc/RTCCertificate-postMessage.html": [
@@ -669374,7 +669518,7 @@
    "testharness"
   ],
   "webrtc/RTCIceTransport.html": [
-   "17ae6dca016fcd08cbb34b4819129f6338de28c6",
+   "6a00e1c59e7183fd84712862b6c6b044d4be340d",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-add-track-no-deadlock.https.html": [
@@ -669398,7 +669542,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-connectionState.html": [
-   "d8e94112718155720f31622966b27760b653c399",
+   "7ef7e4a3bf2f30a221d1de2c09e5388f206afdc5",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-constructor.html": [
@@ -669510,7 +669654,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html": [
-   "7179f1ef78ccd5b5b956df6241d0b2b47c7425a4",
+   "c9d2d1282c7b2190f80506becebc48e32b3dc009",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-setRemoteDescription.html": [
@@ -669666,7 +669810,7 @@
    "testharness"
   ],
   "webrtc/idlharness.https.window.js": [
-   "3c57a022cabfbedcf4a015024ac88ecd3080faf6",
+   "6e9b7e9afa2a1a1ef0448307b2e39e7fbc7a358f",
    "testharness"
   ],
   "webrtc/legacy/README.txt": [
@@ -669710,7 +669854,7 @@
    "support"
   ],
   "webrtc/simplecall-no-ssrcs.https.html": [
-   "266b57663781115154f1ad8ddd2dd69143bc44b9",
+   "877791052824d9d5bf6b9718a4f4adc1d98c8742",
    "testharness"
   ],
   "webrtc/simplecall.https.html": [
@@ -669738,19 +669882,19 @@
    "support"
   ],
   "websockets/Close-1000-reason.any.js": [
-   "1517db2e06c525f7e93e63bf062c608aec1deadb",
+   "e8b49b5875bafe8e4e29b275c8d4709fea1e352f",
    "testharness"
   ],
   "websockets/Close-1000.any.js": [
-   "e052f2385073cc0718532cc24c8a71dd7c75bd5e",
+   "bcfceffbd54d3e71f7e45b03f703f01f8ad370a4",
    "testharness"
   ],
   "websockets/Close-Reason-124Bytes.any.js": [
-   "97bc1bb224b8de671a2b0a1f8f7db1eb99c01585",
+   "357748a7c4df65f34c00fafa4a96a3a427fa2508",
    "testharness"
   ],
   "websockets/Close-reason-unpaired-surrogates.any.js": [
-   "119a32d0c931d1213c5e6b1dc8368c5647843f5e",
+   "0b2e6813cbcf106ed67020e142a9fbaeb2793842",
    "testharness"
   ],
   "websockets/Close-undefined.any.js": [
@@ -669758,39 +669902,39 @@
    "testharness"
   ],
   "websockets/Create-Secure-extensions-empty.any.js": [
-   "82b000dde728a26f325b9eaa9fdf3e3d24cc69eb",
+   "647b7f8ef414baf95c21b1a33921bc0de716a18d",
    "testharness"
   ],
   "websockets/Create-Secure-url-with-space.any.js": [
-   "94265c6182c11e92a09e6b7e35a4a919215d8544",
+   "f6ca19e04726a428fd8c635dc65919ca953c0479",
    "testharness"
   ],
   "websockets/Create-Secure-valid-url-array-protocols.any.js": [
-   "fcaf8a36454d1cbd42826e5bfb8073acb6512f0d",
+   "b0ebe6a0dbe454e12a1040db90f4310c9bdeba3d",
    "testharness"
   ],
   "websockets/Create-Secure-valid-url-binaryType-blob.any.js": [
-   "fed88f5c2f2f51dca1405ae0e2929707c2ba4a70",
+   "a639ee88ab290241696b498bb46501e515ee1235",
    "testharness"
   ],
   "websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js": [
-   "7ecd2959f76dc0572bb9df51a900cd69aee722fa",
+   "768e1bc46f6b81825ef997b4b8702b666207686c",
    "testharness"
   ],
   "websockets/Create-Secure-valid-url-protocol-string.any.js": [
-   "59c77c696acc1baa9116de5a8fc4e0ce6cfa7921",
+   "e1e661cf56771408bf8f8c038945431f5d315986",
    "testharness"
   ],
   "websockets/Create-Secure-valid-url.any.js": [
-   "6f1229e7616634bf7baf4c153e3261f0a29d5a3a",
+   "ab02a19e1374bf6561687f27594360bf50f71856",
    "testharness"
   ],
   "websockets/Create-Secure-verify-url-set-non-default-port.any.js": [
-   "755dbe2f3ffded950166a80f941d3e574adf814d",
+   "8ed985b58e2bd9fb33bfd39683a9f0504084fd62",
    "testharness"
   ],
   "websockets/Create-asciiSep-protocol-string.any.js": [
-   "cb3c3e4c96f1acad756677ea58c86a18f64cdda4",
+   "37657f18dfca8fee3157c48e88798bdbc41f68c3",
    "testharness"
   ],
   "websockets/Create-blocked-port.any.js": [
@@ -669802,11 +669946,11 @@
    "testharness"
   ],
   "websockets/Create-non-absolute-url.any.js": [
-   "369557ec3f526cbd1c4a5a8e01633f73a80d094a",
+   "9ac9707209f9b9bc6a22ea1637783c0aed8f2222",
    "testharness"
   ],
   "websockets/Create-nonAscii-protocol-string.any.js": [
-   "39be9f458051ffa2ea0f1cb17296c3e7e6495af2",
+   "631699413a357caf1ed950f460d484cfeda63ebd",
    "testharness"
   ],
   "websockets/Create-on-worker-shutdown.any.js": [
@@ -669814,39 +669958,39 @@
    "testharness"
   ],
   "websockets/Create-protocol-with-space.any.js": [
-   "b3c14d8e1717a120b71e72323ff5bde601d39419",
+   "18f6815a489a8af0b671d9111c11210f306d0567",
    "testharness"
   ],
   "websockets/Create-protocols-repeated-case-insensitive.any.js": [
-   "16f99759d18afcd4b097ea9282055b5c70f7034c",
+   "1d59015e05835074a9bf4642fe8a40850675bf64",
    "testharness"
   ],
   "websockets/Create-protocols-repeated.any.js": [
-   "624d45306a77ce6fc37b94d2fdd73410c96398d3",
+   "bdaf5606a8b16a4b9a65d0326ba1e0ab3eb330e2",
    "testharness"
   ],
   "websockets/Create-valid-url-array-protocols.any.js": [
-   "dde0303aa0fe3cb4af194e4f13824888f616ffe0",
+   "f8161334e5e0f3cd739daa4bf6ca3ed871d95b8a",
    "testharness"
   ],
   "websockets/Create-valid-url-protocol-empty.any.js": [
-   "8682e4a40181fa96f87a2f0fee6823aabadcbd0e",
+   "0bf2ff53bbc8e1fa84fa4b2728c7a3f24cd14ef8",
    "testharness"
   ],
   "websockets/Create-valid-url-protocol.any.js": [
-   "85e870fda2fc725fe2cdae24b298e27a90ed9611",
+   "2dcae27f1a66e52ee2674b7a08216bc5abdae87d",
    "testharness"
   ],
   "websockets/Create-valid-url.any.js": [
-   "9a43dcc5fdd15c04901738f764623c74dfde4e53",
+   "b84e2118a1d6d98b8b717f38360181b1100fb606",
    "testharness"
   ],
   "websockets/Create-verify-url-set-non-default-port.any.js": [
-   "5548fd134ca1971068dcde4a909d8345428b32c1",
+   "56116719682f11349e0bee4a12219c8a2f90905a",
    "testharness"
   ],
   "websockets/Create-wrong-scheme.any.js": [
-   "506f81c17035c15d563a0e6a7b51d4746f6653eb",
+   "78ff7394622edfce754d6649d478e547a77e57c5",
    "testharness"
   ],
   "websockets/META.yml": [
@@ -669858,63 +670002,63 @@
    "support"
   ],
   "websockets/Secure-Close-1000-reason.any.js": [
-   "4d3f67cf45a8caf0e63146f13899d59890704c0d",
+   "8f289875d9ff3e428ff34cd45a32888041dd80c9",
    "testharness"
   ],
   "websockets/Secure-Close-1000-verify-code.any.js": [
-   "87ba4079ccfef3b2bc6049e35ee6ae700f67aa3a",
+   "a812e0d62c8792945c6c62bafb5f591759a2f624",
    "testharness"
   ],
   "websockets/Secure-Close-1000.any.js": [
-   "67f4e054a3de4c39a31cf2ac9db1255d2dc88d01",
+   "2c7e5e9c63d53125ffe7a55929635ce334d988a8",
    "testharness"
   ],
   "websockets/Secure-Close-1005-verify-code.any.js": [
-   "a7c72eaf5157857f1b4075d8cbd5d02a62e4f8df",
+   "aa8e37ea2245cff6bee993a080aa437f1abe48e3",
    "testharness"
   ],
   "websockets/Secure-Close-1005.any.js": [
-   "ddb2c185854f41aabf3841b341fcf4fc10a74a4a",
+   "f5f2cbf6e6616e7c596789ba6bb1339fe358b0bc",
    "testharness"
   ],
   "websockets/Secure-Close-2999-reason.any.js": [
-   "0fa198eb39e04ba9836f897d30d81499b3743911",
+   "ee1c756694ba258d9c8f05f469c0e94f0e4aaf53",
    "testharness"
   ],
   "websockets/Secure-Close-3000-reason.any.js": [
-   "6640ddc17d4738376aab0e15a197719fbcee9068",
+   "d2266ddc0222efe2c2a0c589c65bace0264861f9",
    "testharness"
   ],
   "websockets/Secure-Close-3000-verify-code.any.js": [
-   "5b122d4c33f4665cd22e0952e4297951504d7a6d",
+   "bbd5bbb22a897ed303aa71dd174b12dfbe39301b",
    "testharness"
   ],
   "websockets/Secure-Close-4999-reason.any.js": [
-   "d57899eb3eed65a352eb8ac37f02ff8f5cc1ea52",
+   "b8429cf97b5b1654a0d93f53c4421435e132e514",
    "testharness"
   ],
   "websockets/Secure-Close-Reason-124Bytes.any.js": [
-   "826cb6eccf761af93bcf56bf9da19c9df0da758d",
+   "0786c295e760c3af2cb4994267974f62c6f004c1",
    "testharness"
   ],
   "websockets/Secure-Close-Reason-Unpaired-surrogates.any.js": [
-   "fdc62c465d34a1ca56475a4efac7131d48eacbc9",
+   "a7b9ea4bb6424160ced80e726cac835961a19b3b",
    "testharness"
   ],
   "websockets/Secure-Close-onlyReason.any.js": [
-   "79f79b5d833994ed7a89fa0f0dbeb5c0c8e7dcfd",
+   "029b8d8af8ef8517fad73cfeec84131aef8d1583",
    "testharness"
   ],
   "websockets/Secure-Close-readyState-Closed.any.js": [
-   "3279744848c0e5a983a2eeadd51e854743b59572",
+   "0dd46f14be148357c02e8878b77ddc66360b968c",
    "testharness"
   ],
   "websockets/Secure-Close-readyState-Closing.any.js": [
-   "b18347447a569dec7d81ec949d27787d543ce31c",
+   "690ca83a2b3fbc4a850626167395625b38da919b",
    "testharness"
   ],
   "websockets/Secure-Close-server-initiated-close.any.js": [
-   "8531b3140b1dcfe058a21a13341807b9de2323f1",
+   "800fbc40e1d15ef407ba824a6424de91dc22188c",
    "testharness"
   ],
   "websockets/Secure-Close-undefined.any.js": [
@@ -669922,123 +670066,123 @@
    "testharness"
   ],
   "websockets/Secure-Send-65K-data.any.js": [
-   "daa937af579a7b710fd4d4e74cf5840f0d30b88b",
+   "ca876534339d7b61eef58552bf8e028f3b9caa7b",
    "testharness"
   ],
   "websockets/Secure-Send-binary-65K-arraybuffer.any.js": [
-   "17859e5630d871d53ae165aece610555e8475820",
+   "0627e7554e6e77d2e4ce1bee28cb2d0022b4ae77",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybuffer.any.js": [
-   "6e4c08d6901039f56625bd30c0f5d9f67547f8c8",
+   "5778a241fffd2c1c3eab0fff86a4b089c403d137",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybufferview-float32.any.js": [
-   "9825d34d5c053070b51db467181b695205d0fe86",
+   "2672319d40e0dbe976386ce82543b63171526b5a",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybufferview-float64.any.js": [
-   "4dcac40e37e251f5c1c64773ff7950f67fe6fb23",
+   "993d5fc07e7167939678496cbf4e7ce467161527",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybufferview-int32.any.js": [
-   "655af21575bf4343ef318a7017269084338d624e",
+   "58fe02b2505902823fc94b020db0ceea1652a647",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js": [
-   "16f050f3a649f1d2e4f677dc8420ce910b64a9ae",
+   "26231b411f0256c65c25de8b854688713e2d9b7e",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js": [
-   "8976b3dc614116d2e76daa90b2eacb6115d1a36d",
+   "d2995ae539f156e01ba71b910346be2586ca7aaa",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js": [
-   "9e9d1b5a825e1eafc912248a7d7a07ae7d4ee24e",
+   "90d9d9d51f85a58e48869fb0c2173c14808f2ff9",
    "testharness"
   ],
   "websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js": [
-   "f563cec9184a999ee1b695f3ab13d5786d2bfe1a",
+   "ce2e6081dd2bbacec91e588f024d8e5eb7967ad6",
    "testharness"
   ],
   "websockets/Secure-Send-binary-blob.any.js": [
-   "8bf0f12ed8267a9e63bae1387a98ac255db99c5f",
+   "f532dfbf83ab91f429eb793d5f95fe8d8856baa9",
    "testharness"
   ],
   "websockets/Secure-Send-data.any.js": [
-   "04c720de792d7cf7a3a14217b7bbea520a8c6a7e",
+   "78de87cc78be78c60237c24a0f1d744f5bdb1249",
    "testharness"
   ],
   "websockets/Secure-Send-null.any.js": [
-   "7c374c25c24eeb51b0d593b2e99988da1785bc17",
+   "bf644c6de880bd17a8781b5f20103a297424c9c7",
    "testharness"
   ],
   "websockets/Secure-Send-paired-surrogates.any.js": [
-   "073f06472982e45322f47a30358b80226db41799",
+   "f53b9d522acc50a6dd86c1269a828b2abe5ec094",
    "testharness"
   ],
   "websockets/Secure-Send-unicode-data.any.js": [
-   "a3518c12f7aabdf9b13b770f46b1fc7e9e36e083",
+   "7156698510b9a54f6c0369bb41306ac1a1717961",
    "testharness"
   ],
   "websockets/Secure-Send-unpaired-surrogates.any.js": [
-   "83f3e7bebc2034981e9cb996c7412152f41b232e",
+   "00d8589ed7fde5d9e2e6012c307ac3144a9acb12",
    "testharness"
   ],
   "websockets/Send-0byte-data.any.js": [
-   "131a19d77dd0b4f071b5aee9944d7552fa38f6ae",
+   "b335a1fc151655b598b878b020e40eee0fd36ab8",
    "testharness"
   ],
   "websockets/Send-65K-data.any.js": [
-   "172e6eed5ac7764a4c300e17fb7669ae1eaa89d0",
+   "ad74327fa8157c4235ced2459e73d5bc216dd5b3",
    "testharness"
   ],
   "websockets/Send-Unpaired-Surrogates.any.js": [
-   "65bb2b16ce843e897be6f691471d1d7afa1bcc99",
+   "820fb3115714a37d42df0bd3008daae1cd494b34",
    "testharness"
   ],
   "websockets/Send-before-open.any.js": [
-   "101a1a2ff60116038b269d902672a5829878a6db",
+   "b2f1ea9c3aa856e5e0ace17ff4ff3a69d6cf57fd",
    "testharness"
   ],
   "websockets/Send-binary-65K-arraybuffer.any.js": [
-   "f446a2579b82e8b64e3dd0bc49ed02d89128a8fa",
+   "394a902c8d70258e482c650baafd3509ee3a73d9",
    "testharness"
   ],
   "websockets/Send-binary-arraybuffer.any.js": [
-   "620514351f3c5987bc22e4b45d562d904627bbd0",
+   "24618293fb8ba537321bd4d7d3b552e00d2d0fa2",
    "testharness"
   ],
   "websockets/Send-binary-arraybufferview-int16-offset.any.js": [
-   "7022668e637bf98b15845f6f7505dec9421df055",
+   "a32b1391dc79693cf5779c00809650ee1782cc5e",
    "testharness"
   ],
   "websockets/Send-binary-arraybufferview-int8.any.js": [
-   "242c8c6ece8f6aeead8e84a81c9ff06a6642e255",
+   "d9e50b511d44164af55c486d1da78a19c4bb7eb1",
    "testharness"
   ],
   "websockets/Send-binary-blob.any.js": [
-   "ee6486ea129e2cd73f7fa81aadda1a8654fad91c",
+   "12d2a83785dde0eb752907a45992f8752d70102b",
    "testharness"
   ],
   "websockets/Send-data.any.js": [
-   "487393b582eddb3fc7627c1d4da379b6065d83a2",
+   "98a866b29493145b34738c2db187d670e7f27318",
    "testharness"
   ],
   "websockets/Send-data.worker.js": [
-   "f607fd7cf386783b0d6c058d309f7ef1d94c64ba",
+   "6d4f693d053266f9982ff2eabcac617d61019857",
    "testharness"
   ],
   "websockets/Send-null.any.js": [
-   "8d8d6b76133ebb97510b6002159eab8d05c3b1f0",
+   "ac1a1b29826652e35c384653aacf79cbee2de7c3",
    "testharness"
   ],
   "websockets/Send-paired-surrogates.any.js": [
-   "f12b0016eb0a91eb32fc76cd934d9f91d0f9035c",
+   "003b04010a8affbf61f32ab3a7974f5b278977a9",
    "testharness"
   ],
   "websockets/Send-unicode-data.any.js": [
-   "ce2b9a0e2405b2b9eed974c91e49b0b2e2c8b6cc",
+   "59292546db11f69b3b25ca7cce37f029f928ea33",
    "testharness"
   ],
   "websockets/basic-auth.any.js": [
@@ -670062,7 +670206,7 @@
    "testharness"
   ],
   "websockets/binaryType-wrong-value.any.js": [
-   "6030608c20176020aaed20c453978e38aa2c4456",
+   "61ac6a19ffd07bf6cb942bc325282ff0b902ace1",
    "testharness"
   ],
   "websockets/bufferedAmount-unchanged-by-sync-xhr.any.js": [
@@ -670630,7 +670774,7 @@
    "testharness"
   ],
   "websockets/opening-handshake/003-sets-origin.worker.js": [
-   "8746cca234ca0f26c39722da9e67ff944ed4501b",
+   "cc54f2b88416e6b2f665a576e32fd6ae301df54f",
    "testharness"
   ],
   "websockets/opening-handshake/003.html": [
@@ -676978,7 +677122,7 @@
    "testharness"
   ],
   "xhr/send-content-type-charset.htm": [
-   "0a91e1fbd7e061df3123163e049cc8aab90a67e2",
+   "a968bb3f4d4e7f3bf67d517b921a436a7faa1aff",
    "testharness"
   ],
   "xhr/send-content-type-string.htm": [
diff --git a/tests/wpt/metadata/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html.ini b/tests/wpt/metadata/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html.ini
new file mode 100644
index 00000000000..f1b2c08cf15
--- /dev/null
+++ b/tests/wpt/metadata/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html.ini
@@ -0,0 +1,4 @@
+[adjacent-to-relpos-inline-in-inline-that-had-block.html]
+  [Make sure that we're sized by the right ancestor]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini b/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini
deleted file mode 100644
index 5496474410b..00000000000
--- a/tests/wpt/metadata/css/compositing/mix-blend-mode/mix-blend-mode-animation.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[mix-blend-mode-animation.html]
-  expected: FAIL
diff --git a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
index dfda874e36a..dc6e246e9db 100644
--- a/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
+++ b/tests/wpt/metadata/css/css-fonts/variations/at-font-face-font-matching.html.ini
@@ -5,9 +5,6 @@
   [Descriptor mathcing priority: Stretch has higher priority than weight]
     expected: FAIL
 
-  [Matching font-weight: '400' should prefer '400' over '450 460']
-    expected: FAIL
-
   [Matching font-weight: '400' should prefer '450 460' over '500']
     expected: FAIL
 
@@ -23,9 +20,6 @@
   [Matching font-weight: '400' should prefer '501 550' over '502 560']
     expected: FAIL
 
-  [Matching font-weight: '430' should prefer '420 440' over '450 460']
-    expected: FAIL
-
   [Matching font-weight: '430' should prefer '450 460' over '500']
     expected: FAIL
 
@@ -62,9 +56,6 @@
   [Matching font-weight: '501' should prefer '450 460' over '390 410']
     expected: FAIL
 
-  [Matching font-weight: '501' should prefer '390 410' over '300 350']
-    expected: FAIL
-
   [Matching font-weight: '399' should prefer '340 360' over '200 300']
     expected: FAIL
 
@@ -98,9 +89,6 @@
   [Matching font-style: 'italic' should prefer 'oblique 40deg 50deg' over 'oblique 5deg 10deg']
     expected: FAIL
 
-  [Matching font-style: 'italic' should prefer 'oblique 5deg' over 'normal']
-    expected: FAIL
-
   [Matching font-style: 'italic' should prefer 'normal' over 'oblique 0deg']
     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 32e3258c7d8..bde5c07388a 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
@@ -701,9 +701,6 @@
   [font-size length(in) / values]
     expected: FAIL
 
-  [text-indent length(ex) / values]
-    expected: FAIL
-
   [font-size length(em) / values]
     expected: FAIL
 
@@ -713,9 +710,6 @@
   [vertical-align length(em) / values]
     expected: FAIL
 
-  [text-indent length(px) / values]
-    expected: FAIL
-
   [clip rectangle(rectangle) / values]
     expected: FAIL
 
@@ -857,9 +851,6 @@
   [max-width length(px) / values]
     expected: FAIL
 
-  [text-indent length(mm) / values]
-    expected: FAIL
-
   [font-size length(mm) / values]
     expected: FAIL
 
@@ -908,9 +899,6 @@
   [word-spacing length(pt) / values]
     expected: FAIL
 
-  [text-indent length(cm) / values]
-    expected: FAIL
-
   [border-right-width length(mm) / values]
     expected: FAIL
 
@@ -929,9 +917,6 @@
   [border-left-width length(in) / values]
     expected: FAIL
 
-  [text-shadow shadow(shadow) / values]
-    expected: FAIL
-
   [max-height length(in) / values]
     expected: FAIL
 
@@ -992,12 +977,6 @@
   [line-height percentage(%) / values]
     expected: FAIL
 
-  [text-indent length(in) / values]
-    expected: FAIL
-
-  [text-indent length(em) / values]
-    expected: FAIL
-
   [border-top-width length(pt) / values]
     expected: FAIL
 
@@ -1043,9 +1022,6 @@
   [border-bottom-width length(pc) / values]
     expected: FAIL
 
-  [text-indent percentage(%) / values]
-    expected: FAIL
-
   [line-height length(pc) / values]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
index f07f9ef2353..1c8f983cd37 100644
--- a/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/transitions-animatable-properties-01.html.ini
@@ -74,9 +74,6 @@
   [opacity end]
     expected: FAIL
 
-  [border-top-width end]
-    expected: FAIL
-
-  [border-right-width end]
+  [outline-width end]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
new file mode 100644
index 00000000000..87b07c3e670
--- /dev/null
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
@@ -0,0 +1,4 @@
+[traverse_the_history_1.html]
+  [Multiple history traversals from the same task]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
index 63ed71e8409..9e8b7f1ef7c 100644
--- a/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-location-interface/location-protocol-setter-non-broken.html.ini
@@ -21,3 +21,15 @@
   [Set HTTP URL frame location.protocol to x]
     expected: FAIL
 
+  [Set HTTP URL frame location.protocol to data]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to gopher]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to http+x]
+    expected: FAIL
+
+  [Set HTTP URL frame location.protocol to ftp]
+    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..8c50bd0c259 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
@@ -2,10 +2,10 @@
   type: testharness
   expected: TIMEOUT
   [picture: source (max-width:500px) broken image, img valid image, resize to wide]
-    expected: TIMEOUT
+    expected: FAIL
 
   [picture: source (max-width:500px) valid image, img valid image, resize to wide]
-    expected: TIMEOUT
+    expected: FAIL
 
   [picture: source (max-width:500px) valid image, img broken image, resize to narrow]
     expected: TIMEOUT
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
new file mode 100644
index 00000000000..8cc42056d34
--- /dev/null
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-img-element/non-active-document.html.ini
@@ -0,0 +1,10 @@
+[non-active-document.html]
+  [DOMParser]
+    expected: FAIL
+
+  [createHTMLDocument]
+    expected: FAIL
+
+  [<template>]
+    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/no-quirks.html.ini b/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini
new file mode 100644
index 00000000000..818a429ed39
--- /dev/null
+++ b/tests/wpt/metadata/quirks/unitless-length/no-quirks.html.ini
@@ -0,0 +1,283 @@
+[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/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
index a56bad443a2..66bd350083b 100644
--- a/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
+++ b/tests/wpt/metadata/webaudio/the-audio-api/the-analysernode-interface/realtimeanalyser-fft-scaling.html.ini
@@ -1,5 +1,4 @@
 [realtimeanalyser-fft-scaling.html]
-  expected: TIMEOUT
   [X 2048-point FFT peak position is not equal to 64. Got 0.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini b/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini
index 6ed09e913f3..41e56e4a392 100644
--- a/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini
+++ b/tests/wpt/metadata/websockets/Create-Secure-extensions-empty.any.js.ini
@@ -6,6 +6,12 @@
   [W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed]
     expected: NOTRUN
 
+  [Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened]
+    expected: FAIL
+
+  [Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed]
+    expected: NOTRUN
+
 
 [Create-Secure-extensions-empty.any.worker.html]
   expected: TIMEOUT
@@ -15,3 +21,9 @@
   [W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed]
     expected: NOTRUN
 
+  [Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened]
+    expected: FAIL
+
+  [Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed]
+    expected: NOTRUN
+
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index f806a845a2a..9d72f08e38e 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,6 +1,5 @@
 [005.html]
   type: testharness
-  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/xhr/send-content-type-charset.htm.ini b/tests/wpt/metadata/xhr/send-content-type-charset.htm.ini
index cbd02923017..db6f0c392be 100644
--- a/tests/wpt/metadata/xhr/send-content-type-charset.htm.ini
+++ b/tests/wpt/metadata/xhr/send-content-type-charset.htm.ini
@@ -51,3 +51,6 @@
   [Multiple non-UTF-8 charset parameters deduplicate, bogus parameter dropped]
     expected: FAIL
 
+  [charset with leading space that is UTF-8 does change]
+    expected: FAIL
+
diff --git a/tests/wpt/web-platform-tests/.azure-pipelines.yml b/tests/wpt/web-platform-tests/.azure-pipelines.yml
index e4c265e1276..f2a7b84f358 100644
--- a/tests/wpt/web-platform-tests/.azure-pipelines.yml
+++ b/tests/wpt/web-platform-tests/.azure-pipelines.yml
@@ -1,6 +1,7 @@
 # This is the configuration file for Azure Pipelines, used to run tests on
 # macOS. Documentation to help understand this setup:
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema
+# https://docs.microsoft.com/en-us/azure/devops/pipelines/process/variables
 
 trigger: none # disable builds for branches
 
@@ -41,6 +42,14 @@ jobs:
     displayName: 'Install web-platform.test certificate'
     condition: variables.run_wptrunner_infrastructure
 
+  - script: HOMEBREW_NO_AUTO_UPDATE=1 brew cask install Homebrew/homebrew-cask-versions/google-chrome-dev
+    displayName: 'Install Chrome Dev'
+    condition: variables.run_wptrunner_infrastructure
+
+  - script: HOMEBREW_NO_AUTO_UPDATE=1 brew cask install Homebrew/homebrew-cask-versions/firefox-nightly
+    displayName: 'Install Firefox Nightly'
+    condition: variables.run_wptrunner_infrastructure
+
   - script: |
       # Pin to STP 67, as SafariDriver isn't working in 68:
       # https://github.com/web-platform-tests/wpt/issues/13800
@@ -59,6 +68,14 @@ jobs:
     displayName: 'Update manifest'
     condition: variables.run_wptrunner_infrastructure
 
+  - script: no_proxy='*' ./wpt run --yes --no-manifest-update --manifest MANIFEST.json --metadata infrastructure/metadata/ --channel=dev chrome infrastructure/
+    displayName: 'Run infrastructure/ tests (Chrome Dev)'
+    condition: variables.run_wptrunner_infrastructure
+
+  - script: no_proxy='*' ./wpt run --yes --no-manifest-update --manifest MANIFEST.json --metadata infrastructure/metadata/ --channel=nightly firefox infrastructure/
+    displayName: 'Run infrastructure/ tests (Firefox Nightly)'
+    condition: variables.run_wptrunner_infrastructure
+
   - script: no_proxy='*' ./wpt run --yes --no-manifest-update --manifest MANIFEST.json --metadata infrastructure/metadata/ --channel=preview safari_webdriver infrastructure/
-    displayName: 'Run infrastructure/ tests'
+    displayName: 'Run infrastructure/ tests (Safari Technology Preview)'
     condition: variables.run_wptrunner_infrastructure
diff --git a/tests/wpt/web-platform-tests/.pyup.yml b/tests/wpt/web-platform-tests/.pyup.yml
index 2137f610f7e..2249e1a89dc 100644
--- a/tests/wpt/web-platform-tests/.pyup.yml
+++ b/tests/wpt/web-platform-tests/.pyup.yml
@@ -7,36 +7,39 @@ search: False
 # default: empty
 # allowed: list
 requirements:
- - tools/wptrunner/requirements_chrome_android.txt:
+ - tools/requirements_flake8.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements_edge.txt:
+ - tools/wpt/requirements.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements_opera.txt:
+ - tools/wptrunner/requirements.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements_servo.txt:
+ - tools/wptrunner/requirements_chrome.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements_safari.txt:
+ - tools/wptrunner/requirements_chrome_android.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements_sauce.txt:
+ - tools/wptrunner/requirements_edge.txt:
+      update: all
+      pin: True
+ - tools/wptrunner/requirements_firefox.txt:
       update: all
       pin: True
  - tools/wptrunner/requirements_ie.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements.txt:
+ - tools/wptrunner/requirements_opera.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements_firefox.txt:
+ - tools/wptrunner/requirements_safari.txt:
       update: all
       pin: True
- - tools/wptrunner/requirements_chrome.txt:
+ - tools/wptrunner/requirements_sauce.txt:
       update: all
       pin: True
- - tools/wpt/requirements.txt:
+ - tools/wptrunner/requirements_servo.txt:
       update: all
       pin: True
diff --git a/tests/wpt/web-platform-tests/audio-output/META.yml b/tests/wpt/web-platform-tests/audio-output/META.yml
index ea6b29e42f3..b6a7d4d0625 100644
--- a/tests/wpt/web-platform-tests/audio-output/META.yml
+++ b/tests/wpt/web-platform-tests/audio-output/META.yml
@@ -1,3 +1,4 @@
 spec: https://w3c.github.io/mediacapture-output/
 suggested_reviewers:
   - guidou
+  - jan-ivar
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html b/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html
new file mode 100644
index 00000000000..784cdc88752
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html
@@ -0,0 +1,22 @@
+<!DOCTYPE HTML>
+<html>
+<head>
+    <script src='/resources/testharness.js'></script>
+    <script src='/resources/testharnessreport.js'></script>
+</head>
+<body>
+    <!-- This tests that a report only policy is not treated as enforcing when
+         inherited by a worker. This manifests in particular for `unsafe-eval`
+         in this bug crbug.com/777076  -->
+    <script nonce="abc">
+      var t1 = async_test("Check that inline is allowed since the inherited policy is report only");
+      var t2 = async_test("Check that eval is allowed since the inherited policy is report only");
+
+      var w = new Worker("support/eval.js");
+      w.onmessage = function(e) {
+        if (e.data == "unsafe-inline allowed") t1.done();
+        else if (e.data == "unsafe-eval allowed") t2.done();
+      }
+    </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers
new file mode 100644
index 00000000000..877e192bbff
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/cspro-not-enforced-in-worker.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy-Report-Only: script-src 'self' 'nonce-abc';
diff --git a/tests/wpt/web-platform-tests/content-security-policy/generic/support/eval.js b/tests/wpt/web-platform-tests/content-security-policy/generic/support/eval.js
new file mode 100644
index 00000000000..d8ba2a5589a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/generic/support/eval.js
@@ -0,0 +1,2 @@
+postMessage('unsafe-inline allowed');
+eval("postMessage('unsafe-eval allowed')");
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html
index 458373fbc01..f58407ac6de 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-allows.sub.html
@@ -12,5 +12,5 @@
     assert_equals(e.data.result, 'success');
   });
 </script>
-<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27%3B%20form-action%20%27self%27%3B&action=post_message_to_frame_owner.html&report_id=dummy">
+<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27%3B%20form-action%20%27self%27%3B&action=post_message_to_frame_owner.html&report_id={{uuid()}}">
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html
index 3ed4815bff6..0ddc8820f94 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-allows-navigate-to-blocks.sub.html
@@ -12,5 +12,5 @@
     assert_equals(e.data.result, 'success');
   });
 </script>
-<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27none%27%3B%20form-action%20%27self%27%3B&action=post_message_to_frame_owner.html&report_id=dummy">
+<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27none%27%3B%20form-action%20%27self%27%3B&action=post_message_to_frame_owner.html&report_id={{uuid()}}">
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html
index f3f7896e932..927ebb4d361 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-allows.sub.html
@@ -13,5 +13,5 @@
     assert_equals(e.data.violatedDirective, 'form-action');
   });
 </script>
-<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27%3B%20form-action%20%27none%27%3B&action=post_message_to_frame_owner.html&report_id=dummy">
-</body>
\ No newline at end of file
+<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27self%27%3B%20form-action%20%27none%27%3B&action=post_message_to_frame_owner.html&report_id={{uuid()}}"">
+</body>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html
index 08e0cbe3fb9..56688fa418b 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/form-action/form-action-blocks-navigate-to-blocks.sub.html
@@ -13,5 +13,5 @@
     assert_equals(e.data.violatedDirective, 'form-action');
   });
 </script>
-<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27none%27%3B%20form-action%20%27none%27%3B&action=post_message_to_frame_owner.html&report_id=dummy">
+<iframe src="../support/form_action_navigation.sub.html?csp=navigate-to%20%27none%27%3B%20form-action%20%27none%27%3B&action=post_message_to_frame_owner.html&report_id={{uuid()}}">
 </body>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.html b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html
index a09057e7156..a09057e7156 100644
--- a/tests/wpt/web-platform-tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.html
+++ b/tests/wpt/web-platform-tests/content-security-policy/navigate-to/spv-only-sent-to-initiator.sub.html
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html
new file mode 100644
index 00000000000..5357aa2eef2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html
@@ -0,0 +1,19 @@
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <!-- Content-Security-Policy-Report-Only: script-src 'unsafe-inline'; report-uri ../support/report.py?op=put&reportID={{$id}} -->
+</head>
+<body>
+  <script>
+    var t = async_test("Eval is allowed because the CSP is report-only");
+    try {
+      eval("t.done()");
+    } catch {
+      t.step(function() { assert_true(false, "The eval should have execute succesfully"); })
+    }
+  </script>
+
+  <script async defer src="../support/checkReport.sub.js?reportField=violated-directive&reportValue=script-src%20%27unsafe-inline%27"></script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers
new file mode 100644
index 00000000000..37a04b5fc2e
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode-and-sends-report.html.sub.headers
@@ -0,0 +1,2 @@
+Set-Cookie: eval-allowed-in-report-only-mode-and-sends-report={{$id:uuid()}}; Path=/content-security-policy/script-src
+Content-Security-Policy-Report-Only: script-src 'unsafe-inline'; report-uri ../support/report.py?op=put&reportID={{$id}}
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html
new file mode 100644
index 00000000000..eebc8f026f9
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html
@@ -0,0 +1,17 @@
+<html>
+<head>
+  <script src="/resources/testharness.js"></script>
+  <script src="/resources/testharnessreport.js"></script>
+  <!-- Content-Security-Policy-Report-Only: script-src 'unsafe-inline' -->
+</head>
+<body>
+  <script>
+    var t = async_test("Eval is allowed because the CSP is report-only");
+    try {
+      eval("t.done()");
+    } catch {
+      t.step(function() { assert_true(false, "The eval should have execute succesfully"); })
+    }
+  </script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers
new file mode 100644
index 00000000000..b9b5d81acc3
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/script-src/eval-allowed-in-report-only-mode.html.sub.headers
@@ -0,0 +1 @@
+Content-Security-Policy-Report-Only: script-src 'unsafe-inline'
diff --git a/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/constructor-required-fields.html b/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/constructor-required-fields.html
new file mode 100644
index 00000000000..1260c491fc2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/content-security-policy/securitypolicyviolation/constructor-required-fields.html
@@ -0,0 +1,239 @@
+<!doctype html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+    // basic tests.
+    test(function() {
+      assert_throws(TypeError(),
+                    function() { new SecurityPolicyViolationEvent(); });
+    }, "SecurityPolicyViolationEvent constructor should throw with no parameters");
+
+    test(function() {
+      assert_not_equals(new SecurityPolicyViolationEvent("securitypolicyviolation", {
+        documentURI: "http://example.com",
+        referrer: "http://example.com",
+        blockedURI: "http://example.com",
+        violatedDirective: "default-src",
+        effectiveDirective: "default-src",
+        originalPolicy: "default-src 'none'",
+        sourceFile: "example.js",
+        sample: "<script>alert('1');</scr" + "ipt>",
+        disposition: "enforce",
+        statusCode: 200,
+        lineNumber: 1,
+        columnNumber: 1,
+      }), undefined);
+    }, "SecurityPolicyViolationEvent constructor works with an init dict");
+
+    // missing required members
+    test(function() {
+      assert_throws(TypeError(),
+        function() { new SecurityPolicyViolationEvent("securitypolicyviolation", {
+          // documentURI: "http://example.com",
+          referrer: "http://example.com",
+          blockedURI: "http://example.com",
+          violatedDirective: "default-src",
+          effectiveDirective: "default-src",
+          originalPolicy: "default-src 'none'",
+          sourceFile: "example.js",
+          sample: "<script>alert('1');</scr" + "ipt>",
+          disposition: "enforce",
+          statusCode: 200,
+          lineNumber: 1,
+          columnNumber: 1,
+      })});
+    }, "SecurityPolicyViolationEvent constructor requires documentURI");
+
+    test(function() {
+      assert_throws(TypeError(),
+        function() { new SecurityPolicyViolationEvent("securitypolicyviolation", {
+          documentURI: "http://example.com",
+          referrer: "http://example.com",
+          blockedURI: "http://example.com",
+          // violatedDirective: "default-src",
+          effectiveDirective: "default-src",
+          originalPolicy: "default-src 'none'",
+          sourceFile: "example.js",
+          sample: "<script>alert('1');</scr" + "ipt>",
+          disposition: "enforce",
+          statusCode: 200,
+          lineNumber: 1,
+          columnNumber: 1,
+      })});
+    }, "SecurityPolicyViolationEvent constructor requires violatedDirective");
+
+    test(function() {
+      assert_throws(TypeError(),
+        function() { new SecurityPolicyViolationEvent("securitypolicyviolation", {
+          documentURI: "http://example.com",
+          referrer: "http://example.com",
+          blockedURI: "http://example.com",
+          violatedDirective: "default-src",
+          // effectiveDirective: "default-src",
+          originalPolicy: "default-src 'none'",
+          sourceFile: "example.js",
+          sample: "<script>alert('1');</scr" + "ipt>",
+          disposition: "enforce",
+          statusCode: 200,
+          lineNumber: 1,
+          columnNumber: 1,
+      })});
+    }, "SecurityPolicyViolationEvent constructor requires effectiveDirective");
+
+    test(function() {
+      assert_throws(TypeError(),
+        function() { new SecurityPolicyViolationEvent("securitypolicyviolation", {
+          documentURI: "http://example.com",
+          referrer: "http://example.com",
+          blockedURI: "http://example.com",
+          violatedDirective: "default-src",
+          effectiveDirective: "default-src",
+          // originalPolicy: "default-src 'none'",
+          sourceFile: "example.js",
+          sample: "<script>alert('1');</scr" + "ipt>",
+          disposition: "enforce",
+          statusCode: 200,
+          lineNumber: 1,
+          columnNumber: 1,
+      })});
+    }, "SecurityPolicyViolationEvent constructor requires originalPolicy");
+
+    test(function() {
+      assert_throws(TypeError(),
+        function() { new SecurityPolicyViolationEvent("securitypolicyviolation", {
+          documentURI: "http://example.com",
+          referrer: "http://example.com",
+          blockedURI: "http://example.com",
+          violatedDirective: "default-src",
+          effectiveDirective: "default-src",
+          originalPolicy: "default-src 'none'",
+          sourceFile: "example.js",
+          sample: "<script>alert('1');</scr" + "ipt>",
+          // disposition: "enforce",
+          statusCode: 200,
+          lineNumber: 1,
+          columnNumber: 1,
+      })});
+    }, "SecurityPolicyViolationEvent constructor requires disposition");
+
+    test(function() {
+      assert_throws(TypeError(),
+        function() { new SecurityPolicyViolationEvent("securitypolicyviolation", {
+          documentURI: "http://example.com",
+          referrer: "http://example.com",
+          blockedURI: "http://example.com",
+          violatedDirective: "default-src",
+          effectiveDirective: "default-src",
+          originalPolicy: "default-src 'none'",
+          sourceFile: "example.js",
+          sample: "<script>alert('1');</scr" + "ipt>",
+          disposition: "enforce",
+          // statusCode: 200,
+          lineNumber: 1,
+          columnNumber: 1,
+      })});
+    }, "SecurityPolicyViolationEvent constructor requires statusCode");
+
+    // missing optional members
+    test(function() {
+      assert_not_equals(new SecurityPolicyViolationEvent("securitypolicyviolation", {
+        documentURI: "http://example.com",
+        // referrer: "http://example.com",
+        blockedURI: "http://example.com",
+        violatedDirective: "default-src",
+        effectiveDirective: "default-src",
+        originalPolicy: "default-src 'none'",
+        sourceFile: "example.js",
+        sample: "<script>alert('1');</scr" + "ipt>",
+        disposition: "enforce",
+        statusCode: 200,
+        lineNumber: 1,
+        columnNumber: 1,
+      }), undefined);
+    }, "SecurityPolicyViolationEvent constructor does not require referrer");
+
+    test(function() {
+      assert_not_equals(new SecurityPolicyViolationEvent("securitypolicyviolation", {
+        documentURI: "http://example.com",
+        referrer: "http://example.com",
+        // blockedURI: "http://example.com",
+        violatedDirective: "default-src",
+        effectiveDirective: "default-src",
+        originalPolicy: "default-src 'none'",
+        sourceFile: "example.js",
+        sample: "<script>alert('1');</scr" + "ipt>",
+        disposition: "enforce",
+        statusCode: 200,
+        lineNumber: 1,
+        columnNumber: 1,
+      }), undefined);
+    }, "SecurityPolicyViolationEvent constructor does not require blockedURI");
+
+    test(function() {
+      assert_not_equals(new SecurityPolicyViolationEvent("securitypolicyviolation", {
+        documentURI: "http://example.com",
+        referrer: "http://example.com",
+        blockedURI: "http://example.com",
+        violatedDirective: "default-src",
+        effectiveDirective: "default-src",
+        originalPolicy: "default-src 'none'",
+        // sourceFile: "example.js",
+        sample: "<script>alert('1');</scr" + "ipt>",
+        disposition: "enforce",
+        statusCode: 200,
+        lineNumber: 1,
+        columnNumber: 1,
+      }), undefined);
+    }, "SecurityPolicyViolationEvent constructor does not require sourceFile");
+
+    test(function() {
+      assert_not_equals(new SecurityPolicyViolationEvent("securitypolicyviolation", {
+        documentURI: "http://example.com",
+        referrer: "http://example.com",
+        blockedURI: "http://example.com",
+        violatedDirective: "default-src",
+        effectiveDirective: "default-src",
+        originalPolicy: "default-src 'none'",
+        sourceFile: "example.js",
+        // sample: "<script>alert('1');</scr" + "ipt>",
+        disposition: "enforce",
+        statusCode: 200,
+        lineNumber: 1,
+        columnNumber: 1,
+      }), undefined);
+    }, "SecurityPolicyViolationEvent constructor does not require sample");
+
+    test(function() {
+      assert_not_equals(new SecurityPolicyViolationEvent("securitypolicyviolation", {
+        documentURI: "http://example.com",
+        referrer: "http://example.com",
+        blockedURI: "http://example.com",
+        violatedDirective: "default-src",
+        effectiveDirective: "default-src",
+        originalPolicy: "default-src 'none'",
+        sourceFile: "example.js",
+        sample: "<script>alert('1');</scr" + "ipt>",
+        disposition: "enforce",
+        statusCode: 200,
+        // lineNumber: 1,
+        columnNumber: 1,
+      }), undefined);
+    }, "SecurityPolicyViolationEvent constructor does not require lineNumber");
+
+    test(function() {
+      assert_not_equals(new SecurityPolicyViolationEvent("securitypolicyviolation", {
+        documentURI: "http://example.com",
+        referrer: "http://example.com",
+        blockedURI: "http://example.com",
+        violatedDirective: "default-src",
+        effectiveDirective: "default-src",
+        originalPolicy: "default-src 'none'",
+        sourceFile: "example.js",
+        sample: "<script>alert('1');</scr" + "ipt>",
+        disposition: "enforce",
+        statusCode: 200,
+        lineNumber: 1,
+        // columnNumber: 1,
+      }), undefined);
+    }, "SecurityPolicyViolationEvent constructor does not require columnNumber");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html b/tests/wpt/web-platform-tests/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html
new file mode 100644
index 00000000000..1859ff83001
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/CSS2/abspos/adjacent-to-relpos-inline-in-inline-that-had-block.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<link rel="author" title="Morten Stenshorne" href="mstensho@chromium.org">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visudet.html#containing-block-details">
+<link rel="help" href="https://www.w3.org/TR/CSS22/visuren.html#anonymous-block-level">
+<p>There should be a green square below, and no red.</p>
+<div style="position:relative; width:100px; height:100px; background:red;">
+  <span>
+    <span id="posMe">
+      <div id="removeMe"></div>
+    </span>
+  </span>
+  <span>
+    <div>
+      <div id="target" style="position:absolute; width:100%; height:100%; background:green;"></div>
+    </div>
+  </span>
+</div>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+  test(()=> {
+    document.body.offsetTop;
+    removeMe.style.display = "none";
+    document.body.offsetTop;
+    posMe.style.position = "relative";
+    assert_equals(document.getElementById("target").offsetWidth, 100);
+    assert_equals(document.getElementById("target").offsetHeight, 100);
+    assert_equals(document.getElementById("target").offsetLeft, 0);
+    assert_equals(document.getElementById("target").offsetTop, 0);
+  }, "Make sure that we're sized by the right ancestor");
+</script>
diff --git a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html
index 3e069e76045..091e985406b 100644
--- a/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html
+++ b/tests/wpt/web-platform-tests/css/css-typed-om/the-stylepropertymap/properties/pointer-events.html
@@ -15,9 +15,9 @@
 
 runPropertyTests('pointer-events', [
   { syntax: 'bounding-box' },
-  { syntax: 'visiblePainted' },
-  { syntax: 'visibleFill' },
-  { syntax: 'visibleStroke' },
+  { syntax: 'visiblepainted' },
+  { syntax: 'visiblefill' },
+  { syntax: 'visiblestroke' },
   { syntax: 'visible' },
   { syntax: 'painted' },
   { syntax: 'fill' },
diff --git a/tests/wpt/web-platform-tests/css/css-values/vh-support-margin.html b/tests/wpt/web-platform-tests/css/css-values/vh-support-margin.html
index 06b2375a82d..57fce2064b0 100644
--- a/tests/wpt/web-platform-tests/css/css-values/vh-support-margin.html
+++ b/tests/wpt/web-platform-tests/css/css-values/vh-support-margin.html
@@ -13,7 +13,7 @@
 	<link
 		rel="author"
 		title="François REMY"
-		href="mailto:fremycompany.developer@yahoo.fr"
+		href="mailto:francois.remy.pub@outlook.com"
 	/ >
 
 	<link rel="help" href="http://www.w3.org/TR/css3-values/#viewport-relative-lengths">
@@ -25,7 +25,7 @@
 
 	<style type="text/css">
 
-			html, body { margin: 0px; padding: 0px; }
+			html, body { margin: 0px; padding: 0px; height: 100%; }
 
 			html { background: green; }
 			#target { background: red; width: 100%; height: 100%; margin-left: -100vw; margin-top: -100vh; }
diff --git a/tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-computed.html b/tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-computed.html
new file mode 100644
index 00000000000..a29d25ccdf2
--- /dev/null
+++ b/tests/wpt/web-platform-tests/css/motion/parsing/offset-rotate-computed.html
@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8">
+<title>Motion Path Module Level 1: getComputedValue().offsetRotate</title>
+<link rel="author" title="Eric Willigers" href="mailto:ericwilligers@chromium.org">
+<link rel="help" href="https://drafts.fxtf.org/motion-1/#offset-rotate-property">
+<meta name="assert" content="offset-rotate reverse is auto 180deg.">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="/css/support/computed-testcommon.js"></script>
+</head>
+<body>
+<div id="target"></div>
+<script>
+test_computed_value("offset-rotate", "auto", "auto 0deg");
+test_computed_value("offset-rotate", "reverse", "auto 180deg");
+test_computed_value("offset-rotate", "calc(90deg - 0.5turn - 300grad + 0rad)", "-360deg");
+test_computed_value("offset-rotate", "auto 5turn", "auto 1800deg");
+test_computed_value("offset-rotate", "reverse -50grad", "auto 135deg");
+</script>
+</body>
+</html>
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html
new file mode 100644
index 00000000000..b148df17caf
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html
@@ -0,0 +1,65 @@
+<!DOCTYPE html>
+<body>
+  <script src=/resources/testharness.js></script>
+  <script src=/resources/testharnessreport.js></script>
+  <script src=/feature-policy/resources/featurepolicy.js></script>
+  <!-- Feature-Policy: fullscreen cross_origin https://www.example.com; -->
+  <script>
+  'use strict';
+  var same_origin = 'https://{{domains[]}}:{{ports[https][0]}}';
+  var cross_origin = 'https://{{domains[www]}}:{{ports[https][0]}}';
+  var same_origin_src = '/feature-policy/resources/feature-policy-allowedfeatures.html';
+  var cross_origin_src = cross_origin + same_origin_src;
+  var header_policy = 'Feature-Policy: fullscreen \'self\' ' + cross_origin +
+  ' https://www.example.com;';
+
+  // Test that fullscreen's allowlist is [same_origin, cross_origin, 'https://www.example.com']
+  test(function() {
+    assert_array_equals(
+      document.policy.getAllowlistForFeature('fullscreen'),
+      [cross_origin, 'https://www.example.com']);
+  }, header_policy + ' -- test allowlist is [cross_origin, https://www.example.com]');
+
+  // Test that fullscreen is disallowed on same_origin, allowed on some cross_origin subframes.
+  test_disallowed_feature_for_subframe(
+    header_policy + ' -- test fullscreen is allowed on same-origin subframe',
+    'fullscreen',
+    same_origin_src);
+  test_allowed_feature_for_subframe(
+    header_policy + ' -- test fullscreen is allowed on cross-origin ' + cross_origin_src + ' subframe',
+    'fullscreen',
+    cross_origin_src);
+  var cross_origin_src1 = 'https://{{domains[www1]}}:{{ports[https][0]}}' + same_origin_src;
+  test_disallowed_feature_for_subframe(
+    header_policy + ' -- test fullscreen is disallowed on cross-origin ' + cross_origin_src1 + ' subframe',
+    'fullscreen',
+    cross_origin_src1);
+
+  // dynamically update sub frame's container policy
+  var disallow = "fullscreen 'none';"
+  test_disallowed_feature_for_subframe(
+    header_policy + ', iframe.allow = ' + disallow + ' -- test fullscreen is disallowed on same-origin subframe',
+    'fullscreen',
+    same_origin_src,
+    disallow);
+
+  test_disallowed_feature_for_subframe(
+    header_policy + 'iframe.allow = ' + disallow + ' -- test fullscreen is allowed on specific cross-origin subframe',
+    'fullscreen',
+    cross_origin_src,
+    disallow);
+
+  var allow = "fullscreen " + cross_origin;
+  test_disallowed_feature_for_subframe(
+    header_policy + ', iframe.allow = ' + allow + ' -- test fullscreen is disallowed on same-origin subframe',
+    'fullscreen',
+    same_origin_src,
+    allow);
+
+  test_allowed_feature_for_subframe(
+    header_policy + 'iframe.allow = ' + allow + ' -- test fullscreen is allowed on specific cross-origin subframe',
+    'fullscreen',
+    cross_origin_src,
+    allow);
+  </script>
+</body>
diff --git a/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers
new file mode 100644
index 00000000000..4ac2a4a588c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/feature-policy/feature-policy-header-policy-declined.https.sub.html.sub.headers
@@ -0,0 +1 @@
+Feature-Policy: fullscreen https://{{domains[www]}}:{{ports[https][0]}} https://www.example.com;
diff --git a/tests/wpt/web-platform-tests/interfaces/CSP.idl b/tests/wpt/web-platform-tests/interfaces/CSP.idl
index 46fae543cb2..4b53e3a3a40 100644
--- a/tests/wpt/web-platform-tests/interfaces/CSP.idl
+++ b/tests/wpt/web-platform-tests/interfaces/CSP.idl
@@ -10,31 +10,34 @@ enum SecurityPolicyViolationEventDisposition {
 [Constructor(DOMString type, optional SecurityPolicyViolationEventInit eventInitDict),
  Exposed=(Window,Worker)]
 interface SecurityPolicyViolationEvent : Event {
-    readonly    attribute USVString      documentURI;
+    readonly    attribute USVString      documentURL;
+    readonly    attribute USVString      documentURI; // historical alias of documentURL
     readonly    attribute USVString      referrer;
-    readonly    attribute USVString      blockedURI;
-    readonly    attribute DOMString      violatedDirective;
+    readonly    attribute USVString      blockedURL;
+    readonly    attribute USVString      blockedURI; // historical alias of blockedURL
     readonly    attribute DOMString      effectiveDirective;
+    readonly    attribute DOMString      violatedDirective; // historical alias of effectiveDirective
     readonly    attribute DOMString      originalPolicy;
     readonly    attribute USVString      sourceFile;
     readonly    attribute DOMString      sample;
     readonly    attribute SecurityPolicyViolationEventDisposition      disposition;
     readonly    attribute unsigned short statusCode;
-    readonly    attribute unsigned long  lineNumber;
-    readonly    attribute unsigned long  columnNumber;
+    readonly    attribute unsigned long  lineno;
+    readonly    attribute unsigned long  lineNumber; // historical alias of lineno
+    readonly    attribute unsigned long  colno;
+    readonly    attribute unsigned long  columnNumber; // historical alias of colno
 };
 
 dictionary SecurityPolicyViolationEventInit : EventInit {
-    required USVString      documentURI;
+    required USVString      documentURL;
              USVString      referrer = "";
-             USVString      blockedURI = "";
-    required DOMString      violatedDirective;
+             USVString      blockedURL = "";
     required DOMString      effectiveDirective;
     required DOMString      originalPolicy;
              USVString      sourceFile = "";
              DOMString      sample = "";
     required SecurityPolicyViolationEventDisposition disposition;
     required unsigned short statusCode;
-             unsigned long  lineNumber = 0;
-             unsigned long  columnNumber = 0;
+             unsigned long  lineno = 0;
+             unsigned long  colno = 0;
 };
diff --git a/tests/wpt/web-platform-tests/interfaces/screen-capture.idl b/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
index b79d09d19dc..f00660bd904 100644
--- a/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
+++ b/tests/wpt/web-platform-tests/interfaces/screen-capture.idl
@@ -3,7 +3,7 @@
 // (https://github.com/tidoust/reffy-reports)
 // Source: Screen Capture (https://w3c.github.io/mediacapture-screen-share/)
 
-partial interface Navigator {
+partial interface MediaDevices {
     Promise<MediaStream> getDisplayMedia(optional MediaStreamConstraints constraints);
 };
 
diff --git a/tests/wpt/web-platform-tests/mediacapture-streams/META.yml b/tests/wpt/web-platform-tests/mediacapture-streams/META.yml
index 9e8b0f46f9b..1ed650e97c4 100644
--- a/tests/wpt/web-platform-tests/mediacapture-streams/META.yml
+++ b/tests/wpt/web-platform-tests/mediacapture-streams/META.yml
@@ -5,3 +5,4 @@ suggested_reviewers:
   - dontcallmedom
   - eric-carlson
   - youennf
+  - jan-ivar
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-abort-method.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-abort-method.https.html
index 64886a6b7cc..8e561b288d1 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-abort-method.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-abort-method.https.html
@@ -48,7 +48,7 @@ promise_test(async t => {
   await promise_rejects(t, "AbortError", acceptPromise);
   // As request is now "closed", trying to show it will fail
   await promise_rejects(t, "InvalidStateError", request.show());
-});
+}, "The same request cannot be shown multiple times.");
 
 promise_test(async t => {
   // request is in "created" state.
@@ -70,7 +70,7 @@ promise_test(async t => {
   // The request is now "closed", so...
   await promise_rejects(t, "InvalidStateError", request.abort());
   await promise_rejects(t, "AbortError", acceptPromise);
-});
+}, "Aborting a request before it is shown doesn't prevent it from being shown later.");
 
 promise_test(async t => {
   const request = new PaymentRequest(defaultMethods, defaultDetails);
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html
index 03a9c19fb8f..f38caa00b93 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-canmakepayment-method.https.html
@@ -8,7 +8,9 @@
 <script src="/resources/testdriver.js"></script>
 <script>
 const basicCard = Object.freeze({ supportedMethods: "basic-card" });
-const applePay = Object.freeze({ supportedMethods: "https://apple.com/apple-pay" });
+const applePay = Object.freeze({
+  supportedMethods: "https://apple.com/apple-pay",
+});
 const defaultMethods = Object.freeze([basicCard, applePay]);
 const defaultDetails = Object.freeze({
   total: {
@@ -20,15 +22,23 @@ const defaultDetails = Object.freeze({
   },
 });
 
+const unsupportedMethods = [
+  { supportedMethods: "this-is-not-supported" },
+  { supportedMethods: "https://not.supported" },
+];
+
 promise_test(async t => {
   const request = new PaymentRequest(defaultMethods, defaultDetails);
-  assert_true(await request.canMakePayment(), "one of the methods should be supported");
-}, `If payment method identifier and serialized parts are supported, resolve promise with true.`);
+  assert_true(
+    await request.canMakePayment(),
+    "one of the methods should be supported"
+  );
+}, `If payment method identifier are supported, resolve promise with true.`);
 
 promise_test(async t => {
   const request = new PaymentRequest(defaultMethods, defaultDetails);
   const acceptPromise = test_driver.bless("show payment request", () => {
-    request.show() // Sets state to "interactive"
+    request.show(); // Sets state to "interactive"
   });
   const canMakePaymentPromise = request.canMakePayment();
   try {
@@ -50,7 +60,7 @@ promise_test(async t => {
 promise_test(async t => {
   const request = new PaymentRequest(defaultMethods, defaultDetails);
   const acceptPromise = test_driver.bless("show payment request", () => {
-    request.show() // Sets state to "interactive"
+    request.show(); // Sets state to "interactive"
   });
   acceptPromise.catch(() => {}); // no-op, just to silence unhandled rejection in devtools.
   await request.abort(); // The state is now "closed"
@@ -91,52 +101,20 @@ promise_test(async t => {
 }, `If request.[[state]] is "created", then return a promise that resolves to true for known method.`);
 
 promise_test(async t => {
-  const unsupportedMethods = [
-    "this-is-not-supported",
-    "https://not.supported",
-    "e",
-    "n6jzof05mk2g4lhxr-u-q-w1-c-i-pa-ty-bdvs9-ho-ae7-p-md8-s-wq3-h-qd-e-q-sa",
-    "a-b-q-n-s-pw0",
-    "m-u",
-    "s-l5",
-    "k9-f",
-    "m-l",
-    "u4-n-t",
-    "i488jh6-g18-fck-yb-v7-i",
-    "x-x-t-t-c34-o",
-    "https://wpt",
-    "https://wpt.fyi/",
-    "https://wpt.fyi/payment",
-    "https://wpt.fyi/payment-request",
-    "https://wpt.fyi/payment-request?",
-    "https://wpt.fyi/payment-request?this=is",
-    "https://wpt.fyi/payment-request?this=is&totally",
-    "https://wpt.fyi:443/payment-request?this=is&totally",
-    "https://wpt.fyi:443/payment-request?this=is&totally#fine",
-    "https://:@wpt.fyi:443/payment-request?this=is&totally#👍",
-    " \thttps://wpt\n ",
-    "https://xn--c1yn36f",
-    "https://點看",
-  ];
-  for (const method of unsupportedMethods) {
-    try {
-      const request = new PaymentRequest(
-        [{ supportedMethods: method }],
-        defaultDetails
-      );
-      assert_false(
-        await request.canMakePayment(),
-        `method "${method}" must not be supported`
-      );
-    } catch (err) {
-      assert_equals(
-        err.name,
-        "NotAllowedError",
-        "if it throws, then it must be a NotAllowedError."
-      );
-    }
-  }
-}, `If payment method identifier is unknown, resolve promise with false.`);
+  const noneSupported = new PaymentRequest(
+    unsupportedMethods,
+    defaultDetails
+  ).canMakePayment();
+  assert_false(await noneSupported, `methods must not be supported`);
+}, "All methods are unsupported");
+
+promise_test(async t => {
+  const someSupported = new PaymentRequest(
+    [...unsupportedMethods, ...defaultMethods],
+    defaultDetails
+  ).canMakePayment();
+  assert_true(await someSupported, `At least one method is expected to be supported.`);
+}, `Mix of supported and unsupported methods, at least one method is supported.`);
 </script>
 
 <small>
diff --git a/tests/wpt/web-platform-tests/payment-request/payment-request-constructor.https.html b/tests/wpt/web-platform-tests/payment-request/payment-request-constructor.https.html
index b5997a0c9be..99c25d17234 100644
--- a/tests/wpt/web-platform-tests/payment-request/payment-request-constructor.https.html
+++ b/tests/wpt/web-platform-tests/payment-request/payment-request-constructor.https.html
@@ -283,9 +283,6 @@ test(() => {
       [
         {
           supportedMethods: "https://wpt.fyi/payment-request",
-          data: {
-            supportedTypes: ["debit"],
-          },
         },
       ],
       {
diff --git a/tests/wpt/web-platform-tests/pointerlock/mouse_buttons_back_forward-manual.html b/tests/wpt/web-platform-tests/pointerlock/mouse_buttons_back_forward-manual.html
index 06e0a5daee1..4515ebabcbd 100644
--- a/tests/wpt/web-platform-tests/pointerlock/mouse_buttons_back_forward-manual.html
+++ b/tests/wpt/web-platform-tests/pointerlock/mouse_buttons_back_forward-manual.html
@@ -10,13 +10,16 @@
             var testMouseUp = async_test('Tests that when pointer is locked, the mouseup is preventable.');
             var received_back = false;
             var received_forward = false;
+            const left_button = 0;
+            const back_button = 3;
+            const forward_button = 4;
             window.addEventListener('mouseup', function(e) {
-              if (e.button == 0) {
+              if (e.button == left_button) {
                 document.body.requestPointerLock();
-              } else if (e.button == 3) {
+              } else if (e.button == back_button) {
                 received_back = true;
                 e.preventDefault();
-              } else if (e.button == 4) {
+              } else if (e.button == forward_button) {
                 received_forward = true;
                 e.preventDefault();
               }
diff --git a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html b/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html
index 211e8a01058..ab1bd8089d1 100644
--- a/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html
+++ b/tests/wpt/web-platform-tests/presentation-api/controlling-ua/reconnectToMultiplePresentations_success-manual.https.html
@@ -94,13 +94,31 @@
     await eventWatcher2.wait_for('close');
     assert_equals(connection2.state, 'closed', 'The presentation connection is successfully closed.');
 
-    const c1 = await request1.reconnect(connection1.id);
-    assert_equals(c1, connection1, 'The promise is resolved with the existing presentation connection.');
+    const c11 = await request1.reconnect(connection1.id);
+    assert_equals(c11, connection1, 'The promise is resolved with the existing presentation connection.');
+
+    const c22 = await request2.reconnect(connection2.id);
+    assert_equals(c22, connection2, 'The promise is resolved with the existing presentation connection.');
+
+    await Promise.all([
+      eventWatcher1.wait_for('connect'),
+      eventWatcher2.wait_for('connect')
+    ]);
+
+    assert_equals(connection1.state, 'connected', 'The presentation connection is successfully reconnected.');
+    assert_equals(connection2.state, 'connected', 'The presentation connection is successfully reconnected.');
 
     // Reconnecting a presentation via a different presentation request with the same presentation
     // URLs will succeed
-    const c2 = await request1.reconnect(connection2.id);
-    assert_equals(c2, connection2, 'The promise is resolved with the existing presentation connection.');
+    connection2.close();
+    await eventWatcher2.wait_for('close');
+    const c12 = await request1.reconnect(connection2.id);
+    assert_equals(c12, connection2, 'The promise is resolved with the existing presentation connection.');
+
+    connection1.close();
+    await eventWatcher1.wait_for('close');
+    const c21 = await request2.reconnect(connection1.id);
+    assert_equals(c21, connection1, 'The promise is resolved with the existing presentation connection.');
 
     await Promise.all([
       eventWatcher1.wait_for('connect'),
diff --git a/tests/wpt/web-platform-tests/screen-capture/META.yml b/tests/wpt/web-platform-tests/screen-capture/META.yml
index 6e5b23cd967..47882d3275f 100644
--- a/tests/wpt/web-platform-tests/screen-capture/META.yml
+++ b/tests/wpt/web-platform-tests/screen-capture/META.yml
@@ -3,3 +3,4 @@ suggested_reviewers:
   - alvestrand
   - martinthomson
   - uysalere
+  - jan-ivar
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 06ab72d20bf..36e0f22933a 100644
--- a/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
+++ b/tests/wpt/web-platform-tests/screen-capture/getdisplaymedia.https.html
@@ -7,8 +7,8 @@
   'use strict';
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
-  const stream = await navigator.getDisplayMedia({video: true});
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
+  const stream = await navigator.mediaDevices.getDisplayMedia({video: true});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   assert_equals(stream.getTracks().length, 1);
@@ -22,8 +22,8 @@ promise_test(async t => {
 // Note that this results in some non-intuitive cases returning a video track,
 // i.e. {video: false}.
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
-  const stream = await navigator.getDisplayMedia();
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
+  const stream = await navigator.mediaDevices.getDisplayMedia();
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   assert_equals(stream.getTracks().length, 1);
@@ -32,8 +32,8 @@ promise_test(async t => {
 }, 'getDisplayMedia() with no constraints');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
-  const stream = await navigator.getDisplayMedia({video: false});
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
+  const stream = await navigator.mediaDevices.getDisplayMedia({video: false});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   assert_equals(stream.getTracks().length, 1);
@@ -42,8 +42,8 @@ promise_test(async t => {
 }, 'getDisplayMedia() with video false');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
-  const stream = await navigator.getDisplayMedia({audio: false});
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
+  const stream = await navigator.mediaDevices.getDisplayMedia({audio: false});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   assert_equals(stream.getTracks().length, 1);
@@ -52,8 +52,8 @@ promise_test(async t => {
 }, 'getDisplayMedia() with audio false');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
-  const stream = await navigator.getDisplayMedia({audio: true});
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
+  const stream = await navigator.mediaDevices.getDisplayMedia({audio: true});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   assert_equals(stream.getTracks().length, 1);
@@ -62,10 +62,10 @@ promise_test(async t => {
 }, 'getDisplayMedia() with audio true');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
   try {
-    const stream =
-        await navigator.getDisplayMedia({video: {advanced: [{zoom: 1}]}});
+    const stream = await navigator.mediaDevices.getDisplayMedia(
+        {video: {advanced: [{zoom: 1}]}});
   } catch (err) {
     assert_equals(err.name, 'TypeError');
     return;
@@ -74,10 +74,10 @@ promise_test(async t => {
 }, 'getDisplayMedia() with advanced constraint');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
   try {
-    const stream =
-        await navigator.getDisplayMedia({video: {width: {min: 360}}});
+    const stream = await navigator.mediaDevices.getDisplayMedia(
+        {video: {width: {min: 360}}});
   } catch (err) {
     assert_equals(err.name, 'TypeError');
     return;
@@ -86,10 +86,10 @@ promise_test(async t => {
 }, 'getDisplayMedia() with min constraint');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
   try {
-    const stream =
-        await navigator.getDisplayMedia({video: {width: {exact: 360}}});
+    const stream = await navigator.mediaDevices.getDisplayMedia(
+        {video: {width: {exact: 360}}});
   } catch (err) {
     assert_equals(err.name, 'TypeError');
     return;
@@ -98,10 +98,10 @@ promise_test(async t => {
 }, 'getDisplayMedia() with exact constraint');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
   const maxWidth = 360;
-  const stream =
-      await navigator.getDisplayMedia({video: {width: {max: maxWidth}}});
+  const stream = await navigator.mediaDevices.getDisplayMedia(
+      {video: {width: {max: maxWidth}}});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   assert_equals(stream.getVideoTracks().length, 1);
@@ -111,10 +111,10 @@ promise_test(async t => {
 }, 'getDisplayMedia() with max constraint');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
   const maxWidth = 360;
   const maxFrameRate = 4;
-  const stream = await navigator.getDisplayMedia(
+  const stream = await navigator.mediaDevices.getDisplayMedia(
       {video: {width: {max: maxWidth}, frameRate: {max: maxFrameRate}}});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
@@ -126,9 +126,10 @@ promise_test(async t => {
 }, 'getDisplayMedia() with constraints applied');
 
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
   try {
-    const stream = await navigator.getDisplayMedia({video: {width: {max: 0}}});
+    const stream = await navigator.mediaDevices.getDisplayMedia(
+        {video: {width: {max: 0}}});
   } catch (err) {
     assert_equals(err.name, 'OverconstrainedError');
     return;
@@ -138,8 +139,8 @@ promise_test(async t => {
 
 // Content shell picks a fake desktop device by default.
 promise_test(async t => {
-  assert_idl_attribute(navigator, 'getDisplayMedia');
-  const stream = await navigator.getDisplayMedia({video: true});
+  assert_idl_attribute(navigator.mediaDevices, 'getDisplayMedia');
+  const stream = await navigator.mediaDevices.getDisplayMedia({video: true});
   const [track] = stream.getTracks();
   t.add_cleanup(() => track.stop());
   assert_equals(stream.getVideoTracks().length, 1);
diff --git a/tests/wpt/web-platform-tests/screen-capture/idlharness.window.js b/tests/wpt/web-platform-tests/screen-capture/idlharness.window.js
index 076e89f275c..527565ea963 100644
--- a/tests/wpt/web-platform-tests/screen-capture/idlharness.window.js
+++ b/tests/wpt/web-platform-tests/screen-capture/idlharness.window.js
@@ -7,10 +7,10 @@
 
 idl_test(
   ['screen-capture'],
-  ['mediacapture-streams', 'html'],
+  ['mediacapture-streams', 'html', 'dom'],
   idl_array => {
     idl_array.add_objects({
-      Navigator: ['navigator'],
+      MediaDevices: ['navigator.mediaDevices'],
     });
   }
 );
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html
index 210cbb04212..d3b5a966d33 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/clients-matchall-include-uncontrolled.https.html
@@ -4,35 +4,26 @@
 <script src="/resources/testharnessreport.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-var base_url = 'resources/blank.html'; // This is out-of-scope.
-var scope = base_url + '?clients-matchAll-includeUncontrolled';
-var frames = [];
+const base_url = 'resources/blank.html'; // This is out-of-scope.
+const scope = base_url + '?clients-matchAll-includeUncontrolled';
+let frames = [];
 
-// Creates 3 iframes, 2 for in-scope and 1 for out-of-scope.
-// The frame opened for scope + '#2' is returned via a promise.
-function create_iframes(scope) {
-  return with_iframe(base_url)
-    .then(function(frame0) {
-        frames.push(frame0);
-        return with_iframe(scope + '#1');
-      })
-    .then(function(frame1) {
-        frames.push(frame1);
-        return with_iframe(scope + '#2');
-      })
-    .then(function(frame2) {
-        frames.push(frame2);
-        return frame2;
-      })
+// Creates 3 iframes, 2 for in-scope and 1 for out-of-scope. Returns the frame
+// opened for scope + '#2'.
+async function create_iframes(scope) {
+  frames.push(await with_iframe(base_url));
+  frames.push(await with_iframe(scope + '#1'));
+  frames.push(await with_iframe(scope + '#2'));
+  return frames[2];
 }
 
-var expected_without_include_uncontrolled = [
+const expected_without_include_uncontrolled = [
     // visibilityState, focused, url, type, frameType
     ['visible', false, new URL(scope + '#1', location).toString(), 'window', 'nested'],
     ['visible', true, new URL(scope + '#2', location).toString(), 'window', 'nested']
 ];
 
-var expected_with_include_uncontrolled = [
+const expected_with_include_uncontrolled = [
     // visibilityState, focused, url, type, frameType
     ['visible', true, location.href, 'window', 'top-level'],
     ['visible', false, new URL(scope + '#1', location).toString(), 'window', 'nested'],
@@ -44,21 +35,21 @@ function test_matchall(frame, expected, query_options) {
   // Make sure we have focus for '#2' frame and its parent window.
   frame.focus();
   frame.contentWindow.focus();
-  expected.sort(function(a, b) { return a[2] > b[2] ? 1 : -1; });
-  return new Promise(function(resolve, reject) {
-    var channel = new MessageChannel();
-    channel.port1.onmessage = function(e) {
+  expected.sort((a, b) => a[2] > b[2] ? 1 : -1);
+  return new Promise((resolve, reject) => {
+    const channel = new MessageChannel();
+    channel.port1.onmessage = e => {
       // Ignore hidden clients which may be coming from background tabs, or
       // clients unrelated to this test.
-      var data = e.data.filter(function(info) {
+      const data = e.data.filter(info => {
         return info[0] == 'visible' &&
                info[2].indexOf('service-worker') > -1;
       });
-      data.sort(function(a, b) { return a[2] > b[2] ? 1 : -1; });
+      data.sort((a, b) => a[2] > b[2] ? 1 : -1);
       assert_equals(data.length, expected.length);
-      for (var i = 0; i < data.length; i++)
+      for (let i = 0; i < data.length; i++)
         assert_array_equals(data[i], expected[i]);
-      resolve(frame);
+      resolve();
     };
     frame.contentWindow.navigator.serviceWorker.controller.postMessage(
         {port:channel.port2, options:query_options},
@@ -69,27 +60,15 @@ function test_matchall(frame, expected, query_options) {
 // Run clients.matchAll without and with includeUncontrolled=true.
 // (We want to run the two tests sequentially in the same promise_test
 // so that we can use the same set of iframes without intefering each other.
-promise_test(function(t) {
-    return service_worker_unregister_and_register(
-        t, 'resources/clients-matchall-worker.js', scope)
-      .then(function(registration) {
-          t.add_cleanup(function() {
-              return service_worker_unregister(t, scope);
-            });
-
-          return wait_for_state(t, registration.installing, 'activated');
-        })
-      .then(function() { return create_iframes(scope); })
-      .then(function(frame) {
-          return test_matchall(frame, expected_without_include_uncontrolled);
-        })
-      .then(function(frame) {
-          return test_matchall(frame, expected_with_include_uncontrolled,
-                               {includeUncontrolled:true});
-        })
-      .then(function() {
-          frames.forEach(function(f) { f.remove() });
-        });
-  }, 'Verify matchAll() respect includeUncontrolled');
-
+promise_test(async t => {
+  const registration =
+      await service_worker_unregister_and_register(
+          t, 'resources/clients-matchall-worker.js', scope);
+  t.add_cleanup(() => service_worker_unregister(t, scope));
+  await wait_for_state(t, registration.installing, 'activated');
+  const frame = await create_iframes(scope);
+  await test_matchall(frame, expected_without_include_uncontrolled);
+  await test_matchall(frame, expected_with_include_uncontrolled,
+                      {includeUncontrolled:true});
+}, 'Verify matchAll() respect includeUncontrolled');
 </script>
diff --git a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client.https.html b/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client.https.html
index 15d2e889337..f834a4bffe2 100644
--- a/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client.https.html
+++ b/tests/wpt/web-platform-tests/service-workers/service-worker/postmessage-to-client.https.html
@@ -5,50 +5,38 @@
 <script src="/common/get-host-info.sub.js"></script>
 <script src="resources/test-helpers.sub.js"></script>
 <script>
-promise_test(t => {
-    var script = 'resources/postmessage-to-client-worker.js';
-    var scope = 'resources/blank.html';
-    var w;
+promise_test(async t => {
+  const script = 'resources/postmessage-to-client-worker.js';
+  const scope = 'resources/blank.html';
 
-    return service_worker_unregister_and_register(t, script, scope)
-      .then(registration => {
-          t.add_cleanup(() => registration.unregister());
-          return wait_for_state(t, registration.installing, 'activated');
-        })
-      .then(() => with_iframe(scope))
-      .then(frame => {
-          t.add_cleanup(() => frame.remove());
+  const registration =
+      await service_worker_unregister_and_register(t, script, scope);
+  t.add_cleanup(() => registration.unregister());
+  await wait_for_state(t, registration.installing, 'activated');
+  const frame = await with_iframe(scope);
+  t.add_cleanup(() => frame.remove());
+  const w = frame.contentWindow;
 
-          return new Promise(resolve => {
-              w = frame.contentWindow;
-              w.navigator.serviceWorker.onmessage = resolve;
-              w.navigator.serviceWorker.controller.postMessage('ping');
-            });
-        })
-      .then(e => {
-          var message = e.data;
-          assert_equals(e.constructor, w.MessageEvent,
-                        'message events should use MessageEvent interface.');
-          assert_equals(e.type, 'message', 'type should be "message".');
-          assert_equals(e.bubbles, false, 'message events should not bubble.');
-          assert_equals(e.cancelable, false,
-                        'message events should not be cancelable.');
-          assert_equals(
-              e.origin, location.origin,
-              'origin of message should be origin of Service Worker.');
-          assert_equals(e.lastEventId, '',
-                        'lastEventId should be an empty string.');
-          assert_equals(e.source.constructor, w.ServiceWorker,
-                        'source should use ServiceWorker interface.');
-          assert_equals(
-              e.source, w.navigator.serviceWorker.controller,
-              'source should be the service worker that sent the message.');
-          assert_equals(e.ports.length, 0, 'ports should be an empty array.');
-          assert_equals(message, 'Sending message via clients');
-          return new Promise(resolve => {
-              w.navigator.serviceWorker.onmessage = resolve;
-            });
-        })
-      .then(e => { assert_equals(e.data, 'quit'); });
-  }, 'postMessage from ServiceWorker to Client.');
+  w.navigator.serviceWorker.controller.postMessage('ping');
+  let e = await new Promise(r => w.navigator.serviceWorker.onmessage = r);
+
+  assert_equals(e.constructor, w.MessageEvent,
+                'message events should use MessageEvent interface.');
+  assert_equals(e.type, 'message', 'type should be "message".');
+  assert_false(e.bubbles, 'message events should not bubble.');
+  assert_false(e.cancelable, 'message events should not be cancelable.');
+  assert_equals(e.origin, location.origin,
+                'origin of message should be origin of Service Worker.');
+  assert_equals(e.lastEventId, '',
+                'lastEventId should be an empty string.');
+  assert_equals(e.source.constructor, w.ServiceWorker,
+                'source should use ServiceWorker interface.');
+  assert_equals(e.source, w.navigator.serviceWorker.controller,
+                'source should be the service worker that sent the message.');
+  assert_equals(e.ports.length, 0, 'ports should be an empty array.');
+  assert_equals(e.data, 'Sending message via clients');
+
+  e = await new Promise(r => w.navigator.serviceWorker.onmessage = r);
+  assert_equals(e.data, 'quit');
+}, 'postMessage from ServiceWorker to Client.');
 </script>
diff --git a/tests/wpt/web-platform-tests/tools/flake8.ini b/tests/wpt/web-platform-tests/tools/py27-flake8.ini
index a53cbf49d55..1a5ce431ca8 100644
--- a/tests/wpt/web-platform-tests/tools/flake8.ini
+++ b/tests/wpt/web-platform-tests/tools/py27-flake8.ini
@@ -1,9 +1,7 @@
 [flake8]
-# flake8 config used in tools/tox.ini, tools/wpt/tox.ini, and tools/wptrunner/tox.ini
 select = E,W,F,N
 # E128: continuation line under-indented for visual indent
 # E129: visually indented line with same indent as next logical line
-# E221: multiple spaces before operator
 # E226: missing whitespace around arithmetic operator
 # E231: missing whitespace after ‘,’, ‘;’, or ‘:’
 # E251: unexpected spaces around keyword / parameter equals
@@ -13,11 +11,10 @@ select = E,W,F,N
 # E305: expected 2 blank lines after end of function or class
 # E402: module level import not at top of file
 # E731: do not assign a lambda expression, use a def
-# E901: SyntaxError or IndentationError
 # W601: .has_key() is deprecated, use ‘in’
 # N801: class names should use CapWords convention
 # N802: function name should be lowercase
-ignore = E128,E129,E221,E226,E231,E251,E265,E302,E303,E305,E402,E731,E901,W601,N801,N802
+ignore = E128,E129,E226,E231,E251,E265,E302,E303,E305,E402,E731,W601,N801,N802
 exclude =
     .tox,
     pywebsocket,
diff --git a/tests/wpt/web-platform-tests/tools/py36-flake8.ini b/tests/wpt/web-platform-tests/tools/py36-flake8.ini
new file mode 100644
index 00000000000..9b01f22a3cd
--- /dev/null
+++ b/tests/wpt/web-platform-tests/tools/py36-flake8.ini
@@ -0,0 +1,24 @@
+[flake8]
+select = E,W,F,N
+# E128: continuation line under-indented for visual indent
+# E129: visually indented line with same indent as next logical line
+# E226: missing whitespace around arithmetic operator
+# E231: missing whitespace after ‘,’, ‘;’, or ‘:’
+# E251: unexpected spaces around keyword / parameter equals
+# E265: block comment should start with ‘# ‘
+# E302: expected 2 blank lines, found 0
+# E303: too many blank lines (3)
+# E305: expected 2 blank lines after end of function or class
+# E402: module level import not at top of file
+# E731: do not assign a lambda expression, use a def
+# N801: class names should use CapWords convention
+# N802: function name should be lowercase
+ignore = E128,E129,E226,E231,E251,E265,E302,E303,E305,E402,E731,N801,N802
+exclude =
+    .tox,
+    pywebsocket,
+    third_party,
+    wptrunner,
+    wptserve/docs/conf.py,
+    wptserve/tests/functional/docroot/invalid.py
+max-line-length = 141
diff --git a/tests/wpt/web-platform-tests/tools/tox.ini b/tests/wpt/web-platform-tests/tools/tox.ini
index b0099437be9..fc66c6c2ac3 100644
--- a/tests/wpt/web-platform-tests/tools/tox.ini
+++ b/tests/wpt/web-platform-tests/tools/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py36,pypy,py27-flake8
+envlist = py27,py36,pypy,{py27,py36}-flake8
 skipsdist=True
 
 [testenv]
@@ -16,5 +16,9 @@ passenv =
   HYPOTHESIS_PROFILE
 
 [testenv:py27-flake8]
-deps = -r{toxinidir}/requirements_flake8.txt
-commands = flake8 --append-config={toxinidir}/flake8.ini {posargs}
+deps = -r requirements_flake8.txt
+commands = flake8 --append-config=py27-flake8.ini {posargs}
+
+[testenv:py36-flake8]
+deps = -r requirements_flake8.txt
+commands = flake8 --append-config=py36-flake8.ini {posargs}
diff --git a/tests/wpt/web-platform-tests/tools/wpt/install.py b/tests/wpt/web-platform-tests/tools/wpt/install.py
index 9c8feffee3f..817ad418e80 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/install.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/install.py
@@ -58,8 +58,8 @@ def run(venv, **kwargs):
     channel = get_channel(browser, kwargs["channel"])
 
     if channel != kwargs["channel"]:
-        print "Interpreting channel '%s' as '%s'" % (kwargs["channel"],
-                                                     channel)
+        print("Interpreting channel '%s' as '%s'" % (kwargs["channel"],
+                                                     channel))
 
     if destination is None:
         if venv:
diff --git a/tests/wpt/web-platform-tests/tools/wpt/markdown.py b/tests/wpt/web-platform-tests/tools/wpt/markdown.py
index 8b5ff8079df..43020cdafe6 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/markdown.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/markdown.py
@@ -1,3 +1,5 @@
+from functools import reduce
+
 def format_comment_title(product):
     """Produce a Markdown-formatted string based on a given "product"--a string
     containing a browser identifier optionally followed by a colon and a
diff --git a/tests/wpt/web-platform-tests/tools/wpt/run.py b/tests/wpt/web-platform-tests/tools/wpt/run.py
index 093bc013c1b..1894492d267 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/run.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/run.py
@@ -3,6 +3,7 @@ import os
 import platform
 import sys
 from distutils.spawn import find_executable
+from six.moves import input
 
 wpt_root = os.path.abspath(os.path.join(os.path.dirname(__file__), os.pardir, os.pardir))
 sys.path.insert(0, os.path.abspath(os.path.join(wpt_root, "tools")))
@@ -154,7 +155,7 @@ class BrowserSetup(object):
         if not self.prompt:
             return True
         while True:
-            resp = raw_input("Download and install %s [Y/n]? " % component).strip().lower()
+            resp = input("Download and install %s [Y/n]? " % component).strip().lower()
             if not resp or resp == "y":
                 return True
             elif resp == "n":
diff --git a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
index d987242679b..c5fd9d96c36 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/tests/test_wpt.py
@@ -443,9 +443,9 @@ def test_serve():
                 assert False, "server did not start responding within 60s"
             try:
                 resp = urllib2.urlopen("http://web-platform.test:8000")
-                print resp
+                print(resp)
             except urllib2.URLError:
-                print "URLError"
+                print("URLError")
                 time.sleep(1)
             else:
                 assert resp.code == 200
diff --git a/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py b/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py
index b8454c979c2..0ce7054ae22 100644
--- a/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py
+++ b/tests/wpt/web-platform-tests/tools/wpt/virtualenv.py
@@ -39,7 +39,7 @@ class Virtualenv(object):
 
     def activate(self):
         path = os.path.join(self.bin_path, "activate_this.py")
-        execfile(path, {"__file__": path})
+        execfile(path, {"__file__": path})  # noqa: F821
 
     def start(self):
         if not self.exists:
diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js
index 279572bfe4d..e78951a2604 100644
--- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js
+++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/executors/testharness_webdriver_resume.js
@@ -1,3 +1,21 @@
 var callback = arguments[arguments.length - 1];
-window.opener.testdriver_callback = callback;
+window.opener.testdriver_callback = function(results) {
+  /**
+   * The current window and its opener belong to the same domain, making it
+   * technically possible for data structures to be shared directly.
+   * Unfortunately, some browser/WebDriver implementations incorrectly
+   * serialize Arrays from foreign realms [1]. This issue does not extend to
+   * the behavior of `JSON.stringify` and `JSON.parse` in these
+   * implementations. Use that API to re-create the data structure in the local
+   * realm to avoid the problem in the non-conforming browsers.
+   *
+   * [1] This has been observed in Edge version 17 and/or the corresponding
+   *     release of Edgedriver
+   */
+  try {
+    results = JSON.parse(JSON.stringify(results));
+  } catch (error) {}
+
+  callback(results);
+};
 window.opener.process_next_event();
diff --git a/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-defaultTests.tentative.html b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-defaultTests.tentative.html
new file mode 100644
index 00000000000..a6dd2d1317a
--- /dev/null
+++ b/tests/wpt/web-platform-tests/trusted-types/TrustedTypePolicyFactory-createPolicy-defaultTests.tentative.html
@@ -0,0 +1,13 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js" ></script>
+<script src="/resources/testharnessreport.js"></script>
+<script src="support/helper.sub.js"></script>
+<body>
+<script>
+  //Policy name test
+  test(t => {
+    assert_throws("InvalidStateError", _ => {
+      let policy = window.TrustedTypes.createPolicy('default', { createHTML: s => s } );
+    });
+  }, "default policy has to be exposed");
+</script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/Window-TrustedTypes.tentative.html b/tests/wpt/web-platform-tests/trusted-types/Window-TrustedTypes.tentative.html
index 8e20e492e6a..5bbb4356c21 100644
--- a/tests/wpt/web-platform-tests/trusted-types/Window-TrustedTypes.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/Window-TrustedTypes.tentative.html
@@ -8,4 +8,10 @@
     let factory = window.TrustedTypes;
     assert_true(factory instanceof TrustedTypePolicyFactory);
   }, "factory = window.TrustedTypes");
+
+  test(t => {
+    assert_throws(new TypeError(), _ => {
+      let factory = new TrustedTypePolicyFactory();
+    });
+  }, "factory construction fails");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html
index ec19ebc8db8..4446a588366 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMParser-parseFromString.tentative.html
@@ -30,4 +30,19 @@
       var doc = parser.parseFromString(null, "text/html");
     });
   }, "'document.innerText = null' throws");
+
+  // After default policy creation string assignment implicitly calls createHTML.
+  test(t => {
+    let p = window.TrustedTypes.createPolicy("default", { createHTML: createHTMLJS }, true);
+    let parser = new DOMParser();
+    let doc = parser.parseFromString(INPUTS.HTML, "text/html");
+    assert_equals(doc.body.innerText, RESULTS.HTML);
+  }, "'document.innerText = string' assigned via default policy (successful HTML transformation).");
+
+  // After default policy creation null assignment implicitly calls createHTML.
+  test(t => {
+    var parser = new DOMParser();
+    var doc = parser.parseFromString(null, "text/html");
+    assert_equals(doc.body.innerText, "null");
+  }, "'document.innerText = null' assigned via default policy does not throw");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html
index 99e187d45be..2554ce63560 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-DOMWindowTimers-setTimeout-setInterval.tentative.html
@@ -53,4 +53,17 @@
       setInterval(null);
     });
   }, "`window.setInterval(null)` throws.");
+
+  // After default policy creation string assignment implicitly calls createScript.
+  test(t => {
+    let policy = window.TrustedTypes.createPolicy("default", { createScript: createScriptJS }, true);
+    setTimeout(INPUTS.SCRIPT);
+    setInterval(INPUTS.SCRIPT);
+  }, "`setTimeout(string)`, `setInterval(string)` via default policy (successful Script transformation).");
+
+  // After default policy creation null assignment implicitly calls createScript.
+  test(t => {
+    setTimeout(null);
+    setInterval(null);
+  }, "`setTimeout(null)`, `setInterval(null)` via default policy (successful Script transformation).");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Document-write.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Document-write.tentative.html
index 5e7039705a8..0d9ff61c9b3 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Document-write.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Document-write.tentative.html
@@ -9,6 +9,14 @@
 </head>
 <body>
 <script>
+  // TrustedHTML assignments do not throw.
+  test(t => {
+    let p = createHTML_policy(window, 1);
+    let html = p.createHTML(INPUTS.HTML);
+    document.write(html);
+    assert_equals(document.body.innerText, RESULTS.HTML);
+  }, "document.write with html assigned via policy (successful URL transformation).");
+
   // String assignments throw.
   test(t => {
     assert_throws(new TypeError(), _ => {
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html
index 4eee887a005..ae1ace69bf8 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-insertAdjacentHTML.tentative.html
@@ -90,6 +90,58 @@
     assert_equals(d.lastChild, null);
     assert_equals(d.nextSibling, null);
   }, "`insertAdjacentHTML(null)` throws.");
+
+  // After default policy creation string assignment implicitly calls createHTML.
+  test(t => {
+    let p = window.TrustedTypes.createPolicy("default", { createHTML: createHTMLJS }, true);
+
+    var d = document.createElement('div');
+    container.appendChild(d);
+
+    d.insertAdjacentHTML('beforebegin', INPUTS.HTML);
+    assert_equals(d.previousSibling.nodeType, Node.TEXT_NODE);
+    assert_equals(d.previousSibling.data, RESULTS.HTML);
+
+    d.insertAdjacentHTML('afterbegin', INPUTS.HTML);
+    assert_equals(d.firstChild.nodeType, Node.TEXT_NODE);
+    assert_equals(d.firstChild.data, RESULTS.HTML);
+
+    d.insertAdjacentHTML('beforeend', INPUTS.HTML);
+    assert_equals(d.lastChild.nodeType, Node.TEXT_NODE);
+    assert_equals(d.lastChild.data, RESULTS.HTML);
+
+    d.insertAdjacentHTML('afterend', INPUTS.HTML);
+    assert_equals(d.nextSibling.nodeType, Node.TEXT_NODE);
+    assert_equals(d.nextSibling.data, RESULTS.HTML);
+
+    while (container.firstChild)
+      container.firstChild.remove();
+  }, "`insertAdjacentHTML(string)` assigned via default policy (successful HTML transformation).");
+
+   // After default policy creation null assignment implicitly calls createHTML.
+  test(t => {
+    var d = document.createElement('div');
+    container.appendChild(d);
+
+    d.insertAdjacentHTML('beforebegin', null);
+    assert_equals(d.previousSibling.nodeType, Node.TEXT_NODE);
+    assert_equals(d.previousSibling.data, "null");
+
+    d.insertAdjacentHTML('afterbegin', null);
+    assert_equals(d.firstChild.nodeType, Node.TEXT_NODE);
+    assert_equals(d.firstChild.data, "null");
+
+    d.insertAdjacentHTML('beforeend', null);
+    assert_equals(d.lastChild.nodeType, Node.TEXT_NODE);
+    assert_equals(d.lastChild.data, "null");
+
+    d.insertAdjacentHTML('afterend', null);
+    assert_equals(d.nextSibling.nodeType, Node.TEXT_NODE);
+    assert_equals(d.nextSibling.data, "null");
+
+    while (container.firstChild)
+      container.firstChild.remove();
+  }, "`insertAdjacentHTML(null)` assigned via default policy does not throw.");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html
index fde0c172f52..945e3dd2a79 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-outerHTML.tentative.html
@@ -49,6 +49,30 @@
     while (container.firstChild)
       container.firstChild.remove();
   }, "`outerHTML = null` throws.");
+
+  // After default policy creation string assignment implicitly calls createHTML.
+  test(t => {
+    let p = window.TrustedTypes.createPolicy("default", { createHTML: createHTMLJS }, true);
+
+    var d = document.createElement('div');
+    document.querySelector('#container').appendChild(d);
+    d.outerHTML = INPUTS.HTML;
+    assert_equals(container.innerText, RESULTS.HTML);
+
+    while (container.firstChild)
+      container.firstChild.remove();
+  }, "`outerHTML = string` assigned via default policy (successful HTML transformation).");
+
+  // After default policy creation null assignment implicitly calls createHTML.
+  test(t => {
+    var d = document.createElement('div');
+    container.appendChild(d);
+    d.outerHTML = null;
+    assert_equals(container.innerText, "null");
+
+    while (container.firstChild)
+      container.firstChild.remove();
+  }, "`outerHTML = null` assigned via default policy does not throw");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html
index 26aaa5123e7..646997de472 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Element-setAttribute.tentative.html
@@ -10,7 +10,7 @@
 <body>
 <script>
   // TrustedURL Assignments
-  let testCases = [
+  const URLTestCases = [
     [ 'a', 'href' ],
     [ 'area', 'href' ],
     [ 'base', 'href' ],
@@ -26,7 +26,7 @@
     [ 'track', 'src' ]
   ];
 
-  testCases.forEach(c => {
+  URLTestCases.forEach(c => {
     test(t => {
       assert_element_accepts_trusted_url_explicit_set(window, c, t, c[0], c[1], RESULTS.URL);
       assert_throws_no_trusted_type_explicit_set(c[0], c[1], 'A string');
@@ -35,12 +35,12 @@
   });
 
   // TrustedScriptURL Assignments
-  let scriptTestCases = [
+  const scriptURLTestCases = [
     [ 'embed', 'src' ],
     [ 'script', 'src' ]
   ];
 
-  scriptTestCases.forEach(c => {
+  scriptURLTestCases.forEach(c => {
     test(t => {
       assert_element_accepts_trusted_script_url_explicit_set(window, c, t, c[0], c[1], RESULTS.SCRIPTURL);
       assert_throws_no_trusted_type_explicit_set(c[0], c[1], 'A string');
@@ -49,7 +49,7 @@
   });
 
   // TrustedHTML Assignments
-  let HTMLTestCases = [
+  const HTMLTestCases = [
     [ 'iframe', 'srcdoc' ]
   ];
 
@@ -61,6 +61,35 @@
     }, c[0] + "." + c[1] + " accepts only TrustedHTML");
   });
 
+  // After default policy creation string and null assignments implicitly call createXYZ
+  let p = window.TrustedTypes.createPolicy("default", { createURL: createURLJS, createScriptURL: createScriptURLJS, createHTML: createHTMLJS }, true);
+  URLTestCases.forEach(c => {
+    test(t => {
+      assert_element_accepts_trusted_type(c[0], c[1], INPUTS.URL, RESULTS.URL);
+
+      // Properties that actually parse the URLs will resort to the base URL
+      // when given a null or empty URL.
+      assert_element_accepts_trusted_type(c[0], c[1], null, "" + window.location);
+    }, c[0] + "." + c[1] + " accepts string and null after default policy was created.");
+  });
+
+  scriptURLTestCases.forEach(c => {
+    test(t => {
+      assert_element_accepts_trusted_type(c[0], c[1], INPUTS.SCRIPTURL, RESULTS.SCRIPTURL);
+
+      // Properties that actually parse the URLs will resort to the base URL
+      // when given a null or empty URL.
+      assert_element_accepts_trusted_type(c[0], c[1], null, "" + window.location);
+    }, c[0] + "." + c[1] + " accepts string and null after default policy was created.");
+  });
+
+  HTMLTestCases.forEach(c => {
+    test(t => {
+      assert_element_accepts_trusted_type(c[0], c[1], INPUTS.HTML, RESULTS.HTML);
+      assert_element_accepts_trusted_type(c[0], c[1], null, "null");
+    }, c[0] + "." + c[1] + " accepts string and null after default policy was created.");
+  });
+
   // Other attributes can be assigned with TrustedTypes or strings or null values
   test(t => {
     assert_element_accepts_trusted_url_explicit_set(window, 'arel', t, 'a', 'rel', RESULTS.URL);
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html
index ceac828d7bd..2a7edab9db4 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-HTMLElement-generic.tentative.html
@@ -11,7 +11,7 @@
 <script>
   var testnb = 0;
   // TrustedURL Assignments
-  let testCases = [
+  const URLTestCases = [
     [ 'a', 'href' ],
     [ 'area', 'href' ],
     [ 'base', 'href' ],
@@ -27,7 +27,7 @@
     [ 'track', 'src' ]
   ];
 
-  testCases.forEach(c => {
+  URLTestCases.forEach(c => {
     test(t => {
       assert_element_accepts_trusted_url(window, ++testnb, t, c[0], c[1], RESULTS.URL);
       assert_throws_no_trusted_type(c[0], c[1], 'A string');
@@ -36,13 +36,13 @@
   });
 
   // TrustedScriptURL Assignments
-  let scriptTestCases = [
+  const scriptURLTestCases = [
     [ 'embed', 'src' ],
     [ 'script', 'src' ]
   ];
 
   testnb = 0;
-  scriptTestCases.forEach(c => {
+  scriptURLTestCases.forEach(c => {
     test(t => {
       assert_element_accepts_trusted_script_url(window, ++testnb, t, c[0], c[1], RESULTS.SCRIPTURL);
       assert_throws_no_trusted_type(c[0], c[1], 'A string');
@@ -51,7 +51,7 @@
   });
 
   // TrustedHTML Assignments
-  let HTMLTestCases = [
+  const HTMLTestCases = [
     [ 'div', 'innerHTML' ],
     [ 'iframe', 'srcdoc' ]
   ];
@@ -64,4 +64,29 @@
       assert_throws_no_trusted_type(c[0], c[1], null);
     }, c[0] + "." + c[1] + " accepts only TrustedHTML");
   });
+
+  // After default policy creation string and null assignments implicitly call createHTML
+  let p = window.TrustedTypes.createPolicy("default", { createURL: createURLJS, createScriptURL: createScriptURLJS, createHTML: createHTMLJS }, true);
+
+  URLTestCases.forEach(c => {
+    test(t => {
+      assert_element_accepts_trusted_type(c[0], c[1], INPUTS.URL, RESULTS.URL);
+      assert_element_accepts_trusted_type(c[0], c[1], null, "" + window.location);
+    }, c[0] + "." + c[1] + " accepts string and null after default policy was created");
+  });
+
+  scriptURLTestCases.forEach(c => {
+    test(t => {
+      assert_element_accepts_trusted_type(c[0], c[1], INPUTS.SCRIPTURL, RESULTS.SCRIPTURL);
+      assert_element_accepts_trusted_type(c[0], c[1], null, "" + window.location);
+    }, c[0] + "." + c[1] + " accepts string and null after default policy was created");
+  });
+
+
+  HTMLTestCases.forEach(c => {
+    test(t => {
+      assert_element_accepts_trusted_type(c[0], c[1], INPUTS.HTML, RESULTS.HTML);
+      assert_element_accepts_trusted_type(c[0], c[1], null, "null");
+    }, c[0] + "." + c[1] + " accepts string and null after default policy was created");
+  });
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-assign.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-assign.tentative.html
index c0817d669a1..4ad4af9df5a 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-assign.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-assign.tentative.html
@@ -30,4 +30,20 @@
       location.assign(null);
     });
   }, "`location.assign = null` throws");
+
+  // Create default policy. Applies to all subsequent tests.
+  let p = window.TrustedTypes.createPolicy("default",
+      { createURL: createLocationURLJS }, true);
+
+  // After default policy creation string assignment implicitly calls createURL.
+  test(t => {
+    location.assign("abcdefg");
+    assert_true(location.href.endsWith("#abcdefg"));
+  }, "`location.assign = string` via default policy (successful URL transformation).");
+
+  // After default policy creation null assignment implicitly calls createURL.
+  test(t => {
+    location.assign(null);
+    assert_true(location.href.endsWith("#null"));
+  }, "`location.assign = null` via default policy does not throw.");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-href.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-href.tentative.html
index 2a29e1e233e..fd0a4e5ea0e 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-href.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-href.tentative.html
@@ -30,4 +30,21 @@
       location.href = null;
     });
   }, "`location.href = null` throws");
+
+
+  // Create default policy. Applies to all subsequent tests.
+  let p = window.TrustedTypes.createPolicy("default",
+      { createURL: createLocationURLJS }, true);
+
+  // After default policy creation string assignment implicitly calls createURL.
+  test(t => {
+    location.href = "xxxx";
+    assert_true(location.href.endsWith("#xxxx"));
+  }, "`location.href = string` via default policy (successful URL transformation).");
+
+  // After default policy creation null assignment implicitly calls createURL.
+  test(t => {
+    location.href = null;
+    assert_true(location.href.endsWith("#null"));
+  }, "`location.href = null` assigned via default policy does not throw.");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-replace.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-replace.tentative.html
index 8e534bf8382..9b8cabe5835 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-replace.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Location-replace.tentative.html
@@ -30,4 +30,20 @@
       location.replace(null);
     });
   }, "`location.replace = null` throws");
+
+  // Create default policy. Applies to all subsequent tests.
+  let p = window.TrustedTypes.createPolicy("default",
+      { createURL: createLocationURLJS }, true);
+
+  // After default policy creation string assignment implicitly calls createURL.
+  test(t => {
+    location.replace("potato");
+    assert_true(location.href.endsWith("#potato"));
+  }, "`location.replace = string` via default policy (successful URL transformation).");
+
+  // After default policy creation null assignment implicitly calls createURL.
+  test(t => {
+    location.replace(null);
+    assert_true(location.href.endsWith("#null"));
+  }, "`location.replace = null` via default policy (successful URL transformation).");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html
index f44266a3074..4919b7fd4de 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Range-createContextualFragment.tentative.html
@@ -33,4 +33,21 @@
       var result = range.createContextualFragment(null);
     });
   }, "`range.createContextualFragment(null)` throws.");
+
+  // After default policy creation string assignment implicitly calls createHTML
+  test(t => {
+    let p = window.TrustedTypes.createPolicy("default", { createHTML: createHTMLJS }, true);
+    var range = document.createRange();
+    range.selectNodeContents(document.documentElement);
+    var result = range.createContextualFragment(INPUTS.HTML);
+    assert_equals(result.textContent, RESULTS.HTML);
+  }, "`range.createContextualFragment(string)` assigned via default policy (successful HTML transformation).");
+
+  // After default policy creation null assignment implicitly calls createHTML
+  test(t => {
+    var range = document.createRange();
+    range.selectNodeContents(document.documentElement);
+    var result = range.createContextualFragment(null);
+    assert_equals(result.textContent, "null");
+  }, "`range.createContextualFragment(null)` assigned via default policy does not throw.");
 </script>
diff --git a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Window-open.tentative.html b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Window-open.tentative.html
index 7b917dbf642..fd30b6edfba 100644
--- a/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Window-open.tentative.html
+++ b/tests/wpt/web-platform-tests/trusted-types/block-string-assignment-to-Window-open.tentative.html
@@ -29,6 +29,14 @@
     });
   }
 
+  function testWindowDoesntThrow(t, url, expected, win) {
+    let child_window = win.open(url, "", "");
+    child_window.onload = t.step_func_done(_ => {
+      assert_equals(child_window.location.href, expected);
+      child_window.close();
+    });
+  }
+
   // TrustedURL assignments do not throw.
   test(t => {
     testWindowOpen(t, window, ++testnb);
@@ -55,6 +63,24 @@
   test(t => {
     testWindowThrows(t, null, document, ++testnb);
   }, "`document.open(null)` throws.");
+
+  // After default policy creation string assignment implicitly calls createURL.
+  let p = window.TrustedTypes.createPolicy("default", { createURL: createURLJS }, true);
+  test(t => {
+    testWindowDoesntThrow(t, INPUTS.URL, RESULTS.URL, window);
+  }, "'window.open(string)' assigned via default policy (successful URL transformation).");
+
+  test(t => {
+    testWindowDoesntThrow(t, INPUTS.URL, RESULTS.URL, document);
+  }, "'document.open(string)' assigned via default policy (successful URL transformation).");
+
+  test(t => {
+    testWindowDoesntThrow(t, null, "null", window);
+  }, "'window.open(null)' assigned via default policy does not throw.");
+
+  test(t => {
+    testWindowDoesntThrow(t, null, "null", document);
+  }, "'document.open(null)' assigned via default policy does not throw.");
 </script>
 </body>
 </html>
diff --git a/tests/wpt/web-platform-tests/trusted-types/support/helper.sub.js b/tests/wpt/web-platform-tests/trusted-types/support/helper.sub.js
index 75874e5b3c2..9ad60597555 100644
--- a/tests/wpt/web-platform-tests/trusted-types/support/helper.sub.js
+++ b/tests/wpt/web-platform-tests/trusted-types/support/helper.sub.js
@@ -1,11 +1,11 @@
-var INPUTS = {
+const INPUTS = {
   HTML: "Hi, I want to be transformed!",
   SCRIPT: "Hi, I want to be transformed!",
   SCRIPTURL: "http://this.is.a.scripturl.test/",
   URL: "http://hello.i.am.an.url/"
 };
 
-var RESULTS = {
+const RESULTS = {
   HTML: "Quack, I want to be a duck!",
   SCRIPT: "Meow, I want to be a cat!",
   SCRIPTURL: "http://this.is.a.successful.test/",
@@ -31,6 +31,14 @@ function createURLJS(url) {
       .replace("an.url", "successfully.transformed");
 }
 
+// When testing location.href (& friends), we have the problem that assigning
+// to the new location will navigate away from the test. To fix this, we'll
+// have a policy that will just stick the argument into the fragment identifier
+// of the current location.href.
+function createLocationURLJS(value) {
+  return location.href.replace(/#.*/g, "") + "#" + value;
+}
+
 function createHTML_policy(win, c) {
   return win.TrustedTypes.createPolicy('SomeHTMLPolicyName' + c, { createHTML: createHTMLJS });
 }
diff --git a/tests/wpt/web-platform-tests/uievents/mouse/mouse_buttons_back_forward-manual.html b/tests/wpt/web-platform-tests/uievents/mouse/mouse_buttons_back_forward-manual.html
index 7a676db4c44..aa4e944b95c 100644
--- a/tests/wpt/web-platform-tests/uievents/mouse/mouse_buttons_back_forward-manual.html
+++ b/tests/wpt/web-platform-tests/uievents/mouse/mouse_buttons_back_forward-manual.html
@@ -10,11 +10,13 @@
             var testMouseUp = async_test('Tests that the mouseup is preventable.');
             var received_back = false;
             var received_forward = false;
+            const backButton = 3;
+            const forwardButton = 4;
             window.addEventListener('mouseup', function(e) {
-              if (e.button == 3) {
+              if (e.button == backButton) {
                 received_back = true;
                 e.preventDefault();
-              } else if (e.button == 4) {
+              } else if (e.button == forwardButton) {
                 received_forward = true;
                 e.preventDefault();
               }
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py b/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py
index 3c5615ebdfa..702468599f3 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_click/interactability.py
@@ -3,6 +3,7 @@ import pytest
 from tests.support.asserts import assert_error, assert_success
 from tests.support.inline import inline
 
+
 def element_click(session, element):
     return session.transport.send(
         "POST", "session/{session_id}/element/{element_id}/click".format(
@@ -10,6 +11,38 @@ def element_click(session, element):
             element_id=element.id))
 
 
+def test_display_none(session):
+    session.url = inline("""<button style="display: none">foobar</button>""")
+    element = session.find.css("button", all=False)
+
+    response = element_click(session, element)
+    assert_error(response, "element not interactable")
+
+
+def test_visibility_hidden(session):
+    session.url = inline("""<button style="visibility: hidden">foobar</button>""")
+    element = session.find.css("button", all=False)
+
+    response = element_click(session, element)
+    assert_error(response, "element not interactable")
+
+
+def test_hidden(session):
+    session.url = inline("<button hidden>foobar</button>")
+    element = session.find.css("button", all=False)
+
+    response = element_click(session, element)
+    assert_error(response, "element not interactable")
+
+
+def test_disabled(session):
+    session.url = inline("""<button disabled>foobar</button>""")
+    element = session.find.css("button", all=False)
+
+    response = element_click(session, element)
+    assert_success(response)
+
+
 @pytest.mark.parametrize("transform", ["translate(-100px, -100px)", "rotate(50deg)"])
 def test_element_not_interactable_css_transform(session, transform):
     session.url = inline("""
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py
index d1a8b81da78..7fbab8a66aa 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/file_upload.py
@@ -1,3 +1,5 @@
+import pytest
+
 from tests.support.asserts import assert_error, assert_files_uploaded, assert_success
 from tests.support.inline import inline
 
@@ -140,3 +142,87 @@ def test_single_file_appends_with_multiple_attribute(session, create_files):
     assert_success(response)
 
     assert_files_uploaded(session, element, files)
+
+
+def test_transparent(session, create_files):
+    files = create_files(["foo"])
+    session.url = inline("""<input type=file style="opacity: 0">""")
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, str(files[0]))
+    assert_success(response)
+    assert_files_uploaded(session, element, files)
+
+
+def test_obscured(session, create_files):
+    files = create_files(["foo"])
+    session.url = inline("""
+        <style>
+          div {
+            position: absolute;
+            width: 100vh;
+            height: 100vh;
+            background: blue;
+            top: 0;
+            left: 0;
+          }
+        </style>
+
+        <input type=file>
+        <div></div>
+        """)
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, str(files[0]))
+    assert_success(response)
+    assert_files_uploaded(session, element, files)
+
+
+def test_outside_viewport(session, create_files):
+    files = create_files(["foo"])
+    session.url = inline("""<input type=file style="margin-left: -100vh">""")
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, str(files[0]))
+    assert_success(response)
+    assert_files_uploaded(session, element, files)
+
+
+def test_hidden(session, create_files):
+    files = create_files(["foo"])
+    session.url = inline("<input type=file hidden>")
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, str(files[0]))
+    assert_success(response)
+    assert_files_uploaded(session, element, files)
+
+
+def test_display_none(session, create_files):
+    files = create_files(["foo"])
+    session.url = inline("""<input type=file style="display: none">""")
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, str(files[0]))
+    assert_success(response)
+    assert_files_uploaded(session, element, files)
+
+
+@pytest.mark.capabilities({"strictFileInteractability": True})
+def test_strict_hidden(session, create_files):
+    files = create_files(["foo"])
+    session.url = inline("<input type=file hidden>")
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, str(files[0]))
+    assert_error(response, "element not interactable")
+
+
+@pytest.mark.capabilities({"strictFileInteractability": True})
+def test_strict_display_none(session, create_files):
+    files = create_files(["foo"])
+    session.url = inline("""<input type=file style="display: none">""")
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, str(files[0]))
+    assert_error(response, "element not interactable")
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
index 4145f8b1e32..0717537ae5d 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/element_send_keys/interactability.py
@@ -111,7 +111,7 @@ def test_not_a_focusable_element(session):
     assert_error(response, "element not interactable")
 
 
-def test_not_displayed_element(session):
+def test_display_none(session):
     session.url = inline("""<input style="display: none">""")
     element = session.find.css("input", all=False)
 
@@ -119,7 +119,7 @@ def test_not_displayed_element(session):
     assert_error(response, "element not interactable")
 
 
-def test_hidden_element(session):
+def test_visibility_hidden(session):
     session.url = inline("""<input style="visibility: hidden">""")
     element = session.find.css("input", all=False)
 
@@ -127,7 +127,15 @@ def test_hidden_element(session):
     assert_error(response, "element not interactable")
 
 
-def test_disabled_element(session):
+def test_hidden(session):
+    session.url = inline("<input hidden>")
+    element = session.find.css("input", all=False)
+
+    response = element_send_keys(session, element, "foo")
+    assert_error(response, "element not interactable")
+
+
+def test_disabled(session):
     session.url = inline("""<input disabled>""")
     element = session.find.css("input", all=False)
 
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/execute_script/promise.py b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/promise.py
new file mode 100644
index 00000000000..1eab7822c5c
--- /dev/null
+++ b/tests/wpt/web-platform-tests/webdriver/tests/execute_script/promise.py
@@ -0,0 +1,114 @@
+import pytest
+
+from tests.support.asserts import assert_dialog_handled, assert_error, assert_success
+
+
+def execute_script(session, script, args=None):
+    if args is None:
+        args = []
+    body = {"script": script, "args": args}
+
+    return session.transport.send(
+        "POST", "/session/{session_id}/execute/sync".format(
+            session_id=session.session_id),
+        body)
+
+
+def test_promise_resolve(session):
+    response = execute_script(session, """
+        return Promise.resolve('foobar');
+        """)
+    assert_success(response, "foobar")
+
+
+def test_promise_resolve_delayed(session):
+    response = execute_script(session, """
+        return new Promise(
+            (resolve) => setTimeout(
+                () => resolve('foobar'),
+                50
+            )
+        );
+        """)
+    assert_success(response, "foobar")
+
+
+def test_promise_all_resolve(session):
+    response = execute_script(session, """
+        return Promise.all([
+            Promise.resolve(1),
+            Promise.resolve(2)
+        ]);
+        """)
+    assert_success(response, [1, 2])
+
+
+def test_await_promise_resolve(session):
+    response = execute_script(session, """
+        const res = await Promise.resolve('foobar');
+        return res;
+        """)
+    assert_success(response, "foobar")
+
+
+def test_promise_reject(session):
+    response = execute_script(session, """
+        return Promise.reject(new Error('my error'));
+        """)
+    assert_error(response, "javascript error")
+
+
+def test_promise_reject_delayed(session):
+    response = execute_script(session, """
+        return new Promise(
+            (resolve, reject) => setTimeout(
+                () => reject(new Error('my error')),
+                50
+            )
+        );
+        """)
+    assert_error(response, "javascript error")
+
+
+def test_promise_all_reject(session):
+    response = execute_script(session, """
+        return Promise.all([
+            Promise.resolve(1),
+            Promise.reject(new Error('error'))
+        ]);
+        """)
+    assert_error(response, "javascript error")
+
+
+def test_await_promise_reject(session):
+    response = execute_script(session, """
+        await Promise.reject(new Error('my error'));
+        return 'foo';
+        """)
+    assert_error(response, "javascript error")
+
+
+def test_promise_resolve_timeout(session):
+    session.timeouts.script = .1
+    response = execute_script(session, """
+        return new Promise(
+            (resolve) => setTimeout(
+                () => resolve(),
+                1000
+            )
+        );
+        """)
+    assert_error(response, "timeout error")
+
+
+def test_promise_reject_timeout(session):
+    session.timeouts.script = .1
+    response = execute_script(session, """
+        return new Promise(
+            (resolve, reject) => setTimeout(
+                () => reject(new Error('my error')),
+                1000
+            )
+        );
+        """)
+    assert_error(response, "timeout error")
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_session/response.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/response.py
index 3e852071823..16c526ae10b 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/new_session/response.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/new_session/response.py
@@ -21,6 +21,7 @@ def test_sessionid(new_session, add_browser_capabilities):
     ("proxy", dict),
     ("setWindowRect", bool),
     ("timeouts", dict),
+    ("strictFileInteractability", bool),
     ("unhandledPromptBehavior", basestring),
 ])
 def test_capability_type(session, capability, type):
@@ -35,6 +36,7 @@ def test_capability_type(session, capability, type):
     ("proxy", {}),
     ("setWindowRect", True),
     ("timeouts", {"implicit": 0, "pageLoad": 300000, "script": 30000}),
+    ("strictFileInteractability", False),
     ("unhandledPromptBehavior", "dismiss and notify"),
 ])
 def test_capability_default_value(session, capability, default_value):
diff --git a/tests/wpt/web-platform-tests/webdriver/tests/new_session/support/create.py b/tests/wpt/web-platform-tests/webdriver/tests/new_session/support/create.py
index 475fe5a424f..a0d0ce37b57 100644
--- a/tests/wpt/web-platform-tests/webdriver/tests/new_session/support/create.py
+++ b/tests/wpt/web-platform-tests/webdriver/tests/new_session/support/create.py
@@ -27,6 +27,9 @@ valid_data = [
         {"script": 50, "pageLoad": 25},
         {"script": 500},
     ]),
+    ("strictFileInteractability", [
+        True, False, None,
+    ]),
     ("unhandledPromptBehavior", [
         "dismiss",
         "accept",
@@ -95,6 +98,9 @@ invalid_data = [
         {"pageLoad": {"value": 10}},
         {"pageLoad": 10, "invalid": 10},
     ]),
+    ("strictFileInteractability", [
+        1, [], {}, "false",
+    ]),
     ("unhandledPromptBehavior", [
         1, [], {}, False,
         "DISMISS",
@@ -106,25 +112,25 @@ invalid_data = [
 ]
 
 invalid_extensions = [
-    "firefox",
-    "firefox_binary",
-    "firefoxOptions",
-    "chromeOptions",
     "automaticInspection",
     "automaticProfiling",
-    "platform",
-    "version",
     "browser",
-    "platformVersion",
+    "chromeOptions",
+    "ensureCleanSession",
+    "firefox",
+    "firefox_binary",
+    "firefoxOptions",
+    "initialBrowserUrl",
     "javascriptEnabled",
+    "logFile",
+    "logLevel",
     "nativeEvents",
-    "seleniumProtocol",
+    "platform",
+    "platformVersion",
     "profile",
-    "trustAllSSLCertificates",
-    "initialBrowserUrl",
     "requireWindowFocus",
-    "logFile",
-    "logLevel",
     "safari.options",
-    "ensureCleanSession",
+    "seleniumProtocol",
+    "trustAllSSLCertificates",
+    "version",
 ]
diff --git a/tests/wpt/web-platform-tests/webrtc-identity/META.yml b/tests/wpt/web-platform-tests/webrtc-identity/META.yml
index 900769b9d43..940144cee1d 100644
--- a/tests/wpt/web-platform-tests/webrtc-identity/META.yml
+++ b/tests/wpt/web-platform-tests/webrtc-identity/META.yml
@@ -1,3 +1,4 @@
 spec: https://github.com/w3c/webrtc-identity
 suggested_reviewers:
   - martinthomson
+  - jan-ivar
diff --git a/tests/wpt/web-platform-tests/webrtc-stats/META.yml b/tests/wpt/web-platform-tests/webrtc-stats/META.yml
index 489264f23d6..10bcf856eb9 100644
--- a/tests/wpt/web-platform-tests/webrtc-stats/META.yml
+++ b/tests/wpt/web-platform-tests/webrtc-stats/META.yml
@@ -2,3 +2,4 @@ spec: https://w3c.github.io/webrtc-stats/
 suggested_reviewers:
   - henbos
   - vr000m
+  - jan-ivar
diff --git a/tests/wpt/web-platform-tests/webrtc/META.yml b/tests/wpt/web-platform-tests/webrtc/META.yml
index ea2846e97af..2025a11f381 100644
--- a/tests/wpt/web-platform-tests/webrtc/META.yml
+++ b/tests/wpt/web-platform-tests/webrtc/META.yml
@@ -9,3 +9,4 @@ suggested_reviewers:
   - phoglund
   - youennf
   - rwaldron
+  - jan-ivar
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html b/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html
index 17ae6dca016..6a00e1c59e7 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCIceTransport.html
@@ -58,7 +58,7 @@
     assert_true(dtlsTransport instanceof RTCDtlsTransport,
       'Expect sctp.transport to be an RTCDtlsTransport');
 
-    const iceTransport = dtlsTransport.transport;
+    const iceTransport = dtlsTransport.iceTransport;
     assert_true(iceTransport instanceof RTCIceTransport,
       'Expect dtlsTransport.transport to be an RTCIceTransport');
 
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-connectionState.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-connectionState.html
index d8e94112718..7ef7e4a3bf2 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-connectionState.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-connectionState.html
@@ -34,7 +34,7 @@
 
     5.5.  RTCDtlsTransport Interface
       interface RTCDtlsTransport {
-        readonly attribute RTCIceTransport       transport;
+        readonly attribute RTCIceTransport       iceTransport;
         readonly attribute RTCDtlsTransportState state;
         ...
       };
@@ -121,7 +121,7 @@
         assert_equals(dtlsTransport.state, 'connected',
           'Expect DTLS transport to be in connected state');
 
-        const iceTransport = dtlsTransport.transport
+        const iceTransport = dtlsTransport.iceTransport
         assert_true(iceTransport.state ===  'connected' ||
           iceTransport.state === 'completed',
           'Expect ICE transport to be in connected or completed state');
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
index 7179f1ef78c..c9d2d1282c7 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-setRemoteDescription-tracks.https.html
@@ -115,9 +115,12 @@
                   'Second ontrack\'s stream ID matches local stream.');
     assert_array_equals(firstTrackEvent.streams, secondTrackEvent.streams,
                         'ontrack was fired with the same streams both times.');
-    assert_array_equals(firstTrackEvent.streams[0].getTracks(),
-                        [firstTrackEvent.track, secondTrackEvent.track],
-                        'The remote stream == [first track, second track].');
+
+    assert_equals(firstTrackEvent.streams[0].getTracks().length, 2, "stream should have two tracks");
+    assert_true(firstTrackEvent.streams[0].getTracks().includes(firstTrackEvent.track), "remoteStream should have the first track");
+    assert_true(firstTrackEvent.streams[0].getTracks().includes(secondTrackEvent.track), "remoteStream should have the second track");
+    assert_equals(ontrackEventsFired, 2, 'Unexpected number of track events.');
+
     assert_equals(ontrackEventsFired, 2, 'Unexpected number of track events.');
   }, 'addTrack() with two tracks and one stream makes ontrack fire twice with the tracks and shared stream.');
 
diff --git a/tests/wpt/web-platform-tests/webrtc/idlharness.https.window.js b/tests/wpt/web-platform-tests/webrtc/idlharness.https.window.js
index 3c57a022cab..6e9b7e9afa2 100644
--- a/tests/wpt/web-platform-tests/webrtc/idlharness.https.window.js
+++ b/tests/wpt/web-platform-tests/webrtc/idlharness.https.window.js
@@ -67,7 +67,9 @@ function asyncInitTransports() {
       'Expect sctpTransport.transport to be instance of RTCDtlsTransport');
     idlTestObjects.dtlsTransport = dtlsTransport;
 
-    const iceTransport = dtlsTransport.transport;
+    const iceTransport = dtlsTransport.iceTransport;
+    assert_true(iceTransport instanceof RTCIceTransport,
+      'Expect sctpTransport.transport to be instance of RTCDtlsTransport');
     idlTestObjects.iceTransport = iceTransport;
   });
 }
diff --git a/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html b/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html
index 266b5766378..87779105282 100644
--- a/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/simplecall-no-ssrcs.https.html
@@ -101,9 +101,9 @@
 
   var onRemoteTrack = test.step_func(function(event) {
     var videoTag = document.getElementById('remote-view');
-    if (!videoTag.srcObject) {
-      videoTag.srcObject = event.streams[0];
-    }
+    if (!videoTag.srcObject)
+      videoTag.srcObject = new MediaStream();
+    videoTag.srcObject.addTrack(event.track);
   });
 
   // Returns a suitable error callback.
diff --git a/tests/wpt/web-platform-tests/websockets/Close-1000-reason.any.js b/tests/wpt/web-platform-tests/websockets/Close-1000-reason.any.js
index 1517db2e06c..e8b49b5875b 100644
--- a/tests/wpt/web-platform-tests/websockets/Close-1000-reason.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Close-1000-reason.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create WebSocket - Close the Connection - Connection should be opened");
+var testClose = async_test("Create WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(false, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Close-1000.any.js b/tests/wpt/web-platform-tests/websockets/Close-1000.any.js
index e052f238507..bcfceffbd54 100644
--- a/tests/wpt/web-platform-tests/websockets/Close-1000.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Close-1000.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create WebSocket - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create WebSocket - Connection should be opened");
+var testClose = async_test("Create WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(false, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Close-Reason-124Bytes.any.js b/tests/wpt/web-platform-tests/websockets/Close-Reason-124Bytes.any.js
index 97bc1bb224b..357748a7c4d 100644
--- a/tests/wpt/web-platform-tests/websockets/Close-Reason-124Bytes.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Close-Reason-124Bytes.any.js
@@ -1,6 +1,6 @@
 // META: script=websocket.sub.js
 
-var test = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown");
+var test = async_test("Create WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown");
 
 var wsocket = CreateWebSocket(false, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.js b/tests/wpt/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.js
index 119a32d0c93..0b2e6813cbc 100644
--- a/tests/wpt/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Close-reason-unpaired-surrogates.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened");
-var testClose = async_test("W3C WebSocket API - Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed");
+var testOpen = async_test("Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened");
+var testClose = async_test("Create WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed");
 
 var wsocket = CreateWebSocket(false, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-extensions-empty.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-extensions-empty.any.js
index 82b000dde72..647b7f8ef41 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-extensions-empty.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-extensions-empty.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - wsocket.extensions should be set to '' after connection is established - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-url-with-space.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-url-with-space.any.js
index 94265c6182c..f6ca19e0472 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-url-with-space.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-url-with-space.any.js
@@ -6,4 +6,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketWithSpaceInUrl(spaceUrl)
   });
-}, "W3C WebSocket API - Create Secure WebSocket - Pass a URL with a space - SYNTAX_ERR should be thrown")
+}, "Create Secure WebSocket - Pass a URL with a space - SYNTAX_ERR should be thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-array-protocols.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-array-protocols.any.js
index fcaf8a36454..b0ebe6a0dbe 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-array-protocols.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-array-protocols.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, true);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-binaryType-blob.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-binaryType-blob.any.js
index fed88f5c2f2..a639ee88ab2 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-binaryType-blob.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-binaryType-blob.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - wsocket.binaryType should be set to 'blob' after connection is established - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js
index 7ecd2959f76..768e1bc46f6 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-setCorrectly.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Pass a valid URL and protocol string - protocol should be set correctly - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, true, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-string.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-string.any.js
index 59c77c696ac..e1e661cf567 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-string.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url-protocol-string.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Check readyState is 1");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Check readyState is 1");
+var testClose = async_test("Create Secure WebSocket - Pass a valid URL and protocol string - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, true, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url.any.js
index 6f1229e7616..ab02a19e137 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-valid-url.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL  - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Pass a valid URL - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Pass a valid URL  - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Pass a valid URL - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-Secure-verify-url-set-non-default-port.any.js b/tests/wpt/web-platform-tests/websockets/Create-Secure-verify-url-set-non-default-port.any.js
index 755dbe2f3ff..8ed985b58e2 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-Secure-verify-url-set-non-default-port.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-Secure-verify-url-set-non-default-port.any.js
@@ -4,4 +4,4 @@ test(function() {
   var urlNonDefaultPort = "wss://" + __SERVER__NAME + ":" + __NEW__SECURE__PORT + "/" + __PATH;
   var wsocket = new WebSocket(urlNonDefaultPort);
   assert_equals(wsocket.url, urlNonDefaultPort, "wsocket.url is set correctly");
-}, "W3C WebSocket API - Create Secure WebSocket - wsocket.url should be set correctly")
+}, "Create Secure WebSocket - wsocket.url should be set correctly")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-asciiSep-protocol-string.any.js b/tests/wpt/web-platform-tests/websockets/Create-asciiSep-protocol-string.any.js
index cb3c3e4c96f..37657f18dfc 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-asciiSep-protocol-string.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-asciiSep-protocol-string.any.js
@@ -6,4 +6,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketWithAsciiSep(asciiWithSep)
   });
-}, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with an ascii separator character - SYNTAX_ERR is thrown")
+}, "Create WebSocket - Pass a valid URL and a protocol string with an ascii separator character - SYNTAX_ERR is thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-non-absolute-url.any.js b/tests/wpt/web-platform-tests/websockets/Create-non-absolute-url.any.js
index 369557ec3f5..9ac9707209f 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-non-absolute-url.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-non-absolute-url.any.js
@@ -5,4 +5,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketNonAbsolute()
   });
-}, "W3C WebSocket API - Create WebSocket - Pass a non absolute URL - SYNTAX_ERR is thrown")
+}, "Create WebSocket - Pass a non absolute URL - SYNTAX_ERR is thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-nonAscii-protocol-string.any.js b/tests/wpt/web-platform-tests/websockets/Create-nonAscii-protocol-string.any.js
index 39be9f45805..631699413a3 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-nonAscii-protocol-string.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-nonAscii-protocol-string.any.js
@@ -6,4 +6,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketNonAsciiProtocol(nonAsciiProtocol)
   });
-}, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with non-ascii values - SYNTAX_ERR is thrown")
+}, "Create WebSocket - Pass a valid URL and a protocol string with non-ascii values - SYNTAX_ERR is thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-protocol-with-space.any.js b/tests/wpt/web-platform-tests/websockets/Create-protocol-with-space.any.js
index b3c14d8e171..18f6815a489 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-protocol-with-space.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-protocol-with-space.any.js
@@ -5,4 +5,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketWithSpaceInProtocol("ec ho")
   });
-}, "W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string with a space in it - SYNTAX_ERR is thrown")
+}, "Create WebSocket - Pass a valid URL and a protocol string with a space in it - SYNTAX_ERR is thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated-case-insensitive.any.js b/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated-case-insensitive.any.js
index 16f99759d18..1d59015e058 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated-case-insensitive.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated-case-insensitive.any.js
@@ -5,4 +5,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketWithRepeatedProtocolsCaseInsensitive()
   });
-}, "W3C WebSocket API - Create WebSocket - Pass a valid URL and an array of protocol strings with repeated values but different case - SYNTAX_ERR is thrown")
+}, "Create WebSocket - Pass a valid URL and an array of protocol strings with repeated values but different case - SYNTAX_ERR is thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated.any.js b/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated.any.js
index 624d45306a7..bdaf5606a8b 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-protocols-repeated.any.js
@@ -5,4 +5,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketWithRepeatedProtocols()
   });
-}, "W3C WebSocket API - Create WebSocket - Pass a valid URL and an array of protocol strings with repeated values - SYNTAX_ERR is thrown")
+}, "Create WebSocket - Pass a valid URL and an array of protocol strings with repeated values - SYNTAX_ERR is thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-array-protocols.any.js b/tests/wpt/web-platform-tests/websockets/Create-valid-url-array-protocols.any.js
index dde0303aa0f..f8161334e5e 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-valid-url-array-protocols.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-valid-url-array-protocols.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed");
+var testOpen = async_test("Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be opened");
+var testClose = async_test("Create WebSocket - Pass a valid URL and array of protocol strings - Connection should be closed");
 
 var wsocket = CreateWebSocket(false, false, true);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-empty.any.js b/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-empty.any.js
index 8682e4a4018..0bf2ff53bbc 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-empty.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol-empty.any.js
@@ -4,4 +4,4 @@ test(function() {
   var wsocket = CreateWebSocket(false, true, false);
   assert_equals(wsocket.protocol, "", "protocol should be empty");
   wsocket.close();
-}, "W3C WebSocket API - Create WebSocket - wsocket.protocol should be empty before connection is established")
+}, "Create WebSocket - wsocket.protocol should be empty before connection is established")
diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol.any.js b/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol.any.js
index 85e870fda2f..2dcae27f1a6 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-valid-url-protocol.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL and a protocol string - Connection should be closed");
+var testOpen = async_test("Create WebSocket - Pass a valid URL and a protocol string - Connection should be opened");
+var testClose = async_test("Create WebSocket - Pass a valid URL and a protocol string - Connection should be closed");
 
 var wsocket = CreateWebSocket(false, true, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-valid-url.any.js b/tests/wpt/web-platform-tests/websockets/Create-valid-url.any.js
index 9a43dcc5fdd..b84e2118a1d 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-valid-url.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-valid-url.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create WebSocket - Pass a valid URL - Connection should be closed");
+var testOpen = async_test("Create WebSocket - Pass a valid URL - Connection should be opened");
+var testClose = async_test("Create WebSocket - Pass a valid URL - Connection should be closed");
 
 var wsocket = CreateWebSocket(false, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Create-verify-url-set-non-default-port.any.js b/tests/wpt/web-platform-tests/websockets/Create-verify-url-set-non-default-port.any.js
index 5548fd134ca..56116719682 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-verify-url-set-non-default-port.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-verify-url-set-non-default-port.any.js
@@ -4,4 +4,4 @@ test(function() {
   var urlNonDefaultPort = "ws://" + __SERVER__NAME + ":" + __NEW__PORT + "/" + __PATH;
   var wsocket = new WebSocket(urlNonDefaultPort);
   assert_equals(wsocket.url, urlNonDefaultPort, "wsocket.url is set correctly");
-}, "W3C WebSocket API - Create WebSocket - wsocket.url should be set correctly");
+}, "Create WebSocket - wsocket.url should be set correctly");
diff --git a/tests/wpt/web-platform-tests/websockets/Create-wrong-scheme.any.js b/tests/wpt/web-platform-tests/websockets/Create-wrong-scheme.any.js
index 506f81c1703..78ff7394622 100644
--- a/tests/wpt/web-platform-tests/websockets/Create-wrong-scheme.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Create-wrong-scheme.any.js
@@ -5,4 +5,4 @@ test(function() {
   assert_throws("SYNTAX_ERR", function() {
     wsocket = CreateWebSocketNonWsScheme()
   });
-}, "W3C WebSocket API - Create WebSocket - Pass a URL with a non ws/wss scheme - SYNTAX_ERR is thrown")
+}, "Create WebSocket - Pass a URL with a non ws/wss scheme - SYNTAX_ERR is thrown")
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-reason.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-reason.any.js
index 4d3f67cf45a..8f289875d9f 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-reason.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-reason.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close(1000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-verify-code.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-verify-code.any.js
index 87ba4079ccf..a812e0d62c8 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-verify-code.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-1000-verify-code.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000, reason) - event.code == 1000 and event.reason = 'Clean Close'");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close(1000, reason) - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close(1000, reason) - event.code == 1000 and event.reason = 'Clean Close'");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-1000.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-1000.any.js
index 67f4e054a3d..2c7e5e9c63d 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-1000.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-1000.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close(1000) - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close(1000) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-1005-verify-code.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-1005-verify-code.any.js
index a7c72eaf515..aa8e37ea224 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-1005-verify-code.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-1005-verify-code.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close() - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close() - return close code is 1005 - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-1005.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-1005.any.js
index ddb2c185854..f5f2cbf6e66 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-1005.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-1005.any.js
@@ -1,6 +1,6 @@
 // META: script=websocket.sub.js
 
-var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(1005) - see '7.1.5.  The WebSocket Connection Close Code' in http://www.ietf.org/rfc/rfc6455.txt");
+var test = async_test("Create Secure WebSocket - Close the Connection - close(1005) - see '7.1.5.  The WebSocket Connection Close Code' in http://www.ietf.org/rfc/rfc6455.txt");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-2999-reason.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-2999-reason.any.js
index 0fa198eb39e..ee1c756694b 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-2999-reason.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-2999-reason.any.js
@@ -1,6 +1,6 @@
 // META: script=websocket.sub.js
 
-var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(2999, reason) - INVALID_ACCESS_ERR is thrown");
+var test = async_test("Create Secure WebSocket - Close the Connection - close(2999, reason) - INVALID_ACCESS_ERR is thrown");
 
 var wsocket = CreateWebSocket(true, false, false);
 
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-reason.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-reason.any.js
index 6640ddc17d4..d2266ddc022 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-reason.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-reason.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close(3000, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-verify-code.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-verify-code.any.js
index 5b122d4c33f..bbd5bbb22a8 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-verify-code.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-3000-verify-code.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(3000, reason) - verify return code is 3000 - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close(3000, reason) - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close(3000, reason) - verify return code is 3000 - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-4999-reason.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-4999-reason.any.js
index d57899eb3ee..b8429cf97b5 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-4999-reason.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-4999-reason.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(4999, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close(4999, reason) - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close(4999, reason) - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-124Bytes.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-124Bytes.any.js
index 826cb6eccf7..0786c295e76 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-124Bytes.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-124Bytes.any.js
@@ -1,6 +1,6 @@
 // META: script=websocket.sub.js
 
-var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown");
+var test = async_test("Create Secure WebSocket - Close the Connection - close(code, 'reason more than 123 bytes') - SYNTAX_ERR is thrown");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js
index fdc62c465d3..a7b9ea4bb64 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-Reason-Unpaired-surrogates.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - close(reason with unpaired surrogates) - connection should get closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-onlyReason.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-onlyReason.any.js
index 79f79b5d833..029b8d8af8e 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-onlyReason.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-onlyReason.any.js
@@ -1,6 +1,6 @@
 // META: script=websocket.sub.js
 
-var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - close(only reason) - INVALID_ACCESS_ERR is thrown");
+var test = async_test("Create Secure WebSocket - Close the Connection - close(only reason) - INVALID_ACCESS_ERR is thrown");
 
 var wsocket = CreateWebSocket(true, false, false);
 
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closed.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closed.any.js
index 3279744848c..0dd46f14be1 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closed.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closed.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Close the Connection - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Close the Connection - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closing.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closing.any.js
index b18347447a5..690ca83a2b3 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closing.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-readyState-Closing.any.js
@@ -1,6 +1,6 @@
 // META: script=websocket.sub.js
 
-var test = async_test("W3C WebSocket API - Create Secure WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called");
+var test = async_test("Create Secure WebSocket - Close the Connection - readyState should be in CLOSING state just before onclose is called");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Close-server-initiated-close.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Close-server-initiated-close.any.js
index 8531b3140b1..800fbc40e1d 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Close-server-initiated-close.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Close-server-initiated-close.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
+var testOpen = async_test("Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - Connection should be opened");
+var testClose = async_test("Create Secure WebSocket - Server initiated Close - Client sends back a CLOSE - readyState should be in CLOSED state and wasClean is TRUE - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 var isOpenCalled = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-65K-data.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-65K-data.any.js
index daa937af579..ca876534339 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-65K-data.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-65K-data.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send  65K data on a Secure WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send 65K data on a Secure WebSocket - Connection should be closed");
+var testOpen = async_test("Send  65K data on a Secure WebSocket - Connection should be opened");
+var testMessage = async_test("Send 65K data on a Secure WebSocket - Message should be received");
+var testClose = async_test("Send 65K data on a Secure WebSocket - Connection should be closed");
 
 var data = "";
 var wsocket = CreateWebSocket(true, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-65K-arraybuffer.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-65K-arraybuffer.any.js
index 17859e5630d..0627e7554e6 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-65K-arraybuffer.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-65K-arraybuffer.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed");
+var testOpen = async_test("Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened");
+var testMessage = async_test("Send 65K binary data on a Secure WebSocket - ArrayBuffer - Message should be received");
+var testClose = async_test("Send 65K binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed");
 
 var data = "";
 var datasize = 65000;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybuffer.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybuffer.any.js
index 6e4c08d6901..5778a241fff 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybuffer.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybuffer.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed");
+var testOpen = async_test("Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be opened");
+var testMessage = async_test("Send binary data on a Secure WebSocket - ArrayBuffer - Message should be received");
+var testClose = async_test("Send binary data on a Secure WebSocket - ArrayBuffer - Connection should be closed");
 
 var data = "";
 var datasize = 15;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float32.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float32.any.js
index 9825d34d5c0..2672319d40e 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float32.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float32.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Float32Array - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Float32Array - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float64.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float64.any.js
index 4dcac40e37e..993d5fc07e7 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float64.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-float64.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Float64Array - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Float64Array - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-int32.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-int32.any.js
index 655af21575b..58fe02b2505 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-int32.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-int32.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Int32Array - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Int32Array - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js
index 16f050f3a64..26231b411f0 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint16-offset-length.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint16Array with offset and length - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js
index 8976b3dc614..d2995ae539f 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint32-offset.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint32Array with offset - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js
index 9e9d1b5a825..90d9d9d51f8 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset-length.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset and length - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js
index f563cec9184..ce2e6081dd2 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-arraybufferview-uint8-offset.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Uint8Array with offset - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-blob.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-blob.any.js
index 8bf0f12ed82..f532dfbf83a 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-blob.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-binary-blob.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a Secure WebSocket - Blob - Connection should be closed");
+var testOpen = async_test("Send binary data on a Secure WebSocket - Blob - Connection should be opened");
+var testMessage = async_test("Send binary data on a Secure WebSocket - Blob - Message should be received");
+var testClose = async_test("Send binary data on a Secure WebSocket - Blob - Connection should be closed");
 
 var data = "";
 var datasize = 65000;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-data.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-data.any.js
index 04c720de792..78de87cc78b 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-data.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-data.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send  data on a Secure WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send data on a Secure WebSocket - Connection should be closed");
+var testOpen = async_test("Send  data on a Secure WebSocket - Connection should be opened");
+var testMessage = async_test("Send data on a Secure WebSocket - Message should be received");
+var testClose = async_test("Send data on a Secure WebSocket - Connection should be closed");
 
 var data = "Message to send";
 var wsocket = CreateWebSocket(true, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-null.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-null.any.js
index 7c374c25c24..bf644c6de88 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-null.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-null.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send null data on a Secure WebSocket - Connection should be closed");
+var testOpen = async_test("Send null data on a Secure WebSocket - Connection should be opened");
+var testMessage = async_test("Send null data on a Secure WebSocket - Message should be received");
+var testClose = async_test("Send null data on a Secure WebSocket - Connection should be closed");
 
 var data = null;
 var nullReturned = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-paired-surrogates.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-paired-surrogates.any.js
index 073f0647298..f53b9d522ac 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-paired-surrogates.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-paired-surrogates.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send paired surrogates data on a Secure WebSocket - Connection should be closed");
+var testOpen = async_test("Send paired surrogates data on a Secure WebSocket - Connection should be opened");
+var testMessage = async_test("Send paired surrogates data on a Secure WebSocket - Message should be received");
+var testClose = async_test("Send paired surrogates data on a Secure WebSocket - Connection should be closed");
 
 var data = "\uD801\uDC07";
 var wsocket = CreateWebSocket(true, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-unicode-data.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-unicode-data.any.js
index a3518c12f7a..7156698510b 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-unicode-data.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-unicode-data.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send  unicode data on a Secure WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send unicode data on a Secure WebSocket - Connection should be closed");
+var testOpen = async_test("Send  unicode data on a Secure WebSocket - Connection should be opened");
+var testMessage = async_test("Send unicode data on a Secure WebSocket - Message should be received");
+var testClose = async_test("Send unicode data on a Secure WebSocket - Connection should be closed");
 
 var data = "¥¥¥¥¥¥";
 var wsocket = CreateWebSocket(true, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Secure-Send-unpaired-surrogates.any.js b/tests/wpt/web-platform-tests/websockets/Secure-Send-unpaired-surrogates.any.js
index 83f3e7bebc2..00d8589ed7f 100644
--- a/tests/wpt/web-platform-tests/websockets/Secure-Send-unpaired-surrogates.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Secure-Send-unpaired-surrogates.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send unpaired surrogates on a Secure WebSocket - Connection should be closed");
+var testOpen = async_test("Send unpaired surrogates on a Secure WebSocket - Connection should be opened");
+var testMessage = async_test("Send unpaired surrogates on a Secure WebSocket - Message should be received");
+var testClose = async_test("Send unpaired surrogates on a Secure WebSocket - Connection should be closed");
 
 var data = "\uD807";
 var replacementChar = "\uFFFD";
diff --git a/tests/wpt/web-platform-tests/websockets/Send-0byte-data.any.js b/tests/wpt/web-platform-tests/websockets/Send-0byte-data.any.js
index 131a19d77dd..b335a1fc151 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-0byte-data.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-0byte-data.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send 0 byte data on a WebSocket - Connection should be closed");
+var testOpen = async_test("Send 0 byte data on a WebSocket - Connection should be opened");
+var testMessage = async_test("Send 0 byte data on a WebSocket - Message should be received");
+var testClose = async_test("Send 0 byte data on a WebSocket - Connection should be closed");
 
 var data = "";
 var wsocket = CreateWebSocket(false, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Send-65K-data.any.js b/tests/wpt/web-platform-tests/websockets/Send-65K-data.any.js
index 172e6eed5ac..ad74327fa81 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-65K-data.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-65K-data.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send 65K data on a WebSocket -  Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send 65K data on a WebSocket - Connection should be closed");
+var testOpen = async_test("Send 65K data on a WebSocket -  Connection should be opened");
+var testMessage = async_test("Send 65K data on a WebSocket - Message should be received");
+var testClose = async_test("Send 65K data on a WebSocket - Connection should be closed");
 
 var data = "";
 var wsocket = CreateWebSocket(false, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Send-Unpaired-Surrogates.any.js b/tests/wpt/web-platform-tests/websockets/Send-Unpaired-Surrogates.any.js
index 65bb2b16ce8..820fb311571 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-Unpaired-Surrogates.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-Unpaired-Surrogates.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send unpaired surrogates on a WebSocket - Connection should be closed");
+var testOpen = async_test("Send unpaired surrogates on a WebSocket - Connection should be opened");
+var testMessage = async_test("Send unpaired surrogates on a WebSocket - Message should be received");
+var testClose = async_test("Send unpaired surrogates on a WebSocket - Connection should be closed");
 
 var data = "\uD807";
 var replacementChar = "\uFFFD";
diff --git a/tests/wpt/web-platform-tests/websockets/Send-before-open.any.js b/tests/wpt/web-platform-tests/websockets/Send-before-open.any.js
index 101a1a2ff60..b2f1ea9c3aa 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-before-open.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-before-open.any.js
@@ -5,4 +5,4 @@ test(function() {
   assert_throws("INVALID_STATE_ERR", function() {
     wsocket.send("Message to send")
   });
-}, "W3C WebSocket API - Send data on a WebSocket before connection is opened - INVALID_STATE_ERR is returned")
+}, "Send data on a WebSocket before connection is opened - INVALID_STATE_ERR is returned")
diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-65K-arraybuffer.any.js b/tests/wpt/web-platform-tests/websockets/Send-binary-65K-arraybuffer.any.js
index f446a2579b8..394a902c8d7 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-binary-65K-arraybuffer.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-binary-65K-arraybuffer.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be closed");
+var testOpen = async_test("Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be opened");
+var testMessage = async_test("Send 65K binary data on a WebSocket - ArrayBuffer - Message should be received");
+var testClose = async_test("Send 65K binary data on a WebSocket - ArrayBuffer - Connection should be closed");
 
 var data = "";
 var datasize = 65000;
diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybuffer.any.js b/tests/wpt/web-platform-tests/websockets/Send-binary-arraybuffer.any.js
index 620514351f3..24618293fb8 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybuffer.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-binary-arraybuffer.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBuffer - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBuffer - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBuffer - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBuffer - Connection should be closed");
 
 var data = "";
 var datasize = 15;
diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int16-offset.any.js b/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int16-offset.any.js
index 7022668e637..a32b1391dc7 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int16-offset.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int16-offset.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Int16Array with offset - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int8.any.js b/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int8.any.js
index 242c8c6ece8..d9e50b511d4 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int8.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-binary-arraybufferview-int8.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - ArrayBufferView - Int8Array - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - ArrayBufferView - Int8Array - Connection should be closed");
 
 var data = "";
 var datasize = 8;
diff --git a/tests/wpt/web-platform-tests/websockets/Send-binary-blob.any.js b/tests/wpt/web-platform-tests/websockets/Send-binary-blob.any.js
index ee6486ea129..12d2a83785d 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-binary-blob.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-binary-blob.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send binary data on a WebSocket - Blob - Connection should be closed");
+var testOpen = async_test("Send binary data on a WebSocket - Blob - Connection should be opened");
+var testMessage = async_test("Send binary data on a WebSocket - Blob - Message should be received");
+var testClose = async_test("Send binary data on a WebSocket - Blob - Connection should be closed");
 
 var data = "";
 var datasize = 65000;
diff --git a/tests/wpt/web-platform-tests/websockets/Send-data.any.js b/tests/wpt/web-platform-tests/websockets/Send-data.any.js
index 487393b582e..98a866b2949 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-data.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-data.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send data on a WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send data on a WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send data on a WebSocket - Connection should be closed");
+var testOpen = async_test("Send data on a WebSocket - Connection should be opened");
+var testMessage = async_test("Send data on a WebSocket - Message should be received");
+var testClose = async_test("Send data on a WebSocket - Connection should be closed");
 
 var data = "Message to send";
 var wsocket = CreateWebSocket(false, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Send-data.worker.js b/tests/wpt/web-platform-tests/websockets/Send-data.worker.js
index f607fd7cf38..6d4f693d053 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-data.worker.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-data.worker.js
@@ -16,6 +16,6 @@ async_test(function(t) {
             done();
     }), true);
 
-}, "W3C WebSocket API - Send data on a WebSocket in a Worker")
+}, "Send data on a WebSocket in a Worker")
 
 
diff --git a/tests/wpt/web-platform-tests/websockets/Send-null.any.js b/tests/wpt/web-platform-tests/websockets/Send-null.any.js
index 8d8d6b76133..ac1a1b29826 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-null.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-null.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send null data on a WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send null data on a WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send null data on a WebSocket - Connection should be closed");
+var testOpen = async_test("Send null data on a WebSocket - Connection should be opened");
+var testMessage = async_test("Send null data on a WebSocket - Message should be received");
+var testClose = async_test("Send null data on a WebSocket - Connection should be closed");
 
 var data = null;
 var nullReturned = false;
diff --git a/tests/wpt/web-platform-tests/websockets/Send-paired-surrogates.any.js b/tests/wpt/web-platform-tests/websockets/Send-paired-surrogates.any.js
index f12b0016eb0..003b04010a8 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-paired-surrogates.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-paired-surrogates.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send (paired surrogates) data on a WebSocket - Connection should be closed");
+var testOpen = async_test("Send (paired surrogates) data on a WebSocket - Connection should be opened");
+var testMessage = async_test("Send (paired surrogates) data on a WebSocket - Message should be received");
+var testClose = async_test("Send (paired surrogates) data on a WebSocket - Connection should be closed");
 
 var data = "\uD801\uDC07";
 var wsocket = CreateWebSocket(false, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/Send-unicode-data.any.js b/tests/wpt/web-platform-tests/websockets/Send-unicode-data.any.js
index ce2b9a0e240..59292546db1 100644
--- a/tests/wpt/web-platform-tests/websockets/Send-unicode-data.any.js
+++ b/tests/wpt/web-platform-tests/websockets/Send-unicode-data.any.js
@@ -1,8 +1,8 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Connection should be opened");
-var testMessage = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Message should be received");
-var testClose = async_test("W3C WebSocket API - Send unicode data on a WebSocket - Connection should be closed");
+var testOpen = async_test("Send unicode data on a WebSocket - Connection should be opened");
+var testMessage = async_test("Send unicode data on a WebSocket - Message should be received");
+var testClose = async_test("Send unicode data on a WebSocket - Connection should be closed");
 
 var data = "¥¥¥¥¥¥";
 var wsocket = CreateWebSocket(false, false, false);
diff --git a/tests/wpt/web-platform-tests/websockets/binaryType-wrong-value.any.js b/tests/wpt/web-platform-tests/websockets/binaryType-wrong-value.any.js
index 6030608c201..61ac6a19ffd 100644
--- a/tests/wpt/web-platform-tests/websockets/binaryType-wrong-value.any.js
+++ b/tests/wpt/web-platform-tests/websockets/binaryType-wrong-value.any.js
@@ -1,7 +1,7 @@
 // META: script=websocket.sub.js
 
-var testOpen = async_test("W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be opened");
-var testClose = async_test("W3C WebSocket API - Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be closed");
+var testOpen = async_test("Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be opened");
+var testClose = async_test("Create WebSocket - set binaryType to something other than blob or arraybuffer - SYNTAX_ERR is returned - Connection should be closed");
 
 var wsocket = CreateWebSocket(true, false, false);
 
diff --git a/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js b/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js
index 8746cca234c..cc54f2b8841 100644
--- a/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js
+++ b/tests/wpt/web-platform-tests/websockets/opening-handshake/003-sets-origin.worker.js
@@ -14,5 +14,5 @@ async_test(function(t) {
     ws.close();
   })
   ws.onerror = ws.onclose = t.unreached_func();
-}, "W3C WebSocket API - origin set in a Worker");
+}, "origin set in a Worker");
 done();
diff --git a/tests/wpt/web-platform-tests/xhr/send-content-type-charset.htm b/tests/wpt/web-platform-tests/xhr/send-content-type-charset.htm
index 0a91e1fbd7e..a968bb3f4d4 100644
--- a/tests/wpt/web-platform-tests/xhr/send-content-type-charset.htm
+++ b/tests/wpt/web-platform-tests/xhr/send-content-type-charset.htm
@@ -88,8 +88,12 @@
       )
       request(
         "text/plain;charset= utf-8",
-        "text/plain;charset= utf-8",
-        "charset with space that is UTF-8 does not change")
+        "text/plain;charset=UTF-8",
+        "charset with leading space that is UTF-8 does change")
+      request(
+        "text/plain;charset=utf-8 ;x=x",
+        "text/plain;charset=utf-8 ;x=x",
+        "charset with trailing space that is UTF-8 does not change");
       request(
         "text/plain;charset=\"utf-8\"",
         "text/plain;charset=\"utf-8\"",