diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json
index 0750cc462817..9fbf4e053ade 100644
--- a/tests/wpt/metadata/MANIFEST.json
+++ b/tests/wpt/metadata/MANIFEST.json
@@ -561574,7 +561574,7 @@
    "testharness"
   ],
   "css/css-animations/CSSAnimation-getCurrentTime.tentative.html": [
-   "4a0b9bdce744d9f452f4989b41025bd94931dc4b",
+   "e4d1f859fd4d65f51b89de6e23ead724545568a3",
    "testharness"
   ],
   "css/css-animations/CSSAnimation-id.tentative.html": [
@@ -613826,7 +613826,7 @@
    "testharness"
   ],
   "css/css-transitions/CSSTransition-currentTime.tentative.html": [
-   "4c7a7a4891636a7201f07b671ff605dca3ddcc2b",
+   "8ee7215b7414722ec315826b54ceb650006552c5",
    "testharness"
   ],
   "css/css-transitions/CSSTransition-effect.tentative.html": [
@@ -672490,7 +672490,7 @@
    "testharness"
   ],
   "html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html": [
-   "dcf10077331e6c4e64d4037525a6d6c0d12af1f7",
+   "2b70f7ae6020dfc99d3a948c6c99970ea2dfd67e",
    "testharness"
   ],
   "html/webappapis/system-state-and-capabilities/the-navigator-object/secure_context.html": [
@@ -677006,7 +677006,7 @@
    "testharness"
   ],
   "media-source/mediasource-addsourcebuffer.html": [
-   "7f6aa2ab697784c76da466aa2ad807b5b75c7ade",
+   "6ada12284908d13a9658380cbdde3179e702047d",
    "testharness"
   ],
   "media-source/mediasource-append-buffer.html": [
@@ -677018,7 +677018,7 @@
    "testharness"
   ],
   "media-source/mediasource-appendwindow.html": [
-   "272031a6e9ec7efbed938e8a5de927c9f2afed8a",
+   "aebbee418dfefb7a67c72fb569c9b84560faee44",
    "testharness"
   ],
   "media-source/mediasource-attach-stops-delaying-load-event.html": [
@@ -677054,7 +677054,7 @@
    "support"
   ],
   "media-source/mediasource-changetype.html": [
-   "263dd82671650afc6d4456ed0aff2eb0ec543235",
+   "8ce821d08f1c247675e5f9d86ee9554c191e47e4",
    "testharness"
   ],
   "media-source/mediasource-closed.html": [
@@ -677166,7 +677166,7 @@
    "testharness"
   ],
   "media-source/mediasource-liveseekable.html": [
-   "a2f05a9cd6a38984f2479cd45f8e5f42b27ecd4a",
+   "3e79a1140264ffa467198bc8c2996c42657231fb",
    "testharness"
   ],
   "media-source/mediasource-multiple-attach.html": [
@@ -677190,7 +677190,7 @@
    "testharness"
   ],
   "media-source/mediasource-remove.html": [
-   "9a4eb3fc5cb1b0d4d4f95da7345e1bb6f4f674f8",
+   "454178709f9b7b2f83fd9a60625765512874b502",
    "testharness"
   ],
   "media-source/mediasource-removesourcebuffer.html": [
@@ -714338,67 +714338,67 @@
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html": [
-   "1200fd450a0c0fa18c85b3bfb15a21ea3801f25b",
+   "9727bfb22403f9f8fa8f0d14cad719be25b37132",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html": [
-   "7d8a4be26acf5e0a957242cf1c78e727d72d3c8e",
+   "cb4a631af663cdbcac8d50edcef49f536c0e8eb6",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html": [
-   "c86e6594a296c57562b18f84ac6fa38399567a08",
+   "ab906119ad88b38a7db0a89c0d16810d67b8b4a7",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html": [
-   "19714ea73f08fb99041c82e53c44b89094caea1d",
+   "e6315b434504e754872dd460988187957efbfb07",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html": [
-   "cab47f1bdaebaa167c60ea3a9f11f0ec2a7644cc",
+   "b2aff0bd8cc84146488cc277a3eec6905f7686f7",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html": [
-   "11fe32d527c3547e80fbbc823977a528e386caae",
+   "14dda6e227e2826299b150af850a12c72dc6fbfa",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html": [
-   "250bc6ce811af3d42a337ade8427ba245467b5e1",
+   "3bf638e5e6b60519e7259f96890ed0c6f11a4316",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html": [
-   "06e23346bf6165559762c2574fb5345ba4561528",
+   "2818a8afa4ac42c5ae7a83646f4e56931dbf748f",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html": [
-   "b8a82db15eda1da842056229799368899cfe213b",
+   "fcf38a8513adcbba0ceb4543340173c85de8ed7c",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html": [
-   "fcb3d717b2f1cea03b1a846c7bac0a637e320607",
+   "a23a66f3d25817fa112f18f5a29ad3f43936f65a",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html": [
-   "7ff298a9d063009daae352e651e94cbce083531e",
+   "7ac884ae3e5052d40a60521a5c6b91eb854b4e4c",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html": [
-   "e2a755688851d8a44827891196ea5c318af4ff29",
+   "6a0a26bacb7ecd13264ac419dffb97266ead097f",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html": [
-   "069336506f259769c791899f7943a1ec9579c32e",
+   "6c49adee9020f527d9f6fb51ff01204810d4b61e",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html": [
-   "60e15bda01bd29ee3630a164868c7f4df98c9f15",
+   "0798c9be666e0c40279364cb2fabb58ee3ffdc0a",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html": [
-   "46c136f777f8c95ddd666770ebb31b8ff81d24a5",
+   "9841866b5a2a8bb83ac5155ba666a4695e8c269d",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedEnumeration.html": [
-   "bac69203311116bcc5fd9957ebae7be80f7e9096",
+   "990b884545d70a3f1156e4c070cdac2d6cc2ac79",
    "testharness"
   ],
   "svg/types/scripted/SVGAnimatedInteger.html": [
@@ -726286,7 +726286,7 @@
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/constructor.html": [
-   "8f16aa18711e596c1c2c604595146e36601a606f",
+   "46a23b0c2e87aef9d36c86960b4f9c2d254f3140",
    "testharness"
   ],
   "web-animations/interfaces/KeyframeEffect/copy-constructor.html": [
diff --git a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
index 4a1e8110f6fb..f8e7e539aae9 100644
--- a/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
+++ b/tests/wpt/metadata/css/css-transforms/transform-scale-hittest.html.ini
@@ -2,3 +2,6 @@
   [Hit test intersecting scaled box]
     expected: FAIL
 
+  [Hit test within unscaled box]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini b/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
deleted file mode 100644
index 4c79907309ba..000000000000
--- a/tests/wpt/metadata/css/cssom-view/CaretPosition-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[CaretPosition-001.html]
-  [Element at (400, 100)]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
index 628b1fab7703..c884dc82eab6 100644
--- a/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
+++ b/tests/wpt/metadata/css/cssom-view/MediaQueryList-addListener-removeListener.html.ini
@@ -2,3 +2,6 @@
   [listeners are called when <iframe> is resized]
     expected: FAIL
 
+  [listeners are called correct number of times]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini b/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
deleted file mode 100644
index e38782d8c85a..000000000000
--- a/tests/wpt/metadata/css/cssom-view/elementFromPoint-001.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[elementFromPoint-001.html]
-  [CSSOM View - 5 - extensions to the Document interface]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini b/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
deleted file mode 100644
index 2ca05f57bb00..000000000000
--- a/tests/wpt/metadata/custom-elements/reactions/HTMLMediaElement.html.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[HTMLMediaElement.html]
-  expected: TIMEOUT
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 958cfbec2be2..b91e94323309 100644
--- a/tests/wpt/metadata/fetch/content-type/response.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/response.window.js.ini
@@ -315,24 +315,21 @@
   [<iframe>: combined response Content-Type: text/html */*]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html;x=" text/plain]
-    expected: FAIL
-
-  [<iframe>: combined response Content-Type: text/html;" \\" text/plain]
-    expected: FAIL
-
   [<iframe>: separate response Content-Type: text/html */*;charset=gbk]
     expected: FAIL
 
   [<iframe>: combined response Content-Type: text/html;charset=gbk text/plain text/html]
     expected: FAIL
 
-  [<iframe>: combined response Content-Type: text/html */*;charset=gbk]
+  [<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;" text/plain]
+    expected: FAIL
+
+  [<iframe>: separate response Content-Type: text/plain */*]
     expected: FAIL
 
-  [<iframe>: separate response Content-Type: text/plain */*;charset=gbk]
+  [<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 d2df9b78483b..5c0015928591 100644
--- a/tests/wpt/metadata/fetch/content-type/script.window.js.ini
+++ b/tests/wpt/metadata/fetch/content-type/script.window.js.ini
@@ -56,3 +56,6 @@
   [separate text/javascript x/x]
     expected: FAIL
 
+  [separate text/javascript;charset=windows-1252 error text/javascript]
+    expected: FAIL
+
diff --git a/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini b/tests/wpt/metadata/fetch/nosniff/parsing-nosniff.window.js.ini
index 2023a8550868..d4ba399b7623 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,6 @@
   [X-Content-Type-Options%3A%20nosniff%0C]
     expected: FAIL
 
-  [X-Content-Type-Options%3A%20no%0D%0AX-Content-Type-Options%3A%20nosniff]
+  [X-Content-Type-Options%3A%20'NosniFF']
     expected: FAIL
 
diff --git a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
index 80ebd73cb009..2644d64e6a0c 100644
--- a/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
+++ b/tests/wpt/metadata/fetch/security/embedded-credentials.tentative.sub.html.ini
@@ -1,6 +1,6 @@
 [embedded-credentials.tentative.sub.html]
   type: testharness
-  expected: TIMEOUT
+  expected: CRASH
   [Embedded credentials are treated as network errors.]
     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_2.html.ini
deleted file mode 100644
index 75d75b4cda2e..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_2.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_2.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_4.html.ini b/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
deleted file mode 100644
index 385376c7321e..000000000000
--- a/tests/wpt/metadata/html/browsers/history/the-history-interface/traverse_the_history_4.html.ini
+++ /dev/null
@@ -1,4 +0,0 @@
-[traverse_the_history_4.html]
-  [Multiple history traversals, last would be aborted]
-    expected: FAIL
-
diff --git a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
index 71edac2c5ede..e440b1e38c61 100644
--- a/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
+++ b/tests/wpt/metadata/html/semantics/embedded-content/the-iframe-element/iframe_sandbox_popups_nonescaping-3.html.ini
@@ -1,6 +1,6 @@
 [iframe_sandbox_popups_nonescaping-3.html]
   type: testharness
-  expected: CRASH
+  expected: TIMEOUT
   [Check that popups from a sandboxed iframe do not escape the sandbox]
     expected: NOTRUN
 
diff --git a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
index 1c7ec9ce1db1..b4090ef9fe25 100644
--- a/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
+++ b/tests/wpt/metadata/resource-timing/crossorigin-sandwich-TAO.sub.html.ini
@@ -1,4 +1,5 @@
 [crossorigin-sandwich-TAO.sub.html]
+  expected: ERROR
   [There should be one entry.]
     expected: FAIL
 
diff --git a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini b/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
deleted file mode 100644
index 064cf47545b5..000000000000
--- a/tests/wpt/metadata/webmessaging/with-ports/017.html.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[017.html]
-  expected: TIMEOUT
-  [origin of the script that invoked the method, about:blank]
-    expected: TIMEOUT
-
diff --git a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html b/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html
index 4a0b9bdce744..e4d1f859fd4d 100644
--- a/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-animations/CSSAnimation-getCurrentTime.tentative.html
@@ -56,8 +56,8 @@
   const animation = div.getAnimations()[0];
   await animation.ready;
 
-  assert_throws(
-    new TypeError(),
+  assert_throws_js(
+    TypeError,
     () => {
       animation.currentTime = null;
     },
diff --git a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-currentTime.tentative.html b/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-currentTime.tentative.html
index 4c7a7a489163..8ee7215b7414 100644
--- a/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-currentTime.tentative.html
+++ b/tests/wpt/web-platform-tests/css/css-transitions/CSSTransition-currentTime.tentative.html
@@ -98,8 +98,8 @@
 
   await animation.ready;
 
-  assert_throws(
-    new TypeError(),
+  assert_throws_js(
+    TypeError,
     () => {
       animation.currentTime = null;
     },
diff --git a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
index dcf10077331e..2b70f7ae6020 100644
--- a/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
+++ b/tests/wpt/web-platform-tests/html/webappapis/system-state-and-capabilities/the-navigator-object/protocol.https.html
@@ -110,9 +110,9 @@
   'ws',
   'wss',
   'wyciwyg',
-  /*other invalid schemes*/
+  /* other invalid schemes */
   'unrecognized',
-  'mаilto', /*a cyrillic "а"*/
+  'mаilto', /* a cyrillic "а" */
   'mailto:',
   'mailto://',
   'mailto' + String.fromCharCode(0),
@@ -122,7 +122,11 @@
   'ssh:/',
   'magnet:+',
   'tel:sip',
+  /* web+ prefixed schemes must be followed by 1+ ascii alphas */
   'web+',
+  'web+dots.are.forbidden',
+  'web+dashes-are-forbidden',
+  'web+digits123areforbidden',
 ];
 for (const scheme of denylist) {
   test(() => {
@@ -161,7 +165,7 @@
   'webcal',
   'wtai',
   'xmpp',
-  /*other valid schemes*/
+  /* other valid schemes */
   'BitcoIn',
   'Irc',
   'MagneT',
diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer.html b/tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer.html
index 7f6aa2ab6977..6ada12284908 100644
--- a/tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer.html
+++ b/tests/wpt/web-platform-tests/media-source/mediasource-addsourcebuffer.html
@@ -21,7 +21,7 @@
 
           mediasource_test(function(test, mediaElement, mediaSource)
           {
-              assert_throws({name: "TypeError"},
+              assert_throws_js(TypeError,
                           function() { mediaSource.addSourceBuffer(""); },
                           "addSourceBuffer() threw an exception when passed an empty string.");
               test.done();
diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-appendwindow.html b/tests/wpt/web-platform-tests/media-source/mediasource-appendwindow.html
index 272031a6e9ec..aebbee418dfe 100644
--- a/tests/wpt/web-platform-tests/media-source/mediasource-appendwindow.html
+++ b/tests/wpt/web-platform-tests/media-source/mediasource-appendwindow.html
@@ -33,51 +33,51 @@
               assert_true(sourceBuffer != null, "New SourceBuffer returned");
               sourceBuffer.appendWindowEnd = 500.0;
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowStart = Number.NEGATIVE_INFINITY; },
                   "set appendWindowStart throws an exception for Number.NEGATIVE_INFINITY.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowStart = Number.POSITIVE_INFINITY; },
                   "set appendWindowStart throws an exception for Number.POSITIVE_INFINITY.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowStart = Number.NaN; },
                   "set appendWindowStart throws an exception for Number.NaN.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowStart = 600.0; },
                   "set appendWindowStart throws an exception when greater than appendWindowEnd.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowStart = sourceBuffer.appendWindowEnd; },
                   "set appendWindowStart throws an exception when equal to appendWindowEnd.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowEnd = sourceBuffer.appendWindowStart; },
                   "set appendWindowEnd throws an exception when equal to appendWindowStart.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowEnd = sourceBuffer.appendWindowStart - 1; },
                   "set appendWindowEnd throws an exception if less than appendWindowStart.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowStart = -100.0; },
                   "set appendWindowStart throws an exception when less than 0.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowEnd = -100.0; },
                   "set appendWindowEnd throws an exception when less than 0.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowEnd = Number.NaN; },
                   "set appendWindowEnd throws an exception if NaN.");
 
-              assert_throws(new TypeError(),
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowEnd = undefined; },
                   "set appendWindowEnd throws an exception if undefined.");
 
-              assert_throws({name: "TypeError"},
+              assert_throws_js(TypeError,
                   function() { sourceBuffer.appendWindowStart = undefined; },
                   "set appendWindowStart throws an exception if undefined.");
 
diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-changetype.html b/tests/wpt/web-platform-tests/media-source/mediasource-changetype.html
index 263dd8267165..8ce821d08f1c 100644
--- a/tests/wpt/web-platform-tests/media-source/mediasource-changetype.html
+++ b/tests/wpt/web-platform-tests/media-source/mediasource-changetype.html
@@ -15,7 +15,7 @@
 {
     var sourceBuffer = mediaSource.addSourceBuffer(MediaSourceUtil.AUDIO_VIDEO_TYPE);
 
-    assert_throws(new TypeError(), function()
+    assert_throws_js(TypeError, function()
     {
         sourceBuffer.changeType("");
     }, "changeType");
diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-liveseekable.html b/tests/wpt/web-platform-tests/media-source/mediasource-liveseekable.html
index a2f05a9cd6a3..3e79a1140264 100644
--- a/tests/wpt/web-platform-tests/media-source/mediasource-liveseekable.html
+++ b/tests/wpt/web-platform-tests/media-source/mediasource-liveseekable.html
@@ -49,7 +49,7 @@
 mediasource_test(function(test, mediaElement, mediaSource)
 {
     mediaElement.addEventListener('error', test.unreached_func("Unexpected event 'error'"));
-    assert_throws(new TypeError(), function() { mediaSource.setLiveSeekableRange(-1, 1); });
+    assert_throws_js(TypeError, function() { mediaSource.setLiveSeekableRange(-1, 1); });
     test.done();
 }, "setLiveSeekableRange throws a TypeError if start is negative");
 
@@ -57,7 +57,7 @@
 mediasource_test(function(test, mediaElement, mediaSource)
 {
     mediaElement.addEventListener('error', test.unreached_func("Unexpected event 'error'"));
-    assert_throws(new TypeError(), function() { mediaSource.setLiveSeekableRange(2, 1); });
+    assert_throws_js(TypeError, function() { mediaSource.setLiveSeekableRange(2, 1); });
     test.done();
 }, "setLiveSeekableRange throws a TypeError if start is greater than end");
 
diff --git a/tests/wpt/web-platform-tests/media-source/mediasource-remove.html b/tests/wpt/web-platform-tests/media-source/mediasource-remove.html
index 9a4eb3fc5cb1..454178709f9b 100644
--- a/tests/wpt/web-platform-tests/media-source/mediasource-remove.html
+++ b/tests/wpt/web-platform-tests/media-source/mediasource-remove.html
@@ -17,7 +17,7 @@
 
               mediaSource.duration = 10;
 
-              assert_throws(new TypeError(), function()
+              assert_throws_js(TypeError, function()
               {
                   sourceBuffer.remove(-1, 2);
               }, "remove");
@@ -33,7 +33,7 @@
 
               [ undefined, NaN, Infinity, -Infinity ].forEach(function(item)
               {
-                  assert_throws(new TypeError(), function()
+                  assert_throws_js(TypeError, function()
                   {
                       sourceBuffer.remove(item, 2);
                   }, "remove");
@@ -48,7 +48,7 @@
 
               mediaSource.duration = 10;
 
-              assert_throws(new TypeError(), function()
+              assert_throws_js(TypeError, function()
               {
                   sourceBuffer.remove(11, 12);
               }, "remove");
@@ -62,7 +62,7 @@
 
               mediaSource.duration = 10;
 
-              assert_throws(new TypeError(), function()
+              assert_throws_js(TypeError, function()
               {
                   sourceBuffer.remove(2, 1);
               }, "remove");
@@ -76,7 +76,7 @@
 
               mediaSource.duration = 10;
 
-              assert_throws(new TypeError(), function()
+              assert_throws_js(TypeError, function()
               {
                   sourceBuffer.remove(0, Number.NEGATIVE_INFINITY);
               }, "remove");
@@ -90,7 +90,7 @@
 
               mediaSource.duration = 10;
 
-              assert_throws(new TypeError(), function()
+              assert_throws_js(TypeError, function()
               {
                   sourceBuffer.remove(0, Number.NaN);
               }, "remove");
@@ -121,7 +121,7 @@
               assert_false(sourceBuffer.updating, "updating is false");
               assert_equals(mediaSource.duration, NaN, "duration isn't set");
 
-              assert_throws(new TypeError(), function()
+              assert_throws_js(TypeError, function()
               {
                   sourceBuffer.remove(0, 0);
               }, "remove");
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html
index 1200fd450a0c..9727bfb22403 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGClipPathElement.html
@@ -20,15 +20,15 @@
   assert_equals(clipPathElement.getAttribute('clipPathUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { clipPathElement.clipPathUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { clipPathElement.clipPathUnits.baseVal = 3; });
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(clipPathElement.getAttribute('clipPathUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { clipPathElement.clipPathUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { clipPathElement.clipPathUnits.baseVal = -1; });
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(clipPathElement.getAttribute('clipPathUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { clipPathElement.clipPathUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { clipPathElement.clipPathUnits.baseVal = 0; });
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(clipPathElement.getAttribute('clipPathUnits'), "objectBoundingBox");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html
index 7d8a4be26acf..cb4a631af663 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGComponentTransferFunctionElement.html
@@ -35,15 +35,15 @@
   assert_equals(feFuncRElement.getAttribute('type'), "gamma");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feFuncRElement.type.baseVal = 6; });
+  assert_throws_js(TypeError, function() { feFuncRElement.type.baseVal = 6; });
   assert_equals(feFuncRElement.type.baseVal, SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_GAMMA);
   assert_equals(feFuncRElement.getAttribute('type'), "gamma");
 
-  assert_throws(new TypeError(), function() { feFuncRElement.type.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feFuncRElement.type.baseVal = -1; });
   assert_equals(feFuncRElement.type.baseVal, SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_GAMMA);
   assert_equals(feFuncRElement.getAttribute('type'), "gamma");
 
-  assert_throws(new TypeError(), function() { feFuncRElement.type.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feFuncRElement.type.baseVal = 0; });
   assert_equals(feFuncRElement.type.baseVal, SVGComponentTransferFunctionElement.SVG_FECOMPONENTTRANSFER_TYPE_GAMMA);
   assert_equals(feFuncRElement.getAttribute('type'), "gamma");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html
index c86e6594a296..ab906119ad88 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEColorMatrixElement.html
@@ -30,15 +30,15 @@
   assert_equals(feColorMatrixElement.getAttribute('type'), "luminanceToAlpha");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feColorMatrixElement.type.baseVal = 5; });
+  assert_throws_js(TypeError, function() { feColorMatrixElement.type.baseVal = 5; });
   assert_equals(feColorMatrixElement.type.baseVal, SVGFEColorMatrixElement.SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA);
   assert_equals(feColorMatrixElement.getAttribute('type'), "luminanceToAlpha");
 
-  assert_throws(new TypeError(), function() { feColorMatrixElement.type.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feColorMatrixElement.type.baseVal = -1; });
   assert_equals(feColorMatrixElement.type.baseVal, SVGFEColorMatrixElement.SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA);
   assert_equals(feColorMatrixElement.getAttribute('type'), "luminanceToAlpha");
 
-  assert_throws(new TypeError(), function() { feColorMatrixElement.type.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feColorMatrixElement.type.baseVal = 0; });
   assert_equals(feColorMatrixElement.type.baseVal, SVGFEColorMatrixElement.SVG_FECOLORMATRIX_TYPE_LUMINANCETOALPHA);
   assert_equals(feColorMatrixElement.getAttribute('type'), "luminanceToAlpha");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html
index 19714ea73f08..e6315b434504 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFECompositeElement.html
@@ -40,15 +40,15 @@
   assert_equals(feCompositeElement.getAttribute('operator'), "arithmetic");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feCompositeElement.operator.baseVal = 7; });
+  assert_throws_js(TypeError, function() { feCompositeElement.operator.baseVal = 7; });
   assert_equals(feCompositeElement.operator.baseVal, SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_ARITHMETIC);
   assert_equals(feCompositeElement.getAttribute('operator'), "arithmetic");
 
-  assert_throws(new TypeError(), function() { feCompositeElement.operator.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feCompositeElement.operator.baseVal = -1; });
   assert_equals(feCompositeElement.operator.baseVal, SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_ARITHMETIC);
   assert_equals(feCompositeElement.getAttribute('operator'), "arithmetic");
 
-  assert_throws(new TypeError(), function() { feCompositeElement.operator.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feCompositeElement.operator.baseVal = 0; });
   assert_equals(feCompositeElement.operator.baseVal, SVGFECompositeElement.SVG_FECOMPOSITE_OPERATOR_ARITHMETIC);
   assert_equals(feCompositeElement.getAttribute('operator'), "arithmetic");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html
index cab47f1bdaeb..b2aff0bd8cc8 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEConvolveMatrixElement.html
@@ -25,15 +25,15 @@
   assert_equals(feConvolveMatrixElement.getAttribute('edgeMode'), "none");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feConvolveMatrixElement.edgeMode.baseVal = 4; });
+  assert_throws_js(TypeError, function() { feConvolveMatrixElement.edgeMode.baseVal = 4; });
   assert_equals(feConvolveMatrixElement.edgeMode.baseVal, SVGFEConvolveMatrixElement.SVG_EDGEMODE_NONE);
   assert_equals(feConvolveMatrixElement.getAttribute('edgeMode'), "none");
 
-  assert_throws(new TypeError(), function() { feConvolveMatrixElement.edgeMode.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feConvolveMatrixElement.edgeMode.baseVal = -1; });
   assert_equals(feConvolveMatrixElement.edgeMode.baseVal, SVGFEConvolveMatrixElement.SVG_EDGEMODE_NONE);
   assert_equals(feConvolveMatrixElement.getAttribute('edgeMode'), "none");
 
-  assert_throws(new TypeError(), function() { feConvolveMatrixElement.edgeMode.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feConvolveMatrixElement.edgeMode.baseVal = 0; });
   assert_equals(feConvolveMatrixElement.edgeMode.baseVal, SVGFEConvolveMatrixElement.SVG_EDGEMODE_NONE);
   assert_equals(feConvolveMatrixElement.getAttribute('edgeMode'), "none");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html
index 11fe32d527c3..14dda6e227e2 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEDisplacementMapElement.html
@@ -32,15 +32,15 @@
   assert_equals(feDisplacementMapElement.getAttribute('xChannelSelector'), "A");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feDisplacementMapElement.xChannelSelector.baseVal = 5; });
+  assert_throws_js(TypeError, function() { feDisplacementMapElement.xChannelSelector.baseVal = 5; });
   assert_equals(feDisplacementMapElement.xChannelSelector.baseVal, SVGFEDisplacementMapElement.SVG_CHANNEL_A);
   assert_equals(feDisplacementMapElement.getAttribute('xChannelSelector'), "A");
 
-  assert_throws(new TypeError(), function() { feDisplacementMapElement.xChannelSelector.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feDisplacementMapElement.xChannelSelector.baseVal = -1; });
   assert_equals(feDisplacementMapElement.xChannelSelector.baseVal, SVGFEDisplacementMapElement.SVG_CHANNEL_A);
   assert_equals(feDisplacementMapElement.getAttribute('xChannelSelector'), "A");
 
-  assert_throws(new TypeError(), function() { feDisplacementMapElement.xChannelSelector.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feDisplacementMapElement.xChannelSelector.baseVal = 0; });
   assert_equals(feDisplacementMapElement.xChannelSelector.baseVal, SVGFEDisplacementMapElement.SVG_CHANNEL_A);
   assert_equals(feDisplacementMapElement.getAttribute('xChannelSelector'), "A");
 
@@ -71,15 +71,15 @@
   assert_equals(feDisplacementMapElement.getAttribute('yChannelSelector'), "A");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feDisplacementMapElement.yChannelSelector.baseVal = 5; });
+  assert_throws_js(TypeError, function() { feDisplacementMapElement.yChannelSelector.baseVal = 5; });
   assert_equals(feDisplacementMapElement.yChannelSelector.baseVal, SVGFEDisplacementMapElement.SVG_CHANNEL_A);
   assert_equals(feDisplacementMapElement.getAttribute('yChannelSelector'), "A");
 
-  assert_throws(new TypeError(), function() { feDisplacementMapElement.yChannelSelector.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feDisplacementMapElement.yChannelSelector.baseVal = -1; });
   assert_equals(feDisplacementMapElement.yChannelSelector.baseVal, SVGFEDisplacementMapElement.SVG_CHANNEL_A);
   assert_equals(feDisplacementMapElement.getAttribute('yChannelSelector'), "A");
 
-  assert_throws(new TypeError(), function() { feDisplacementMapElement.yChannelSelector.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feDisplacementMapElement.yChannelSelector.baseVal = 0; });
   assert_equals(feDisplacementMapElement.yChannelSelector.baseVal, SVGFEDisplacementMapElement.SVG_CHANNEL_A);
   assert_equals(feDisplacementMapElement.getAttribute('yChannelSelector'), "A");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html
index 250bc6ce811a..3bf638e5e6b6 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFEMorphologyElement.html
@@ -20,15 +20,15 @@
   assert_equals(feMorphologyElement.getAttribute('operator'), "dilate");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feMorphologyElement.operator.baseVal = 4; });
+  assert_throws_js(TypeError, function() { feMorphologyElement.operator.baseVal = 4; });
   assert_equals(feMorphologyElement.operator.baseVal, SVGFEMorphologyElement.SVG_MORPHOLOGY_OPERATOR_DILATE);
   assert_equals(feMorphologyElement.getAttribute('operator'), "dilate");
 
-  assert_throws(new TypeError(), function() { feMorphologyElement.operator.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feMorphologyElement.operator.baseVal = -1; });
   assert_equals(feMorphologyElement.operator.baseVal, SVGFEMorphologyElement.SVG_MORPHOLOGY_OPERATOR_DILATE);
   assert_equals(feMorphologyElement.getAttribute('operator'), "dilate");
 
-  assert_throws(new TypeError(), function() { feMorphologyElement.operator.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feMorphologyElement.operator.baseVal = 0; });
   assert_equals(feMorphologyElement.operator.baseVal, SVGFEMorphologyElement.SVG_MORPHOLOGY_OPERATOR_DILATE);
   assert_equals(feMorphologyElement.getAttribute('operator'), "dilate");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html
index 06e23346bf61..2818a8afa4ac 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFETurbulenceElement.html
@@ -22,15 +22,15 @@
   assert_equals(feTurbulenceElement.getAttribute('type'), "turbulence");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feTurbulenceElement.type.baseVal = 3; });
+  assert_throws_js(TypeError, function() { feTurbulenceElement.type.baseVal = 3; });
   assert_equals(feTurbulenceElement.type.baseVal, SVGFETurbulenceElement.SVG_TURBULENCE_TYPE_TURBULENCE);
   assert_equals(feTurbulenceElement.getAttribute('type'), "turbulence");
 
-  assert_throws(new TypeError(), function() { feTurbulenceElement.type.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feTurbulenceElement.type.baseVal = -1; });
   assert_equals(feTurbulenceElement.type.baseVal, SVGFETurbulenceElement.SVG_TURBULENCE_TYPE_TURBULENCE);
   assert_equals(feTurbulenceElement.getAttribute('type'), "turbulence");
 
-  assert_throws(new TypeError(), function() { feTurbulenceElement.type.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feTurbulenceElement.type.baseVal = 0; });
   assert_equals(feTurbulenceElement.type.baseVal, SVGFETurbulenceElement.SVG_TURBULENCE_TYPE_TURBULENCE);
   assert_equals(feTurbulenceElement.getAttribute('type'), "turbulence");
 
@@ -51,15 +51,15 @@
   assert_equals(feTurbulenceElement.getAttribute('stitchTiles'), "noStitch");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { feTurbulenceElement.stitchTiles.baseVal = 3; });
+  assert_throws_js(TypeError, function() { feTurbulenceElement.stitchTiles.baseVal = 3; });
   assert_equals(feTurbulenceElement.stitchTiles.baseVal, SVGFETurbulenceElement.SVG_STITCHTYPE_NOSTITCH);
   assert_equals(feTurbulenceElement.getAttribute('stitchTiles'), "noStitch");
 
-  assert_throws(new TypeError(), function() { feTurbulenceElement.stitchTiles.baseVal = -1; });
+  assert_throws_js(TypeError, function() { feTurbulenceElement.stitchTiles.baseVal = -1; });
   assert_equals(feTurbulenceElement.stitchTiles.baseVal, SVGFETurbulenceElement.SVG_STITCHTYPE_NOSTITCH);
   assert_equals(feTurbulenceElement.getAttribute('stitchTiles'), "noStitch");
 
-  assert_throws(new TypeError(), function() { feTurbulenceElement.stitchTiles.baseVal = 0; });
+  assert_throws_js(TypeError, function() { feTurbulenceElement.stitchTiles.baseVal = 0; });
   assert_equals(feTurbulenceElement.stitchTiles.baseVal, SVGFETurbulenceElement.SVG_STITCHTYPE_NOSTITCH);
   assert_equals(feTurbulenceElement.getAttribute('stitchTiles'), "noStitch");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html
index b8a82db15eda..fcf38a8513ad 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGFilterElement.html
@@ -22,15 +22,15 @@
   assert_equals(filterElement.getAttribute('filterUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { filterElement.filterUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { filterElement.filterUnits.baseVal = 3; });
   assert_equals(filterElement.filterUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(filterElement.getAttribute('filterUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { filterElement.filterUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { filterElement.filterUnits.baseVal = -1; });
   assert_equals(filterElement.filterUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(filterElement.getAttribute('filterUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { filterElement.filterUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { filterElement.filterUnits.baseVal = 0; });
   assert_equals(filterElement.filterUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(filterElement.getAttribute('filterUnits'), "objectBoundingBox");
 
@@ -51,15 +51,15 @@
   assert_equals(filterElement.getAttribute('primitiveUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { filterElement.primitiveUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { filterElement.primitiveUnits.baseVal = 3; });
   assert_equals(filterElement.primitiveUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(filterElement.getAttribute('primitiveUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { filterElement.primitiveUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { filterElement.primitiveUnits.baseVal = -1; });
   assert_equals(filterElement.primitiveUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(filterElement.getAttribute('primitiveUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { filterElement.primitiveUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { filterElement.primitiveUnits.baseVal = 0; });
   assert_equals(filterElement.primitiveUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(filterElement.getAttribute('primitiveUnits'), "objectBoundingBox");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html
index fcb3d717b2f1..a23a66f3d258 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGGradientElement.html
@@ -22,15 +22,15 @@
   assert_equals(gradientElement.getAttribute('gradientUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { gradientElement.gradientUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { gradientElement.gradientUnits.baseVal = 3; });
   assert_equals(gradientElement.gradientUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(gradientElement.getAttribute('gradientUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { gradientElement.gradientUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { gradientElement.gradientUnits.baseVal = -1; });
   assert_equals(gradientElement.gradientUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(gradientElement.getAttribute('gradientUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { gradientElement.gradientUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { gradientElement.gradientUnits.baseVal = 0; });
   assert_equals(gradientElement.gradientUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(gradientElement.getAttribute('gradientUnits'), "objectBoundingBox");
 
@@ -56,15 +56,15 @@
   assert_equals(gradientElement.getAttribute('spreadMethod'), "repeat");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { gradientElement.spreadMethod.baseVal = 4; });
+  assert_throws_js(TypeError, function() { gradientElement.spreadMethod.baseVal = 4; });
   assert_equals(gradientElement.spreadMethod.baseVal, SVGGradientElement.SVG_SPREADMETHOD_REPEAT);
   assert_equals(gradientElement.getAttribute('spreadMethod'), "repeat");
 
-  assert_throws(new TypeError(), function() { gradientElement.spreadMethod.baseVal = -1; });
+  assert_throws_js(TypeError, function() { gradientElement.spreadMethod.baseVal = -1; });
   assert_equals(gradientElement.spreadMethod.baseVal, SVGGradientElement.SVG_SPREADMETHOD_REPEAT);
   assert_equals(gradientElement.getAttribute('spreadMethod'), "repeat");
 
-  assert_throws(new TypeError(), function() { gradientElement.spreadMethod.baseVal = 0; });
+  assert_throws_js(TypeError, function() { gradientElement.spreadMethod.baseVal = 0; });
   assert_equals(gradientElement.spreadMethod.baseVal, SVGGradientElement.SVG_SPREADMETHOD_REPEAT);
   assert_equals(gradientElement.getAttribute('spreadMethod'), "repeat");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html
index 7ff298a9d063..7ac884ae3e50 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMarkerElement.html
@@ -24,15 +24,15 @@
   assert_equals(markerElement.getAttribute('markerUnits'), "strokeWidth");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { markerElement.markerUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { markerElement.markerUnits.baseVal = 3; });
   assert_equals(markerElement.markerUnits.baseVal, SVGMarkerElement.SVG_MARKERUNITS_STROKEWIDTH);
   assert_equals(markerElement.getAttribute('markerUnits'), "strokeWidth");
 
-  assert_throws(new TypeError(), function() { markerElement.markerUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { markerElement.markerUnits.baseVal = -1; });
   assert_equals(markerElement.markerUnits.baseVal, SVGMarkerElement.SVG_MARKERUNITS_STROKEWIDTH);
   assert_equals(markerElement.getAttribute('markerUnits'), "strokeWidth");
 
-  assert_throws(new TypeError(), function() { markerElement.markerUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { markerElement.markerUnits.baseVal = 0; });
   assert_equals(markerElement.markerUnits.baseVal, SVGMarkerElement.SVG_MARKERUNITS_STROKEWIDTH);
   assert_equals(markerElement.getAttribute('markerUnits'), "strokeWidth");
 
@@ -91,15 +91,15 @@
   markerElement.setAttribute('orient', '10deg');
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { markerElement.orientType.baseVal = 3; });
+  assert_throws_js(TypeError, function() { markerElement.orientType.baseVal = 3; });
   assert_equals(markerElement.orientType.baseVal, SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE);
   assert_equals(markerElement.getAttribute('orient'), "10deg");
 
-  assert_throws(new TypeError(), function() { markerElement.orientType.baseVal = -1; });
+  assert_throws_js(TypeError, function() { markerElement.orientType.baseVal = -1; });
   assert_equals(markerElement.orientType.baseVal, SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE);
   assert_equals(markerElement.getAttribute('orient'), "10deg");
 
-  assert_throws(new TypeError(), function() { markerElement.orientType.baseVal = 0; });
+  assert_throws_js(TypeError, function() { markerElement.orientType.baseVal = 0; });
   assert_equals(markerElement.orientType.baseVal, SVGMarkerElement.SVG_MARKER_ORIENT_ANGLE);
   assert_equals(markerElement.getAttribute('orient'), "10deg");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html
index e2a755688851..6a0a26bacb7e 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGMaskElement.html
@@ -22,15 +22,15 @@
   assert_equals(maskElement.getAttribute('maskUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { maskElement.maskUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { maskElement.maskUnits.baseVal = 3; });
   assert_equals(maskElement.maskUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(maskElement.getAttribute('maskUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { maskElement.maskUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { maskElement.maskUnits.baseVal = -1; });
   assert_equals(maskElement.maskUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(maskElement.getAttribute('maskUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { maskElement.maskUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { maskElement.maskUnits.baseVal = 0; });
   assert_equals(maskElement.maskUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(maskElement.getAttribute('maskUnits'), "objectBoundingBox");
 
@@ -51,15 +51,15 @@
   assert_equals(maskElement.getAttribute('maskContentUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { maskElement.maskContentUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { maskElement.maskContentUnits.baseVal = 3; });
   assert_equals(maskElement.maskContentUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(maskElement.getAttribute('maskContentUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { maskElement.maskContentUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { maskElement.maskContentUnits.baseVal = -1; });
   assert_equals(maskElement.maskContentUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(maskElement.getAttribute('maskContentUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { maskElement.maskContentUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { maskElement.maskContentUnits.baseVal = 0; });
   assert_equals(maskElement.maskContentUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(maskElement.getAttribute('maskContentUnits'), "objectBoundingBox");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html
index 069336506f25..6c49adee9020 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGPatternElement.html
@@ -22,15 +22,15 @@
   assert_equals(patternElement.getAttribute('patternUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { patternElement.patternUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { patternElement.patternUnits.baseVal = 3; });
   assert_equals(patternElement.patternUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(patternElement.getAttribute('patternUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { patternElement.patternUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { patternElement.patternUnits.baseVal = -1; });
   assert_equals(patternElement.patternUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(patternElement.getAttribute('patternUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { patternElement.patternUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { patternElement.patternUnits.baseVal = 0; });
   assert_equals(patternElement.patternUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(patternElement.getAttribute('patternUnits'), "objectBoundingBox");
 
@@ -51,15 +51,15 @@
   assert_equals(patternElement.getAttribute('patternContentUnits'), "objectBoundingBox");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { patternElement.patternContentUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { patternElement.patternContentUnits.baseVal = 3; });
   assert_equals(patternElement.patternContentUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(patternElement.getAttribute('patternContentUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { patternElement.patternContentUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { patternElement.patternContentUnits.baseVal = -1; });
   assert_equals(patternElement.patternContentUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(patternElement.getAttribute('patternContentUnits'), "objectBoundingBox");
 
-  assert_throws(new TypeError(), function() { patternElement.patternContentUnits.baseVal = 0; });
+  assert_throws_js(TypeError, function() { patternElement.patternContentUnits.baseVal = 0; });
   assert_equals(patternElement.patternContentUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
   assert_equals(patternElement.getAttribute('patternContentUnits'), "objectBoundingBox");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html
index 60e15bda01bd..0798c9be666e 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextContentElement.html
@@ -20,15 +20,15 @@
   assert_equals(textContentElement.getAttribute('lengthAdjust'), "spacingAndGlyphs");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { textContentElement.lengthAdjust.baseVal = 3; });
+  assert_throws_js(TypeError, function() { textContentElement.lengthAdjust.baseVal = 3; });
   assert_equals(textContentElement.lengthAdjust.baseVal, SVGTextContentElement.LENGTHADJUST_SPACINGANDGLYPHS);
   assert_equals(textContentElement.getAttribute('lengthAdjust'), "spacingAndGlyphs");
 
-  assert_throws(new TypeError(), function() { textContentElement.lengthAdjust.baseVal = -1; });
+  assert_throws_js(TypeError, function() { textContentElement.lengthAdjust.baseVal = -1; });
   assert_equals(textContentElement.lengthAdjust.baseVal, SVGTextContentElement.LENGTHADJUST_SPACINGANDGLYPHS);
   assert_equals(textContentElement.getAttribute('lengthAdjust'), "spacingAndGlyphs");
 
-  assert_throws(new TypeError(), function() { textContentElement.lengthAdjust.baseVal = 0; });
+  assert_throws_js(TypeError, function() { textContentElement.lengthAdjust.baseVal = 0; });
   assert_equals(textContentElement.lengthAdjust.baseVal, SVGTextContentElement.LENGTHADJUST_SPACINGANDGLYPHS);
   assert_equals(textContentElement.getAttribute('lengthAdjust'), "spacingAndGlyphs");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html
index 46c136f777f8..9841866b5a2a 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration-SVGTextPathElement.html
@@ -22,15 +22,15 @@
   assert_equals(textPathElement.getAttribute('method'), "stretch");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { textPathElement.method.baseVal = 3; });
+  assert_throws_js(TypeError, function() { textPathElement.method.baseVal = 3; });
   assert_equals(textPathElement.method.baseVal, SVGTextPathElement.TEXTPATH_METHODTYPE_STRETCH);
   assert_equals(textPathElement.getAttribute('method'), "stretch");
 
-  assert_throws(new TypeError(), function() { textPathElement.method.baseVal = -1; });
+  assert_throws_js(TypeError, function() { textPathElement.method.baseVal = -1; });
   assert_equals(textPathElement.method.baseVal, SVGTextPathElement.TEXTPATH_METHODTYPE_STRETCH);
   assert_equals(textPathElement.getAttribute('method'), "stretch");
 
-  assert_throws(new TypeError(), function() { textPathElement.method.baseVal = 0; });
+  assert_throws_js(TypeError, function() { textPathElement.method.baseVal = 0; });
   assert_equals(textPathElement.method.baseVal, SVGTextPathElement.TEXTPATH_METHODTYPE_STRETCH);
   assert_equals(textPathElement.getAttribute('method'), "stretch");
 
@@ -51,15 +51,15 @@
   assert_equals(textPathElement.getAttribute('spacing'), "exact");
 
   // Try setting invalid values.
-  assert_throws(new TypeError(), function() { textPathElement.spacing.baseVal = 3; });
+  assert_throws_js(TypeError, function() { textPathElement.spacing.baseVal = 3; });
   assert_equals(textPathElement.spacing.baseVal, SVGTextPathElement.TEXTPATH_SPACINGTYPE_EXACT);
   assert_equals(textPathElement.getAttribute('spacing'), "exact");
 
-  assert_throws(new TypeError(), function() { textPathElement.spacing.baseVal = -1; });
+  assert_throws_js(TypeError, function() { textPathElement.spacing.baseVal = -1; });
   assert_equals(textPathElement.spacing.baseVal, SVGTextPathElement.TEXTPATH_SPACINGTYPE_EXACT);
   assert_equals(textPathElement.getAttribute('spacing'), "exact");
 
-  assert_throws(new TypeError(), function() { textPathElement.spacing.baseVal = 0; });
+  assert_throws_js(TypeError, function() { textPathElement.spacing.baseVal = 0; });
   assert_equals(textPathElement.spacing.baseVal, SVGTextPathElement.TEXTPATH_SPACINGTYPE_EXACT);
   assert_equals(textPathElement.getAttribute('spacing'), "exact");
 
diff --git a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration.html b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration.html
index bac692033111..990b884545d7 100644
--- a/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration.html
+++ b/tests/wpt/web-platform-tests/svg/types/scripted/SVGAnimatedEnumeration.html
@@ -20,9 +20,9 @@
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_USERSPACEONUSE);
 
   // Check assigning various valid and invalid values.
-  assert_throws(new TypeError(), function() { clipPathElement.clipPathUnits.baseVal = 3; });
+  assert_throws_js(TypeError, function() { clipPathElement.clipPathUnits.baseVal = 3; });
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_USERSPACEONUSE);
-  assert_throws(new TypeError(), function() { clipPathElement.clipPathUnits.baseVal = -1; });
+  assert_throws_js(TypeError, function() { clipPathElement.clipPathUnits.baseVal = -1; });
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_USERSPACEONUSE);
 
   // ECMA-262, 9.7, "ToUint16"
@@ -30,12 +30,12 @@
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_USERSPACEONUSE);
 
   // ECMA-262, 9.7, "ToUint16"
-  assert_throws(new TypeError(), function() { clipPathElement.clipPathUnits.baseVal = 'aString'; });
+  assert_throws_js(TypeError, function() { clipPathElement.clipPathUnits.baseVal = 'aString'; });
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_USERSPACEONUSE);
 
   clipPathElement.clipPathUnits.baseVal = 2;
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
-  assert_throws(new TypeError(), function() { clipPathElement.clipPathUnits.baseVal = clipPathElement; });
+  assert_throws_js(TypeError, function() { clipPathElement.clipPathUnits.baseVal = clipPathElement; });
   assert_equals(clipPathElement.clipPathUnits.baseVal, SVGUnitTypes.SVG_UNIT_TYPE_OBJECTBOUNDINGBOX);
 });
 </script>
\ No newline at end of file
diff --git a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html
index 8f16aa18711e..46a23b0c2e87 100644
--- a/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html
+++ b/tests/wpt/web-platform-tests/web-animations/interfaces/KeyframeEffect/constructor.html
@@ -41,7 +41,7 @@
 
 test(t => {
   for (const invalidEasing of gInvalidEasings) {
-    assert_throws(new TypeError, () => {
+    assert_throws_js(TypeError, () => {
       new KeyframeEffect(target, null, { easing: invalidEasing });
     }, `TypeError is thrown for easing '${invalidEasing}'`);
   }
@@ -57,7 +57,7 @@
                   `resulting composite for '${composite}'`);
   }
   for (const composite of gBadKeyframeCompositeValueTests) {
-    assert_throws(new TypeError, () => {
+    assert_throws_js(TypeError, () => {
       new KeyframeEffect(target, getKeyframe(composite));
     });
   }
@@ -76,7 +76,7 @@
                   `resulting composite for '${composite}'`);
   }
   for (const composite of gBadKeyframeCompositeValueTests) {
-    assert_throws(new TypeError, () => {
+    assert_throws_js(TypeError, () => {
       new KeyframeEffect(target, getKeyframes(composite));
     });
   }
@@ -92,7 +92,7 @@
                   `resulting composite for '${composite}'`);
   }
   for (const composite of gBadOptionsCompositeValueTests) {
-    assert_throws(new TypeError, () => {
+    assert_throws_js(TypeError, () => {
       new KeyframeEffect(target, {
         left: ['10px', '20px']
       }, { composite: composite });
@@ -117,7 +117,7 @@
 
 for (const subtest of gInvalidKeyframesTests) {
   test(t => {
-    assert_throws(new TypeError, () => {
+    assert_throws_js(TypeError, () => {
       new KeyframeEffect(target, subtest.input);
     });
   }, `KeyframeEffect constructor throws with ${subtest.desc}`);
@@ -169,7 +169,7 @@
 
 for (const subtest of gInvalidKeyframeEffectOptionTests) {
   test(t => {
-    assert_throws(new TypeError, () => {
+    assert_throws_js(TypeError, () => {
       new KeyframeEffect(target, { left: ['10px', '20px'] }, subtest.input);
     });
   }, `Invalid KeyframeEffect option by ${subtest.desc}`);