diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt
index b46e231882ce17b783da19bff93be4c54ea3ddd3..a309a416e7b4fd2ae527acd3f822278f7be9cae2 100644
--- a/test/freeflow/navierstokes/CMakeLists.txt
+++ b/test/freeflow/navierstokes/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_dumux_test(test_navierstokes test_navierstokes test_navierstokes.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/navierstokes-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/navierstokes-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/navierstokes-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/navierstokes-00008.vtu)
diff --git a/test/freeflow/stokes/CMakeLists.txt b/test/freeflow/stokes/CMakeLists.txt
index a8f9dabba6a6aeb09dec4760ad0d5f278ff1867c..1e031dd87bb733fac03158f6e76e042c8fc56a73 100644
--- a/test/freeflow/stokes/CMakeLists.txt
+++ b/test/freeflow/stokes/CMakeLists.txt
@@ -1,6 +1,6 @@
 add_dumux_test(test_stokes test_stokes test_stokes.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes-00014.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes-00014.vtu)
diff --git a/test/freeflow/stokes2c/CMakeLists.txt b/test/freeflow/stokes2c/CMakeLists.txt
index 7f6aeccda482631d1ce2c0b0cd9158b5bb4b0d82..705b3c3cb946545d3a98d90b08d94c143115296d 100644
--- a/test/freeflow/stokes2c/CMakeLists.txt
+++ b/test/freeflow/stokes2c/CMakeLists.txt
@@ -1,14 +1,15 @@
+add_input_file_links()
+
 add_dumux_test(test_stokes2c test_stokes2c test_stokes2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2c-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu)
 
 add_dumux_test(test_stokes2c_diffusion test_stokes2c test_stokes2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2c_diffusion-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2c_diffusion-00020.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2c_diffusion.input)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2c_diffusion.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2c_diffusion-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2c_diffusion-00020.vtu)
diff --git a/test/freeflow/stokes2cni/CMakeLists.txt b/test/freeflow/stokes2cni/CMakeLists.txt
index ca0af4c3939512b701b66f9cddf2414ede3c61d0..50f6406aeb94fcddb4e88d74374e281455b0776a 100644
--- a/test/freeflow/stokes2cni/CMakeLists.txt
+++ b/test/freeflow/stokes2cni/CMakeLists.txt
@@ -1,14 +1,15 @@
+add_input_file_links()
+
 add_dumux_test(test_stokes2cni test_stokes2cni test_stokes2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu)
 
 add_dumux_test(test_stokes2cni_conduction test_stokes2cni test_stokes2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/stokes2cni_conduction-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_conduction-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2cni_conduction.input)
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_stokes2cni_conduction.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/stokes2cni_conduction-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni_conduction-00006.vtu)
diff --git a/test/freeflow/zeroeq/CMakeLists.txt b/test/freeflow/zeroeq/CMakeLists.txt
index 107ace468177a8da69511d059d270b0f89f26555..4aa6918c8d219849c53194f8872f1bee1b4f6e8d 100644
--- a/test/freeflow/zeroeq/CMakeLists.txt
+++ b/test/freeflow/zeroeq/CMakeLists.txt
@@ -1,19 +1,13 @@
-# test: test_zeroeq
 add_dumux_test(test_zeroeq test_zeroeq test_zeroeq.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeq-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq-00006.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeq-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq-00006.vtu)
 
