diff --git a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java b/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
index cada6b1ec726933301c7af1d584cab09bcb91e10..861e747bba50ce1e435838916c348348377c85b7 100644
--- a/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
+++ b/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/HierarchicalStructureDuplicatorFileToHdf5Test.java
@@ -23,9 +23,7 @@ import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
-import ch.systemsx.cisd.common.hdf5.Hdf5Container;
 import ch.systemsx.cisd.common.hdf5.Hdf5Container.IHdf5ReaderClient;
-import ch.systemsx.cisd.common.hdf5.HierarchicalStructureDuplicatorFileToHdf5;
 import ch.systemsx.cisd.hdf5.IHDF5SimpleReader;
 
 /**
@@ -125,7 +123,7 @@ public class HierarchicalStructureDuplicatorFileToHdf5Test extends AbstractFileS
 
     private File getTestData(String folderOrFile)
     {
-        return new File("sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/", folderOrFile);
+        return new File("sourceTest/java/ch/systemsx/cisd/common/hdf5/", folderOrFile);
     }
 
     private void verifyDuplicate(final File sourceFolderOrFile)
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/basic-file-structure/file0.txt b/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/file0.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/basic-file-structure/file0.txt
rename to common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/file0.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/basic-file-structure/sub-folder1/file1.txt b/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/file1.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/basic-file-structure/sub-folder1/file1.txt
rename to common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/file1.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt b/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt
rename to common/sourceTest/java/ch/systemsx/cisd/common/hdf5/basic-file-structure/sub-folder1/subfolder2/file2.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/file-structure-with-links/file0.txt b/common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file0.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/hdf5/file-structure-with-links/file0.txt
rename to common/sourceTest/java/ch/systemsx/cisd/common/hdf5/file-structure-with-links/file0.txt