diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java
index f9223e2c06d0e95349b37411fab49ec5d6bd6139..a17534d334a074d251e18bc00b70e64ed3008597 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/NachrichtenManagerTestApplication.java
@@ -1,13 +1,11 @@
 package de.ozgcloud.nachrichten;
 
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.context.annotation.ComponentScan;
 
 import de.ozgcloud.apilib.common.command.OzgCloudCommandService;
 import de.ozgcloud.apilib.file.OzgCloudFileService;
-import de.ozgcloud.apilib.file.grpc.GrpcOzgCloudFileService;
 import de.ozgcloud.nachrichten.postfach.BinaryFileService;
 
 @SpringBootApplication
@@ -17,11 +15,8 @@ public class NachrichtenManagerTestApplication {
 	@MockBean
 	private OzgCloudCommandService ozgCloudCommandService;
 	@MockBean
-	@Qualifier("mukPostfach_OzgCloudFileService")
 	private OzgCloudFileService ozgCloudFileService;
 	@MockBean
-	private GrpcOzgCloudFileService grpcOzgCloudFileService;
-	@MockBean
 	private BinaryFileService binaryFileService;
 
 }
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailSendRequestValidationTest.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailSendRequestValidationTest.java
index 22d43927d9b88ab10164c7b75d4770c3cd7e46db..a79763f929bc508c25b93ff49da88e0a3cd81328 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailSendRequestValidationTest.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailSendRequestValidationTest.java
@@ -6,9 +6,7 @@ import static org.assertj.core.api.Assertions.*;
 import jakarta.mail.util.ByteArrayDataSource;
 import jakarta.validation.Validation;
 import jakarta.validation.Validator;
-import jakarta.validation.ValidatorFactory;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
@@ -18,13 +16,7 @@ import de.ozgcloud.nachrichten.email.MailSendRequest.MailAttachment;
 
 class MailSendRequestValidationTest {
 
-	private Validator validator;
-
-	@BeforeEach
-	public void setUp() {
-		ValidatorFactory factory = Validation.buildDefaultValidatorFactory();
-		validator = factory.getValidator();
-	}
+	private final Validator validator = Validation.buildDefaultValidatorFactory().getValidator();
 
 	@Nested
 	class TestToAddressesValidation {
diff --git a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java
index 3d46051a91c227c72e28b60ee5937d47bb5e360e..3708772085cc7349c4aace9d0235c03f9ad2ef04 100644
--- a/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java
+++ b/nachrichten-manager-server/src/test/java/de/ozgcloud/nachrichten/email/MailServiceITCase.java
@@ -22,6 +22,9 @@ class MailServiceITCase {
 	@MockBean
 	private OzgCloudCallContextAttachingInterceptor interceptor;
 
+	@MockBean
+	private EmailGrpcService emailGrpcService;
+
 	@Nested
 	class TestSendMail {
 
diff --git a/nachrichten-manager-server/src/test/resources/application-itcase.yaml b/nachrichten-manager-server/src/test/resources/application-itcase.yaml
index cc10fcc543c67448321e6bddfe062902a0e20240..a99534b0e2823eeb33a967c8854cbb8e4f6c223b 100644
--- a/nachrichten-manager-server/src/test/resources/application-itcase.yaml
+++ b/nachrichten-manager-server/src/test/resources/application-itcase.yaml
@@ -2,18 +2,9 @@ grpc:
   server:
     port: -1
 
-  client:
-    command-manager:
-      address: self:self
-      negotiationType: PLAINTEXT
-
 spring:
   mail:
     host: dummy
     username: dummy
     password: dummy
-    port: -1
-
-ozgcloud:
-  notification:
-    mail-from: mailFrom
\ No newline at end of file
+    port: -1
\ No newline at end of file