diff --git a/addons/test_mail_sms/tests/common.py b/addons/test_mail_sms/tests/common.py
index 39d78c90171..aec262c85f5 100644
--- a/addons/test_mail_sms/tests/common.py
+++ b/addons/test_mail_sms/tests/common.py
@@ -2,16 +2,9 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 from odoo.addons.phone_validation.tools import phone_validation
-from odoo.addons.sms.tests.common import SMSCommon
-from odoo.addons.mail.tests.common import MailCommon
 from odoo.addons.test_mail.tests.common import TestRecipients
 
 
-class TestSMSCommon(SMSCommon, MailCommon):
-    """ Main entry point for functional tests. It combines both SMS and MAIL
-    testing classes. """
-
-
 class TestSMSRecipients(TestRecipients):
 
     @classmethod
diff --git a/addons/test_mail_sms/tests/test_mail_thread_phone.py b/addons/test_mail_sms/tests/test_mail_thread_phone.py
index 0ad61f0e279..548b0d77762 100644
--- a/addons/test_mail_sms/tests/test_mail_thread_phone.py
+++ b/addons/test_mail_sms/tests/test_mail_thread_phone.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon, TestSMSRecipients
+from odoo.addons.sms.tests.common import SMSCommon
+from odoo.addons.test_mail_sms.tests.common import TestSMSRecipients
 from odoo.tests import tagged, users
 
 
 @tagged('mail_thread')
-class TestSMSActionsCommon(TestSMSCommon, TestSMSRecipients):
+class TestSMSActionsCommon(SMSCommon, TestSMSRecipients):
     """ Test mail.thread.phone mixin, its tools and API """
 
     @classmethod
diff --git a/addons/test_mail_sms/tests/test_phone_blacklist.py b/addons/test_mail_sms/tests/test_phone_blacklist.py
index 2d3ae14469e..d1c2ba69e7f 100644
--- a/addons/test_mail_sms/tests/test_phone_blacklist.py
+++ b/addons/test_mail_sms/tests/test_phone_blacklist.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon, TestSMSRecipients
+from odoo.addons.sms.tests.common import SMSCommon
+from odoo.addons.test_mail_sms.tests.common import TestSMSRecipients
 
 
-class TestPhoneBlacklist(TestSMSCommon, TestSMSRecipients):
+class TestPhoneBlacklist(SMSCommon, TestSMSRecipients):
     """ Test phone blacklist management """
 
     @classmethod
diff --git a/addons/test_mail_sms/tests/test_sms_composer.py b/addons/test_mail_sms/tests/test_sms_composer.py
index ba4ed996b39..fbf05a81729 100644
--- a/addons/test_mail_sms/tests/test_sms_composer.py
+++ b/addons/test_mail_sms/tests/test_sms_composer.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon, TestSMSRecipients
+from odoo.addons.sms.tests.common import SMSCommon
+from odoo.addons.test_mail_sms.tests.common import TestSMSRecipients
 
 
-class TestSMSComposerComment(TestSMSCommon, TestSMSRecipients):
+class TestSMSComposerComment(SMSCommon, TestSMSRecipients):
     """ TODO LIST
 
      * add test for default_res_model / default_res_id and stuff like that;
@@ -251,7 +252,7 @@ class TestSMSComposerComment(TestSMSCommon, TestSMSRecipients):
         self.assertSMSNotification([{'number': self.random_numbers_san[0]}], self._test_body)
 
 
-class TestSMSComposerBatch(TestSMSCommon):
+class TestSMSComposerBatch(SMSCommon):
     @classmethod
     def setUpClass(cls):
         super(TestSMSComposerBatch, cls).setUpClass()
@@ -301,7 +302,7 @@ class TestSMSComposerBatch(TestSMSCommon):
             )
 
 
-class TestSMSComposerMass(TestSMSCommon):
+class TestSMSComposerMass(SMSCommon):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mail_sms/tests/test_sms_management.py b/addons/test_mail_sms/tests/test_sms_management.py
index 1bdf940ad74..4f8b1f03347 100644
--- a/addons/test_mail_sms/tests/test_sms_management.py
+++ b/addons/test_mail_sms/tests/test_sms_management.py
@@ -1,12 +1,13 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon, TestSMSRecipients
+from odoo.addons.sms.tests.common import SMSCommon
+from odoo.addons.test_mail_sms.tests.common import TestSMSRecipients
 from odoo.tests import tagged
 from odoo.tools import mute_logger
 
 
-class TestSMSActionsCommon(TestSMSCommon, TestSMSRecipients):
+class TestSMSActionsCommon(SMSCommon, TestSMSRecipients):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mail_sms/tests/test_sms_post.py b/addons/test_mail_sms/tests/test_sms_post.py
index deb66ad8574..f63258e703b 100644
--- a/addons/test_mail_sms/tests/test_sms_post.py
+++ b/addons/test_mail_sms/tests/test_sms_post.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon, TestSMSRecipients
+from odoo.addons.sms.tests.common import SMSCommon
+from odoo.addons.test_mail_sms.tests.common import TestSMSRecipients
 
 
-class TestSMSPost(TestSMSCommon, TestSMSRecipients):
+class TestSMSPost(SMSCommon, TestSMSRecipients):
     """ TODO
 
       * add tests for new mail.message and mail.thread fields;
