diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
index dbd409a23b..c8d25ae82d 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/BranchRootResourceTest.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class BranchRootResourceTestBase extends RepositoryTestBase {
+public class BranchRootResourceTest extends RepositoryTestBase {
 
   public static final String BRANCH_PATH = "space/repo/branches/master";
   public static final String BRANCH_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + BRANCH_PATH;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
index a9d2541f36..e4e991a7d4 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ChangesetRootResourceTest.java
@@ -44,7 +44,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class ChangesetRootResourceTestBase extends RepositoryTestBase {
+public class ChangesetRootResourceTest extends RepositoryTestBase {
 
 
   public static final String CHANGESET_PATH = "space/repo/changesets/";
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
index 9d2c5c9e85..f6a8fa4e09 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/DiffResourceTest.java
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class DiffResourceTestBase extends RepositoryTestBase {
+public class DiffResourceTest extends RepositoryTestBase {
 
 
   public static final String DIFF_PATH = "space/repo/diff/";
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
index 700534af98..778682f62d 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/FileHistoryResourceTest.java
@@ -47,7 +47,7 @@ import static org.mockito.Mockito.when;
 
 @RunWith(MockitoJUnitRunner.Silent.class)
 @Slf4j
-public class FileHistoryResourceTestBase extends RepositoryTestBase {
+public class FileHistoryResourceTest extends RepositoryTestBase {
 
   public static final String FILE_HISTORY_PATH = "space/repo/history/";
   public static final String FILE_HISTORY_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + FILE_HISTORY_PATH;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
index 3b4f275346..f8b555f180 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/ModificationsResourceTest.java
@@ -39,7 +39,7 @@ import static org.mockito.Mockito.when;
 
 @Slf4j
 @RunWith(MockitoJUnitRunner.Silent.class)
-public class ModificationsResourceTestBase extends RepositoryTestBase {
+public class ModificationsResourceTest extends RepositoryTestBase {
 
 
   public static final String MODIFICATIONS_PATH = "space/repo/modifications/";
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
index ef416608bb..ac5ad07cf8 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/PermissionRootResourceTest.java
@@ -64,7 +64,7 @@ import static sonia.scm.api.v2.resources.PermissionDto.GROUP_PREFIX;
   password = "secret",
   configuration = "classpath:sonia/scm/repository/shiro.ini"
 )
-public class PermissionRootResourceTestBase extends RepositoryTestBase {
+public class PermissionRootResourceTest extends RepositoryTestBase {
   private static final String REPOSITORY_NAMESPACE = "repo_namespace";
   private static final String REPOSITORY_NAME = "repo";
   private static final String PERMISSION_WRITE = "repository:permissionWrite:" + REPOSITORY_NAME;
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
index 83ed8e8356..7c6deedf65 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/RepositoryRootResourceTest.java
@@ -55,7 +55,7 @@ import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
   password = "secret",
   configuration = "classpath:sonia/scm/repository/shiro.ini"
 )
-public class RepositoryRootResourceTestBase extends RepositoryTestBase {
+public class RepositoryRootResourceTest extends RepositoryTestBase {
 
   private Dispatcher dispatcher;
 
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
similarity index 98%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
index 4709ca26c3..4759e1ebd7 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/SourceRootResourceTest.java
@@ -32,7 +32,7 @@ import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
 
 
 @RunWith(MockitoJUnitRunner.Silent.class)
-public class SourceRootResourceTestBase extends RepositoryTestBase {
+public class SourceRootResourceTest extends RepositoryTestBase {
 
   private Dispatcher dispatcher;
   private final URI baseUri = URI.create("/");
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTestBase.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
similarity index 99%
rename from scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTestBase.java
rename to scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
index 7192954280..c5beaa457b 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTestBase.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/TagRootResourceTest.java
@@ -38,7 +38,7 @@ import static sonia.scm.api.v2.resources.DispatcherMock.createDispatcher;
 
 @Slf4j
 @RunWith(MockitoJUnitRunner.Silent.class)
-public class TagRootResourceTestBase extends RepositoryTestBase {
+public class TagRootResourceTest extends RepositoryTestBase {
 
   public static final String TAG_PATH = "space/repo/tags/";
   public static final String TAG_URL = "/" + RepositoryRootResource.REPOSITORIES_PATH_V2 + TAG_PATH;