diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
index 8819157eef00872a48731cb1dd832afa1ae23c39..248c67055e2599e4d16249a568de032e491d65a1 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorForTSVTest.java
@@ -348,7 +348,7 @@ public class DataSetValidatorForTSVTest extends AbstractFileSystemTestCase
             fail("UserFailureException expected");
         } catch (UserFailureException ex)
         {
-            assertEquals("The row in line 3 has 2 cells instead of 1", ex.getMessage());
+            assertEquals("2. row has 2 instead of 1 cells.", ex.getMessage());
         }
         
         MockValidatorFactory.assertSatisfied();
diff --git a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
index dccffe73c67c610d4f63d01f820a26a9305e0b9c..33c3cd0311facf55937d8e215e9ac1f0779f1144 100644
--- a/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
+++ b/datastore_server/sourceTest/java/ch/systemsx/cisd/etlserver/validation/DataSetValidatorTest.java
@@ -145,6 +145,7 @@ public class DataSetValidatorTest extends AbstractFileSystemTestCase
         properties.setProperty(DataSetValidator.DATA_SET_VALIDATORS_KEY, "v");
         properties.setProperty("v." + DataSetValidator.DATA_SET_TYPE_KEY, dataSetType1.getCode());
         properties.setProperty("v." + DataSetValidatorForTSV.PATH_PATTERNS_KEY, "*.txt");
+        properties.setProperty("v." + DataSetValidatorForTSV.STRICT_ROW_SIZE_KEY, "false");
         properties.setProperty("v." + DataSetValidatorForTSV.COLUMNS_KEY, "c1,c2");
         properties.setProperty("v.c1." + DefaultValueValidatorFactory.VALUE_TYPE_KEY, "unique");
         properties.setProperty("v.c2." + DefaultValueValidatorFactory.VALUE_TYPE_KEY, "numeric");