diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
index 58e0cf2222ca03a6728dfda2eee4be77936e728a..014b35f7866b8a802a3681aa960157e1fa1944ee 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/AuthorizationManagementConsolTest.java
@@ -97,7 +97,8 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
 
         remoteConsole.prepare(new OpenRoleAssignmentDialog());
         remoteConsole.prepare(FillRoleAssignmentForm.fillAuthorizationGroupRole(TEST_GROUP
-                .toUpperCase(), TestConstants.ADMINS_GROUP, RoleWithHierarchy.SPACE_OBSERVER.toString()));
+                .toUpperCase(), TestConstants.ADMINS_GROUP, RoleWithHierarchy.SPACE_OBSERVER
+                .toString()));
         final CheckRoleAssignmentTable table = new CheckRoleAssignmentTable();
         table.expectedRow(RoleAssignmentRow.authorizationGroupRoleRow(TEST_GROUP.toUpperCase(),
                 ADMINS_GROUP, RoleWithHierarchy.SPACE_OBSERVER.toString()));
@@ -114,7 +115,7 @@ public class AuthorizationManagementConsolTest extends AbstractGWTTestCase
         FailureExpectation failureExpectation =
                 new FailureExpectation(
                         (Class<? extends AsyncCallback<?>>) AbstractBrowserGrid.ListEntitiesCallback.class)
-                        .with("Authorization failure: None of method roles '[INSTANCE.ADMIN]' "
+                        .with("Authorization failure: None of method roles '[INSTANCE_ADMIN]' "
                                 + "could be found in roles of user 'o'.");
 
         remoteConsole.prepare(failureExpectation);
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
index a8124afe9b6a3a379646a6dfa67abdcfdc094322..b0ff1449818d75f17baab22065bc2b4807581afd 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleRegistrationTest.java
@@ -110,7 +110,7 @@ public class GenericSampleRegistrationTest extends AbstractGWTTestCase
         FailureExpectation failureExpectation =
                 new FailureExpectation(GenericSampleRegistrationForm.RegisterSampleCallback.class)
                         .with("Authorization failure: None of method roles "
-                                + "'[SPACE.USER, SPACE.POWER_USER, SPACE.ADMIN, INSTANCE.ADMIN]' "
+                                + "'[INSTANCE_ADMIN, SPACE_ADMIN, SPACE_USER, SPACE_POWER_USER]' "
                                 + "could be found in roles of user 'observer'.");
         remoteConsole.prepare(failureExpectation);
         launchTest();