diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
index 7c14ee2ce0f6215d3ae185c3f9d910e7eb86c7ce..edecf227bea56b3d4b84fdaae918270440a952f5 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/ETLDaemon.java
@@ -374,7 +374,7 @@ public final class ETLDaemon
 
         TopLevelDataSetRegistratorGlobalState globalState =
                 new TopLevelDataSetRegistratorGlobalState(initializationData.dssCode, initializationData.shareId, initializationData.storeRootDir,
-                        initializationData.dssInternalTempDir, openBISService, mailClient, dataSetValidator,
+                        initializationData.dssInternalTempDir, initializationData.dssRegistrationLogDir, openBISService, mailClient, dataSetValidator,
                         dataSourceQueryService, new DynamicTransactionQueryFactory(),
                         notifySuccessfulRegistration, threadParameters);
 
@@ -403,7 +403,7 @@ public final class ETLDaemon
 
         TopLevelDataSetRegistratorGlobalState globalState =
                 new TopLevelDataSetRegistratorGlobalState(initializationData.dssCode, initializationData.shareId, initializationData.storeRootDir,
-                        initializationData.dssInternalTempDir, openBISService, mailClient, dataSetValidator,
+                        initializationData.dssInternalTempDir, initializationData.dssRegistrationLogDir, openBISService, mailClient, dataSetValidator,
                         dataSourceQueryService, new DynamicTransactionQueryFactory(),
                         notifySuccessfulRegistration, threadParameters, useIsFinishedMarkerFile,
                         deleteUnidentified, preRegistrationScriptOrNull,
diff --git a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
index 4eea2ca41646b2d13712b0edb0fd8f39047c0cc9..264fdfff3fdc40107462d309791c5b33e1ee1047 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/etlserver/TopLevelDataSetRegistratorGlobalState.java
@@ -50,6 +50,8 @@ public class TopLevelDataSetRegistratorGlobalState
 
     private final File dssInternalTempDir;
 
+    private final File dssRegistrationLogDir;
+
     private final IEncapsulatedOpenBISService openBisService;
 
     private final IMailClient mailClient;
@@ -87,13 +89,13 @@ public class TopLevelDataSetRegistratorGlobalState
      * @param threadParameters
      */
     public TopLevelDataSetRegistratorGlobalState(String dssCode, String shareId, File storeRootDir,
-            File dssInternalTempDir, IEncapsulatedOpenBISService openBisService,
+            File dssInternalTempDir, File dssRegistrationLogDir, IEncapsulatedOpenBISService openBisService,
             IMailClient mailClient, IDataSetValidator dataSetValidator,
             IDataSourceQueryService dataSourceQueryService,
             DynamicTransactionQueryFactory dynamicTransactionQueryFactory,
             boolean notifySuccessfulRegistration, ThreadParameters threadParameters)
     {
-        this(dssCode, shareId, storeRootDir, dssInternalTempDir, openBisService, mailClient,
+        this(dssCode, shareId, storeRootDir, dssInternalTempDir, dssRegistrationLogDir, openBisService, mailClient,
                 dataSetValidator, dataSourceQueryService, dynamicTransactionQueryFactory,
                 notifySuccessfulRegistration, threadParameters, threadParameters
                         .useIsFinishedMarkerFile(), threadParameters.deleteUnidentified(),
@@ -102,7 +104,7 @@ public class TopLevelDataSetRegistratorGlobalState
     }
 
     public TopLevelDataSetRegistratorGlobalState(String dssCode, String shareId, File storeRootDir,
-            File dssInternalTempDir, IEncapsulatedOpenBISService openBisService,
+            File dssInternalTempDir, File dssRegistrationLogDir, IEncapsulatedOpenBISService openBisService,
             IMailClient mailClient, IDataSetValidator dataSetValidator,
             IDataSourceQueryService dataSourceQueryService,
             DynamicTransactionQueryFactory dynamicTransactionQueryFactory,
@@ -116,6 +118,7 @@ public class TopLevelDataSetRegistratorGlobalState
         this.shareId = shareId;
         this.storeRootDir = storeRootDir;
         this.dssInternalTempDir = dssInternalTempDir;
+        this.dssRegistrationLogDir = dssRegistrationLogDir;
         this.openBisService = openBisService;
         this.mailClient = mailClient;
         this.dataSetValidator = dataSetValidator;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
index 3129e6a3266fa2d44b7ff6ebbfcf0f1cc9d192b1..5b9afcca80f0d5550f89b79e8b0908efbc671a1a 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/TransferredDataSetHandlerTest.java
@@ -288,7 +288,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
         TopLevelDataSetRegistratorGlobalState globalState =
                 new TopLevelDataSetRegistratorGlobalState("dss",
                         ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
-                        workingDirectory, workingDirectory, authorizedLimsService, mailClient,
+                        workingDirectory, workingDirectory, workingDirectory, authorizedLimsService, mailClient,
                         dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
                         threadParameters);
 
@@ -807,7 +807,7 @@ public final class TransferredDataSetHandlerTest extends AbstractFileSystemTestC
         TopLevelDataSetRegistratorGlobalState globalState =
                 new TopLevelDataSetRegistratorGlobalState("dss",
                         ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
-                        workingDirectory, workingDirectory, authorizedLimsService, mailClient,
+                        workingDirectory, workingDirectory, workingDirectory, authorizedLimsService, mailClient,
                         dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
                         threadParameters);
         context.checking(new Expectations()
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
index d88daf8c444fc894adc2ae0f7f73eff19920c7d9..5ea85563a976a4f918af7a2600591bd10fd143d0 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/api/v1/PutDataSetTopLevelDataSetHandlerTest.java
@@ -306,6 +306,6 @@ public class PutDataSetTopLevelDataSetHandlerTest extends AbstractFileSystemTest
                 new ThreadParameters(createThreadProperties(), getClass().getSimpleName()
                         + "-thread");
         return new TopLevelDataSetRegistratorGlobalState(DATA_SET_CODE, "1", this.storeDir,
-                tmpIncomingDir, this.service, null, null, null, null, true, params);
+                tmpIncomingDir, workingDirectory, this.service, null, null, null, null, true, params);
     }
 }
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
index 250210e5d7a32582be580de1b60e9da21e37ee16..9c20411b62a7d02f95a7917e42abfea12f630cc9 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/AbstractJythonDataSetHandlerTest.java
@@ -177,7 +177,7 @@ public abstract class AbstractJythonDataSetHandlerTest extends AbstractFileSyste
         TopLevelDataSetRegistratorGlobalState globalState =
                 new TopLevelDataSetRegistratorGlobalState("dss",
                         ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
-                        workingDirectory, workingDirectory, openBisService, mailClient,
+                        workingDirectory, workingDirectory, workingDirectory, openBisService, mailClient,
                         dataSetValidator, dataSourceQueryService, myFactory, true, threadParameters);
         return globalState;
     }
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
index 43dffe1af828eea4968617300c1eed0473edc46c..cb273dc233f973bbb7165d9f7bb3099ada09e54c 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/DataSetStorageRollbackerTest.java
@@ -111,7 +111,7 @@ public class DataSetStorageRollbackerTest extends AbstractFileSystemTestCase
         TopLevelDataSetRegistratorGlobalState globalState =
                 new TopLevelDataSetRegistratorGlobalState("dss",
                         ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
-                        workingDirectory, workingDirectory, openBisService, mailClient,
+                        workingDirectory, workingDirectory, workingDirectory, openBisService, mailClient,
                         dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
                         threadParameters);
         return globalState;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
index 206e5e7dd1ec6bced92a89f13d0e13ccc7d16d9c..bf81678f319bb955a3704df788bb715aa5c26f00 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/registrator/api/v1/impl/DataSetRegistrationTransactionTest.java
@@ -287,7 +287,7 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa
 
         context.assertIsSatisfied();
     }
