diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index 4a99ea63e4a..7be5bb6f46f 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -5,5 +5,6 @@ from . import test_mail_channel
 from . import test_mail_channel_partner
 from . import test_mail_full_composer
 from . import test_mail_render
+from . import test_mail_tools
 from . import test_res_partner
 from . import test_update_notification
diff --git a/addons/test_mail/tests/test_mail_tools.py b/addons/mail/tests/test_mail_tools.py
similarity index 96%
rename from addons/test_mail/tests/test_mail_tools.py
rename to addons/mail/tests/test_mail_tools.py
index b36a1335c5d..931936ed353 100644
--- a/addons/test_mail/tests/test_mail_tools.py
+++ b/addons/mail/tests/test_mail_tools.py
@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail.tests.common import TestMailCommon, TestRecipients
+from odoo.addons.mail.tests.common import MailCommon
 from odoo.tests import tagged, users
 
 
 @tagged('mail_tools')
-class TestMailTools(TestMailCommon, TestRecipients):
+class TestMailTools(MailCommon):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mail/tests/__init__.py b/addons/test_mail/tests/__init__.py
index 8958112bbf6..b6e302cb99d 100644
--- a/addons/test_mail/tests/__init__.py
+++ b/addons/test_mail/tests/__init__.py
@@ -11,7 +11,6 @@ from . import test_mail_mail
 from . import test_mail_gateway
 from . import test_mail_thread_internals
 from . import test_mail_template
-from . import test_mail_tools
 from . import test_message_management
 from . import test_message_post
 from . import test_message_track
diff --git a/addons/test_mass_mailing/tests/__init__.py b/addons/test_mass_mailing/tests/__init__.py
index 180386874e0..c50bc65832e 100644
--- a/addons/test_mass_mailing/tests/__init__.py
+++ b/addons/test_mass_mailing/tests/__init__.py
@@ -5,7 +5,7 @@ from . import test_blacklist
 from . import test_blacklist_behavior
 from . import test_blacklist_mixin
 from . import test_link_tracker
-from . import test_mailing_test
 from . import test_mailing
-from . import test_mass_mailing_server
+from . import test_mailing_server
+from . import test_mailing_test
 from . import test_performance
diff --git a/addons/test_mass_mailing/tests/test_mass_mailing_server.py b/addons/test_mass_mailing/tests/test_mailing_server.py
similarity index 100%
rename from addons/test_mass_mailing/tests/test_mass_mailing_server.py
rename to addons/test_mass_mailing/tests/test_mailing_server.py