diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index f9e9f58a5d4..951f2e81ac8 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -85,7 +85,8 @@ Thanks to the double entry management, the inventory controlling is powerful and
         'test/process/update_stock.yml',
         #'test/stock_report.yml',
         #'test/stock_test_wizard.yml',
-        'test/stock_demo_backorder.yml'
+        'test/process/stock_demo_backorder.yml',
+        #'test/process/stock_incoming_shipment.yml',
     ],
     'installable': True,
     'active': False,
diff --git a/addons/stock/stock_demo.xml b/addons/stock/stock_demo.xml
index ca897ced8ef..8cacdba9919 100644
--- a/addons/stock/stock_demo.xml
+++ b/addons/stock/stock_demo.xml
@@ -9,6 +9,14 @@
         <!--
     Resource: stock.location
     -->
+        <record id="chain_location_1" model="stock.location">
+            <field name="name">Cold Storage</field>
+            <field name="location_id" ref="stock_location_suppliers"/>
+            <field name="chained_location_type">fixed</field>
+            <field name="chained_location_id" ref="stock_location_customers"/>
+            <field name="chained_auto_packing">auto</field>
+            <field name="usage">internal</field>
+        </record>
         <record id="stock_location_3" model="stock.location">
             <field name="name">IT Suppliers</field>
             <field name="location_id" ref="stock_location_suppliers"/>
diff --git a/addons/stock/test/stock_demo_backorder.yml b/addons/stock/test/process/stock_demo_backorder.yml
similarity index 100%
rename from addons/stock/test/stock_demo_backorder.yml
rename to addons/stock/test/process/stock_demo_backorder.yml
diff --git a/addons/stock/test/process/update_stock.yml b/addons/stock/test/process/update_stock.yml
index 9f0abf101fb..cea7b39cb07 100644
--- a/addons/stock/test/process/update_stock.yml
+++ b/addons/stock/test/process/update_stock.yml
@@ -1,22 +1,18 @@
 -
   In order to test the stock module, I will update the current stock of the product.
 - 
-  I Creating a location record for test the chained location flow.
+  I assign a chain location cold storage to test the chained location flow.
 - 
-  !record {model: stock.location, id: stock_location_loc0}:
+  !record {model: stock.location, id: stock_location_stock}:
     chained_auto_packing: auto
-    chained_delay: 0.0
-    chained_location_type: none
-    location_id: stock.stock_location_company
-    name: chain location
-    parent_left: 2
-    parent_right: 3
+    chained_location_type: fixed
+    chained_location_id: stock.chain_location_1
     usage: internal
 - 
   I assignd the created location in to warehouse.
 - 
   !record {model: stock.warehouse, id: stock.warehouse0}:
-    lot_stock_id: stock_location_loc0
+    lot_stock_id: stock_location_stock
 -
   I create Stock Production Lot for product CPU2
 -
@@ -36,7 +32,7 @@
   !python {model: stock.change.product.qty}: |
     #stock.stock_location_stock
     product = self.pool.get('product.product').browse(cr, uid, ref('product.product_product_cpu2'))
-    fields = {'location_id' : ref('stock_location_loc0'), 'new_quantity': 2, 'product_id': product.id, 'prodlot_id': ref('stock.stock_production_lot0')}
+    fields = {'location_id' : ref('stock_location_stock'), 'new_quantity': 2, 'product_id': product.id, 'prodlot_id': ref('stock.stock_production_lot0')}
     ids = self.create(cr, uid, fields)
     self.change_product_qty(cr, uid, [ids], {'active_model':'product.product', 'active_id': product.id, 'active_ids':[product.id]})
     assert product.qty_available == 2,'Product Quantity is not Updated'
@@ -48,7 +44,7 @@
     inventory = self.browse(cr, uid, ids)[0]
     assert inventory.product_id.id == ref('product.product_product_cpu2'), 'Product is not correspond'
     assert inventory.product_qty == 2,'product Quantity is not correspond'
-    assert inventory.location_id.id == ref('stock_location_loc0'), 'Location is not correspond'
+    assert inventory.location_id.id == ref('stock_location_stock'), 'Location is not correspond'
     assert inventory.state == 'done', 'State should be in Done state'
 -
   I check stock moves created.