diff --git a/addons/delivery/tests/test_delivery_cost.py b/addons/delivery/tests/test_delivery_cost.py
index d58fac708d8..d60980419b8 100644
--- a/addons/delivery/tests/test_delivery_cost.py
+++ b/addons/delivery/tests/test_delivery_cost.py
@@ -15,17 +15,31 @@ class TestDeliveryCost(common.TransactionCase):
         self.SaleConfigSetting = self.env['res.config.settings']
         self.Product = self.env['product.product']
 
-        self.partner_18 = self.env.ref('base.res_partner_18')
+        self.partner_18 = self.env['res.partner'].create({'name': 'My Test Customer'})
         self.pricelist = self.env.ref('product.list0')
-        self.product_4 = self.env.ref('product.product_product_4')
+        self.product_4 = self.env['product.product'].create({'name': 'A product to deliver'})
         self.product_uom_unit = self.env.ref('uom.product_uom_unit')
-        self.normal_delivery = self.env.ref('delivery.normal_delivery_carrier')
-        self.partner_4 = self.env.ref('base.res_partner_4')
-        self.partner_address_13 = self.env.ref('base.res_partner_address_13')
+        self.product_delivery_normal = self.env['product.product'].create({
+            'name': 'Normal Delivery Charges',
+            'type': 'service',
+            'list_price': 10.0,
+            'categ_id': self.env.ref('delivery.product_category_deliveries').id,
+        })
+        self.normal_delivery = self.env['delivery.carrier'].create({
+            'name': 'Normal Delivery Charges',
+            'fixed_price': 10,
+            'delivery_type': 'fixed',
+            'product_id': self.product_delivery_normal.id,
+        })
+        self.partner_4 = self.env['res.partner'].create({'name': 'Another Customer'})
+        self.partner_address_13 = self.env['res.partner'].create({
+            'name': "Another Customer's Address",
+            'parent_id': self.partner_4.id,
+        })
         self.product_uom_hour = self.env.ref('uom.product_uom_hour')
         self.account_data = self.env.ref('account.data_account_type_revenue')
         self.account_tag_operating = self.env.ref('account.account_tag_operating')
-        self.product_2 = self.env.ref('product.product_product_2')
+        self.product_2 = self.env['product.product'].create({'name': 'Zizizaproduct'})
         self.product_category = self.env.ref('product.product_category_all')
         self.free_delivery = self.env.ref('delivery.free_delivery_carrier')
         # as the tests hereunder assume all the prices in USD, we must ensure
diff --git a/addons/delivery/tests/test_delivery_stock_move.py b/addons/delivery/tests/test_delivery_stock_move.py
index 2fc3e7c2f90..73738a46fec 100644
--- a/addons/delivery/tests/test_delivery_stock_move.py
+++ b/addons/delivery/tests/test_delivery_stock_move.py
@@ -13,12 +13,26 @@ class StockMoveInvoice(AccountingTestCase):
         self.SaleOrder = self.env['sale.order']
         self.AccountJournal = self.env['account.journal']
 
-        self.partner_18 = self.env.ref('base.res_partner_18')
+        self.partner_18 = self.env['res.partner'].create({'name': 'My Test Customer'})
         self.pricelist_id = self.env.ref('product.list0')
-        self.product_11 = self.env.ref('product.product_product_11')
-        self.product_cable_management_box = self.env.ref('stock.product_cable_management_box')
+        self.product_11 = self.env['product.product'].create({'name': 'A product to deliver'})
+        self.product_cable_management_box = self.env['product.product'].create({
+            'name': 'Another product to deliver',
+            'weight': 1.0,
+        })
         self.product_uom_unit = self.env.ref('uom.product_uom_unit')
-        self.normal_delivery = self.env.ref('delivery.normal_delivery_carrier')
+        self.product_delivery_normal = self.env['product.product'].create({
+            'name': 'Normal Delivery Charges',
+            'type': 'service',
+            'list_price': 10.0,
+            'categ_id': self.env.ref('delivery.product_category_deliveries').id,
+        })
+        self.normal_delivery = self.env['delivery.carrier'].create({
+            'name': 'Normal Delivery Charges',
+            'fixed_price': 10,
+            'delivery_type': 'fixed',
+            'product_id': self.product_delivery_normal.id,
+        })
 
     def test_01_delivery_stock_move(self):
         # Test if the stored fields of stock moves are computed with invoice before delivery flow
diff --git a/addons/delivery/tests/test_packing_delivery.py b/addons/delivery/tests/test_packing_delivery.py
index 89630390cd4..17f4c2edb25 100644
--- a/addons/delivery/tests/test_packing_delivery.py
+++ b/addons/delivery/tests/test_packing_delivery.py
@@ -38,7 +38,7 @@ class TestPacking(TestPacking):
         self.env['stock.quant']._update_available_quantity(self.product_bw, self.stock_location, 20.0)
 
         picking_ship = self.env['stock.picking'].create({
-            'partner_id': self.env.ref('base.res_partner_2').id,
+            'partner_id': self.env['res.partner'].create({'name': 'A partner'}).id,
             'picking_type_id': self.warehouse.out_type_id.id,
             'location_id': self.stock_location.id,
             'location_dest_id': self.customer_location.id,