diff --git a/addons/stock/data/stock_demo.xml b/addons/stock/data/stock_demo.xml
index 5ba6b1a3dd6..f274a335fa7 100644
--- a/addons/stock/data/stock_demo.xml
+++ b/addons/stock/data/stock_demo.xml
@@ -7,41 +7,6 @@
         </record>
 
 
-        <!-- Resource: stock.location -->
-
-        <record id="stock_location_3" model="stock.location">
-            <field name="name">IT Vendors</field>
-            <field name="location_id" ref="stock_location_suppliers"/>
-            <field name="usage">supplier</field>
-            <field name="barcode">2601985</field>
-            <field name="company_id"></field>
-        </record>
-        <record id="stock_location_4" model="stock.location">
-            <field name="name">Big Vendors</field>
-            <field name="location_id" ref="stock_location_3"/>
-            <field name="usage">supplier</field>
-            <field name="company_id"></field>
-        </record>
-        <record id="stock_location_5" model="stock.location">
-            <field name="name">Generic IT Vendors</field>
-            <field name="location_id" ref="stock_location_3"/>
-            <field name="usage">supplier</field>
-            <field name="company_id"></field>
-        </record>
-        <record id="stock_location_7" model="stock.location">
-            <field name="name">European Customers</field>
-            <field name="location_id" ref="stock_location_customers"/>
-            <field name="usage">customer</field>
-            <field name="company_id"></field>
-        </record>
-        <record id="stock_location_8" model="stock.location">
-            <field name="name">Non European Customers</field>
-            <field name="location_id" ref="stock_location_customers"/>
-            <field name="usage">customer</field>
-            <field name="company_id"></field>
-        </record>
-
-
         <!-- Resource: stock.inventory -->
 
         <record id="stock_inventory_0" model="stock.inventory">
diff --git a/addons/stock/data/stock_demo_pre.xml b/addons/stock/data/stock_demo_pre.xml
index f72e84cdfc2..57fac7bc229 100644
--- a/addons/stock/data/stock_demo_pre.xml
+++ b/addons/stock/data/stock_demo_pre.xml
@@ -4,12 +4,14 @@
         <record id="stock_location_14" model="stock.location">
             <field name="name">Shelf 2</field>
             <field name="posx">0</field>
+            <field name="barcode">2601985</field>
             <field name="location_id" model="stock.location"
                 eval="obj().env.ref('stock.warehouse0').lot_stock_id.id"/>
         </record>
         <record id="stock_location_components" model="stock.location">
             <field name="name">Shelf 1</field>
             <field name="posx">0</field>
+            <field name="barcode">2601892</field>
             <field name="location_id" model="stock.location"
                 eval="obj().env.ref('stock.warehouse0').lot_stock_id.id"/>
         </record>
diff --git a/addons/stock/tests/test_stock_location_search.py b/addons/stock/tests/test_stock_location_search.py
index 014759c7899..d19cfa8d775 100644
--- a/addons/stock/tests/test_stock_location_search.py
+++ b/addons/stock/tests/test_stock_location_search.py
@@ -7,7 +7,7 @@ class TestStockLocationSearch(common.TransactionCase):
     def setUp(self):
         super(TestStockLocationSearch, self).setUp()
         self.location = self.env['stock.location']
-        self.location_barcode = self.env.ref('stock.stock_location_3')
+        self.location_barcode = self.env.ref('stock.stock_location_14')
         self.location_barcode_id = self.location_barcode.id
         self.barcode = self.location_barcode.barcode
         self.name = self.location_barcode.name