diff --git a/kop-common-lib/src/test/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtilsTest.java b/kop-common-lib/src/test/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtilsTest.java
index dcf6dd0a204f0278c6f304207687e1d3ce2b6dff..840dfc969d58728020329107d973e0fdf8749715 100644
--- a/kop-common-lib/src/test/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtilsTest.java
+++ b/kop-common-lib/src/test/java/de/itvsh/kop/common/binaryfile/GrpcFileUploadUtilsTest.java
@@ -93,30 +93,26 @@ class GrpcFileUploadUtilsTest {
 
 		@Test
 		void shouldSetOnReadyHandler() {
-			callService();
+			fileSender.send();
 
 			verify(requestObserver).setOnReadyHandler(any());
 		}
 
 		@Test
 		void shouldCallSendNextOnReady() {
-			callService();
+			fileSender.send();
 
-			verify(requestObserver).setOnReadyHandler(runnableCaptor.capture());
+			verify(requestObserver, timeout(500)).setOnReadyHandler(runnableCaptor.capture());
 			runnableCaptor.getValue().run();
 
 			verify(fileSender, timeout(500)).sendNext();
 		}
 
 		@Test
-		void shouldReturnFuture() {
-			var result = callService();
-
-			assertThat(result).isNotNull();
-		}
+		void shouldReturnSenderWithFuture() {
+			var result = fileSender.send();
 
-		private FileSender<TestRequestType, TestResponseType> callService() {
-			return fileSender.send();
+			assertThat(result).isNotNull().extracting(FileSender::getResultFuture).isNotNull();
 		}
 	}