diff --git a/ProcessLib/SmallDeformation/Tests.cmake b/ProcessLib/SmallDeformation/Tests.cmake
index e6a44203ea5b67a169899eb930ee66f780f21ed1..316e668df58ef18b7e2b25fa55aeffb498b65be0 100644
--- a/ProcessLib/SmallDeformation/Tests.cmake
+++ b/ProcessLib/SmallDeformation/Tests.cmake
@@ -30,7 +30,7 @@ if (OGS_USE_PYTHON)
 endif()
 
 if (OGS_USE_MPI)
-    OgsTest(WRAPPER "mpirun -np 4" PROJECTFILE "Mechanics/Linear/disc_with_hole.prj")
+    OgsTest(WRAPPER mpirun -np 4 PROJECTFILE Mechanics/Linear/disc_with_hole.prj)
 endif()
 
 # Basic test that MFront works at all.
diff --git a/scripts/cmake/test/OgsTest.cmake b/scripts/cmake/test/OgsTest.cmake
index cd9d435b6a5ed9efff08b07f628bbddc15b4d9db..166c87b88d8a8bd6654d41e4e44d88e135502276 100644
--- a/scripts/cmake/test/OgsTest.cmake
+++ b/scripts/cmake/test/OgsTest.cmake
@@ -3,8 +3,8 @@ function (OgsTest)
         return()
     endif()
     set(options LARGE)
-    set(oneValueArgs PROJECTFILE WRAPPER)
-    set(multiValueArgs XXX)
+    set(oneValueArgs PROJECTFILE)
+    set(multiValueArgs WRAPPER)
     cmake_parse_arguments(OgsTest "${options}" "${oneValueArgs}"
         "${multiValueArgs}" ${ARGN})
 
@@ -37,12 +37,12 @@ function (OgsTest)
     add_test(
         NAME ${TEST_NAME}
         WORKING_DIRECTORY "${OgsTest_BINARY_DIR}"
-        COMMAND ogs -r "${OgsTest_SOURCE_DIR}" "${OgsTest_SOURCE_DIR}/${OgsTest_NAME}")
+        COMMAND ${OgsTest_WRAPPER} $<TARGET_FILE:ogs> -r ${OgsTest_SOURCE_DIR} ${OgsTest_SOURCE_DIR}/${OgsTest_NAME})
     # For debugging:
     #message("Adding test with
     #    NAME ${TEST_NAME}
     #    WORKING_DIRECTORY ${OgsTest_BINARY_DIR}
-    #    COMMAND ogs -r ${OgsTest_SOURCE_DIR} ${OgsTest_SOURCE_DIR}/${OgsTest_NAME}")
+    #    COMMAND ${OgsTest_WRAPPER} $<TARGET_FILE:ogs> -r ${OgsTest_SOURCE_DIR} ${OgsTest_SOURCE_DIR}/${OgsTest_NAME})
 
     set_tests_properties(${TEST_NAME} PROPERTIES ENVIRONMENT
         VTKDIFF_EXE=$<TARGET_FILE:vtkdiff>)