diff --git a/addons/mail/tests/common.py b/addons/mail/tests/common.py
index a6ae60a84a2..2c1c33a44c3 100644
--- a/addons/mail/tests/common.py
+++ b/addons/mail/tests/common.py
@@ -324,7 +324,7 @@ class MockEmail(common.BaseCase, MockSmtplibCase):
 
     def _find_sent_email(self, email_from, emails_to, subject=None):
         """ Find an outgoing email based on from / to and optional subject when
-        having conflicts.
+        having a conflict.
 
         :return sent_email: an outgoing email generated during the mock;
         """
diff --git a/addons/mass_mailing/tests/common.py b/addons/mass_mailing/tests/common.py
index eb2934fa017..c94762ec48e 100644
--- a/addons/mass_mailing/tests/common.py
+++ b/addons/mass_mailing/tests/common.py
@@ -121,18 +121,29 @@ class MassMailCase(MailCase, MockLinkTracker):
 
                 # mail.mail specific values to check
                 fields_values = {'mailing_id': mailing}
+                if 'failure_reason' in recipient_info:
+                    fields_values['failure_reason'] = recipient_info['failure_reason']
 
                 # specific for partner: email_formatted is used
                 if partner:
                     if status == 'sent' and sent_unlink:
                         self.assertSentEmail(author, [partner])
                     else:
-                        self.assertMailMail(partner, state_mapping[status], author=author, content=content, fields_values=fields_values)
+                        self.assertMailMail(
+                            partner, state_mapping[status],
+                            author=author, content=content, fields_values=fields_values
+                        )
                 # specific if email is False -> could have troubles finding it if several falsy traces
                 elif not email and status in ('cancel', 'bounce'):
-                    self.assertMailMailWId(recipient_trace.mail_mail_id_int, state_mapping[status], author=author, content=content, fields_values=fields_values)
+                    self.assertMailMailWId(
+                        recipient_trace.mail_mail_id_int, state_mapping[status],
+                        author=author, content=content, fields_values=fields_values
+                    )
                 else:
-                    self.assertMailMailWEmails([email], state_mapping[status], author=author, content=content, fields_values=fields_values)
+                    self.assertMailMailWEmails(
+                        [email], state_mapping[status],
+                        author=author, content=content, fields_values=fields_values
+                    )
 
             if link_info:
                 trace_mail = self._find_mail_mail_wrecord(record)
diff --git a/addons/mass_mailing/tests/test_mailing_internals.py b/addons/mass_mailing/tests/test_mailing_internals.py
index eca645ebaf9..4783b467861 100644
--- a/addons/mass_mailing/tests/test_mailing_internals.py
+++ b/addons/mass_mailing/tests/test_mailing_internals.py
@@ -15,11 +15,13 @@ from odoo.addons.base.tests.test_ir_cron import CronMixinCase
 from odoo.addons.mass_mailing.tests.common import MassMailCommon
 from odoo.exceptions import ValidationError
 from odoo.sql_db import Cursor
-from odoo.tests.common import users, Form
+from odoo.tests.common import users, Form, tagged
 from odoo.tools import mute_logger
 
 BASE_64_STRING = 'iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNk+A8AAQUBAScY42YAAAAASUVORK5CYII='
 
+
+@tagged('mass_mailing')
 class TestMassMailValues(MassMailCommon):
 
     @classmethod
@@ -402,6 +404,7 @@ class TestMassMailValues(MassMailCommon):
             msg='The name must be unique')
 
 
+@tagged('mass_mailing')
 class TestMassMailFeatures(MassMailCommon, CronMixinCase):
 
     @classmethod