diff --git a/addons/base_automation/static/tests/base_automation_error_dialog.js b/addons/base_automation/static/tests/base_automation_error_dialog.js
index df04c028466..9489d0b7df3 100644
--- a/addons/base_automation/static/tests/base_automation_error_dialog.js
+++ b/addons/base_automation/static/tests/base_automation_error_dialog.js
@@ -1,5 +1,6 @@
 /** @odoo-modules */
 
+import { browser } from "@web/core/browser/browser";
 import { registry } from "@web/core/registry";
 import { errorService } from "@web/core/errors/error_service";
 import { dialogService } from "@web/core/dialog/dialog_service";
@@ -36,14 +37,14 @@ QUnit.module("base_automation", {}, function () {
             // Both of these are unused but required for the error service to call error handlers
             serviceRegistry.add("notification", notificationService);
             serviceRegistry.add("rpc", makeFakeRPCService());
-            const windowAddEventListener = window.addEventListener;
-            window.addEventListener = (type, cb) => {
+            const windowAddEventListener = browser.addEventListener;
+            browser.addEventListener = (type, cb) => {
                 if (type === "unhandledrejection") {
                     unhandledRejectionCb = cb;
                 }
             };
             registerCleanup(() => {
-                window.addEventListener = windowAddEventListener;
+                browser.addEventListener = windowAddEventListener;
             });
         },
     });
diff --git a/addons/web/static/src/core/errors/error_service.js b/addons/web/static/src/core/errors/error_service.js
index c8725927fac..d4837c91bb7 100644
--- a/addons/web/static/src/core/errors/error_service.js
+++ b/addons/web/static/src/core/errors/error_service.js
@@ -97,7 +97,7 @@ export const errorService = {
             }
         }
 
-        window.addEventListener("error", async (ev) => {
+        browser.addEventListener("error", async (ev) => {
             const { colno, error: originalError, filename, lineno, message } = ev;
             let uncaughtError;
             if (!filename && !lineno && !colno) {
@@ -119,7 +119,7 @@ export const errorService = {
             handleError(uncaughtError, originalError);
         });
 
-        window.addEventListener("unhandledrejection", async (ev) => {
+        browser.addEventListener("unhandledrejection", async (ev) => {
             const originalError = ev.reason;
             const uncaughtError = new UncaughtPromiseError();
             uncaughtError.unhandledRejectionEvent = ev;
diff --git a/addons/web/static/tests/core/errors/error_service_tests.js b/addons/web/static/tests/core/errors/error_service_tests.js
index e8f13fb206b..f2f4a4844bd 100644
--- a/addons/web/static/tests/core/errors/error_service_tests.js
+++ b/addons/web/static/tests/core/errors/error_service_tests.js
@@ -36,8 +36,8 @@ QUnit.module("Error Service", {
         serviceRegistry.add("notification", notificationService);
         serviceRegistry.add("rpc", makeFakeRPCService());
         serviceRegistry.add("localization", makeFakeLocalizationService());
-        const windowAddEventListener = window.addEventListener;
-        window.addEventListener = (type, cb) => {
+        const windowAddEventListener = browser.addEventListener;
+        browser.addEventListener = (type, cb) => {
             if (type === "unhandledrejection") {
                 unhandledRejectionCb = cb;
             }
@@ -46,7 +46,7 @@ QUnit.module("Error Service", {
             }
         };
         registerCleanup(() => {
-            window.addEventListener = windowAddEventListener;
+            browser.addEventListener = windowAddEventListener;
         });
     },
 });