diff --git a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
index 3a3d15b84062..6a3af4e2ece2 100644
--- a/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
+++ b/tests/wpt/metadata/FileAPI/url/url-with-fetch.any.js.ini
@@ -37,6 +37,3 @@
   [Revoke blob URL after creating Request, will fetch]
     expected: FAIL
 
-  [Revoke blob URL after calling fetch, fetch should succeed]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index ddec8f6b25a5..fbfda7bfe8b1 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -387082,6 +387082,12 @@
      {}
     ]
    ],
+   "shape-detection/detection-HTMLVideoElement-invalid-state.html": [
+    [
+     "shape-detection/detection-HTMLVideoElement-invalid-state.html",
+     {}
+    ]
+   ],
    "shape-detection/detection-HTMLVideoElement.html": [
     [
      "shape-detection/detection-HTMLVideoElement.html",
@@ -393930,6 +393936,12 @@
      {}
     ]
    ],
+   "svg/scripted/script-runs-in-shadow-tree.html": [
+    [
+     "svg/scripted/script-runs-in-shadow-tree.html",
+     {}
+    ]
+   ],
    "svg/scripted/text-attrs-dxdy-have-length.svg": [
     [
      "svg/scripted/text-attrs-dxdy-have-length.svg",
@@ -661886,6 +661898,10 @@
    "979efabdcb07cfdc0190383026a24e144dea1747",
    "testharness"
   ],
+  "shape-detection/detection-HTMLVideoElement-invalid-state.html": [
+   "e777c96e4a1737968d60f390bf97d5f4c971e95d",
+   "testharness"
+  ],
   "shape-detection/detection-HTMLVideoElement.html": [
    "7b3736d02e9b6b0769a18354b054e5c3ce268773",
    "testharness"
@@ -661931,7 +661947,7 @@
    "support"
   ],
   "shape-detection/shapedetection-cross-origin.sub.html": [
-   "c9d86430356de470bca7a8dfef8596e9159164ad",
+   "f45369266973ee771c648d01b6e4a48ce1282959",
    "testharness"
   ],
   "shape-detection/shapedetection-empty-input.html": [
@@ -666386,6 +666402,10 @@
    "786290a158b99a727bf26c4a30556246d30af8dc",
    "reftest"
   ],
+  "svg/scripted/script-runs-in-shadow-tree.html": [
+   "d3a896fb93da55973f31fc574b13a6ad62bd1e94",
+   "testharness"
+  ],
   "svg/scripted/text-attrs-dxdy-have-length.svg": [
    "a5f07e29a11ad0279b4645059f50573e76f909cc",
    "testharness"
@@ -678847,7 +678867,7 @@
    "testharness"
   ],
   "webrtc-identity/RTCPeerConnection-peerIdentity.https.html": [
-   "518d57777aa79cd2c74ac1820f3538c4afb2732b",
+   "f372e37a9a693ccf35597f47273d139f7f6b74a0",
    "testharness"
   ],
   "webrtc-identity/identity-helper.sub.js": [
@@ -679083,7 +679103,7 @@
    "testharness"
   ],
   "webrtc/RTCPeerConnection-ontrack.https.html": [
-   "10210129acd598fd959124fbe51462de8a1cdb0b",
+   "99f30c264b3648d52fda6bb50de980bcbe84be3c",
    "testharness"
   ],
   "webrtc/RTCPeerConnection-remote-track-mute.https.html": [
@@ -681579,19 +681599,19 @@
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html": [
-   "1a46c4d83f8dab463739d1928c4fd87d4975f2bb",
+   "fa969b1ab08ed393425c38b19b1b1f54a31e341c",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/2_tracks.html": [
-   "f422d73d6d767b4de5f296e9b67eb8072b0e43cc",
+   "7648d876928dad228e3e84a2afa4a5ab8276773f",
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html": [
-   "bec3c0557ca557457f113c95a79cc3132899c373",
+   "9fc52199fd01b5662e5db2a9a527a446bbe748cd",
    "support"
   ],
   "webvtt/rendering/cues-with-video/processing-model/3_tracks.html": [
-   "809e173b46db0f2c3c65a708ad841703602c40f9",
+   "c0d5c161cb918ee6738199f8b5220861b0401805",
    "reftest"
   ],
   "webvtt/rendering/cues-with-video/processing-model/align_center-ref.html": [
diff --git a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
index cfd5b57b8c09..3aa115fb7c93 100644
--- a/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
+++ b/tests/wpt/metadata/css/css-transitions/properties-value-inherit-002.html.ini
@@ -56,9 +56,6 @@
   [outline-width length(px) / values]
     expected: FAIL
 
-  [border-left-width length(em) / values]
-    expected: FAIL
-
   [border-bottom-width length(px) / values]
     expected: FAIL
 
@@ -92,12 +89,6 @@
   [min-width length(px) / values]
     expected: FAIL
 
-  [border-top-color color(rgba) / values]
-    expected: FAIL
-
-  [border-right-color color(rgba) / values]
-    expected: FAIL
-
   [font-size length(ex) / values]
     expected: FAIL
 
@@ -128,9 +119,6 @@
   [font-size length(em) / values]
     expected: FAIL
 
-  [border-left-width length(mm) / values]
-    expected: FAIL
-
   [vertical-align length(em) / values]
     expected: FAIL
 
@@ -212,9 +200,6 @@
   [letter-spacing length(in) / values]
     expected: FAIL
 
-  [border-bottom-color color(rgba) / values]
-    expected: FAIL
-
   [min-width percentage(%) / values]
     expected: FAIL
 
@@ -233,9 +218,6 @@
   [vertical-align length(pt) / values]
     expected: FAIL
 
-  [border-left-color color(rgba) / values]
-    expected: FAIL
-
   [letter-spacing length(pc) / values]
     expected: FAIL
 
@@ -302,15 +284,9 @@
   [border-top-width length(pc) / values]
     expected: FAIL
 
-  [border-left-width length(px) / values]
-    expected: FAIL
-
   [font-size length(px) / values]
     expected: FAIL
 
-  [border-left-width length(cm) / values]
-    expected: FAIL
-
   [border-right-width length(px) / values]
     expected: FAIL
 
@@ -332,9 +308,6 @@
   [border-right-width length(pt) / values]
     expected: FAIL
 
-  [border-left-width length(in) / values]
-    expected: FAIL
-
   [max-height length(in) / values]
     expected: FAIL
 
@@ -365,15 +338,9 @@
   [letter-spacing length(ex) / values]
     expected: FAIL
 
-  [border-left-width length(ex) / values]
-    expected: FAIL
-
   [outline-width length(mm) / values]
     expected: FAIL
 
-  [border-left-width length(pc) / values]
-    expected: FAIL
-
   [outline-width length(pc) / values]
     expected: FAIL
 
@@ -428,9 +395,6 @@
   [z-index integer(integer) / values]
     expected: FAIL
 
-  [border-left-width length(pt) / values]
-    expected: FAIL
-
   [vertical-align length(mm) / values]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini b/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
deleted file mode 100644
index e6e1f29e2743..000000000000
--- a/tests/wpt/metadata/css/cssom-view/matchMedia-display-none-iframe.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[matchMedia-display-none-iframe.html]
-  expected: ERROR
diff --git a/tests/wpt/metadata/fetch/content-type/response.window.js.ini b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
index 03e7844f26c8..5e44855617fc 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -84,9 +84,6 @@
   [Request: combined response Content-Type: text/html text/plain]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/plain;charset=gbk text/html;charset=windows-1254]
     expected: FAIL
 
@@ -306,9 +303,6 @@
   [Response: combined response Content-Type: text/html;" \\" text/plain ";charset=GBK]
     expected: NOTRUN
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
-    expected: FAIL
-
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
@@ -321,15 +315,12 @@
   [<iframe>: separate response Content-Type: */* text/html]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/html;" text/plain]
-    expected: FAIL
-
-  [<iframe>: separate response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<iframe>: combined response Content-Type: text/html;" text/plain]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
+  [<iframe>: separate response Content-Type: text/html;x=" text/plain]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/content-type/script.window.js.ini b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
index 2003288747e2..258fe3746974 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,9 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
-  [separate text/javascript;charset=windows-1252 error text/javascript]
-    expected: FAIL
-
   [separate text/javascript ]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index d4ba399b7623..87c807a49ff9 100644
--- a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
+++ b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
@@ -11,6 +11,3 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20'NosniFF']
-    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
deleted file mode 100644
index 87b07c3e6704..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_1.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_1.html]
-  [Multiple history traversals from the same task]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
deleted file mode 100644
index 51f8272a6def..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_3.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_3.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
similarity index 71%
rename from tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
rename to tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
index 75d75b4cda2e..dc2e45516deb 100644
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
+++ b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_5.html.ini
@@ -1,4 +1,4 @@
-[traverse_the_history_2.html]
+[traverse_the_history_5.html]
   [Multiple history traversals, last would be aborted]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
index 333edb3a26e1..650c91da4a62 100644
--- a/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
+++ b/tests/wpt/metadata/workers/baseurl/alpha/sharedworker-in-worker.html.ini
@@ -1,4 +1,5 @@
 [sharedworker-in-worker.html]
+  expected: ERROR
   [Base URL in workers: new SharedWorker()]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
index f584fce5df19..268949ced5ce 100644
--- a/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
+++ b/tests/wpt/metadata/workers/semantics/multiple-workers/005.html.ini
@@ -1,5 +1,4 @@
 [005.html]
-  expected: ERROR
   [dedicated worker in shared worker in dedicated worker]
     expected: FAIL
 
diff --git a/tests/wpt/web-platform-tests/shape-detection/detection-HTMLVideoElement-invalid-state.html b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLVideoElement-invalid-state.html
new file mode 100644
index 000000000000..e777c96e4a17
--- /dev/null
+++ b/tests/wpt/web-platform-tests/shape-detection/detection-HTMLVideoElement-invalid-state.html
@@ -0,0 +1,50 @@
+<!DOCTYPE html>
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<script>
+
+const videoElementTests =
+    [
+      {
+        createDetector: () => { return new FaceDetector(); },
+        name: "Face - detect(HTMLVideoElement)",
+      },
+      {
+        createDetector: () => { return new BarcodeDetector(); },
+        name: "Barcode - detect(HTMLVideoElement)",
+      }
+    ];
+
+for (let videoElementTest of videoElementTests) {
+
+  // Detector's detect() rejects on a HAVE_NOTHING HTMLVideoElement.
+  promise_test(async t => {
+    const video = document.createElement("video");
+    video.src = "";
+    const videoWatcher = new EventWatcher(t, video, ["play", "error"]);
+    video.load();
+    await videoWatcher.wait_for("error");
+    assert_equals(video.readyState, video.HAVE_NOTHING);
+
+    const detector = videoElementTest.createDetector();
+    await promise_rejects(t, 'InvalidStateError', detector.detect(video));
+  }, `${videoElementTest.name} - HAVE_NOTHING`);
+
+  // Detector's detect() rejects on a HAVE_METADATA HTMLVideoElement.
+  promise_test(async t => {
+    const video = document.createElement("video");
+    video.src = "/media/white.webm";
+    video.loop = true;
+    video.autoplay = true;
+    const videoWatcher = new EventWatcher(t, video, ["loadedmetadata", "error"]);
+    video.load();
+    await videoWatcher.wait_for("loadedmetadata");
+    assert_equals(video.readyState, video.HAVE_METADATA);
+
+    const detector = videoElementTest.createDetector();
+    await promise_rejects(t, 'InvalidStateError', detector.detect(video));
+  }, `${videoElementTest.name} - HAVE_METADATA`);
+
+}
+
+</script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/shape-detection/shapedetection-cross-origin.sub.html b/tests/wpt/web-platform-tests/shape-detection/shapedetection-cross-origin.sub.html
index c9d86430356d..f45369266973 100644
--- a/tests/wpt/web-platform-tests/shape-detection/shapedetection-cross-origin.sub.html
+++ b/tests/wpt/web-platform-tests/shape-detection/shapedetection-cross-origin.sub.html
@@ -30,9 +30,9 @@
     img.src = IMAGE_URL;
     await imgWatcher.wait_for("load");
     const detector = crossOriginTest.createDetector();
-    promise_rejects(t, "SecurityError", detector.detect(img));
-  }, crossOriginTest.detectorType
-  + " should reject cross-origin HTMLImageElements with a SecurityError.");
+    await promise_rejects(t, "SecurityError", detector.detect(img));
+  }, `${crossOriginTest.detectorType} should reject cross-origin \
+HTMLImageElements with a SecurityError.`);
 
   // Verifies that Detector rejects a cross-origin ImageBitmap.
   promise_test(async t => {
@@ -42,9 +42,9 @@
     await imgWatcher.wait_for("load");
     const imgBitmap = await createImageBitmap(img);
     const detector = crossOriginTest.createDetector();
-    promise_rejects(t, "SecurityError", detector.detect(imgBitmap));
-  }, crossOriginTest.detectorType
-  + " should reject cross-origin ImageBitmaps with a SecurityError.");
+    await promise_rejects(t, "SecurityError", detector.detect(imgBitmap));
+  }, `${crossOriginTest.detectorType} should reject cross-origin \
+ImageBitmaps with a SecurityError.`);
 
   // Verifies that Detector rejects a cross-origin HTMLVideoElement.
   promise_test(async t => {
@@ -53,9 +53,22 @@
     video.src = VIDEO_URL;
     await videoWatcher.wait_for("loadeddata");
     const detector = crossOriginTest.createDetector();
-    promise_rejects(t, "SecurityError", detector.detect(video));
-  }, crossOriginTest.detectorType
-  + " should reject cross-origin HTMLVideoElements with a SecurityError.");
+    await promise_rejects(t, "SecurityError", detector.detect(video));
+  }, `${crossOriginTest.detectorType} should reject cross-origin \
+HTMLVideoElements with a SecurityError.`);
+
+  // Verifies that Detector rejects a cross-origin HTMLCanvasElement.
+  promise_test(async t => {
+    const img = new Image();
+    const imgWatcher = new EventWatcher(t, img, ["load", "error"]);
+    img.src = IMAGE_URL;
+    await imgWatcher.wait_for("load");
+    const canvas = document.createElement("canvas");
+    canvas.getContext("2d").drawImage(img, 0, 0);
+    const detector = crossOriginTest.createDetector();
+    await promise_rejects(t, "SecurityError", detector.detect(canvas));
+  }, `${crossOriginTest.detectorType} should reject cross-origin \
+HTMLCanvasElement with a SecurityError.`);
 
 }
 
diff --git a/tests/wpt/web-platform-tests/svg/scripted/script-runs-in-shadow-tree.html b/tests/wpt/web-platform-tests/svg/scripted/script-runs-in-shadow-tree.html
new file mode 100644
index 000000000000..d3a896fb93da
--- /dev/null
+++ b/tests/wpt/web-platform-tests/svg/scripted/script-runs-in-shadow-tree.html
@@ -0,0 +1,12 @@
+<!doctype html>
+<link rel="author" href="mailto:emilio@crisal.io" title="Emilio Cobos Álvarez">
+<link rel="author" href="https://mozilla.org" title="Mozilla">
+<link rel="help" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1555949">
+<script src="/resources/testharness.js"></script>
+<script src="/resources/testharnessreport.js"></script>
+<div id="host"></div>
+<script>
+  let svgScript = document.createElementNS("http://www.w3.org/2000/svg", "script");
+  svgScript.innerHTML = `test(function() {}, "svg:script runs correctly in a shadow tree");`;
+  document.getElementById("host").attachShadow({ mode: "open" }).appendChild(svgScript);
+</script>
diff --git a/tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html b/tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html
index 518d57777aa7..f372e37a9a69 100644
--- a/tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html
+++ b/tests/wpt/web-platform-tests/webrtc-identity/RTCPeerConnection-peerIdentity.https.html
@@ -78,15 +78,6 @@
       `Expect validated identity from mock-idp.js to be same as specified in usernameHint`);
   }, 'setRemoteDescription() on offer with a=identity should establish peerIdentity');
 
-  /*
-    If the peerIdentity configuration is applied to the RTCPeerConnection, this
-    establishes a target peer identity of the provided value. Alternatively, if the
-    RTCPeerConnection has previously authenticated the identity of the peer (that
-    is, the peerIdentity promise is resolved), then this also establishes a
-    target peer identity.
-
-    The target peer identity cannot be changed once set.
-  */
   promise_test(async t => {
     const port = window.location.port;
     const [idpDomain] = getIdpDomains();
@@ -112,16 +103,11 @@
 
     const offer = await pc1.createOffer();
 
-    try {
-      await pc2.setRemoteDescription(offer);
-      assert_true(false, "Previous line (sRD) should have thrown!");
-    } catch (e) {
-      assert_equals(e.name, 'InvalidModificationError');
-    }
-
-    assert_true(pc2.signalingState, 'closed',
-      'Expect peer connection to be closed after mismatch peer identity');
-  }, 'setRemoteDescription() on offer with a=identity that resolve to value different from target peer identity should reject with InvalidModificationError');
+    await promise_rejects(t, 'OperationError',
+      pc2.setRemoteDescription(offer));
+    await promise_rejects(t, 'OperationError',
+      pc2.peerIdentity);
+  }, 'setRemoteDescription() on offer with a=identity that resolve to value different from target peer identity should reject with OperationError');
 
   /*
     9.4.  Verifying Identity Assertions
diff --git a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ontrack.https.html b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ontrack.https.html
index 10210129acd5..99f30c264b36 100644
--- a/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ontrack.https.html
+++ b/tests/wpt/web-platform-tests/webrtc/RTCPeerConnection-ontrack.https.html
@@ -95,7 +95,7 @@
 
   // tests that ontrack is called and parses the msid information from the SDP and creates
   // the streams with matching identifiers.
-  async_test(t => {
+  promise_test(async t => {
     const pc = new RTCPeerConnection();
 
     t.add_cleanup(() => pc.close());
@@ -123,34 +123,28 @@
 a=ssrc:1001 cname:some
 `;
 
-    pc.ontrack = t.step_func(trackEvent => {
-      const { streams, track, transceiver } = trackEvent;
+    const trackEventPromise = addEventListenerPromise(t, pc, 'track');
+    await pc.setRemoteDescription({ type: 'offer', sdp });
+    const trackEvent = await trackEventPromise;
+    const { streams, track, transceiver } = trackEvent;
 
-      assert_equals(streams.length, 1,
-        'the track belongs to one MediaStream');
+    assert_equals(streams.length, 1,
+      'the track belongs to one MediaStream');
 
-      const [stream] = streams;
-      assert_equals(stream.id, 'stream1',
-        'Expect stream.id to be the same as specified in the a=msid line');
+    const [stream] = streams;
+    assert_equals(stream.id, 'stream1',
+      'Expect stream.id to be the same as specified in the a=msid line');
 
-      assert_equals(track.kind, 'audio',
-        'Expect track.kind to be audio');
+    assert_equals(track.kind, 'audio',
+      'Expect track.kind to be audio');
 
-      validateTrackEvent(trackEvent);
+    validateTrackEvent(trackEvent);
 
-      assert_equals(transceiver.direction, 'recvonly',
-        'Expect transceiver.direction to be reverse of sendonly (recvonly)');
-
-      t.done();
-    });
-
-    pc.setRemoteDescription({ type: 'offer', sdp })
-    .catch(t.step_func(err => {
-      assert_unreached('Error ' + err.name + ': ' + err.message);
-    }));
+    assert_equals(transceiver.direction, 'recvonly',
+      'Expect transceiver.direction to be reverse of sendonly (recvonly)');
   }, 'setRemoteDescription should trigger ontrack event when the MSID of the stream is is parsed.');
 
-  async_test(t => {
+  promise_test(async t => {
     const pc = new RTCPeerConnection();
 
     t.add_cleanup(() => pc.close());
@@ -179,101 +173,61 @@
 
     pc.ontrack = t.unreached_func('ontrack event should not fire for track with recvonly direction');
 
-    pc.setRemoteDescription({ type: 'offer', sdp })
-    .catch(t.step_func(err => {
-      assert_unreached('Error ' + err.name + ': ' + err.message);
-    }))
-    .then(t.step_func(() => {
-      t.step_timeout(t.step_func_done(), 100);
-    }));
+    await pc.setRemoteDescription({ type: 'offer', sdp });
+    await new Promise(resolve => t.step_timeout(resolve, 100));
   }, 'setRemoteDescription() with m= line of recvonly direction should not trigger track event');
 
-  async_test(t => {
+  promise_test(async t => {
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     const pc2 = new RTCPeerConnection();
 
     t.add_cleanup(() => pc2.close());
 
-    pc2.ontrack = t.step_func(trackEvent => {
-      const { track } = trackEvent;
-
-      assert_equals(track.kind, 'audio',
-        'Expect track.kind to be audio');
-
-      validateTrackEvent(trackEvent);
+    const [track, mediaStream] = await getTrackFromUserMedia('audio');
+    pc1.addTrack(track, mediaStream);
+    const trackEventPromise = addEventListenerPromise(t, pc2, 'track');
+    await pc2.setRemoteDescription(await pc1.createOffer());
+    const trackEvent = await trackEventPromise;
 
-      t.done();
-    });
+    assert_equals(trackEvent.track.kind, 'audio',
+      'Expect track.kind to be audio');
 
-    return getTrackFromUserMedia('audio')
-    .then(([track, mediaStream]) => {
-      pc1.addTrack(track, mediaStream);
-
-      return pc1.createOffer()
-      .then(offer => pc2.setRemoteDescription(offer));
-    })
-    .catch(t.step_func(err => {
-      assert_unreached('Error ' + err.name + ': ' + err.message);
-    }));
+    validateTrackEvent(trackEvent);
   }, 'addTrack() should cause remote connection to fire ontrack when setRemoteDescription()');
 
-  async_test(t => {
+  promise_test(async t => {
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     const pc2 = new RTCPeerConnection();
 
     t.add_cleanup(() => pc2.close());
 
-    pc2.ontrack = t.step_func(trackEvent => {
-      const { track } = trackEvent;
-
-      assert_equals(track.kind, 'video',
-        'Expect track.kind to be video');
-
-      validateTrackEvent(trackEvent);
+    pc1.addTransceiver('video');
 
-      t.done();
-    });
+    const trackEventPromise = addEventListenerPromise(t, pc2, 'track');
+    await pc2.setRemoteDescription(await pc1.createOffer());
+    const trackEvent = await trackEventPromise;
+    const { track } = trackEvent;
 
-    pc1.addTransceiver('video');
+    assert_equals(track.kind, 'video',
+      'Expect track.kind to be video');
 
-    return pc1.createOffer()
-    .then(offer => pc2.setRemoteDescription(offer))
-    .catch(t.step_func(err => {
-      assert_unreached('Error ' + err.name + ': ' + err.message);
-    }));
+    validateTrackEvent(trackEvent);
   }, `addTransceiver('video') should cause remote connection to fire ontrack when setRemoteDescription()`);
 
-  async_test(t => {
+  promise_test(async t => {
     const pc1 = new RTCPeerConnection();
     t.add_cleanup(() => pc1.close());
     const pc2 = new RTCPeerConnection();
 
     t.add_cleanup(() => pc2.close());
 
-    pc2.ontrack = t.step_func(trackEvent => {
-      const { track } = trackEvent;
-
-      assert_equals(track.kind, 'video',
-        'Expect track.kind to be video');
-
-      validateTrackEvent(trackEvent);
-
-      t.done();
-    });
-
     pc1.addTransceiver('audio', { direction: 'inactive' });
     pc2.ontrack = t.unreached_func('ontrack event should not fire for track with inactive direction');
 
-    return pc1.createOffer()
-    .then(offer => pc2.setRemoteDescription(offer))
-    .catch(t.step_func(err => {
-      assert_unreached('Error ' + err.name + ': ' + err.message);
-    }))
-    .then(t.step_func(() => {
-      t.step_timeout(t.step_func_done(), 100);
-    }));
+    await pc2.setRemoteDescription(await pc1.createOffer());
+    await new Promise(resolve => t.step_timeout(resolve, 100));
   }, `addTransceiver() with inactive direction should not cause remote connection to fire ontrack when setRemoteDescription()`);
 
 </script>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html
index 1a46c4d83f8d..fa969b1ab08e 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks-ref.html
@@ -18,9 +18,9 @@
     left: 0;
     right: 0;
     text-align: center;
-    font-family: sans-serif;
 }
-.cue > span {
+.cueText {
+    font-family: Ahem, sans-serif;
     background: rgba(0,0,0,0.8);
     color: white;
 }
@@ -30,6 +30,9 @@
     <source src="/media/white.webm" type="video/webm">
     <source src="/media/white.mp4" type="video/mp4">
   </video>
-  <span class="cue"><span>This is a <u>test subtitle</u><br>This is a test subtitle</span></span>
+  <span class="cue">
+    <div><span class="cueText">This is a <u>test subtitle</u></span></div>
+    <div><span class="cueText">This is a test subtitle</span></div>
+  </span>
 </div>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html
index f422d73d6d76..7648d876928d 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/2_tracks.html
@@ -5,6 +5,9 @@
 <style>
 html { overflow:hidden }
 body { margin:0 }
+::cue {
+    font-family: Ahem, sans-serif;
+}
 </style>
 <script src="/common/reftest-wait.js"></script>
 <video width="320" height="180" autoplay onplaying="this.onplaying = null; this.pause(); takeScreenshot();">
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html
index bec3c0557ca5..9fc52199fd01 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks-ref.html
@@ -18,9 +18,9 @@
     left: 0;
     right: 0;
     text-align: center;
-    font-family: sans-serif;
 }
-.cue > span {
+.cueText {
+    font-family: Ahem, sans-serif;
     background: rgba(0,0,0,0.8);
     color: white;
 }
@@ -30,6 +30,10 @@
     <source src="/media/white.webm" type="video/webm">
     <source src="/media/white.mp4" type="video/mp4">
   </video>
-  <span class="cue"><span>This is a <b>test subtitle</b><br>This is a <u>test subtitle</u><br>This is a test subtitle</span></span>
+  <span class="cue">
+    <div><span class="cueText">This is a <b>test subtitle</b></span></div>
+    <div><span class="cueText">This is a <u>test subtitle</u></span></div>
+    <div><span class="cueText">This is a test subtitle</span></div>
+  </span>
 </div>
-</html>
\ No newline at end of file
+</html>
diff --git a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html
index 809e173b46db..c0d5c161cb91 100644
--- a/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html
+++ b/tests/wpt/web-platform-tests/webvtt/rendering/cues-with-video/processing-model/3_tracks.html
@@ -5,6 +5,9 @@
 <style>
 html { overflow:hidden }
 body { margin:0 }
+::cue {
+    font-family: Ahem, sans-serif;
+}
 </style>
 <script src="/common/reftest-wait.js"></script>
 <video width="320" height="180" autoplay onplaying="this.onplaying = null; this.pause(); takeScreenshot();">