diff --git a/product/CMFActivity/tests/testCMFActivity.py b/product/CMFActivity/tests/testCMFActivity.py
index 08435a2f1df3e3f089be609d5ed3cd045e18dffd..0b3c4cbcb1bd5244f89db67f1ede2b8dc9cc24c5 100755
--- a/product/CMFActivity/tests/testCMFActivity.py
+++ b/product/CMFActivity/tests/testCMFActivity.py
@@ -81,7 +81,7 @@ class TestCMFActivity(ERP5TypeTestCase):
       
       /organisation
     """
-    return ()
+    return ('erp5_base',)
 
   def getCategoriesTool(self):
     return getattr(self.getPortal(), 'portal_categories', None)
diff --git a/product/CMFCategory/tests/testCMFCategory.py b/product/CMFCategory/tests/testCMFCategory.py
index d49db1f025cd6b3f3dd832c873da09c846763552..d91a5eb7983bdc4cd1a0398f3c2ea75ea819a7c6 100755
--- a/product/CMFCategory/tests/testCMFCategory.py
+++ b/product/CMFCategory/tests/testCMFCategory.py
@@ -80,8 +80,7 @@ class TestCMFCategory(ERP5TypeTestCase):
 
       /organisation
     """
-    #return ('erp5_core',)
-    return ()
+    return ('erp5_base',)
 
   def getCategoriesTool(self):
     return getattr(self.getPortal(), 'portal_categories', None)
diff --git a/product/ERP5/tests/testAccounting.py b/product/ERP5/tests/testAccounting.py
index b780495269844a9ec59b01d1727310ba32a09168..bbc0e69c281bd146fb6a5eabb41c4c21a97f61ac 100755
--- a/product/ERP5/tests/testAccounting.py
+++ b/product/ERP5/tests/testAccounting.py
@@ -121,7 +121,7 @@ class TestAccounting(ERP5TypeTestCase):
   
   def getBusinessTemplateList(self):
     """ """
-    return ('erp5_pdm', 'erp5_trade', 'erp5_accounting',)
+    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_accounting',)
 
   def stepTic(self, **kw):
     self.tic()
diff --git a/product/ERP5/tests/testAccountingRules.py b/product/ERP5/tests/testAccountingRules.py
index 9287c2cf9ce981ad877651d56fd35b98fb508943..eabe81d2975c7c43f514b4ae7e3d3f8d7572748f 100755
--- a/product/ERP5/tests/testAccountingRules.py
+++ b/product/ERP5/tests/testAccountingRules.py
@@ -97,7 +97,7 @@ class TestAccountingRules(ERP5TypeTestCase):
  
   def getBusinessTemplateList(self):
     """  Return the list of business templates. """
