diff --git a/Tests/LibWeb/Text/expected/all-window-properties.txt b/Tests/LibWeb/Text/expected/all-window-properties.txt
index a384a84079..8fa706e12a 100644
--- a/Tests/LibWeb/Text/expected/all-window-properties.txt
+++ b/Tests/LibWeb/Text/expected/all-window-properties.txt
@@ -395,6 +395,7 @@ asyncTest
 printElement
 println
 promiseTest
+removeTestErrorHandler
 spoofCurrentURL
 test
 timeout
diff --git a/Tests/LibWeb/Text/input/HTML/Window-onerror.html b/Tests/LibWeb/Text/input/HTML/Window-onerror.html
index 525f1f70a6..318ab4fd6d 100644
--- a/Tests/LibWeb/Text/input/HTML/Window-onerror.html
+++ b/Tests/LibWeb/Text/input/HTML/Window-onerror.html
@@ -2,6 +2,9 @@
 <script src="../include.js"></script>
 <script>
     asyncTest(done => {
+
+        removeTestErrorHandler()
+
         window.addEventListener("error", (event) => {
             println(`onerror event fired: ${event.error}`);
             done();
diff --git a/Tests/LibWeb/Text/input/HTML/WindowOrWorkerGlobalScope-reportError.html b/Tests/LibWeb/Text/input/HTML/WindowOrWorkerGlobalScope-reportError.html
index e78751da48..7021add9de 100644
--- a/Tests/LibWeb/Text/input/HTML/WindowOrWorkerGlobalScope-reportError.html
+++ b/Tests/LibWeb/Text/input/HTML/WindowOrWorkerGlobalScope-reportError.html
@@ -1,6 +1,8 @@
 <script src="../include.js"></script>
 <script>
     test(() => {
+        removeTestErrorHandler()
+
         window.onerror = (message, filename, lineno, colno, error) => {
             println(`message = ${message}`);
             println(`lineno = ${lineno}`);
diff --git a/Tests/LibWeb/Text/input/include.js b/Tests/LibWeb/Text/input/include.js
index dc60ffa5c7..7ac4f1d092 100644
--- a/Tests/LibWeb/Text/input/include.js
+++ b/Tests/LibWeb/Text/input/include.js
@@ -52,6 +52,20 @@ function timeout(ms) {
     return promise;
 }
 
+const __testErrorHandlerController = new AbortController();
+window.addEventListener(
+    "error",
+    event => {
+        println(`Uncaught Error In Test: ${event.message}`);
+        __finishTest();
+    },
+    { signal: __testErrorHandlerController.signal }
+);
+
+function removeTestErrorHandler() {
+    __testErrorHandlerController.abort();
+}
+
 document.addEventListener("DOMContentLoaded", function () {
     __outputElement = document.createElement("pre");
     __outputElement.setAttribute("id", "out");