diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds1/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds2/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/empty-lines/ds3/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds1/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds2/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/missing-sample-identifier/ds3/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds1/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds2/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/.gitignore b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/emptyfile.txt
similarity index 100%
rename from datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/.gitignore
rename to datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/entityregistration/test-data/not-all-subfolders-mentioned/ds3/emptyfile.txt
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java
index d30d238679a000b6b5aa4d0baffe60b60d42a61e..b62cf8ef005197606028ca75da4c15ebb379e078 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/openbis/dss/generic/shared/api/v1/FileInfoDssBuilderTest.java
@@ -37,8 +37,21 @@ public class FileInfoDssBuilderTest extends AssertJUnit
         ArrayList<FileInfoDssDTO> list = new ArrayList<FileInfoDssDTO>();
         File requestedFile = new File(root);
         builder.appendFileInfosForFile(requestedFile, list, false);
-        // The 3 test files + 1 sub dir + .svn
-        assertEquals(5, list.size());
+        removeSvnFoldersFromList(list);
+        // The 3 test files + 1 sub dir
+        assertEquals(4, list.size());
+    }
+
+    private void removeSvnFoldersFromList(ArrayList<FileInfoDssDTO> list)
+    {
+        // Copy the list since we will modify it
+        for (FileInfoDssDTO info : new ArrayList<FileInfoDssDTO>(list))
+        {
+            if (info.getPathInDataSet().endsWith(".svn"))
+            {
+                list.remove(info);
+            }
+        }
     }
 
     @Test
@@ -50,8 +63,9 @@ public class FileInfoDssBuilderTest extends AssertJUnit
         ArrayList<FileInfoDssDTO> list = new ArrayList<FileInfoDssDTO>();
         File requestedFile = new File(root);
         builder.appendFileInfosForFile(requestedFile, list, false);
-        // The 3 test files + 1 sub dir + .svn
-        assertEquals(5, list.size());
+        removeSvnFoldersFromList(list);
+        // The 3 test files + 1 sub dir
+        assertEquals(4, list.size());
     }
 
     @Test