diff --git a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java
index 7ab621cee..c7fd6d2a8 100644
--- a/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java
+++ b/lib/taskana-core/src/main/java/pro/taskana/configuration/TaskanaEngineConfiguration.java
@@ -16,6 +16,7 @@ import java.util.Map;
 import java.util.Properties;
 import java.util.Set;
 import java.util.StringTokenizer;
+import java.util.stream.Collectors;
 
 import javax.sql.DataSource;
 
@@ -123,8 +124,9 @@ public class TaskanaEngineConfiguration {
     }
 
     private void initTaskanaRoles(Properties props, String rolesSeparator) {
-        List<String> validPropertyNames = Arrays.asList(TaskanaRole.USER.getPropertyName(),
-            TaskanaRole.BUSINESS_ADMIN.getPropertyName(), TaskanaRole.ADMIN.getPropertyName());
+        List<String> validPropertyNames = Arrays.stream(TaskanaRole.values())
+            .map(TaskanaRole::getPropertyName)
+            .collect(Collectors.toList());
         for (Object obj : props.keySet()) {
             String propertyName = ((String) obj);
             if (validPropertyNames.contains(propertyName.toLowerCase().trim())) {
@@ -186,16 +188,8 @@ public class TaskanaEngineConfiguration {
 
     private void ensureRoleMapIsFullyInitialized() {
         // make sure that roleMap does not return null for any role
-        if (!roleMap.containsKey(TaskanaRole.ADMIN)) {
-            roleMap.put(TaskanaRole.ADMIN, new HashSet<>());
-        }
-        if (!roleMap.containsKey(TaskanaRole.BUSINESS_ADMIN)) {
-            roleMap.put(TaskanaRole.BUSINESS_ADMIN, new HashSet<>());
-        }
-
-        if (!roleMap.containsKey(TaskanaRole.USER)) {
-            roleMap.put(TaskanaRole.USER, new HashSet<>());
-        }
+        Arrays.stream(TaskanaRole.values())
+            .forEach(role -> roleMap.putIfAbsent(role, new HashSet<>()));
     }
 
     public static DataSource createDefaultDataSource() {
diff --git a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java
index 85b37907d..8ba79183e 100644
--- a/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java
+++ b/lib/taskana-core/src/test/java/acceptance/workbasket/DeleteWorkbasketAccTest.java
@@ -15,6 +15,7 @@ import acceptance.AbstractAccTest;
 import pro.taskana.Workbasket;
 import pro.taskana.WorkbasketService;
 import pro.taskana.WorkbasketType;
+import pro.taskana.exceptions.DomainNotFoundException;
 import pro.taskana.exceptions.InvalidArgumentException;
 import pro.taskana.exceptions.InvalidWorkbasketException;
 import pro.taskana.exceptions.NotAuthorizedException;
@@ -137,7 +138,7 @@ public class DeleteWorkbasketAccTest extends AbstractAccTest {
     @Test
     public void testCreateAndDeleteWorkbasket()
         throws SQLException, NotAuthorizedException, InvalidArgumentException, WorkbasketNotFoundException,
-        InvalidWorkbasketException, WorkbasketAlreadyExistException {
+        InvalidWorkbasketException, WorkbasketAlreadyExistException, DomainNotFoundException {
         WorkbasketService workbasketService = taskanaEngine.getWorkbasketService();
         int before = workbasketService.createWorkbasketQuery().domainIn("DOMAIN_A").list().size();