diff --git a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java
index fa0875587abbc6861b75cbfbf660b4bf42ff588d..49377d3405d949014c86fb35fa4e432dc9ab3ce2 100644
--- a/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java
+++ b/server-application-server/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/PersonDAOTest.java
@@ -94,11 +94,11 @@ public final class PersonDAOTest extends AbstractDAOTest
     }
 
     @Test
-    public final void testCreatePersonWithValidationFailed()
+    public final void testCreatePersonWithValidationFailed_longUserId()
     {
         final IPersonDAO personDAO = daoFactory.getPersonDAO();
         final PersonPE testPerson = createPerson();
-        testPerson.setUserId(StringUtils.repeat("A", 51));
+        testPerson.setUserId(StringUtils.repeat("A", 257));
         // User id too long
         try
         {
@@ -110,6 +110,23 @@ public final class PersonDAOTest extends AbstractDAOTest
         }
     }
 
+    @Test
+    public final void testCreatePersonWithValidationFailed_longEmail()
+    {
+        final IPersonDAO personDAO = daoFactory.getPersonDAO();
+        final PersonPE testPerson = createPerson();
+        testPerson.setEmail(StringUtils.repeat("A", 64) + "@" + StringUtils.repeat("A", 255) + ".ch");
+        // email too long
+        try
+        {
+            personDAO.createPerson(testPerson);
+            fail("Email exceeds the maximum length");
+        } catch (final DataIntegrityViolationException ex)
+        {
+            assertTrue(ex.getMessage().indexOf("is too long") > -1);
+        }
+    }
+
     @Test
     public final void testCreatePersonWithWhiteSpacesInEmail()
     {