diff --git a/addons/mass_mailing_sms/__manifest__.py b/addons/mass_mailing_sms/__manifest__.py
index 83e20c94581..5e9bed73d4c 100644
--- a/addons/mass_mailing_sms/__manifest__.py
+++ b/addons/mass_mailing_sms/__manifest__.py
@@ -13,7 +13,7 @@
         'sms',
     ],
     'data': [
-        'data/utm_data.xml',
+        'data/utm.xml',
         'security/ir.model.access.csv',
         'report/mailing_trace_report_views.xml',
         'views/mailing_list_views.xml',
@@ -27,9 +27,10 @@
         'wizard/mailing_sms_test_views.xml',
     ],
     'demo': [
-        'data/utm_demo.xml',
-        'data/mailing_list_demo.xml',
-        'data/mailing_demo.xml',
+        'demo/utm.xml',
+        'demo/mailing_list_contact.xml',
+        'demo/mailing_mailing.xml',
+        'demo/mailing_trace.xml',
     ],
     'assets': {
         'web.assets_tests': [
diff --git a/addons/mass_mailing_sms/data/utm_data.xml b/addons/mass_mailing_sms/data/utm.xml
similarity index 100%
rename from addons/mass_mailing_sms/data/utm_data.xml
rename to addons/mass_mailing_sms/data/utm.xml
diff --git a/addons/mass_mailing_sms/data/mailing_list_demo.xml b/addons/mass_mailing_sms/demo/mailing_list_contact.xml
similarity index 100%
rename from addons/mass_mailing_sms/data/mailing_list_demo.xml
rename to addons/mass_mailing_sms/demo/mailing_list_contact.xml
diff --git a/addons/mass_mailing_sms/demo/mailing_mailing.xml b/addons/mass_mailing_sms/demo/mailing_mailing.xml
new file mode 100644
index 00000000000..e751720982d
--- /dev/null
+++ b/addons/mass_mailing_sms/demo/mailing_mailing.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo><data noupdate="0">
+    <record id="mailing_sms_0" model="mailing.mailing">
+        <field name="name">XMas Promo</field>
+        <field name="subject">XMas Promo</field>
+        <field name="mailing_type">sms</field>
+        <field name="state">done</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        <field name="campaign_id" ref="utm_campaign_0"/>
+        <field name="mailing_model_id" ref="base.model_res_partner"/>
+        <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/>
+        <field name="body_plaintext">This week-end, incredible promotion for XMas! See http://sms.example.com!</field>
+    </record>
+    <!-- Generate link tracker information from it -->
+    <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing_sms.mailing_sms_0')]"/>
+
+    <record id="mailing_sms_1" model="mailing.mailing">
+        <field name="subject">Extra Promo</field>
+        <field name="mailing_type">sms</field>
+        <field name="state">done</field>
+        <field name="user_id" ref="base.user_admin"/>
+        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
+        <field name="campaign_id" ref="utm_campaign_0"/>
+        <field name="source_id" ref="mailing_sms_0_utm_source"/>
+        <field name="mailing_model_id" ref="mass_mailing.model_mailing_list"/>
+        <field name="contact_list_ids" eval="[(5, 0), (4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
+        <field name="body_plaintext">Extra promotion for you!</field>
+    </record>
+
+</data></odoo>
diff --git a/addons/mass_mailing_sms/data/mailing_demo.xml b/addons/mass_mailing_sms/demo/mailing_trace.xml
similarity index 82%
rename from addons/mass_mailing_sms/data/mailing_demo.xml
rename to addons/mass_mailing_sms/demo/mailing_trace.xml
index 66f01a4cdbf..1ad2a83ae1f 100644
--- a/addons/mass_mailing_sms/data/mailing_demo.xml
+++ b/addons/mass_mailing_sms/demo/mailing_trace.xml
@@ -1,19 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo><data noupdate="0">
-    <record id="mailing_sms_0" model="mailing.mailing">
-        <field name="name">XMas Promo</field>
-        <field name="subject">XMas Promo</field>
-        <field name="mailing_type">sms</field>
-        <field name="state">done</field>
-        <field name="user_id" ref="base.user_admin"/>
-        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        <field name="campaign_id" ref="utm_campaign_0"/>
-        <field name="mailing_model_id" ref="base.model_res_partner"/>
-        <field name="mailing_domain" eval="[('parent_id', '=', ref('base.res_partner_4'))]"/>
-        <field name="body_plaintext">This week-end, incredible promotion for XMas! See http://sms.example.com!</field>
-    </record>
-    <!-- Generate link tracker information from it -->
-    <function model="mailing.mailing" name="convert_links" eval="[ref('mass_mailing_sms.mailing_sms_0')]"/>
     <!-- Simulate traces -->
     <record id="mailing_sms_0_trace_0" model="mailing.trace">
         <field name="mass_mailing_id" ref="mailing_sms_0"/>
@@ -121,21 +107,6 @@
         <value name="mailing_trace_id" eval="ref('mailing_sms_0_trace_2')"/>
     </function>
 
-    <record id="mailing_sms_0_utm_source" model="utm.source">
-        <field name="name">Mailing Extra Promo</field>
-    </record>
-    <record id="mailing_sms_1" model="mailing.mailing">
-        <field name="subject">Extra Promo</field>
-        <field name="mailing_type">sms</field>
-        <field name="state">done</field>
-        <field name="user_id" ref="base.user_admin"/>
-        <field name="sent_date" eval="(DateTime.today() - relativedelta(days=5)).strftime('%Y-%m-%d %H:%M:%S')"/>
-        <field name="campaign_id" ref="utm_campaign_0"/>
-        <field name="source_id" ref="mailing_sms_0_utm_source"/>
-        <field name="mailing_model_id" ref="mass_mailing.model_mailing_list"/>
-        <field name="contact_list_ids" eval="[(5, 0), (4, ref('mass_mailing_sms.mailing_list_sms_0'))]"/>
-        <field name="body_plaintext">Extra promotion for you!</field>
-    </record>
     <!-- Simulate traces -->
     <record id="mailing_sms_1_trace_0" model="mailing.trace">
         <field name="mass_mailing_id" ref="mailing_sms_1"/>
diff --git a/addons/mass_mailing_sms/data/utm_demo.xml b/addons/mass_mailing_sms/demo/utm.xml
similarity index 80%
rename from addons/mass_mailing_sms/data/utm_demo.xml
rename to addons/mass_mailing_sms/demo/utm.xml
index 4fddf06f497..449599cb3e5 100644
--- a/addons/mass_mailing_sms/data/utm_demo.xml
+++ b/addons/mass_mailing_sms/demo/utm.xml
@@ -10,4 +10,7 @@
         <field name="user_id" ref="base.user_admin"/>
         <field name="tag_ids" eval="[(4, ref('mailing_tag_0')), (4, ref('utm.utm_tag_1'))]"/>
     </record>
+    <record id="mailing_sms_0_utm_source" model="utm.source">
+        <field name="name">Mailing Extra Promo</field>
+    </record>
 </data></odoo>