diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java
index 7075a16dbee0496c3b2663dc8111fe3ef1300098..8043e664848e3c8f6e2beb30065b4324fd8422b2 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/command/PersistPostfachNachrichtByCommandServiceTest.java
@@ -30,7 +30,6 @@ import static org.mockito.Mockito.*;
 import java.io.InputStream;
 import java.util.Map;
 import java.util.Optional;
-import java.util.concurrent.CompletableFuture;
 import java.util.stream.Stream;
 
 import org.apache.http.entity.ContentType;
@@ -196,7 +195,7 @@ class PersistPostfachNachrichtByCommandServiceTest {
 	class TestPersistAttachment {
 		@BeforeEach
 		void init() {
-			when(fileService.uploadFileStream(any(), any(), any(), any())).thenReturn(CompletableFuture.completedFuture(FileId.from("42")));
+			when(fileService.uploadFileStream(any(), any(), any(), any())).thenReturn(FileId.from("42"));
 		}
 
 		@DisplayName("Upload files Reference")
diff --git a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
index 020616069044352cefa37d2c441a85e445e506f6..014f2626f235ae0be3919bd5efe3f29dd25b110c 100644
--- a/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
+++ b/vorgang-manager-server/src/test/java/de/ozgcloud/vorgang/files/FileServiceTest.java
@@ -32,7 +32,6 @@ import java.io.InputStream;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -112,8 +111,7 @@ class FileServiceTest {
 
 		@Test
 		void shouldReturnId() throws Exception {
-			var id = service.uploadFileStream(ref, file, user, contentStream).get(5,
-					TimeUnit.SECONDS);
+			var id = service.uploadFileStream(ref, file, user, contentStream);
 
 			assertThat(id).isEqualTo(IncomingFileTestFactory.ID);
 		}