diff --git a/pluto-utils/src/test/java/de/itvsh/kop/pluto/common/grpc/GrpcFormDataMapperTest.java b/pluto-utils/src/test/java/de/itvsh/kop/pluto/common/grpc/GrpcFormDataMapperTest.java
index 4ca5773dc3ee5ccfa23180bf0b996ba3de45cd14..26b6807fdffb79c0058d44a12e75849519d3689d 100644
--- a/pluto-utils/src/test/java/de/itvsh/kop/pluto/common/grpc/GrpcFormDataMapperTest.java
+++ b/pluto-utils/src/test/java/de/itvsh/kop/pluto/common/grpc/GrpcFormDataMapperTest.java
@@ -24,21 +24,17 @@
 package de.itvsh.kop.pluto.common.grpc;
 
 import static org.assertj.core.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.*;
-import static org.mockito.Mockito.*;
 
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 import org.mapstruct.factory.Mappers;
 import org.mockito.InjectMocks;
-import org.mockito.Mock;
 
 import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
 import de.itvsh.ozg.pluto.vorgang.GrpcFormField;
@@ -49,15 +45,6 @@ class GrpcFormDataMapperTest {
 	@InjectMocks
 	private GrpcFormDataMapper MAPPER_INSTANCE = Mappers.getMapper(GrpcFormDataMapper.class);
 
-	@Mock
-	private GrpcFormDataMapper grpcFormDataMapper;
-
-	@BeforeEach
-	void mockMapperReturnValues() {
-		lenient().when(grpcFormDataMapper.mapToFormData(anyMap()))
-				.thenReturn(GrpcFormData.newBuilder().addField(GrpcFormFieldTestFactory.create()).build());
-	}
-
 	@Nested
 	class TestSimpleValueMapping {
 
diff --git a/pluto-utils/src/test/java/de/itvsh/kop/pluto/common/grpc/GrpcFormDataTestFactory.java b/pluto-utils/src/test/java/de/itvsh/kop/pluto/common/grpc/GrpcFormDataTestFactory.java
new file mode 100644
index 0000000000000000000000000000000000000000..1c40d1147df175675da5a9af9c6b0174492e80ef
--- /dev/null
+++ b/pluto-utils/src/test/java/de/itvsh/kop/pluto/common/grpc/GrpcFormDataTestFactory.java
@@ -0,0 +1,16 @@
+package de.itvsh.kop.pluto.common.grpc;
+
+import de.itvsh.ozg.pluto.vorgang.GrpcFormData;
+import de.itvsh.ozg.pluto.vorgang.GrpcFormData.Builder;
+
+public class GrpcFormDataTestFactory {
+
+	public static GrpcFormData create() {
+		return createBuilder().build();
+	}
+
+	public static Builder createBuilder() {
+		return GrpcFormData.newBuilder()
+				.addField(GrpcFormFieldTestFactory.create());
+	}
+}