diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
index f02ab1f1468aad604dc213e395bbe077019fbd33..a2dc798287678ebef2594fc116668b8cf4e1dc33 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/AbstractServerTest.java
@@ -35,6 +35,7 @@ import ch.systemsx.cisd.openbis.generic.server.dataaccess.IDAOFactory;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IPersonDAO;
 import ch.systemsx.cisd.openbis.generic.server.dataaccess.IRoleAssignmentDAO;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.RoleAssignmentPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
@@ -98,7 +99,7 @@ public class AbstractServerTest extends AssertJUnit
                     will(returnValue(roleAssigmentDAO));
 
                     allowing(daoFactory).getHomeDatabaseInstance();
-                    will(returnValue(null));
+                    will(returnValue(new DatabaseInstancePE()));
                 }
             });
     }
@@ -220,6 +221,7 @@ public class AbstractServerTest extends AssertJUnit
 
                     PersonPE person = new PersonPE();
                     person.setUserId(username);
+                    person.setDatabaseInstance(daoFactory.getHomeDatabaseInstance());
                     one(personDAO).createPerson(person);
 
                     allowing(personDAO).tryFindPersonByUserId(PersonPE.SYSTEM_USER_ID);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
index f98dfbe6219b1712bf445e06fcf412dbc4e53727..d1597f2ea89aa29189bf304ed93131a0e7727bc3 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/CommonServerTest.java
@@ -496,7 +496,10 @@ public final class CommonServerTest extends AbstractServerTestCase
     {
         // users without any roles cannot login
         Set<RoleAssignmentPE> rolesAssignments = new HashSet<RoleAssignmentPE>();
-        rolesAssignments.add(new RoleAssignmentPE());
+        RoleAssignmentPE roleAssignment = new RoleAssignmentPE();
+        roleAssignment.setRole(RoleCode.ADMIN);
+        roleAssignment.setDatabaseInstance(new DatabaseInstancePE());
+        rolesAssignments.add(roleAssignment);
         person.setRoleAssignments(rolesAssignments);
     }
 
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
index 7de88c8dee6224bb6ddc1bbd1bb4bf474428ec08..9bfe012643bd97372ee68c24df9475cb43f580f1 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/query/server/api/v1/QueryApiServerTest.java
@@ -40,10 +40,12 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.DoubleTableCell;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.IntegerTableCell;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.QueryType;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.ReportingPluginType;
+import ch.systemsx.cisd.openbis.generic.shared.basic.dto.RoleWithHierarchy.RoleCode;
 import ch.systemsx.cisd.openbis.generic.shared.basic.dto.StringTableCell;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataSetTypePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataStorePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.DataStoreServicePE;
+import ch.systemsx.cisd.openbis.generic.shared.dto.DatabaseInstancePE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.PersonPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.RoleAssignmentPE;
 import ch.systemsx.cisd.openbis.generic.shared.dto.Session;
@@ -94,10 +96,14 @@ public class QueryApiServerTest extends AbstractServerTestCase
                     one(sessionManager).getSession(SESSION_TOKEN);
                     will(returnValue(session));
 
+                    RoleAssignmentPE roleAssignment = new RoleAssignmentPE();
+                    roleAssignment.setRole(RoleCode.ADMIN);
+                    roleAssignment.setDatabaseInstance(new DatabaseInstancePE());
+
                     PersonPE person = new PersonPE();
                     person.setUserId("Albert");
                     person.setRoleAssignments(new HashSet<RoleAssignmentPE>(Arrays
-                            .asList(new RoleAssignmentPE())));
+                            .asList(roleAssignment)));
                     person.setActive(true);
                     one(personDAO).tryFindPersonByUserId(session.getUserName());
                     will(returnValue(person));