diff --git a/product/ERP5/bootstrap/erp5_core/bt/revision b/product/ERP5/bootstrap/erp5_core/bt/revision
index 9c0e350951810067f06f6f830107ca3d1c4200d4..1a9594c8a4c974e742e3a1be0c0502072e65fc4b 100644
--- a/product/ERP5/bootstrap/erp5_core/bt/revision
+++ b/product/ERP5/bootstrap/erp5_core/bt/revision
@@ -1 +1 @@
-40933
\ No newline at end of file
+40934
\ No newline at end of file
diff --git a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
index ec78274aba2e2fce85d39c5dc5b158077667d2d4..c6ed5fdd85c2302426747e4634bf7db830eab6e0 100644
--- a/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeLiveTestCase.py
@@ -114,6 +114,7 @@ class ERP5TypeLiveTestCase(ERP5TypeTestCaseMixin):
         '''
         # Disabling portal_activities is required in order to avoid
         # conflict with other threads doing tic in the same time
+        self.login()
         self.initial_transaction_hash = transaction.get().__hash__()
         self.activity_tool_subscribed = self.getPortalObject()\
                 .portal_activities.isSubscribed()
diff --git a/product/ERP5Type/tests/ERP5TypeTestCase.py b/product/ERP5Type/tests/ERP5TypeTestCase.py
index aa6867714c4f918e29483aff9ae03edf633324ea..eff9debd8327a53c303622fe7c188454759b87b4 100644
--- a/product/ERP5Type/tests/ERP5TypeTestCase.py
+++ b/product/ERP5Type/tests/ERP5TypeTestCase.py
@@ -306,7 +306,14 @@ class ERP5TypeTestCaseMixin(ProcessingNodeTestCase, PortalTestCase):
       """
       Most of the time, we need to login before doing anything
       """
-      PortalTestCase.login(self, user_name)
+      try:
+        PortalTestCase.login(self, user_name)
+      except AttributeError:
+        uf = self.getPortal().acl_users
+        uf._doAddUser('ERP5TypeTestCase', '', ['Manager', 'Member', 'Assignee',
+                      'Assignor', 'Author', 'Auditor', 'Associate'], [])
+        return PortalTestCase.login(self, user_name)
+
 
     def logout(self):
       PortalTestCase.logout(self)