diff --git a/addons/delivery/test/delivery_cost.yml b/addons/delivery/test/delivery_cost.yml
index e7a3eba8426..9d1c352cef9 100644
--- a/addons/delivery/test/delivery_cost.yml
+++ b/addons/delivery/test/delivery_cost.yml
@@ -1,9 +1,9 @@
 -
   In order to test Carrier Cost,
 -
-  create sales order
+  Create sale order with Normal Delivery Charges
 - 
-  !record {model: sale.order, id: sale_6}:
+  !record {model: sale.order, id: sale_normal_delivery_charges}:
     partner_id: base.res_partner_18
     partner_invoice_id: base.res_partner_18
     partner_shipping_id: base.res_partner_18
@@ -22,26 +22,26 @@
 
 -
   !python {model: sale.order}: |
-    self.delivery_set(cr, uid, [ref("sale_6")], context=context)
+    self.delivery_set(cr, uid, [ref("sale_normal_delivery_charges")], context=context)
     
 -
   I check sale order after added delivery cost.
 -
   !python {model: sale.order.line}: |
-    line_ids = self.search(cr, uid, [('order_id','=', ref('sale_6')), ('product_id','=', ref('product_product_delivery'))])
+    line_ids = self.search(cr, uid, [('order_id','=', ref('sale_normal_delivery_charges')), ('product_id','=', ref('product_product_delivery'))])
     assert len(line_ids), "Delivery cost is not Added"
     line_data = self.browse(cr ,uid ,line_ids[0] ,context)
     assert line_data.price_subtotal == 10, "Delivey cost is not correspond."
 -
   I confirm the sale order.
 -
-  !workflow {model: sale.order, action: order_confirm, ref: sale_6}
+  !workflow {model: sale.order, action: order_confirm, ref: sale_normal_delivery_charges}
 -
   I create Invoice from shipment.
 -
   !python {model: stock.invoice.onshipping}: |
     sale = self.pool.get('sale.order')
-    sale_order = sale.browse(cr, uid, ref("sale_6"))
+    sale_order = sale.browse(cr, uid, ref("sale_normal_delivery_charges"))
     ship_ids = [x.id for x in sale_order.picking_ids]
     wiz_id = self.create(cr, uid, {'journal_id': ref('account.sales_journal')},
       {'active_ids': ship_ids, 'active_model': 'stock.picking'})
@@ -54,15 +54,15 @@
     import openerp.report
     from openerp import tools
     sale = self.pool.get('sale.order')
-    sale_order = sale.browse(cr, uid, ref("sale_6"))
+    sale_order = sale.browse(cr, uid, ref("sale_normal_delivery_charges"))
     ship_ids = [x.id for x in sale_order.picking_ids]
     data, format = openerp.report.render_report(cr, uid, ship_ids, 'sale.shipping', {}, {})
     if tools.config['test_report_directory']:
         file(os.path.join(tools.config['test_report_directory'], 'delivery-shipping'+format), 'wb+').write(data)
 -
-  create one more sale order
+  Create one more sale order with Free Delivery Charges
 - 
-  !record {model: sale.order, id: sale_2}:
+  !record {model: sale.order, id: sale_free_delivery_charges}:
     partner_id: base.res_partner_7
     partner_invoice_id: base.res_partner_address_13
     partner_shipping_id: base.res_partner_address_13
@@ -87,12 +87,12 @@
   I add free delivery cost in Sale order.
 -
   !python {model: sale.order}: |
-    self.delivery_set(cr, uid, [ref("sale_2")], context=context)
+    self.delivery_set(cr, uid, [ref("sale_free_delivery_charges")], context=context)
 -
   I check sale order after added delivery cost.
 -
   !python {model: sale.order.line}: |
-    line_ids = self.search(cr, uid, [('order_id','=', ref('sale_2')), ('product_id','=', ref('product_product_delivery'))])
+    line_ids = self.search(cr, uid, [('order_id','=', ref('sale_free_delivery_charges')), ('product_id','=', ref('product_product_delivery'))])
     assert len(line_ids), "Delivery cost is not Added"
     line_data = self.browse(cr ,uid ,line_ids[0] ,context)
     assert line_data.price_subtotal == 0, "Delivey cost is not correspond."