diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
index 128baf82904f8da642019cff099d5c00b9fbce82..9e244c813fc630dc3272a423842f5e3715d7a700 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/shared/util/SimplePropertyValidatorTest.java
@@ -154,18 +154,18 @@ public class SimplePropertyValidatorTest
         } catch (UserFailureException e)
         {
             assertEquals(e.getMessage(), "Date value '" + stringToParse + "' has improper format. " +
-                    "It must be one of '[yyyy-MM-dd\n" +
-                    "yyyy-MM-dd HH:mm\n" +
-                    "yyyy-MM-dd HH:mm:ss\n" +
-                    "yyyy-MM-dd'T'HH:mm\n" +
+                    "It must be one of '[yyyy-MM-dd'T'HH:mm:ssXXX\n" +
+                    "yyyy-MM-dd'T'HH:mm:ssX\n" +
                     "yyyy-MM-dd'T'HH:mm:ss\n" +
-                    "M/d/yy\n" +
-                    "M/d/yy h:mm a\n" +
-                    "M/d/yy HH:mm\n" +
+                    "yyyy-MM-dd'T'HH:mm\n" +
                     "yyyy-MM-dd HH:mm:ss Z\n" +
-                    "yyyy-MM-dd'T'HH:mm:ssX\n" +
                     "yyyy-MM-dd HH:mm:ss Z\n" +
-                    "yyyy-MM-dd'T'HH:mm:ssXXX]'.");
+                    "yyyy-MM-dd HH:mm:ss\n" +
+                    "yyyy-MM-dd HH:mm\n" +
+                    "yyyy-MM-dd\n" +
+                    "M/d/yy h:mm a\n" +
+                    "M/d/yy HH:mm\n" +
+                    "M/d/yy]'.");
         }
     }