diff --git a/addons/mail/tests/__init__.py b/addons/mail/tests/__init__.py
index 4a5e1461878..5d739b895b2 100644
--- a/addons/mail/tests/__init__.py
+++ b/addons/mail/tests/__init__.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from . import common
+from . import test_mail_channel
 from . import test_mail_full_composer
 from . import test_res_partner
 from . import test_update_notification
diff --git a/addons/test_mail/tests/test_mail_channel.py b/addons/mail/tests/test_mail_channel.py
similarity index 99%
rename from addons/test_mail/tests/test_mail_channel.py
rename to addons/mail/tests/test_mail_channel.py
index 168bf51c760..c243dfedfb9 100644
--- a/addons/test_mail/tests/test_mail_channel.py
+++ b/addons/mail/tests/test_mail_channel.py
@@ -3,12 +3,12 @@
 
 from odoo.tests import tagged
 from odoo.addons.mail.tests.common import mail_new_test_user
-from odoo.addons.test_mail.tests.common import TestMailCommon
+from odoo.addons.mail.tests.common import MailCommon
 from odoo.exceptions import AccessError, ValidationError, UserError
 from odoo.tools import mute_logger, formataddr
 
 
-class TestChannelAccessRights(TestMailCommon):
+class TestChannelAccessRights(MailCommon):
 
     @classmethod
     def setUpClass(cls):
@@ -107,7 +107,7 @@ class TestChannelAccessRights(TestMailCommon):
                 trigger_read = partner.with_user(self.user_portal).name
 
 
-class TestChannelFeatures(TestMailCommon):
+class TestChannelFeatures(MailCommon):
 
     @classmethod
     def setUpClass(cls):
@@ -303,7 +303,7 @@ class TestChannelFeatures(TestMailCommon):
 
 
 @tagged('moderation')
-class TestChannelModeration(TestMailCommon):
+class TestChannelModeration(MailCommon):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mail/tests/__init__.py b/addons/test_mail/tests/__init__.py
index e328b555861..bd72e0bf019 100644
--- a/addons/test_mail/tests/__init__.py
+++ b/addons/test_mail/tests/__init__.py
@@ -7,7 +7,6 @@ from . import test_mail_composer
 from . import test_mail_followers
 from . import test_mail_message
 from . import test_mail_mail
-from . import test_mail_channel
 from . import test_mail_gateway
 from . import test_mail_template
 from . import test_mail_thread_internals