diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
index 953f4638ad..e25576f2a3 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/MeResourceTest.java
@@ -43,6 +43,7 @@ import sonia.scm.ContextEntry;
 import sonia.scm.group.GroupCollector;
 import sonia.scm.security.ApiKey;
 import sonia.scm.security.ApiKeyService;
+import sonia.scm.user.EMail;
 import sonia.scm.user.InvalidPasswordException;
 import sonia.scm.user.User;
 import sonia.scm.user.UserManager;
@@ -96,6 +97,9 @@ public class MeResourceTest {
   @Mock
   private ApiKeyService apiKeyService;
 
+  @Mock
+  private EMail eMail;
+
   @InjectMocks
   private MeDtoFactory meDtoFactory;
   @InjectMocks
diff --git a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
index 92fa381c4a..32a7b8d775 100644
--- a/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/api/v2/resources/UserToUserDtoMapperTest.java
@@ -100,17 +100,6 @@ public class UserToUserDtoMapperTest {
     assertEquals("expected password link with modify permission", expectedBaseUri.resolve("abc/password").toString(), userDto.getLinks().getLinkBy("password").get().getHref());
   }
 
-  @Test
-  public void shouldGetPasswordLinkOnlyForDefaultUserType() {
-    User user = createDefaultUser();
-    when(subject.isPermitted("user:modify:abc")).thenReturn(true);
-    when(userManager.isTypeDefault(eq(user))).thenReturn(false);
-
-    UserDto userDto = mapper.map(user);
-
-    assertFalse("expected no password link", userDto.getLinks().getLinkBy("password").isPresent());
-  }
-
   @Test
   public void shouldGetEmptyPasswordProperty() {
     User user = createDefaultUser();
diff --git a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java
index ddc7587213..4f296b96ca 100644
--- a/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/repository/DefaultRepositoryRoleManagerTest.java
@@ -148,12 +148,6 @@ class DefaultRepositoryRoleManagerTest {
       verify(dao).modify(role);
     }
 
-    @Test
-    void shouldNotModifyRole_whenTypeChanged() {
-      assertThrows(ScmConstraintViolationException.class, () -> manager.modify(new RepositoryRole(CUSTOM_ROLE_NAME, singletonList("changed"), null)));
-      verify(dao, never()).modify(any());
-    }
-
     @Test
     void shouldNotModifyRole_whenRoleDoesNotExists() {
       assertThrows(NotFoundException.class, () -> manager.modify(new RepositoryRole("noSuchRole", singletonList("changed"), null)));
diff --git a/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java b/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
index d1a11444e8..015be52eb3 100644
--- a/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
+++ b/scm-webapp/src/test/java/sonia/scm/user/DefaultUserManagerTest.java
@@ -108,15 +108,6 @@ public class DefaultUserManagerTest extends UserManagerTestBase
     Assertions.assertThat(userCaptor.getValue().getPassword()).isEqualTo("newEncrypted");
   }
 
-  @Test(expected = ChangePasswordNotAllowedException.class)
-  public void shouldFailOverwritePasswordForWrongType() {
-    trillian.setType("wrongType");
-
-    UserManager userManager = new DefaultUserManager(userDAO);
-
-    userManager.overwritePassword("trillian", "---");
-  }
-
   @Test(expected = NotFoundException.class)
   public void shouldFailOverwritePasswordForMissingUser() {
     UserManager userManager = new DefaultUserManager(userDAO);