@@ -130,10 +130,6 @@ function run(workerData) {
   // eslint-disable-next-line no-undef
   add_completion_callback((_, status) => {
     clearTimeout(timeout);
-    // Match WPT semantics: exceptions thrown after done() do not fail the
-    // test. This also replaces the reporting handler of the process backend.
-    process.removeAllListeners('uncaughtException');
-    process.on('uncaughtException', () => {});
     send({
       type: 'completion',
       status,
 
@@ -1,7 +1,22 @@
 'use strict';
 
+const assert = require('assert');
+const { basename } = require('path');
 const { WPTRunner } = require('../common/wpt');
 
 const runner = new WPTRunner('html/webappapis/timers', { concurrency: 1 });
 
+runner.setScriptModifier((script) => {
+  if (!['type-long-settimeout.any.js', 'type-long-setinterval.any.js']
+    .includes(basename(script.filename))) return;
+
+  // Cancel the failure timer when the test completes so it cannot throw
+  // while the runner is still processing the completion message.
+  const failureTimer = 'setTimeout(assert_unreached, 100);';
+  assert(script.code.includes(failureTimer), `Unexpected contents of ${script.filename}`);
+  script.code = script.code.replace(failureTimer,
+                                    'const failureTimer = setTimeout(assert_unreached, 100);\n' +
+                                    'add_completion_callback(() => clearTimeout(failureTimer));');
+});
+
 runner.runJsTests();