-    return ('erp5_pdm', 'erp5_trade', 'erp5_accounting')
+    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_accounting')
 
   def getAccountModule(self):
     return getattr(self.getPortal(), 'account',
diff --git a/product/ERP5/tests/testBase.py b/product/ERP5/tests/testBase.py
index df0de8ef75d5a51f5bd0359bd52d7591d98ff657..9e36d79e27cc7fb4bcfcba25aa67e7af31aa00bc 100755
--- a/product/ERP5/tests/testBase.py
+++ b/product/ERP5/tests/testBase.py
@@ -68,7 +68,7 @@ class TestBase(ERP5TypeTestCase):
   def getBusinessTemplateList(self):
     """
     """
-    return ()
+    return ('erp5_base')
 
   def login(self, quiet=0, run=run_all_test):
     uf = self.getPortal().acl_users
diff --git a/product/ERP5/tests/testDomainTool.py b/product/ERP5/tests/testDomainTool.py
index 37fa46f3122d4635cee17a58e2043e9c65875bdf..13be5d8369ada4b8a2d08b76f9751d29ca585825 100755
--- a/product/ERP5/tests/testDomainTool.py
+++ b/product/ERP5/tests/testDomainTool.py
@@ -76,7 +76,7 @@ class TestDomainTool(ERP5TypeTestCase):
       Return the list of business templates.
 
     """
-    return ('erp5_pdm', 'erp5_trade', 'erp5_apparel')
+    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_apparel')
 
   def getPortalId(self):
     return self.getPortal().getId()
diff --git a/product/ERP5/tests/testERP5BankingCashTransfer.py b/product/ERP5/tests/testERP5BankingCashTransfer.py
index 5cfd3f5f839fcb46b99972bf9a74f0b2a46c2606..caba77c3102d53d87e33238b45b07ccc5f3b95d2 100755
--- a/product/ERP5/tests/testERP5BankingCashTransfer.py
+++ b/product/ERP5/tests/testERP5BankingCashTransfer.py
@@ -117,7 +117,8 @@ class TestERP5BankingCashTransfer(ERP5TypeTestCase):
       the unit test framework in order to know which business templates
       need to be installed to run the test on.
     """
-    return ( 'erp5_trade'  # erp5_trade is not required to make erp5_banking_cash_transfer working.
+    return ( 'erp5_base'   # Organisation,Person,Currency modules
+           , 'erp5_trade'  # erp5_trade is not required to make erp5_banking_cash_transfer working.
                            # As explained below erp5_trade is just used to help us initialize ressources
                            #   via Internal Packing List.
            , 'erp5_banking_core' # erp5_banking_core contains all generic methods for banking
diff --git a/product/ERP5/tests/testERP5Budget.py b/product/ERP5/tests/testERP5Budget.py
index b16dad13e2d7c6bec6480567c2e0998b029800ae..89f117a4b5c3307919efea1712cd77fa763dcf68 100755
--- a/product/ERP5/tests/testERP5Budget.py
+++ b/product/ERP5/tests/testERP5Budget.py
@@ -77,7 +77,7 @@ class TestBudget(ERP5TypeTestCase):
     """
       Return the list of required business templates.
     """
-    return ('erp5_pdm', 'erp5_trade', 'erp5_accounting', 'erp5_budget')
+    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_accounting', 'erp5_budget')
 
 
   def login(self, quiet=QUIET, run=RUN_ALL_TEST):
diff --git a/product/ERP5/tests/testERP5Category.py b/product/ERP5/tests/testERP5Category.py
index 7bab23fd4f2bc67b2c46e9be4969cf7c350ebfc3..0bafa7369d8b84dadf2f8bdf0c00f9e7eb0dc34f 100755
--- a/product/ERP5/tests/testERP5Category.py
+++ b/product/ERP5/tests/testERP5Category.py
@@ -76,7 +76,7 @@ class TestERP5Category(ERP5TypeTestCase):
       Return the list of business templates.
 
     """
-    return ()
+    return ('erp5_base')
 
   def enableActivityTool(self):
     """
diff --git a/product/ERP5/tests/testERP5HR.py b/product/ERP5/tests/testERP5HR.py
index d0821c832f4cd97c213889bdedc3e041ac32bdd5..0ecc945c8c05732638154b797a45ae5e846516dd 100755
--- a/product/ERP5/tests/testERP5HR.py
+++ b/product/ERP5/tests/testERP5HR.py
@@ -74,7 +74,7 @@ class TestHR(ERP5TypeTestCase):
     """
       Return the list of required business templates.
     """
-    return ()
+    return ('erp5_base')
 
 
   def afterSetUp(self, quiet=QUIET, run=RUN_ALL_TEST):
diff --git a/product/ERP5/tests/testImmobilisation.py b/product/ERP5/tests/testImmobilisation.py
index 7dd58402408a9082cd10db109e2483bd40996f56..e110301265de92410c26fc74677d33c41284cb11 100755
--- a/product/ERP5/tests/testImmobilisation.py
+++ b/product/ERP5/tests/testImmobilisation.py
@@ -96,7 +96,8 @@ class TestImmobilisation(TestOrderMixin, ERP5TypeTestCase):
       Return the list of business templates.
 
     """
-    return ("erp5_core_patch_immo",
+    return ("erp5_base",
+            "erp5_core_patch_immo",
             "erp5_trade",
             "erp5_pdm", # Needed by accounting
             "erp5_accounting",
diff --git a/product/ERP5/tests/testInteractionWorkflow.py b/product/ERP5/tests/testInteractionWorkflow.py
index c63c258486416f34a35f718f39c7db8a4c338d76..b1e4fac428d48e009ef679bb4aabcba14cd40c29 100755
--- a/product/ERP5/tests/testInteractionWorkflow.py
+++ b/product/ERP5/tests/testInteractionWorkflow.py
@@ -68,6 +68,9 @@ class TestInteractionWorkflow(ERP5TypeTestCase):
     ZopeTestCase._print('\n%s ' % message)
     LOG('Testing... ',0,message)
 
+  def getBusinessTemplateList(self):
+    return ('erp5_base',)
+
   def afterSetUp(self):
     self.login()
     #self.createData()
diff --git a/product/ERP5/tests/testOrder.py b/product/ERP5/tests/testOrder.py
index 5cc394fd55d542398cfdad4d9f54b8335f74fc67..eda23d559c7162743344a9c4fd8fcd6d2bac038e 100755
--- a/product/ERP5/tests/testOrder.py
+++ b/product/ERP5/tests/testOrder.py
@@ -80,7 +80,7 @@ class TestOrderMixin:
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_pdm', 'erp5_trade', 'erp5_apparel',)
+    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_apparel',)
 
   def login(self, quiet=0, run=run_all_test):
     uf = self.getPortal().acl_users
diff --git a/product/ERP5/tests/testProductionOrder.py b/product/ERP5/tests/testProductionOrder.py
index 1b1bb323ca3c79da39d9d4a19bfbad69469051ae..a6ea0354e0f44e601cdb5619e3d7d22b988286f3 100755
--- a/product/ERP5/tests/testProductionOrder.py
+++ b/product/ERP5/tests/testProductionOrder.py
@@ -74,7 +74,7 @@ class TestProductionOrderMixin(TestOrderMixin):
   def getBusinessTemplateList(self):
     """
     """
-    return ('erp5_pdm', 'erp5_trade', 'erp5_apparel', 'erp5_mrp')
+    return ('erp5_base','erp5_pdm', 'erp5_trade', 'erp5_apparel', 'erp5_mrp')
 
   def createCategories(self):
     """ 
diff --git a/product/ERP5Catalog/tests/testCatalogSecurity.py b/product/ERP5Catalog/tests/testCatalogSecurity.py
index 2f44f353cae76b1e89e918ee5729067754c5cee3..36c773ca83a4f20a003012ed402fdd5ca8cebbba 100755
--- a/product/ERP5Catalog/tests/testCatalogSecurity.py
+++ b/product/ERP5Catalog/tests/testCatalogSecurity.py
@@ -63,6 +63,9 @@ class Test(ERP5TypeTestCase):
   def getTitle(self):
     return "ERP5Catalog"
 
+  def getBusinessTemplateList(self):
+    return ('erp5_base',)
+
   # Different variables used for this test
   run_all_test = 1
   source_company_id = 'Nexedi'
diff --git a/product/ERP5Catalog/tests/testERP5Catalog.py b/product/ERP5Catalog/tests/testERP5Catalog.py
index 9d695470a74f4d372cf2b89baa4dfcd58f43347f..3fcb55a81ef732cd850c1c269ef6dbaf51779d1a 100755
--- a/product/ERP5Catalog/tests/testERP5Catalog.py
+++ b/product/ERP5Catalog/tests/testERP5Catalog.py
@@ -53,6 +53,9 @@ class TestERP5Catalog(ERP5TypeTestCase):
   def getTitle(self):
     return "ERP5Catalog"
 
+  def getBusinessTemplateList(self):
+    return ('erp5_base',)
+
   # Different variables used for this test
   run_all_test = 1
 
diff --git a/product/ERP5SyncML/tests/testERP5SyncML.py b/product/ERP5SyncML/tests/testERP5SyncML.py
index 64a27cf8eae4ce6ad766b57ad95bac4ad4a3ed83..d72553183079607f1e123b208b2017bbad653778 100755
--- a/product/ERP5SyncML/tests/testERP5SyncML.py
+++ b/product/ERP5SyncML/tests/testERP5SyncML.py
@@ -113,7 +113,7 @@ class TestERP5SyncML(ERP5TypeTestCase):
       /person_client2 : empty
     """
     #return ('sync_crm',)
-    return ()
+    return ('erp5_base')
 
   def getSynchronizationTool(self):
     return getattr(self.getPortal(), 'portal_synchronizations', None)