diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java
index 88776017ad45be5cf5d2f306554876feb84f9994..77e0a7a2514a770157d2d0b566dc589e50bef2cc 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/RoleHierarchyTest.java
@@ -10,9 +10,6 @@ import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mockito.Spy;
 
-import de.ozgcloud.user.RoleHierarchy;
-import de.ozgcloud.user.UserRole;
-
 class RoleHierarchyTest {
 
 	private final RoleHierarchy subRole = RoleHierarchy.builder().roleName(UserRole.VERWALTUNG_USER).build();
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java
index f0d5561002dc205d6c0465d4a7fa7677e44a20c9..125ab4f4cc738ee89d6e9b969bfe3415a340a188 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/UserRoleTest.java
@@ -7,8 +7,6 @@ import java.util.List;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-import de.ozgcloud.user.UserRole;
-
 class UserRoleTest {
 
 	@Nested
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java
index 4c3ab3d1b7f449633fa7f5f3f5f7865933a22d85..1b69a51147088d05ea70ba8167530136f6b5ae51 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextInterceptorTestFactory.java
@@ -1,7 +1,5 @@
 package de.ozgcloud.user.common.callcontext;
 
-import de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor;
-import de.ozgcloud.user.common.callcontext.GrpcUtil;
 import io.grpc.CallOptions;
 import io.grpc.Channel;
 import io.grpc.ClientCall;
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java
index 602e8f15e1e72daec1fa48e1289a020f53bdbb97..c74e979aa8fb9dad0c1e4a1b9a8892f0b85303c5 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/CallContextMetadataTestFactory.java
@@ -29,8 +29,6 @@ import org.bson.types.ObjectId;
 
 import com.thedeanda.lorem.LoremIpsum;
 
-import de.ozgcloud.user.common.callcontext.GrpcCallContextInterceptor;
-import de.ozgcloud.user.common.callcontext.GrpcUtil;
 import io.grpc.Metadata;
 
 public class CallContextMetadataTestFactory {
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java
index 0278cb8be71186260d23bb518e4d3cca8ecfef63..3f4ef79a46ed104608754f07d0fd0000e3bb22db 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/GrpcUtilTest.java
@@ -6,7 +6,6 @@ import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-import de.ozgcloud.user.common.callcontext.GrpcUtil;
 import io.grpc.Metadata;
 
 class GrpcUtilTest {
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java
index 9db7e5c7ca491aebc796bb18c91c7f8e9b95c81f..c790742685004c950499e1313868554824d5cc90 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/callcontext/HttpRequestInterceptorTest.java
@@ -38,7 +38,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.Mock;
 import org.mockito.Spy;
 
-import de.ozgcloud.user.common.callcontext.HttpRequestInterceptor;
 
 class HttpRequestInterceptorTest {
 	@Spy
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java
index 8aedffd50671e6385f2b049f090f7093b260b33a..2fcf6e4c3bac3f8b9ced52bfa17d6318be7507bf 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/errorhandling/ApiErrorUtilTest.java
@@ -28,11 +28,6 @@ import static org.mockito.Mockito.*;
 
 import java.util.UUID;
 
-import de.ozgcloud.user.common.errorhandling.AccessForbiddenException;
-import de.ozgcloud.user.common.errorhandling.ApiError;
-import de.ozgcloud.user.common.errorhandling.ApiErrorUtil;
-import de.ozgcloud.user.common.errorhandling.KeycloakUnavailableException;
-import de.ozgcloud.user.common.errorhandling.ResourceNotFoundException;
 import jakarta.ws.rs.NotFoundException;
 
 import org.junit.jupiter.api.BeforeEach;
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java
index a01208dd1a691cc5822ad58a0aaed6ffd8607f61..cc6c8acd688f7e9fc890735820c74d76398c77d4 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/common/lock/LockTestFactory.java
@@ -25,8 +25,6 @@ package de.ozgcloud.user.common.lock;
 
 import java.time.Instant;
 
-import de.ozgcloud.user.common.lock.Lock;
-
 public class LockTestFactory {
 
 	private static final long TIMESTAMP = Instant.now().toEpochMilli();
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java
index fcb0e78f34ae902a19dfa19af5b9ad3c3ee193eb..ea8936b50337fd8b1e8e15fa52fd16dcf3114a7a 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakProviderTest.java
@@ -35,8 +35,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import de.ozgcloud.user.keycloak.KeycloakApiProperties;
-import de.ozgcloud.user.keycloak.KeycloakProvider;
 import lombok.SneakyThrows;
 
 class KeycloakProviderTest {
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java
index 5b17b582fe5ee8341ea58d7c6b9c24f405bdefb4..75bd03fd37279a22afefab4779655924ae1c3833 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/keycloak/KeycloakUserRemoteServiceITCase.java
@@ -27,8 +27,6 @@ import static org.mockito.Mockito.*;
 
 import org.junit.jupiter.api.Test;
 
-import de.ozgcloud.user.keycloak.KeycloakApiService;
-import de.ozgcloud.user.keycloak.KeycloakUserRemoteService;
 import io.quarkus.test.InjectMock;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectSpy;
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
index e6081670ce8c070147642c2269d992197968a381..9d6c2fe82e9dad5e1b5e041f7a4c0ad120bd5084 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitRepositoryTest.java
@@ -16,7 +16,6 @@ import com.mongodb.client.MongoCursor;
 import com.mongodb.client.model.Filters;
 
 import de.ozgcloud.user.User;
-import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitRepository;
 
 class OrganisationsEinheitRepositoryTest {
 
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java
index e51e051d7d585e4e34fab8422996107f75f53e52..65aa2d5a86897ba7ee41a5df41e2ff0803b99816 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationsEinheitServiceTest.java
@@ -8,9 +8,6 @@ import org.junit.jupiter.api.Test;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 
-import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitRepository;
-import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitService;
-
 class OrganisationsEinheitServiceTest {
 
 	@InjectMocks
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
index 9a5bf656f3ae025ccd84655bdc1571283c49698f..eb8f64b977590d7aaaa700a60758f777344c834c 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/organisationseinheit/OrganisationseinheitGrpcServiceTest.java
@@ -11,8 +11,6 @@ import org.mockito.Mock;
 import com.google.protobuf.Empty;
 
 import de.ozgcloud.user.grpc.organisationseinheit.GrpcGetSupportedOrganisationsEinheitenResponse;
-import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitGrpcService;
-import de.ozgcloud.user.organisationseinheit.OrganisationsEinheitService;
 import io.grpc.stub.StreamObserver;
 
 public class OrganisationseinheitGrpcServiceTest {
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
index e77c6bb4ef20d082209165cdaf0f64b9ae6a7d7d..5e3c7ab6886cf791a36976a18e56776d0d4f56a9 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/settings/UserSettingsTestFactory.java
@@ -23,9 +23,6 @@
  */
 package de.ozgcloud.user.settings;
 
-import de.ozgcloud.user.settings.NotificationsSendFor;
-import de.ozgcloud.user.settings.UserSettings;
-
 public class UserSettingsTestFactory {
 
 	public static final NotificationsSendFor NOTIFICATIONS_SEND_FOR = NotificationsSendFor.NONE;
diff --git a/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
index 2b2992f79a4dbf04293f48401764ea851ae491f1..9d20a7e2cfd3850669d10b185304cb7f2bb2f43c 100644
--- a/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
+++ b/user-manager-server/src/test/java/de/ozgcloud/user/sync/SyncSchedulerTest.java
@@ -38,8 +38,6 @@ import org.mockito.Spy;
 
 import de.ozgcloud.user.common.lock.Lock;
 import de.ozgcloud.user.common.lock.LockService;
-import de.ozgcloud.user.sync.SyncScheduler;
-import de.ozgcloud.user.sync.SyncService;
 
 class SyncSchedulerTest {