diff --git a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
index c4f1d7fa46bdfde58b6e4d4351324118b578b680..c07298e4446ae14932a961f31fa3164767051340 100644
--- a/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/CMakeLists.txt
@@ -1,43 +1,43 @@
 add_input_file_links()
 
-dune_add_test(NAME test_boxmpnc
+dune_add_test(NAME test_mpnc_box
               SOURCES test_mpnc_obstacle_fv.cc
               COMPILE_DEFINITIONS TYPETAG=ObstacleBoxProblem
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/obstaclebox-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/test_boxmpnc-00009.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxmpnc test_mpnc.input -Problem.Name test_boxmpnc")
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_box test_mpnc.input -Problem.Name test_boxmpnc")
 
-dune_add_test(NAME test_ccmpnc
+dune_add_test(NAME test_mpnc_tpfa
               SOURCES test_mpnc_obstacle_fv.cc
               COMPILE_DEFINITIONS TYPETAG=ObstacleCCProblem
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/obstaclecc-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/test_ccmpnc-00009.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_ccmpnc test_mpnc.input -Problem.Name test_ccmpnc")
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_tpfa test_mpnc.input -Problem.Name test_ccmpnc")
 
 # build target for the full kinetic test problem
-dune_add_test(NAME test_boxmpnckinetic
+dune_add_test(NAME test_mpnckinetic_box
               SOURCES test_boxmpnckinetic.cc
               COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBoxProblem
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/evaporationatmosphere-reference.vtu
                                 ${CMAKE_CURRENT_BINARY_DIR}/test_boxmpnckinetic-00011.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxmpnckinetic test_boxmpnckinetic.input -Problem.Name test_boxmpnckinetic")
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnckinetic_box test_boxmpnckinetic.input -Problem.Name test_boxmpnckinetic")
 
 # build target for the energy kinetic test problem, two energy balance equations
 dune_add_test(COMPILE_ONLY # since it currently fails miserably with very different results on different machines
-              NAME test_boxmpncthermalnonequil
+              NAME test_mpncthermalnonequil_box
               SOURCES test_boxmpncthermalnonequil.cc
               COMPILE_DEFINITIONS TYPETAG=CombustionProblemOneComponentBoxProblem
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/combustion-reference.vtp
                                 ${CMAKE_CURRENT_BINARY_DIR}/test_boxmpncthermalnonequil-00084.vtp
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_boxmpncthermalnonequil test_boxmpncthermalnonequil.input -Problem.Name test_boxmpncthermalnonequil")
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpncthermalnonequil_box test_boxmpncthermalnonequil.input -Problem.Name test_boxmpncthermalnonequil")