diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
index 4389cc5d4373cdd54ae5b16ebe8df4c6fd9daa59..ce30edaa489eb65381c7daec33c90bf3f3b5a00a 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/HibernateSearchDAOTest.java
@@ -104,9 +104,9 @@ public final class HibernateSearchDAOTest extends AbstractDAOTest
     {
         return new Object[][]
             {
-                { "Doe" },
-                { "d?e" },
-                { "*oe" } };
+                { "john" },
+                { "Jo?n" },
+                { "*ohn" } };
     }
 
     @Test
@@ -137,14 +137,14 @@ public final class HibernateSearchDAOTest extends AbstractDAOTest
     public final void testSearchEntitiesByRegistrator(final String term)
     {
         final IHibernateSearchDAO hibernateSearchDAO = daoFactory.getHibernateSearchDAO();
-        final String lastName = "Doe";
+        final String lastName = "John";
         final List<SearchHit> hits = hibernateSearchDAO.searchEntitiesByTerm(SamplePE.class, term);
         assertTrue(hits.size() > 0);
         for (SearchHit searchHit : hits)
         {
             SamplePE samplePE = ((SamplePE) searchHit.getEntity());
-            assertEquals(lastName, samplePE.getRegistrator().getLastName());
-            AssertionUtil.assertContains("registrator: Last Name", searchHit.getFieldDescription());
+            assertEquals(lastName, samplePE.getRegistrator().getFirstName());
+            AssertionUtil.assertContains("registrator: First Name", searchHit.getFieldDescription());
         }
     }