diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
index fe8be50904aeba35293528b5c09517e02ac0546d..da881be2e198f86cf38eac91e7ba4871e2fad5fc 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadExperimentOptimisticLockingTest.java
@@ -132,7 +132,7 @@ public class MultiThreadExperimentOptimisticLockingTest extends
                         public void handleProgress(String phaseName, int totalItemsToProcess,
                                 int numItemsProcessed)
                         {
-                            if (phaseName.equals("createDataSets") && numItemsProcessed == 1
+                            if (phaseName.equals(CREATING_ENTITIES) && numItemsProcessed == 2
                                     && totalItemsToProcess == 2)
                             {
                                 messageChannelMain.send(ToolBox.FIRST_REGISTERED);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
index df23319bc2ab045a6d81ad3918b6d01730e8987e..be70605def9e1b059d755cec6553165b2c20a3aa 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadOptimisticLockingTestCase.java
@@ -32,6 +32,7 @@ import ch.systemsx.cisd.openbis.systemtest.PersistentSystemTestCase;
 @Transactional
 public class MultiThreadOptimisticLockingTestCase extends PersistentSystemTestCase
 {
+    static final String CREATING_ENTITIES = "creating entities";
     protected ToolBox toolBox;
 
     @BeforeMethod
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
index 3c6299adae4bd4ee828a1e094eb5e2db02c16e77..b4539cd66b812e817921692dd61b1534604ffc13 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadProjectOptimisticLockingTest.java
@@ -115,6 +115,6 @@ public class MultiThreadProjectOptimisticLockingTest extends MultiThreadOptimist
         assertEquals("[OLT-E1, OLT-E2, OLT-E3]", toolBox.extractCodes(experiments).toString());
         toolBox.checkModifierAndModificationDateOfProject1(timeIntervalChecker);
         assertEquals("authorize 1/2\n" + "authorize 2/2\n" + "createExperiments 1/2\n"
-                + "createExperiments 2/2\n", stringBuilder.toString());
+                + "createExperiments 2/2\n" + "load related entities 0/0\n", stringBuilder.toString());
     }
 }
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
index 84a4280dda26aea31a3aca070cd4829b5631932d..5ced99d16d1be72d487bdaca1ac75869838d96c8 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/systemtest/optimistic_locking/MultiThreadSampleOptimisticLockingTest.java
@@ -181,7 +181,7 @@ public class MultiThreadSampleOptimisticLockingTest extends MultiThreadOptimisti
                         public void handleProgress(String phaseName, int totalItemsToProcess,
                                 int numItemsProcessed)
                         {
-                            if (phaseName.equals("createDataSets") && numItemsProcessed == 1
+                            if (phaseName.equals(CREATING_ENTITIES) && numItemsProcessed == 2
                                     && totalItemsToProcess == 2)
                             {
                                 messageChannelMain.send(ToolBox.FIRST_REGISTERED);