@@ -251,7 +252,7 @@ class TestSMSPost(TestSMSCommon, TestSMSRecipients):
         self.assertSMSNotification([{'partner': self.partner_1, 'number': self.test_numbers_san[1]}], 'Dear %s this is an SMS.' % self.test_record.display_name, messages)
 
 
-class TestSMSPostException(TestSMSCommon, TestSMSRecipients):
+class TestSMSPostException(SMSCommon, TestSMSRecipients):
 
     @classmethod
     def setUpClass(cls):
@@ -392,7 +393,7 @@ class TestSMSPostException(TestSMSCommon, TestSMSRecipients):
         ], self._test_body, messages)
 
 
-class TestSMSApi(TestSMSCommon):
+class TestSMSApi(SMSCommon):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mail_sms/tests/test_sms_server_actions.py b/addons/test_mail_sms/tests/test_sms_server_actions.py
index dfe9d6ba163..2984180ccac 100644
--- a/addons/test_mail_sms/tests/test_sms_server_actions.py
+++ b/addons/test_mail_sms/tests/test_sms_server_actions.py
@@ -1,13 +1,14 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon, TestSMSRecipients
+from odoo.addons.sms.tests.common import SMSCommon
+from odoo.addons.test_mail_sms.tests.common import TestSMSRecipients
 from odoo.tests import tagged
 from odoo.tools import mute_logger
 
 
 @tagged('ir_actions')
-class TestServerAction(TestSMSCommon, TestSMSRecipients):
+class TestServerAction(SMSCommon, TestSMSRecipients):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mail_sms/tests/test_sms_sms.py b/addons/test_mail_sms/tests/test_sms_sms.py
index 87a77a9fb61..71ea6574623 100644
--- a/addons/test_mail_sms/tests/test_sms_sms.py
+++ b/addons/test_mail_sms/tests/test_sms_sms.py
@@ -7,12 +7,12 @@ from unittest.mock import DEFAULT
 from odoo import exceptions
 from odoo.addons.link_tracker.tests.common import MockLinkTracker
 from odoo.addons.sms.models.sms_sms import SmsSms as SmsModel
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon
+from odoo.addons.sms.tests.common import SMSCommon
 from odoo.tests import tagged
 
 
 @tagged('link_tracker')
-class TestSMSPost(TestSMSCommon, MockLinkTracker):
+class TestSMSPost(SMSCommon, MockLinkTracker):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mail_sms/tests/test_sms_template.py b/addons/test_mail_sms/tests/test_sms_template.py
index 225a95fdda3..27038b11396 100644
--- a/addons/test_mail_sms/tests/test_sms_template.py
+++ b/addons/test_mail_sms/tests/test_sms_template.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon, TestSMSRecipients
+from odoo.addons.sms.tests.common import SMSCommon
+from odoo.addons.test_mail_sms.tests.common import TestSMSRecipients
 
 
-class TestSmsTemplate(TestSMSCommon, TestSMSRecipients):
+class TestSmsTemplate(SMSCommon, TestSMSRecipients):
 
     @classmethod
     def setUpClass(cls):
diff --git a/addons/test_mass_mailing/tests/common.py b/addons/test_mass_mailing/tests/common.py
index 834b32e9fa3..1fb131c32ae 100644
--- a/addons/test_mass_mailing/tests/common.py
+++ b/addons/test_mass_mailing/tests/common.py
@@ -4,10 +4,9 @@
 from odoo.addons.phone_validation.tools import phone_validation
 
 from odoo.addons.mass_mailing_sms.tests.common import MassSMSCommon
-from odoo.addons.test_mail_sms.tests.common import TestSMSCommon
 
 
-class TestMassMailCommon(MassSMSCommon, TestSMSCommon):
+class TestMassMailCommon(MassSMSCommon):
 
     @classmethod
     def setUpClass(cls):