diff --git a/addons/mail/static/src/utils/test_utils.js b/addons/mail/static/src/utils/test_utils.js
index b42e65ce14e..49b3fed668e 100644
--- a/addons/mail/static/src/utils/test_utils.js
+++ b/addons/mail/static/src/utils/test_utils.js
@@ -24,7 +24,6 @@ import {
     mock,
 } from 'web.test_utils';
 import Widget from 'web.Widget';
-import { registerCleanup } from '@web/../tests/helpers/cleanup';
 import { createWebClient, getActionManagerServerData } from "@web/../tests/webclient/helpers";
 
 import LegacyRegistry from "web.Registry";
@@ -319,6 +318,9 @@ function afterEach(self) {
         self.widget.destroy();
         self.widget = undefined;
     }
+    if (self.messaging) {
+        self.messaging.delete();
+    }
     self.env = undefined;
     self.unpatch();
 }
@@ -775,14 +777,6 @@ async function start(param0 = {}) {
     }
     returnCallbacks.forEach(callback => callback(result));
     await waitUntilEventPromise;
-    registerCleanup(() => {
-        if (modelManager.messaging) {
-            modelManager.messaging.delete();
-        }
-        if (widget) {
-            widget.destroy();
-        }
-    });
     return {
         ...result,
         createComposerComponent: getCreateComposerComponent({ components, env: testEnv, modelManager, widget }),