diff --git a/Applications/CLI/Tests.cmake b/Applications/CLI/Tests.cmake
index bf22e51448eb36c6849ee91752f3394a1fec59a1..93582dea96bed208af09f4f1bac2737b53d26f5f 100644
--- a/Applications/CLI/Tests.cmake
+++ b/Applications/CLI/Tests.cmake
@@ -129,10 +129,10 @@ else()
 	# MPI groundwater flow tests
 	AddTest(
 		NAME ParallelFEM_GroundWaterFlow2D
-		PATH EllipticPETSc/
-		EXECUTABLE_ARGS quad_20x10_GroundWaterFlow.prj -gw_ksp_type bcgs -gw_pc_type bjacobi -gw_ksp_atol 1.e-10
+		PATH EllipticPETSc
+		EXECUTABLE_ARGS quad_20x10_GroundWaterFlow.prj -- -gw_ksp_type bcgs -gw_pc_type bjacobi -gw_ksp_atol 1.e-10
 		WRAPPER mpirun
-		WRAPPER_ARGS "-np 3"
+		WRAPPER_ARGS -np 3
 		TESTER diff
 		DIFF_DATA
 			quad_20x10_GroundWaterFlow_result_pcs_0_ts_1_0.vtu
@@ -142,27 +142,27 @@ else()
 
 	AddTest(
 		NAME ParallelFEM_GroundWaterFlow3D_DirichletBC
-		PATH EllipticPETSc/
-		EXECUTABLE_ARGS cube_1e3.prj -gw_ksp_type bcgs -gw_pc_type bjacobi -gw_ksp_atol 1.e-10
+		PATH EllipticPETSc
+		EXECUTABLE_ARGS cube_1e3.prj -- -gw_ksp_type bcgs -gw_pc_type bjacobi -gw_ksp_atol 1.e-10
 		WRAPPER mpirun
-		WRAPPER_ARGS "-np 3"
+		WRAPPER_ARGS -np 3
 		TESTER diff
 		DIFF_DATA
-			cube_1e3_result_pcs_0_ts_1_0.vtu
-			cube_1e3_result_pcs_0_ts_1_1.vtu
-			cube_1e3_result_pcs_0_ts_1_2.vtu
+			cube_1e3_pcs_0_ts_1_0.vtu
+			cube_1e3_pcs_0_ts_1_1.vtu
+			cube_1e3_pcs_0_ts_1_2.vtu
 	)
 
 	AddTest(
 		NAME ParallelFEM_GroundWaterFlow3D_NeumannBC
-		PATH EllipticPETSc/
-		EXECUTABLE_ARGS cube_1e3_neumann.prj -gw_ksp_type bcgs -gw_pc_type bjacobi -gw_ksp_atol 1.e-10
+		PATH EllipticPETSc
+		EXECUTABLE_ARGS cube_1e3_neumann.prj -- -gw_ksp_type bcgs -gw_pc_type bjacobi -gw_ksp_atol 1.e-10
 		WRAPPER mpirun
-		WRAPPER_ARGS "-np 3"
+		WRAPPER_ARGS -np 3
 		TESTER diff
 		DIFF_DATA
-			cube_1e3_neumann_result_pcs_0_ts_1_0.vtu
-			cube_1e3_neumann_result_pcs_0_ts_1_1.vtu
-			cube_1e3_neumann_result_pcs_0_ts_1_2.vtu
+			cube_1e3_neumann_pcs_0_ts_1_0.vtu
+			cube_1e3_neumann_pcs_0_ts_1_1.vtu
+			cube_1e3_neumann_pcs_0_ts_1_2.vtu
 	)
 endif()
diff --git a/Tests/Data b/Tests/Data
index 70e4dab8b05806056a200dcb2a8ab0d94417c5db..04c505f672119472e5aae422e977b5632931f50e 160000
--- a/Tests/Data
+++ b/Tests/Data
@@ -1 +1 @@
-Subproject commit 70e4dab8b05806056a200dcb2a8ab0d94417c5db
+Subproject commit 04c505f672119472e5aae422e977b5632931f50e
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index c72d82db91a282ab8911d163562996e0b1278df2..32556c535f05918d6827a89a30e042d425c755d4 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -43,13 +43,15 @@ function (AddTest)
 	file(MAKE_DIRECTORY ${AddTest_BINARY_PATH})
 	file(TO_NATIVE_PATH "${AddTest_BINARY_PATH}" AddTest_BINARY_PATH_NATIVE)
 
-	set(AddTest_EXECUTABLE_ARGS ${AddTest_EXECUTABLE_ARGS} -o ${AddTest_BINARY_PATH_NATIVE})
-
 	# set defaults
 	if(NOT AddTest_EXECUTABLE)
 		set(AddTest_EXECUTABLE ogs)
 	endif()
 
+	if("${AddTest_EXECUTABLE}" STREQUAL "ogs")
+		set(AddTest_EXECUTABLE_ARGS -o ${AddTest_BINARY_PATH_NATIVE} ${AddTest_EXECUTABLE_ARGS})
+	endif()
+
 	if(NOT AddTest_WRAPPER)
 		set(AddTest_WRAPPER time)
 	endif()