--- a/tests/keycloak-integration-tests/src/test/java/com/redhat/thermostat/gateway/tests/keycloak/BasicKeycloakIntegrationTestSuite.java	Thu Oct 26 16:15:46 2017 +0200
+++ b/tests/keycloak-integration-tests/src/test/java/com/redhat/thermostat/gateway/tests/keycloak/BasicKeycloakIntegrationTestSuite.java	Thu Oct 26 12:20:15 2017 -0400
@@ -114,42 +114,42 @@
 
     @Test
     public void testGetAuthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenAuthorized(getList, DefaultKeycloakUsers.USER_A.getCredentials());
+        verifyEndpointsWhenAuthorized(getList, DefaultKeycloakUsers.USER_R_A.getCredentials());
     }
 
     @Test
     public void testGetUnauthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenUnauthorized(getList, DefaultKeycloakUsers.USER_B.getCredentials());
+        verifyEndpointsWhenUnauthorized(getList, DefaultKeycloakUsers.USER_W_A.getCredentials());
     }
 
     @Test
     public void testPostAuthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenAuthorized(postList, DefaultKeycloakUsers.USER_B.getCredentials());
+        verifyEndpointsWhenAuthorized(postList, DefaultKeycloakUsers.USER_W_A.getCredentials());
     }
 
     @Test
     public void testPostUnauthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenUnauthorized(postList, DefaultKeycloakUsers.USER_C.getCredentials());
+        verifyEndpointsWhenUnauthorized(postList, DefaultKeycloakUsers.USER_U_A.getCredentials());
     }
 
     @Test
     public void testPutAuthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenAuthorized(putList, DefaultKeycloakUsers.USER_C.getCredentials());
+        verifyEndpointsWhenAuthorized(putList, DefaultKeycloakUsers.USER_U_A.getCredentials());
     }
 
     @Test
     public void testPutUnauthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenUnauthorized(putList, DefaultKeycloakUsers.USER_D.getCredentials());
+        verifyEndpointsWhenUnauthorized(putList, DefaultKeycloakUsers.USER_D_A.getCredentials());
     }
 
     @Test
     public void testDeleteAuthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenAuthorized(deleteList, DefaultKeycloakUsers.USER_D.getCredentials());
+        verifyEndpointsWhenAuthorized(deleteList, DefaultKeycloakUsers.USER_D_A.getCredentials());
     }
 
     @Test
     public void testDeleteUnauthorized() throws InterruptedException, ExecutionException, TimeoutException, IOException {
-        verifyEndpointsWhenUnauthorized(deleteList, DefaultKeycloakUsers.USER_A.getCredentials());
+        verifyEndpointsWhenUnauthorized(deleteList, DefaultKeycloakUsers.USER_R_A.getCredentials());
     }
 
     private void verifyEndpointsWhenUnauthenticated(List<EndpointDefinition> endpoints) throws InterruptedException, ExecutionException, TimeoutException {

--- a/tests/test-utils/src/main/java/com/redhat/thermostat/gateway/tests/utils/keycloak/DefaultKeycloakUsers.java	Thu Oct 26 16:15:46 2017 +0200
+++ b/tests/test-utils/src/main/java/com/redhat/thermostat/gateway/tests/utils/keycloak/DefaultKeycloakUsers.java	Thu Oct 26 12:20:15 2017 -0400
@@ -38,13 +38,13 @@
 
 public enum DefaultKeycloakUsers {
 
-    USER_A("tms-a"),
-    USER_B("tms-b"),
-    USER_C("tms-c"),
-    USER_D("tms-d"),
-    USER_E("tms-e"),
-    USER_F("tms-f"),
-    USER_G("tms-g"),
+    USER_R_A("tms-r-a"),
+    USER_W_A("tms-w-a"),
+    USER_U_A("tms-u-a"),
+    USER_D_A("tms-d-a"),
+    USER_R_A_R_B("tms-r-a-r-b"),
+    USER_WUD_A("tms-wud-a"),
+    USER_WUD_A_WUD_B("tms-wud-a-wud-b"),
 
     ;