diff --git a/addons/calendar/static/tests/systray_activity_menu_tests.js b/addons/calendar/static/tests/systray_activity_menu_tests.js
index 3cbd4e0f7c2..1a275c5c6ca 100644
--- a/addons/calendar/static/tests/systray_activity_menu_tests.js
+++ b/addons/calendar/static/tests/systray_activity_menu_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 import ActivityMenu from '@mail/js/systray/systray_activity_menu';
 
 import testUtils from 'web.test_utils';
diff --git a/addons/hr/static/tests/m2x_avatar_employee_tests.js b/addons/hr/static/tests/m2x_avatar_employee_tests.js
index 5fb632efddc..1b0d3bcd6ab 100644
--- a/addons/hr/static/tests/m2x_avatar_employee_tests.js
+++ b/addons/hr/static/tests/m2x_avatar_employee_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import KanbanView from 'web.KanbanView';
diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
index 71a1557e34f..a9bedc113e2 100644
--- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
+++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
@@ -4,7 +4,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('hr_holidays', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js
index 6394102d72d..b300340a734 100644
--- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js
+++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_icon_tests.js
@@ -4,7 +4,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_view_tests.js b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_view_tests.js
index a9774e46512..7d2638346b0 100644
--- a/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_view_tests.js
+++ b/addons/hr_holidays/static/tests/qunit_suite_tests/components/thread_view_tests.js
@@ -4,7 +4,7 @@ import { insertAndReplace, link } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('hr_holidays', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js
index 351b92b4ca2..ac497d7424e 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js
index e31a6ce0217..06a433f055b 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/composer_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js
index 783e0334412..52479fda776 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js
@@ -3,7 +3,7 @@
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js
index bd13051af81..3ba05c006a2 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js
index fe144457576..2b89ca25db5 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { datetime_to_str } from 'web.time';
 
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js
index db376fb48c7..1277fda1917 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/messaging_menu_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js
index 7671968f18e..a18079500e3 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_icon_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
index da9933d311a..7f732352904 100644
--- a/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
+++ b/addons/im_livechat/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('im_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index cb25c60bbf7..cb4811b0a75 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -84,9 +84,7 @@
             'mail/static/src/models/*.js',
             'mail/static/src/public/*',
             'mail/static/src/services/messaging/messaging.js',
-            'mail/static/src/utils/*/*.js',
-            'mail/static/src/utils/messaging_component.js',
-            'mail/static/src/utils/utils.js',
+            'mail/static/src/utils/*.js',
             # Framework JS
             'bus/static/src/js/*.js',
             'bus/static/src/js/services/bus_service.js',
@@ -116,9 +114,7 @@
             # defines mixins and variables used by multiple components
             'mail/static/src/components/notification_list/notification_list_item.scss',
             'mail/static/src/js/**/*.js',
-            'mail/static/src/utils/*/*.js',
-            'mail/static/src/utils/messaging_component.js',
-            'mail/static/src/utils/utils.js',
+            'mail/static/src/utils/*.js',
             'mail/static/src/scss/*.scss',
             'mail/static/src/component_hooks/*.js',
             'mail/static/src/components/*/*.js',
@@ -141,7 +137,6 @@
         ],
         'web.tests_assets': [
             'mail/static/src/env/test_env.js',
-            'mail/static/src/utils/test_utils.js',
             'mail/static/tests/helpers/*.js',
             'mail/static/tests/models/*.js',
         ],
diff --git a/addons/mail/static/src/model/model_manager.js b/addons/mail/static/src/model/model_manager.js
index b3cef6b1612..e8097c8d7ff 100644
--- a/addons/mail/static/src/model/model_manager.js
+++ b/addons/mail/static/src/model/model_manager.js
@@ -6,7 +6,7 @@ import { FieldCommand, unlinkAll } from '@mail/model/model_field_command';
 import { RelationSet } from '@mail/model/model_field_relation_set';
 import { Listener } from '@mail/model/model_listener';
 import { followRelations } from '@mail/model/model_utils';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 /**
  * Object that manage models and records, notably their update cycle: whenever
diff --git a/addons/mail/static/src/models/messaging.js b/addons/mail/static/src/models/messaging.js
index 7e1f06ab6e0..cf478a7b004 100644
--- a/addons/mail/static/src/models/messaging.js
+++ b/addons/mail/static/src/models/messaging.js
@@ -4,7 +4,7 @@ import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { OnChange } from '@mail/model/model_onchange';
 import { insertAndReplace, link, unlink } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 const { EventBus } = owl;
 
diff --git a/addons/mail/static/src/models/rtc.js b/addons/mail/static/src/models/rtc.js
index 1577fec6021..125a7f71d62 100644
--- a/addons/mail/static/src/models/rtc.js
+++ b/addons/mail/static/src/models/rtc.js
@@ -5,8 +5,7 @@ import { browser } from "@web/core/browser/browser";
 import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { clear, insert, unlink } from '@mail/model/model_field_command';
-
-import { monitorAudio } from '@mail/utils/media_monitoring/media_monitoring';
+import { monitorAudio } from '@mail/utils/media_monitoring';
 
 /**
  * The order in which transceivers are added, relevant for RTCPeerConnection.getTransceivers which returns
diff --git a/addons/mail/static/src/models/thread.js b/addons/mail/static/src/models/thread.js
index 4f8565a6577..f8844728ff3 100644
--- a/addons/mail/static/src/models/thread.js
+++ b/addons/mail/static/src/models/thread.js
@@ -4,8 +4,8 @@ import { registerModel } from '@mail/model/model_core';
 import { attr, many, one } from '@mail/model/model_field';
 import { clear, insert, insertAndReplace, link, replace, unlink, unlinkAll } from '@mail/model/model_field_command';
 import { OnChange } from '@mail/model/model_onchange';
-import throttle from '@mail/utils/throttle/throttle';
-import Timer from '@mail/utils/timer/timer';
+import throttle from '@mail/utils/throttle';
+import Timer from '@mail/utils/timer';
 import { cleanSearchTerm } from '@mail/utils/utils';
 import * as mailUtils from '@mail/js/utils';
 
diff --git a/addons/mail/static/src/utils/deferred/deferred.js b/addons/mail/static/src/utils/deferred.js
similarity index 100%
rename from addons/mail/static/src/utils/deferred/deferred.js
rename to addons/mail/static/src/utils/deferred.js
diff --git a/addons/mail/static/src/utils/media_monitoring/media_monitoring.js b/addons/mail/static/src/utils/media_monitoring.js
similarity index 100%
rename from addons/mail/static/src/utils/media_monitoring/media_monitoring.js
rename to addons/mail/static/src/utils/media_monitoring.js
diff --git a/addons/mail/static/src/utils/throttle/throttle.js b/addons/mail/static/src/utils/throttle.js
similarity index 99%
rename from addons/mail/static/src/utils/throttle/throttle.js
rename to addons/mail/static/src/utils/throttle.js
index d108480cc91..72554990faa 100644
--- a/addons/mail/static/src/utils/throttle/throttle.js
+++ b/addons/mail/static/src/utils/throttle.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 /**
  * This module define an utility function that enables throttling calls on a
diff --git a/addons/mail/static/src/utils/timer/timer.js b/addons/mail/static/src/utils/timer.js
similarity index 98%
rename from addons/mail/static/src/utils/timer/timer.js
rename to addons/mail/static/src/utils/timer.js
index 80d147f9ee1..ad7b36a1809 100644
--- a/addons/mail/static/src/utils/timer/timer.js
+++ b/addons/mail/static/src/utils/timer.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 
 //------------------------------------------------------------------------------
 // Errors
diff --git a/addons/mail/static/tests/helpers/mock_server.js b/addons/mail/static/tests/helpers/mock_server.js
index 7c6ccbd2ca8..254466b48e0 100644
--- a/addons/mail/static/tests/helpers/mock_server.js
+++ b/addons/mail/static/tests/helpers/mock_server.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { nextAnimationFrame } from '@mail/utils/test_utils';
+import { nextAnimationFrame } from '@mail/../tests/helpers/test_utils';
 
 import MockServer from 'web.MockServer';
 import { datetime_to_str } from 'web.time';
diff --git a/addons/mail/static/tests/helpers/model_definitions_setup.js b/addons/mail/static/tests/helpers/model_definitions_setup.js
index f584510c87d..686b07f0944 100644
--- a/addons/mail/static/tests/helpers/model_definitions_setup.js
+++ b/addons/mail/static/tests/helpers/model_definitions_setup.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { TEST_USER_IDS } from '@mail/utils/test_utils';
+import { TEST_USER_IDS } from '@mail/../tests/helpers/test_utils';
 import {
     addFakeModel,
     addModelNamesToFetch,
diff --git a/addons/mail/static/src/utils/test_utils.js b/addons/mail/static/tests/helpers/test_utils.js
similarity index 99%
rename from addons/mail/static/src/utils/test_utils.js
rename to addons/mail/static/tests/helpers/test_utils.js
index 349ab13b16a..7a033648e26 100644
--- a/addons/mail/static/src/utils/test_utils.js
+++ b/addons/mail/static/tests/helpers/test_utils.js
@@ -10,7 +10,7 @@ import {
 import { insertAndReplace, replace } from '@mail/model/model_field_command';
 import { ChatWindowService } from '@mail/services/chat_window_service/chat_window_service';
 import { MessagingService } from '@mail/services/messaging/messaging';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import { DialogService } from '@mail/services/dialog_service/dialog_service';
 import { getMessagingComponent } from '@mail/utils/messaging_component';
 import { nextTick } from '@mail/utils/utils';
diff --git a/addons/mail/static/tests/qunit_mobile_suite_tests/components/discuss_mobile_mailbox_selection_tests.js b/addons/mail/static/tests/qunit_mobile_suite_tests/components/discuss_mobile_mailbox_selection_tests.js
index fafb1904c44..8361eb6e603 100644
--- a/addons/mail/static/tests/qunit_mobile_suite_tests/components/discuss_mobile_mailbox_selection_tests.js
+++ b/addons/mail/static/tests/qunit_mobile_suite_tests/components/discuss_mobile_mailbox_selection_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js b/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js
index c563f0401fb..d5d5006d4b0 100644
--- a/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/chatter_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import ListView from 'web.ListView';
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js
index a7ee2f46e94..4d61f7da3f1 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/activity_mark_done_popover_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js
index 2d5af745a66..bd59a7d2eb4 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/activity_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 import { date_to_str } from 'web.time';
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/attachment_box_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/attachment_box_tests.js
index cf0dc5c1e0b..878c6f4a0f4 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/attachment_box_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/attachment_box_tests.js
@@ -6,7 +6,7 @@ import {
     dragenterFiles,
     dropFiles,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { file } from 'web.test_utils';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/attachment_image_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/attachment_image_tests.js
index 3c678154261..c2691bb375c 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/attachment_image_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/attachment_image_tests.js
@@ -4,7 +4,7 @@ import { link } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/attachment_list_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/attachment_list_tests.js
index 50b63b860ff..3e94021215d 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/attachment_list_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/attachment_list_tests.js
@@ -6,7 +6,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/channel_invitation_form_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/channel_invitation_form_tests.js
index 7b8ff5a32ee..de0ddfa40a3 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/channel_invitation_form_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/channel_invitation_form_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js
index 349f945ea09..476310eddc8 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/chat_window_manager_tests.js
@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { file, dom } from 'web.test_utils';
 const { createFile, inputFiles } = file;
@@ -226,7 +226,7 @@ QUnit.test('chat window new message: fold', async function (assert) {
 QUnit.test('open chat from "new message" chat window should open chat in place of this "new message" chat window', async function (assert) {
     /**
      * InnerWith computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
@@ -860,7 +860,7 @@ QUnit.test('chat window: close on ESCAPE', async function (assert) {
 QUnit.test('focus next visible chat window when closing current chat window with ESCAPE [REQUIRE FOCUS]', async function (assert) {
     /**
      * computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
@@ -1054,7 +1054,7 @@ QUnit.test('chat window: scroll conservation on toggle discuss', async function
 QUnit.test('open 2 different chat windows: enough screen width [REQUIRE FOCUS]', async function (assert) {
     /**
      * computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
@@ -1657,7 +1657,7 @@ QUnit.test('chat window: switch on TAB', async function (assert) {
 QUnit.test('chat window: TAB cycle with 3 open chat windows [REQUIRE FOCUS]', async function (assert) {
     /**
      * InnerWith computation uses following info:
-     * ([mocked] global window width: @see `mail/static/src/utils/test_utils.js:start()` method)
+     * ([mocked] global window width: @see `mail/static/tests/helpers/test_utils.js:start()` method)
      * (others: @see mail/static/src/models/chat_window_manager.js:visual)
      *
      * - chat window width: 325px
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/chatter_suggested_recipient_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/chatter_suggested_recipient_tests.js
index 345f05f48db..ddbfe5d7613 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/chatter_suggested_recipient_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/chatter_suggested_recipient_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/chatter_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/chatter_tests.js
index 920a643ea39..7ce65de0b52 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/chatter_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/chatter_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/chatter_topbar_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/chatter_topbar_tests.js
index 6f1aa29a575..a5069ec2d8d 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/chatter_topbar_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/chatter_topbar_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, nextAnimationFrame, start } from '@mail/../tests/helpers/test_utils';
 
 import { makeTestPromise } from 'web.test_utils';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_canned_response_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_canned_response_tests.js
index e9ceb5a00fa..6dbf0f0de55 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_canned_response_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_canned_response_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_channel_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_channel_tests.js
index c27a6cca900..4d653238e46 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_channel_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_channel_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_command_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_command_tests.js
index 1901455d355..b6e56a3e53d 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_command_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_command_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js
index 0080a84260b..667375e83f8 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/composer_suggestion_partner_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/composer_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/composer_tests.js
index 1a160752480..c20e2e6c370 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/composer_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/composer_tests.js
@@ -9,7 +9,7 @@ import {
     nextAnimationFrame,
     pasteFiles,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/dialog_manager_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/dialog_manager_tests.js
index b1aabba87fa..8716bdb013c 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/dialog_manager_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/dialog_manager_tests.js
@@ -1,11 +1,11 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/discuss_inbox_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/discuss_inbox_tests.js
index 2ffea2d0c50..a958d960590 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/discuss_inbox_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/discuss_inbox_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/discuss_message_edit_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/discuss_message_edit_tests.js
index ef8739a07ce..6c13cb54bb3 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/discuss_message_edit_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/discuss_message_edit_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/discuss_pinned_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/discuss_pinned_tests.js
index 045a5e408ed..0294da4aa44 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/discuss_pinned_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/discuss_pinned_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js
index bcfb840b497..2b812f50063 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_item_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { datetime_to_str } from 'web.time';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js
index c0c740b2af7..0ffe23acf14 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_category_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_tests.js
index 98c7463cb51..2d7ecd56e8f 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/discuss_sidebar_tests.js
@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/discuss_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/discuss_tests.js
index 0ce1a0f3a4d..3f52cda3e85 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/discuss_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/discuss_tests.js
@@ -7,7 +7,7 @@ import {
     nextAnimationFrame,
     start,
     startServer,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 import { makeTestPromise, file } from 'web.test_utils';
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/follow_button_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/follow_button_tests.js
index 75a6c9b6bd8..bff8cde6e2e 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/follow_button_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/follow_button_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/follower_list_menu_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/follower_list_menu_tests.js
index 5fd814bbef9..c98d1823614 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/follower_list_menu_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/follower_list_menu_tests.js
@@ -6,7 +6,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js
index 47cda2d7c7e..849425b833e 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/follower_subtype_tests.js
@@ -6,7 +6,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js
index f790edb11d7..d8b3a68d622 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/follower_tests.js
@@ -1,13 +1,13 @@
 /** @odoo-module **/
 
 import { insert, link } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js
index ed577eacd82..c6f8b73730a 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/message_seen_indicator_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js
index 09829072220..93abd174d43 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/message_tests.js
@@ -1,14 +1,14 @@
 /** @odoo-module **/
 
 import { insert, insertAndReplace, link, replace } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     createRootMessagingComponent,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/messaging_menu_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/messaging_menu_tests.js
index 9bff0afd03f..3dd478c3c8c 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/messaging_menu_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/messaging_menu_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import { makeTestPromise } from 'web.test_utils';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
index 0228163a577..3f6737cc589 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start, } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start, } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/notification_list_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/notification_list_tests.js
index 6ebababaf0e..d382257be6e 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/notification_list_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/notification_list_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
index 95928ab4698..5aceb9a7889 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/partner_im_status_icon_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js
index 9e0c60bf2f1..28a455d2c37 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_icon_tests.js
@@ -5,7 +5,7 @@ import {
     beforeEach,
     createRootMessagingComponent,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_needaction_preview_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_needaction_preview_tests.js
index 76c937b37f4..f0eb0e9596f 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/thread_needaction_preview_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_needaction_preview_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_preview_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_preview_tests.js
index 50826908eba..d543e1cba74 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/thread_preview_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_preview_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
index b3cc84a4539..e18788332b8 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_textual_typing_status_tests.js
@@ -6,7 +6,7 @@ import {
     createRootMessagingComponent,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/components/thread_view_tests.js b/addons/mail/static/tests/qunit_suite_tests/components/thread_view_tests.js
index af31e333835..6945d0b5725 100644
--- a/addons/mail/static/tests/qunit_suite_tests/components/thread_view_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/components/thread_view_tests.js
@@ -6,7 +6,7 @@ import {
     beforeEach,
     dragenterFiles,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js b/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js
index 49703e09079..73bede94eaf 100644
--- a/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/m2x_avatar_user_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { Many2OneAvatarUser } from '@mail/js/m2x_avatar_user';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 import { click, getFixture, legacyExtraNextTick, patchWithCleanup, triggerHotkey } from "@web/../tests/helpers/utils";
 import { doAction } from '@web/../tests/webclient/helpers';
 import { registry } from "@web/core/registry";
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/clear_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/clear_tests.js
index 34857f223fb..8bb4139521b 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/clear_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/clear_tests.js
@@ -4,7 +4,7 @@ import { clear, insertAndReplace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_and_replace_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_and_replace_tests.js
index 0741d72d832..9927021c29a 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_and_replace_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_and_replace_tests.js
@@ -4,7 +4,7 @@ import { insertAndReplace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_tests.js
index 4a602e6d3d0..1ea4d506b3a 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/insert_tests.js
@@ -4,7 +4,7 @@ import { insert, insertAndReplace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/link_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/link_tests.js
index 71de7d2255d..4b845b05ead 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/link_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/link_tests.js
@@ -4,7 +4,7 @@ import { insertAndReplace, link } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/replace_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/replace_tests.js
index 6ee072c2fa8..e3a8a332af8 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/replace_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/replace_tests.js
@@ -4,7 +4,7 @@ import { insertAndReplace, replace } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/set_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/set_tests.js
index 0d5f990df58..9555bf454cf 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/set_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/set_tests.js
@@ -8,7 +8,7 @@ import {
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_all_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_all_tests.js
index 0fdfea67ce6..6183b4e2e22 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_all_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_all_tests.js
@@ -4,7 +4,7 @@ import { insertAndReplace, unlinkAll } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_tests.js b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_tests.js
index 7ceb67adc3c..87d3cf68ece 100644
--- a/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/model_field_commands/unlink_tests.js
@@ -4,7 +4,7 @@ import { insertAndReplace, unlink } from '@mail/model/model_field_command';
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('model_field_commands', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/models/attachment_tests.js b/addons/mail/static/tests/qunit_suite_tests/models/attachment_tests.js
index 54220d0926b..427720b9554 100644
--- a/addons/mail/static/tests/qunit_suite_tests/models/attachment_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/models/attachment_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/models/clock_tests.js b/addons/mail/static/tests/qunit_suite_tests/models/clock_tests.js
index 48c363a5fef..cd5f25d271c 100644
--- a/addons/mail/static/tests/qunit_suite_tests/models/clock_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/models/clock_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { insertAndReplace } from '@mail/model/model_field_command';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/models/file_uploader_tests.js b/addons/mail/static/tests/qunit_suite_tests/models/file_uploader_tests.js
index d72b21360ca..1bef7f2faae 100644
--- a/addons/mail/static/tests/qunit_suite_tests/models/file_uploader_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/models/file_uploader_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import { file } from 'web.test_utils';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/models/message_tests.js b/addons/mail/static/tests/qunit_suite_tests/models/message_tests.js
index 8102cb6cadc..8487ba2624e 100644
--- a/addons/mail/static/tests/qunit_suite_tests/models/message_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/models/message_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { insert, insertAndReplace, link } from '@mail/model/model_field_command';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import { str_to_datetime } from 'web.time';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/models/messaging_menu_tests.js b/addons/mail/static/tests/qunit_suite_tests/models/messaging_menu_tests.js
index 4b90d114fdb..eb19c5f765a 100644
--- a/addons/mail/static/tests/qunit_suite_tests/models/messaging_menu_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/models/messaging_menu_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/models/messaging_tests.js b/addons/mail/static/tests/qunit_suite_tests/models/messaging_tests.js
index 4e372b8f92b..d0143d9243f 100644
--- a/addons/mail/static/tests/qunit_suite_tests/models/messaging_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/models/messaging_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/models/thread_tests.js b/addons/mail/static/tests/qunit_suite_tests/models/thread_tests.js
index 271f36e4a2a..b0464105b76 100644
--- a/addons/mail/static/tests/qunit_suite_tests/models/thread_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/models/thread_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import { insert } from '@mail/model/model_field_command';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail', {}, function () {
 QUnit.module('models', {}, function () {
diff --git a/addons/mail/static/tests/qunit_suite_tests/systray_activity_menu_tests.js b/addons/mail/static/tests/qunit_suite_tests/systray_activity_menu_tests.js
index ac079d43001..29462255832 100644
--- a/addons/mail/static/tests/qunit_suite_tests/systray_activity_menu_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/systray_activity_menu_tests.js
@@ -5,7 +5,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import testUtils from 'web.test_utils';
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/utils/throttle_tests.js b/addons/mail/static/tests/qunit_suite_tests/utils/throttle_tests.js
index ce53e2584a0..eeb935a44ec 100644
--- a/addons/mail/static/tests/qunit_suite_tests/utils/throttle_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/utils/throttle_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
-import throttle from '@mail/utils/throttle/throttle';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
+import throttle from '@mail/utils/throttle';
 import { nextTick } from '@mail/utils/utils';
 
 const { ThrottleReinvokedError, ThrottleCanceledError } = throttle;
diff --git a/addons/mail/static/tests/qunit_suite_tests/utils/timer_tests.js b/addons/mail/static/tests/qunit_suite_tests/utils/timer_tests.js
index 91b76211b92..ff0b8d01c8a 100644
--- a/addons/mail/static/tests/qunit_suite_tests/utils/timer_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/utils/timer_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
-import { beforeEach, nextTick, start } from '@mail/utils/test_utils';
-import Timer from '@mail/utils/timer/timer';
+import { beforeEach, nextTick, start } from '@mail/../tests/helpers/test_utils';
+import Timer from '@mail/utils/timer';
 
 const { TimerClearedError } = Timer;
 
diff --git a/addons/mail/static/tests/qunit_suite_tests/webclient/commands/mail_providers_tests.js b/addons/mail/static/tests/qunit_suite_tests/webclient/commands/mail_providers_tests.js
index bd1c9a927ca..5f199267584 100644
--- a/addons/mail/static/tests/qunit_suite_tests/webclient/commands/mail_providers_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/webclient/commands/mail_providers_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { afterNextRender, beforeEach, start } from '@mail/utils/test_utils';
+import { afterNextRender, beforeEach, start } from '@mail/../tests/helpers/test_utils';
 import { editSearchBar } from '@web/../tests/core/commands/command_service_tests';
 import { click, getFixture, nextTick, patchWithCleanup, triggerHotkey } from "@web/../tests/helpers/utils";
 import { browser } from '@web/core/browser/browser';
diff --git a/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js b/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js
index d41a9decd5c..59f9e072067 100644
--- a/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/widgets/form_renderer_tests.js
@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     nextAnimationFrame,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import config from 'web.config';
 import fieldRegistry from 'web.field_registry';
diff --git a/addons/mail/static/tests/qunit_suite_tests/widgets/notification_alert_tests.js b/addons/mail/static/tests/qunit_suite_tests/widgets/notification_alert_tests.js
index d00c0bee140..1c36226a620 100644
--- a/addons/mail/static/tests/qunit_suite_tests/widgets/notification_alert_tests.js
+++ b/addons/mail/static/tests/qunit_suite_tests/widgets/notification_alert_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 
diff --git a/addons/mail_bot/static/tests/messaging_initializer_tests.js b/addons/mail_bot/static/tests/messaging_initializer_tests.js
index a49d5e2e46b..8edbaea0185 100644
--- a/addons/mail_bot/static/tests/messaging_initializer_tests.js
+++ b/addons/mail_bot/static/tests/messaging_initializer_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('mail_bot', {}, function () {
 QUnit.module('messaging_initializer_tests.js', {
diff --git a/addons/note/static/tests/systray_activity_menu_tests.js b/addons/note/static/tests/systray_activity_menu_tests.js
index 0be2674493f..32d116b81a0 100644
--- a/addons/note/static/tests/systray_activity_menu_tests.js
+++ b/addons/note/static/tests/systray_activity_menu_tests.js
@@ -1,7 +1,7 @@
 /** @odoo-module **/
 
 import ActivityMenu from '@mail/js/systray/systray_activity_menu';
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import testUtils from 'web.test_utils';
 
diff --git a/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js b/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js
index 30926710784..8a51f61b025 100644
--- a/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js
+++ b/addons/sms/static/tests/qunit_suite_tests/components/message_tests.js
@@ -1,12 +1,12 @@
 /** @odoo-module **/
 
 import { insert, insertAndReplace } from '@mail/model/model_field_command';
-import { makeDeferred } from '@mail/utils/deferred/deferred';
+import { makeDeferred } from '@mail/utils/deferred';
 import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/sms/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js b/addons/sms/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
index ab8c813aa12..447f19d87cf 100644
--- a/addons/sms/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
+++ b/addons/sms/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js b/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js
index 58ce529fb25..f3d97f109dc 100644
--- a/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js
+++ b/addons/snailmail/static/tests/qunit_suite_tests/components/message_tests.js
@@ -5,7 +5,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/snailmail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js b/addons/snailmail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
index 926d574932c..6fe841b71f0 100644
--- a/addons/snailmail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
+++ b/addons/snailmail/static/tests/qunit_suite_tests/components/notification_list_notification_group_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 import Bus from 'web.Bus';
 
diff --git a/addons/test_mail/static/tests/tracking_value_tests.js b/addons/test_mail/static/tests/tracking_value_tests.js
index 19c47ac0149..d27fdb4169e 100644
--- a/addons/test_mail/static/tests/tracking_value_tests.js
+++ b/addons/test_mail/static/tests/tracking_value_tests.js
@@ -3,7 +3,7 @@
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import testUtils from 'web.test_utils';
diff --git a/addons/website_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js b/addons/website_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js
index fd7a92c904c..5fa9b5b40be 100644
--- a/addons/website_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js
+++ b/addons/website_livechat/static/tests/qunit_suite_tests/components/discuss_tests.js
@@ -3,7 +3,7 @@
 import {
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('website_livechat', {}, function () {
 QUnit.module('components', {}, function () {
diff --git a/addons/website_livechat/static/tests/qunit_suite_tests/messaging_notification_handler_tests.js b/addons/website_livechat/static/tests/qunit_suite_tests/messaging_notification_handler_tests.js
index 5911f409a1d..5b9f12c28f3 100644
--- a/addons/website_livechat/static/tests/qunit_suite_tests/messaging_notification_handler_tests.js
+++ b/addons/website_livechat/static/tests/qunit_suite_tests/messaging_notification_handler_tests.js
@@ -4,7 +4,7 @@ import {
     afterNextRender,
     beforeEach,
     start,
-} from '@mail/utils/test_utils';
+} from '@mail/../tests/helpers/test_utils';
 
 import FormView from 'web.FormView';
 import { mock } from 'web.test_utils';
diff --git a/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js b/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js
index ac79dc96f58..e8219ca237f 100644
--- a/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js
+++ b/addons/website_slides/static/tests/qunit_suite_tests/components/activity_tests.js
@@ -1,6 +1,6 @@
 /** @odoo-module **/
 
-import { beforeEach, start } from '@mail/utils/test_utils';
+import { beforeEach, start } from '@mail/../tests/helpers/test_utils';
 
 QUnit.module('website_slides', {}, function () {
 QUnit.module('components', {}, function () {