diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
index db6d8701f4372b8b3bddcb0af81bd9d7be953e49..3e17214f18af40217f94d5e7af268b5bdde813ce 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/DataSetRegistrationAlgorithmTest.java
@@ -294,7 +294,8 @@ public class DataSetRegistrationAlgorithmTest extends AbstractFileSystemTestCase
             context.checking(new Expectations()
                 {
                     {
-                        allowing(openBisService).setStorageConfirmed(DATA_SET_CODE);
+                        one(openBisService).setStorageConfirmed(DATA_SET_CODE);
+                        one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
                     }
                 });
         }
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
index 7b60b3d380cc9eec84de3d42e2c5d01471abb2b7..c9e27ad18247b19afa9b51b37764b5862897d7dd 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/JythonTopLevelDataSetRegistratorTest.java
@@ -132,7 +132,9 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
                     will(doAll(returnValue(new AtomicEntityOperationResult()), checkPrecommitDirIsNotEmpty()));
                     
                     one(openBisService).setStorageConfirmed(DATA_SET_CODE);
-                
+                    one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
+                    
+                    
                     will(checkPrecommitDirIsEmpty());
                 }
             });
@@ -387,8 +389,10 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
                     will(returnValue(new AtomicEntityOperationResult()));
 
                     one(openBisService).setStorageConfirmed(DATA_SET_CODE + 1);
-
                     one(openBisService).setStorageConfirmed(DATA_SET_CODE + 2);
+
+                    one(openBisService).markDataSetForRegistration(DATA_SET_CODE + 1);
+                    one(openBisService).markDataSetForRegistration(DATA_SET_CODE + 2);
                 }
             });
 
@@ -466,7 +470,8 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
                     will(returnValue(new AtomicEntityOperationResult()));
                     
                     one(openBisService).setStorageConfirmed(DATA_SET_CODE);
-                }
+                    one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
+                    }
             });
 
         handler.handle(markerFile);
@@ -526,6 +531,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
                     will(returnValue(new AtomicEntityOperationResult()));
                     
                     one(openBisService).setStorageConfirmed(DATA_SET_CODE);
+                    one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
                 }
             });
 
@@ -666,6 +672,7 @@ public class JythonTopLevelDataSetRegistratorTest extends AbstractJythonDataSetH
                     will(returnValue(new AtomicEntityOperationResult()));
                     
                     one(openBisService).setStorageConfirmed(DATA_SET_CODE);
+                    one(openBisService).markDataSetForRegistration(DATA_SET_CODE);
                 }
             });