-    
+
     @Test
     public void testRollbackWhereMoveCreatesIntermediateDirectories()
     {
@@ -445,7 +445,7 @@ public class DataSetRegistrationTransactionTest extends AbstractFileSystemTestCa
         TopLevelDataSetRegistratorGlobalState globalState =
                 new TopLevelDataSetRegistratorGlobalState("dss",
                         ch.systemsx.cisd.openbis.dss.generic.shared.Constants.DEFAULT_SHARE_ID,
-                        workingDirectory, workingDirectory, openBisService, mailClient,
+                        workingDirectory, workingDirectory, workingDirectory, openBisService, mailClient,
                         dataSetValidator, null, new DynamicTransactionQueryFactory(), true,
                         threadParameters);
         return globalState;
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
index 630609ab0508549babf07ed2057737997820cbd4..c16903cb4160a76b5b4c62b1ada45a1c5749a1de 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/datastoreserver/systemtests/DssComponentTest.java
@@ -92,6 +92,8 @@ public class DssComponentTest extends SystemTestCase
         File registrationLogDir = getRegistrationLogDir();
         assertTrue(registrationLogDir.exists());
 
+        File[] contents = registrationLogDir.listFiles();
+        assertTrue(contents.length > 0);
     }
 
     @Test
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
index e4ed7beb4c5bdcd23547e7ea91bf9719bce8bce4..84c2512907bf087007129cc3b8390575deb46837 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/server/DssServiceRpcV1Test.java
@@ -751,7 +751,7 @@ public class DssServiceRpcV1Test extends AbstractFileSystemTestCase
                 new ThreadParameters(createThreadProperties(), getClass().getSimpleName()
                         + "-thread");
         return new TopLevelDataSetRegistratorGlobalState(DATA_SET_CODE, "1", storeDir,
-                rpcIncomingDir, openBisService, null, null, null, null, true, params);
+                rpcIncomingDir, workingDirectory, openBisService, null, null, null, null, true, params);
     }
 
 }