-# test: test_zeroeq_channel_channel
 add_dumux_test(test_zeroeq_channel test_zeroeq_channel test_zeroeq_channel.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeqchannel-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeqchannel-00022.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq_channel
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq_channel.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq_channel"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeqchannel-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeqchannel-00022.vtu)
diff --git a/test/freeflow/zeroeq2c/CMakeLists.txt b/test/freeflow/zeroeq2c/CMakeLists.txt
index 64d71411150c32320aedd881db0d811f90afff33..1f7082d2d659fdadbefa99b45e0d09f4f4ac34aa 100644
--- a/test/freeflow/zeroeq2c/CMakeLists.txt
+++ b/test/freeflow/zeroeq2c/CMakeLists.txt
@@ -1,9 +1,6 @@
-# test: test_zeroeq2c
 add_dumux_test(test_zeroeq2c test_zeroeq2c test_zeroeq2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeq2c-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00013.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq2c.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2c"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeq2c-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00013.vtu)
diff --git a/test/freeflow/zeroeq2cni/CMakeLists.txt b/test/freeflow/zeroeq2cni/CMakeLists.txt
index 2b16f65a508b5c178def769a71b2fa0a79af4f02..77d7225db6dccde19896d044253eea67d5fc5973 100644
--- a/test/freeflow/zeroeq2cni/CMakeLists.txt
+++ b/test/freeflow/zeroeq2cni/CMakeLists.txt
@@ -1,9 +1,6 @@
-# test: test_zeroeq2cni
 add_dumux_test(test_zeroeq2cni test_zeroeq2cni test_zeroeq2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/zeroeq2cni-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00011.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_zeroeq2cni.input
-  )
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_zeroeq2cni"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/zeroeq2cni-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00011.vtu)
diff --git a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
index 03123ca05e0bb616424fea7a54e438550ca9c85e..8a2b4c4efbe835d364ce3b0c01dd063da39fa3f3 100644
--- a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
+++ b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
@@ -1,39 +1,19 @@
-# test: test_2cnistokes2p2cni_1ff
-add_dumux_test(test_2cnistokes2p2cni_1ff test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input
-  )
+add_input_file_links()
 
-# test: test_2cnistokes2p2cni_2pm
-add_dumux_test(test_2cnistokes2p2cni_2pm test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input
-  )
+add_dumux_test(test_2cnistokes2p2cni test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cni-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu)
 
-# test: test_2cnistokes2p2cni_boundarylayer_1ff
-add_dumux_test(test_2cnistokes2p2cni_boundarylayer_1ff test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_boundarylayer.input
-  )
-
-# test: test_2cnistokes2p2cni_boundarylayer_2pm
-add_dumux_test(test_2cnistokes2p2cni_boundarylayer_2pm test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_boundarylayer.input
-  )
+add_dumux_test(test_2cnistokes2p2cni_boundarylayer test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_boundarylayer.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00004.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cnistokes2p2cniboundarylayer-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00004.vtu)
diff --git a/test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt b/test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt
index f6ce5add56ce64d6923f22f9d9f25a4d6521c0d0..7ed49002ceab6966b013c853545c9c4f49457133 100644
--- a/test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt
+++ b/test/multidomain/2cnizeroeq2p2cni/CMakeLists.txt
@@ -1,21 +1,10 @@
-file(COPY evaporationRates.gp DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+dune_symlink_to_source_files(FILES evaporationRates.gp)
 
-# test: test_2cnizeroeq2p2cni_1ff
-add_dumux_test(test_2cnizeroeq2p2cni_1ff test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnizeroeq2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnizeroeq2p2cni_reference.input
-  )
-
-# test: test_2cnizeroeq2p2cni_2pm
-add_dumux_test(test_2cnizeroeq2p2cni_2pm test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00008.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cnizeroeq2p2cni
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnizeroeq2p2cni_reference.input
-  )
+add_dumux_test(test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni test_2cnizeroeq2p2cni.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cnizeroeq2p2cni -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnizeroeq2p2cni_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2cni-00008.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cnizeroeq2p2cni-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2cni-00008.vtu)
diff --git a/test/multidomain/2cstokes2p2c/CMakeLists.txt b/test/multidomain/2cstokes2p2c/CMakeLists.txt
index b772608428b47134f6c44f5f250e4e352abff9a8..950309eab69aa4dd0bce30ced1b44becb0a21606 100644
--- a/test/multidomain/2cstokes2p2c/CMakeLists.txt
+++ b/test/multidomain/2cstokes2p2c/CMakeLists.txt
@@ -1,19 +1,8 @@
-# test: test_2cstokes2p2c_1ff
-add_dumux_test(test_2cstokes2p2c_1ff test_2cstokes2p2c test_2cstokes2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input  
-  )
-
-# test: test_2cstokes2p2c_2pm
-add_dumux_test(test_2cstokes2p2c_2pm test_2cstokes2p2c test_2cstokes2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input  
-  )
+add_dumux_test(test_2cstokes2p2c test_2cstokes2p2c test_2cstokes2p2c.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2cstokes2p2c-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00007.vtu)
diff --git a/test/multidomain/2czeroeq2p2c/CMakeLists.txt b/test/multidomain/2czeroeq2p2c/CMakeLists.txt
index 144e6cf8966711c1ba4155784dfb36a411fe0be7..97d4e3146e1a24e8deffa6e8278978769b21e9cb 100644
--- a/test/multidomain/2czeroeq2p2c/CMakeLists.txt
+++ b/test/multidomain/2czeroeq2p2c/CMakeLists.txt
@@ -1,19 +1,8 @@
-# test: test_2czeroeq2p2c_1ff
-add_dumux_test(test_2czeroeq2p2c_1ff test_2czeroeq2p2c test_2czeroeq2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-ff-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00026.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2czeroeq2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2czeroeq2p2c_reference.input
-  )
-
-# test: test_2czeroeq2p2c_2pm
-add_dumux_test(test_2czeroeq2p2c_2pm test_2czeroeq2p2c test_2czeroeq2p2c.cc
-  ${CMAKE_SOURCE_DIR}/bin/runTest.sh
-  ${CMAKE_SOURCE_DIR}/bin/fuzzycomparevtu.py
-  ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-pm-reference.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00026.vtu
-  ${CMAKE_CURRENT_BINARY_DIR}/test_2czeroeq2p2c
-  -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2czeroeq2p2c_reference.input
-  )
+add_dumux_test(test_2czeroeq2p2c test_2czeroeq2p2c test_2czeroeq2p2c.cc
+               python ${CMAKE_SOURCE_DIR}/bin/runtest.py
+                  --script fuzzy
+                  --command "${CMAKE_CURRENT_BINARY_DIR}/test_2czeroeq2p2c -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2czeroeq2p2c_reference.input"
+                  --files ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-ff-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/zeroeq2c-00026.vtu
+                          ${CMAKE_SOURCE_DIR}/test/references/2czeroeq2p2c-pm-reference.vtu
+                          ${CMAKE_CURRENT_BINARY_DIR}/2p2c-00026.vtu)