diff --git a/product/ERP5/tests/testERP5Commerce.py b/product/ERP5/tests/testERP5Commerce.py
index 03afd06f18528243b23333dff2976268fcc061d3..011ff1a9b500a7d8e8c6dc5a21cb4bbf84a3174b 100644
--- a/product/ERP5/tests/testERP5Commerce.py
+++ b/product/ERP5/tests/testERP5Commerce.py
@@ -128,6 +128,12 @@ class TestCommerce(ERP5TypeTestCase):
     sale_order_module.manage_permission('Access contents information',
                                      roles=['Anonymous'], acquire=0)
 
+    # add quantity_unit/unit/piece
+    if getattr(self.portal.portal_categories.quantity_unit, 'unit', None) is None:
+      self.portal.portal_categories.quantity_unit.newContent(id='unit')
+    if getattr(self.portal.portal_categories.quantity_unit.unit, 'piece', None) is None:
+      self.portal.portal_categories.quantity_unit.unit.newContent(id='piece')
+
     # create default currency (EUR)
     currency = currency_module.newContent(portal_type='Currency',
                                           id='EUR')
@@ -176,12 +182,6 @@ class TestCommerce(ERP5TypeTestCase):
     self.website.setProperty('ecommerce_base_currency',
                                             currency.getRelativeUrl())
 
-    # add quantity_unit/unit/piece
-    if getattr(self.portal.portal_categories.quantity_unit, 'unit', None) is None:
-      self.portal.portal_categories.quantity_unit.newContent(id='unit')
-    if getattr(self.portal.portal_categories.quantity_unit.unit, 'piece', None) is None:
-      self.portal.portal_categories.quantity_unit.unit.newContent(id='piece')
-
     self.app.REQUEST.set('session_id', SESSION_ID)
     self.loginByUserName('ivan')
     self.tic()