diff --git a/addons/base_automation/tests/test_mail_composer.py b/addons/base_automation/tests/test_mail_composer.py
index 528ad8a7bc5..6eb76496dc9 100644
--- a/addons/base_automation/tests/test_mail_composer.py
+++ b/addons/base_automation/tests/test_mail_composer.py
@@ -34,11 +34,13 @@ class TestMailFullComposer(MailCommon, HttpCase):
             'model_id': self.env.ref('mail.model_mail_compose_message').id,
         })
         automation.write({'action_server_ids': [(4, server_action.id)]})
-
-        self.start_tour(
-            f"/web#id={self.user_employee.partner_id.id}&model=res.partner",
-            "mail/static/tests/tours/mail_composer_test_tour.js",
-            login=self.user_employee.login
-        )
-
-        automation.unlink()
+        user = self.env["res.users"].create({"name": "Not A Demo User", "login": "nadu"})
+        with self.mock_mail_app():
+            self.start_tour(
+                f"/web#id={self.user_employee.partner_id.id}&model=res.partner",
+                "mail/static/tests/tours/mail_composer_test_tour.js",
+                login=self.user_employee.login
+            )
+        message = self._new_msgs.filtered(lambda message: message.author_id == self.user_employee.partner_id)
+        self.assertEqual(len(message), 1)
+        self.assertIn(user.partner_id, message.partner_ids)
diff --git a/addons/mail/static/tests/tours/mail_composer_test_tour.js b/addons/mail/static/tests/tours/mail_composer_test_tour.js
index accd6219023..c5e63f7522d 100644
--- a/addons/mail/static/tests/tours/mail_composer_test_tour.js
+++ b/addons/mail/static/tests/tours/mail_composer_test_tour.js
@@ -23,7 +23,7 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/mail_composer_t
         },
         {
             content: "Mention a partner",
-            trigger: ".o-mail-Composer-suggestion:contains(Marc Demo)",
+            trigger: ".o-mail-Composer-suggestion:contains(Not A Demo User)",
         },
         {
             content: "Add one file in composer",
@@ -79,17 +79,17 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/mail_composer_t
                 const bodyContent = document.querySelector(
                     '.o_field_html[name="body"]'
                 ).textContent;
-                if (!bodyContent.includes("blahblah @Marc Demo")) {
+                if (!bodyContent.includes("blahblah @Not A Demo User")) {
                     console.error(
-                        `Full composer should contain text from small composer ("blahblah @Marc Demo") in body input (actual: ${bodyContent})`
+                        `Full composer should contain text from small composer ("blahblah @Not A Demo User") in body input (actual: ${bodyContent})`
                     );
                 }
                 const mentionLink = document.querySelector(
                     '.o_field_html[name="body"] a'
                 ).textContent;
-                if (!mentionLink.includes("@Marc Demo")) {
+                if (!mentionLink.includes("@Not A Demo User")) {
                     console.error(
-                        `Full composer should contain mention link from small composer ("@Marc Demo") in body input)`
+                        `Full composer should contain mention link from small composer ("@Not A Demo User") in body input)`
                     );
                 }
             },
@@ -110,7 +110,7 @@ registry.category("web_tour.tours").add("mail/static/tests/tours/mail_composer_t
         },
         {
             content: "Check message is shown",
-            trigger: '.o-mail-Message-body:contains("blahblah @Marc Demo")',
+            trigger: '.o-mail-Message-body:contains("blahblah @Not A Demo User")',
         },
         {
             content: "Check message contains the attachment",
diff --git a/addons/mail/tests/test_mail_composer.py b/addons/mail/tests/test_mail_composer.py
index 474fc0688bf..6c340dd5a74 100644
--- a/addons/mail/tests/test_mail_composer.py
+++ b/addons/mail/tests/test_mail_composer.py
@@ -275,8 +275,13 @@ class TestMailComposerUI(MailCommon, HttpCase):
         self.user_employee.write({
             'groups_id': [(4, self.env.ref('base.group_partner_manager').id)],
         })
-        self.start_tour(
-            f"/web#id={self.user_employee.partner_id.id}&model=res.partner",
-            "mail/static/tests/tours/mail_composer_test_tour.js",
-            login=self.user_employee.login
-        )
+        user = self.env["res.users"].create({"name": "Not A Demo User", "login": "nadu"})
+        with self.mock_mail_app():
+            self.start_tour(
+                f"/web#id={self.user_employee.partner_id.id}&model=res.partner",
+                "mail/static/tests/tours/mail_composer_test_tour.js",
+                login=self.user_employee.login
+            )
+        message = self._new_msgs.filtered(lambda message: message.author_id == self.user_employee.partner_id)
+        self.assertEqual(len(message), 1)
+        self.assertIn(user.partner_id, message.partner_ids)