diff --git a/odoo/addons/base/__manifest__.py b/odoo/addons/base/__manifest__.py
index 1bb5647fead..5918587e7cb 100644
--- a/odoo/addons/base/__manifest__.py
+++ b/odoo/addons/base/__manifest__.py
@@ -64,7 +64,9 @@ The kernel of Odoo, needed for all installation.
         'security/ir.model.access.csv',
     ],
     'demo': [
-        'data/base_demo.xml',
+        'data/res_company_demo.xml',
+        'data/res_users_demo.xml',
+        'data/res_partner_bank_demo.xml',
         'data/res_currency_rate_demo.xml',
         'data/res_bank_demo.xml',
         'data/res_partner_demo.xml',
diff --git a/odoo/addons/base/data/res_company_demo.xml b/odoo/addons/base/data/res_company_demo.xml
new file mode 100644
index 00000000000..04c61931769
--- /dev/null
+++ b/odoo/addons/base/data/res_company_demo.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data noupdate="1">
+    <record id="main_company" model="res.company">
+        <field name="name">YourCompany</field>
+        <field name="external_report_layout">standard</field>
+    </record>
+</data>
+</odoo>
\ No newline at end of file
diff --git a/odoo/addons/base/data/res_partner_bank_demo.xml b/odoo/addons/base/data/res_partner_bank_demo.xml
new file mode 100644
index 00000000000..3a91723327f
--- /dev/null
+++ b/odoo/addons/base/data/res_partner_bank_demo.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data noupdate="1">
+    <record model="res.partner.bank" id="bank_partner_demo">
+        <field name="acc_number">60-16-13 31926819</field>
+        <field name="acc_type">bank</field>
+        <field name="partner_id" ref="partner_demo"/>
+    </record>
+</data>
+</odoo>
\ No newline at end of file
diff --git a/odoo/addons/base/data/base_demo.xml b/odoo/addons/base/data/res_users_demo.xml
similarity index 89%
rename from odoo/addons/base/data/base_demo.xml
rename to odoo/addons/base/data/res_users_demo.xml
index 6ae5660805b..aa632b5bac8 100644
--- a/odoo/addons/base/data/base_demo.xml
+++ b/odoo/addons/base/data/res_users_demo.xml
@@ -14,12 +14,6 @@
             <field name="country_id" ref="be"/>
         </record>
 
-        <record model="res.partner.bank" id="bank_partner_demo">
-            <field name="acc_number">60-16-13 31926819</field>
-            <field name="acc_type">bank</field>
-            <field name="partner_id" ref="partner_demo" />
-        </record>
-
         <record id="main_partner" model="res.partner">
             <field name="name">YourCompany</field>
             <field name="company_name">YourCompany</field>
@@ -34,11 +28,6 @@
             <field name="image" type="base64" file="base/static/img/res_company_logo.png"/>
         </record>
 
-        <record id="main_company" model="res.company">
-            <field name="name">YourCompany</field>
-            <field name="external_report_layout">standard</field>
-        </record>
-
         <record id="user_demo" model="res.users">
             <field name="partner_id" ref="base.partner_demo"/>
             <field name="login">demo</field>