diff --git a/addons/mass_mailing/data/mass_mailing_demo.xml b/addons/mass_mailing/data/mass_mailing_demo.xml
index 81a8347912a..1da0c40375b 100644
--- a/addons/mass_mailing/data/mass_mailing_demo.xml
+++ b/addons/mass_mailing/data/mass_mailing_demo.xml
@@ -22,13 +22,34 @@
         <record id="mass_mail_contact_2" model="mail.mass_mailing.contact">
             <field name="name">Beverly Bridge</field>
             <field name="email">bb@example.com</field>
-            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2'), ref('mass_mailing.mass_mail_list_2')])]"/>
+            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2')])]"/>
         </record>
         <record id="mass_mail_contact_3" model="mail.mass_mailing.contact">
             <field name="name">Carol Cartridge</field>
             <field name="email">cc@example.com</field>
             <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2')])]"/>
         </record>
+        <record id="mass_mail_contact_4" model="mail.mass_mailing.contact">
+            <field name="name">David Dawson</field>
+            <field name="email">dd@example.com</field>
+        </record>
+        <record id="mass_mail_contact_5" model="mail.mass_mailing.contact">
+            <field name="name">Elsa Ericson</field>
+            <field name="email">ee@example.com</field>
+            <field name="list_ids" eval="[(6,0,[ref('mass_mailing.mass_mail_list_2')])]"/>
+        </record>
+
+        <!-- Create Opt-out Records -->
+        <record id="mass_mail_contact_list_rel_1" model="mail.mass_mailing.list_contact_rel">
+            <field name="list_id" eval="ref('mass_mailing.mass_mail_list_2')"/>
+            <field name="contact_id" eval="ref('mass_mailing.mass_mail_contact_4')"/>
+            <field name="opt_out">True</field>
+        </record>
+
+        <!-- Create Blacklist Records -->
+        <record id="blacklist_1" model="mail.blacklist">
+            <field name="email">ee@example.com</field>
+        </record>
 
         <!-- Create campaign and mailings -->
         <record id="mass_mail_tag_1" model="mail.mass_mailing.tag">
diff --git a/addons/test_mass_mailing/tests/test_mass_mailing.py b/addons/test_mass_mailing/tests/test_mass_mailing.py
index 6629be54f9f..c18d19a6bea 100644
--- a/addons/test_mass_mailing/tests/test_mass_mailing.py
+++ b/addons/test_mass_mailing/tests/test_mass_mailing.py
@@ -138,7 +138,6 @@ class TestAccessRights(TransactionCase):
             'body_html': 'This is mass mail marketing demo'})
         self.mass_mailing.contact_list_ids = [mailing_list_1.id]
         self.mass_mailing.put_in_queue()
-        res_ids = self.mass_mailing.get_remaining_recipients()
         composer_values = {
             'body': self.mass_mailing.convert_links()[self.mass_mailing.id],
             'subject': self.mass_mailing.name,
@@ -149,7 +148,7 @@ class TestAccessRights(TransactionCase):
             'mailing_list_ids': [(4, l.id) for l in self.mass_mailing.contact_list_ids],
         }
         composer = self.env['mail.compose.message'].with_context(
-            active_ids=res_ids,
+            active_ids=[mailing_contact_1.id, mailing_contact_2.id],
             mass_mailing_seen_list=self.mass_mailing._get_seen_list(),
             mass_mailing_opt_out_list=self.mass_mailing._get_opt_out_list()).create(composer_values)
         composer.send_mail()
@@ -194,7 +193,6 @@ class TestAccessRights(TransactionCase):
             'body_html': 'This is mass mail marketing demo'})
         self.mass_mailing.contact_list_ids = [mailing_list_1.id, mailing_list_2.id]
         self.mass_mailing.put_in_queue()
-        res_ids = self.mass_mailing.get_remaining_recipients()
         composer_values = {
             'body': self.mass_mailing.convert_links()[self.mass_mailing.id],
             'subject': self.mass_mailing.name,
@@ -205,7 +203,7 @@ class TestAccessRights(TransactionCase):
             'mailing_list_ids': [(4, l.id) for l in self.mass_mailing.contact_list_ids],
         }
         composer = self.env['mail.compose.message'].with_context(
-            active_ids=res_ids,
+            active_ids=[mailing_contact_1.id, mailing_contact_2.id],
             mass_mailing_seen_list=self.mass_mailing._get_seen_list(),
             mass_mailing_opt_out_list=self.mass_mailing._get_opt_out_list()).create(composer_values)
         composer.send_mail()
@@ -244,7 +242,6 @@ class TestAccessRights(TransactionCase):
             'body_html': 'This is mass mail marketing demo'})
         self.mass_mailing.contact_list_ids = [mailing_list_1.id]
         self.mass_mailing.put_in_queue()
-        res_ids = self.mass_mailing.get_remaining_recipients()
         composer_values = {
             'body': self.mass_mailing.convert_links()[self.mass_mailing.id],
             'subject': self.mass_mailing.name,
@@ -255,7 +252,7 @@ class TestAccessRights(TransactionCase):
             'mailing_list_ids': [(4, l.id) for l in self.mass_mailing.contact_list_ids],
         }
         composer = self.env['mail.compose.message'].with_context(
-            active_ids=res_ids,
+            active_ids=[mailing_contact_1.id, mailing_contact_2.id],
             mass_mailing_seen_list=self.mass_mailing._get_seen_list(),
             mass_mailing_opt_out_list=self.mass_mailing._get_opt_out_list()).create(composer_values)
         composer.send_mail()