diff --git a/scm-it/src/test/java/sonia/scm/it/RoleITCase.java b/scm-it/src/test/java/sonia/scm/it/RoleITCase.java
index 998c4e315e..331a251d23 100644
--- a/scm-it/src/test/java/sonia/scm/it/RoleITCase.java
+++ b/scm-it/src/test/java/sonia/scm/it/RoleITCase.java
@@ -3,12 +3,14 @@ package sonia.scm.it;
 import org.apache.http.HttpStatus;
 import org.junit.Before;
 import org.junit.Test;
-import sonia.scm.it.utils.RestUtil;
+import sonia.scm.it.utils.ScmRequests;
 import sonia.scm.it.utils.TestData;
 import sonia.scm.web.VndMediaType;
 
 import static org.junit.Assert.assertNotNull;
 import static sonia.scm.it.PermissionsITCase.USER_PASS;
+import static sonia.scm.it.utils.RestUtil.ADMIN_PASSWORD;
+import static sonia.scm.it.utils.RestUtil.ADMIN_USERNAME;
 import static sonia.scm.it.utils.RestUtil.given;
 import static sonia.scm.it.utils.TestData.USER_SCM_ADMIN;
 import static sonia.scm.it.utils.TestData.callRepository;
@@ -28,9 +30,13 @@ public class RoleITCase {
   public void userShouldSeePermissionsAfterAddingRoleToUser() {
     callRepository(USER, USER_PASS, "git", HttpStatus.SC_FORBIDDEN);
 
+    String repositoryRolesUrl = new ScmRequests()
+      .requestIndexResource(ADMIN_USERNAME, ADMIN_PASSWORD)
+      .getUrl("repositoryRoles");
+
     given()
       .when()
-      .delete(RestUtil.createResourceUrl("repository-roles/" + ROLE_NAME))
+      .delete(repositoryRolesUrl + ROLE_NAME)
       .then()
       .statusCode(HttpStatus.SC_NO_CONTENT);
 
@@ -40,7 +46,7 @@ public class RoleITCase {
         "\"name\": \"" + ROLE_NAME + "\"," +
         "\"verbs\": [\"read\",\"permissionRead\"]" +
         "}")
-      .post(RestUtil.createResourceUrl("repository-roles/"))
+      .post(repositoryRolesUrl)
       .then()
       .statusCode(HttpStatus.SC_CREATED);
 
diff --git a/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java b/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
index 2164617772..69b9940f70 100644
--- a/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
+++ b/scm-it/src/test/java/sonia/scm/it/utils/ScmRequests.java
@@ -201,7 +201,12 @@ public class ScmRequests {
       return super.assertPropertyPathDoesNotExists(LINK_USERS);
     }
 
-
+    public String getUrl(String linkName) {
+      return response
+        .then()
+        .extract()
+        .path("_links."  + linkName + ".href");
+    }
   }
 
   public class RepositoryResponse<PREV extends ModelResponse> extends ModelResponse<RepositoryResponse<PREV>, PREV> {