diff --git a/addons/stock/__manifest__.py b/addons/stock/__manifest__.py
index e7a2c2f03d3..e5c01fb68c9 100644
--- a/addons/stock/__manifest__.py
+++ b/addons/stock/__manifest__.py
@@ -12,12 +12,9 @@
     'sequence': 25,
     'demo': [
         'data/stock_demo_pre.xml',
-        'data/procurement_demo.xml',
         'data/stock_demo.xml',
-        'data/stock_orderpoint_demo.xml',
         'data/stock_demo2.xml',
-        'data/stock_location_demo_cpu1.xml',
-        'data/stock_location_demo_cpu3.xml',
+        'data/stock_orderpoint_demo.xml',
     ],
     'data': [
         'security/stock_security.xml',
diff --git a/addons/stock/data/procurement_demo.xml b/addons/stock/data/procurement_demo.xml
deleted file mode 100644
index a12def4f328..00000000000
--- a/addons/stock/data/procurement_demo.xml
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="product.product_product_3" model="product.product">
-            <field name="type">product</field>
-
-        </record>
-
-        <record id="product.product_product_4" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_5" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_6" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_7" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_8" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_9" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_10" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_11" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_12" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_13" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_16" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_20" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_22" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_24" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_25" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_product_27" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_delivery_02" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-        <record id="product.product_delivery_01" model="product.product">
-            <field name="type">product</field>
-        </record>
-
-    </data>
-</odoo>
-    
diff --git a/addons/stock/data/stock_demo.xml b/addons/stock/data/stock_demo.xml
index 962f89d9d6b..d63bad9c490 100644
--- a/addons/stock/data/stock_demo.xml
+++ b/addons/stock/data/stock_demo.xml
@@ -200,19 +200,6 @@
             <field name="partner_id" ref="res_partner_address_41"/>
         </record>
 
-        <record id="product.consu_delivery_03" model="product.product">
-            <field name="type">product</field>
-        </record>
-        <record id="product.consu_delivery_02" model="product.product">
-            <field name="type">product</field>
-        </record>
-        <record id="product.consu_delivery_01" model="product.product">
-            <field name="type">product</field>
-        </record>
-        <record id="product.product_order_01" model="product.product">
-            <field name="type">product</field>
-        </record>
-
         <!-- Inventory for Chicago Warehouse -->
         <record id="stock_inventory_chic_0" model="stock.inventory">
             <field name="name">Starting Inventory</field>
diff --git a/addons/stock/data/stock_demo_pre.xml b/addons/stock/data/stock_demo_pre.xml
index 57fac7bc229..acee1ea666a 100644
--- a/addons/stock/data/stock_demo_pre.xml
+++ b/addons/stock/data/stock_demo_pre.xml
@@ -15,5 +15,118 @@
             <field name="location_id" model="stock.location"
                 eval="obj().env.ref('stock.warehouse0').lot_stock_id.id"/>
         </record>
+        <record id="location_order" model="stock.location">
+            <field name="name">Order Processing</field>
+            <field name="usage">internal</field>
+            <field name="location_id" ref="stock.stock_location_company"/>
+        </record>
+        <record id="location_dispatch_zone" model="stock.location">
+            <field name="name">Dispatch Zone</field>
+            <field name="usage">internal</field>
+            <field name="location_id" ref="stock.location_order"/>
+        </record>
+        <record id="location_gate_a" model="stock.location">
+            <field name="name">Gate A</field>
+            <field name="usage">internal</field>
+            <field name="location_id" ref="stock.location_dispatch_zone"/>
+        </record>
+        <record id="location_gate_b" model="stock.location">
+            <field name="name">Gate B</field>
+            <field name="usage">internal</field>
+            <field name="location_id" ref="stock.location_dispatch_zone"/>
+        </record>
+
+        <record id="product.product_product_3" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_4" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_5" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_6" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_7" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_8" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_9" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_10" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_11" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_12" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_13" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_16" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_20" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_22" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_24" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_25" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_product_27" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_delivery_02" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_delivery_01" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.consu_delivery_03" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.consu_delivery_02" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.consu_delivery_01" model="product.product">
+            <field name="type">product</field>
+        </record>
+
+        <record id="product.product_order_01" model="product.product">
+            <field name="type">product</field>
+        </record>
+
     </data>
 </odoo>
diff --git a/addons/stock/data/stock_location_demo_cpu1.xml b/addons/stock/data/stock_location_demo_cpu1.xml
deleted file mode 100644
index dd564f21166..00000000000
--- a/addons/stock/data/stock_location_demo_cpu1.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<odoo>
-    <data noupdate="1">
-        <record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
-            <field name="product_max_qty">20.0</field>
-            <field name="product_min_qty">10.0</field>
-            <field name="product_uom" ref="uom.product_uom_unit"/>
-            <field name="company_id" ref="stock.res_company_1"/>
-            <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
-            <field name="location_id" ref="stock.stock_location_shop0"/>
-            <field name="product_id" ref="product.product_product_9"/>
-        </record>
-
-    </data>
-</odoo>
diff --git a/addons/stock/data/stock_location_demo_cpu3.xml b/addons/stock/data/stock_location_demo_cpu3.xml
deleted file mode 100644
index 08d4cf55dca..00000000000
--- a/addons/stock/data/stock_location_demo_cpu3.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<odoo>
-    <data noupdate="1"> 
-        <record id="location_order" model="stock.location">
-            <field name="name">Order Processing</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.stock_location_company"/>
-        </record>
-
-        <record id="location_dispatch_zone" model="stock.location">
-            <field name="name">Dispatch Zone</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.location_order"/>
-        </record>
-
-        <record id="location_gate_a" model="stock.location">
-            <field name="name">Gate A</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.location_dispatch_zone"/>
-        </record>
-
-        <record id="location_gate_b" model="stock.location">
-            <field name="name">Gate B</field>
-            <field name="usage">internal</field>
-            <field name="location_id" ref="stock.location_dispatch_zone"/>
-        </record>
-    </data>
-</odoo>
diff --git a/addons/stock/data/stock_orderpoint_demo.xml b/addons/stock/data/stock_orderpoint_demo.xml
index eab6be763f5..a677f4be169 100644
--- a/addons/stock/data/stock_orderpoint_demo.xml
+++ b/addons/stock/data/stock_orderpoint_demo.xml
@@ -30,6 +30,15 @@
             <field name="location_id" model="stock.location"
                 eval="obj().env.ref('stock.warehouse0').lot_stock_id.id"/>
         </record>
+        <record id="stock_warehouse_orderpoint_shop1_cpu1" model="stock.warehouse.orderpoint">
+            <field name="product_max_qty">20.0</field>
+            <field name="product_min_qty">10.0</field>
+            <field name="product_uom" ref="uom.product_uom_unit"/>
+            <field name="company_id" ref="stock.res_company_1"/>
+            <field name="warehouse_id" ref="stock.stock_warehouse_shop0"/>
+            <field name="location_id" ref="stock.stock_location_shop0"/>
+            <field name="product_id" ref="product.product_product_9"/>
+        </record>
 
     </data>
 </odoo>
\ No newline at end of file