diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
index ee8d570d6de2a2a003867d89737305c6c08212e8..8f0dd228f49327ff93e7058e4086b757e57a4a25 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag>
@@ -15,7 +15,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan params.input")
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_fickslaw
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS DIFFUSIONTYPE=FicksLaw<TypeTag>
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
index ef763e257c37e0ea7d0f784cfa07dff973cd1b2f..b5aba6a76e5c3b46a3b9fd3795beb0702ee16b6b 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/horizontalflow/CMakeLists.txt
@@ -1,15 +1,14 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal
-              LABELS multidomain freeflow
-             SOURCES main.cc
-             CMAKE_GUARD HAVE_UMFPACK
-             COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-             CMD_ARGS       --script fuzzy
-                            --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-00020.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-00020.vtu
-
-                            --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal params.input
-                            -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_horizontal")
+              LABELS multidomain freeflow 1pnc
+              SOURCES main.cc
+              CMAKE_GUARD HAVE_UMFPACK
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS  --script fuzzy
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_stokes-00020.vtu
+                                ${CMAKE_SOURCE_DIR}/test/references/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal_darcy-00020.vtu
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_boundary_darcy1p2c_stokes1p2c_horizontal params.input
+                                    -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_horizontal")
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
index 1988ed7f9d957f42baa155743713f37993b23063..1574bd3746d79c2fbaacb8c307e3f91a1cf27b62 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/verticalflow/CMakeLists.txt
@@ -3,7 +3,7 @@ add_input_file_links()
 add_executable(test_md_boundary_darcy1p2c_stokes1p2c_vertical EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -17,7 +17,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion
                              -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion")
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_advection
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               TARGET test_md_boundary_darcy1p2c_stokes1p2c_vertical
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
index 4afa37814f57094079d504160dde35eae6737f97..f668fd1c3f16c11a43524a8ca7f79037759303e8 100644
--- a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy1p3c_stokes1p3c_horizontal
-              LABELS multidomain freeflow
+              LABELS multidomain freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
index 89938290acec32bd5b3ec88ba99742376788a5b0..8e2e10b53cbe8ca2225687807e1f26f912b852f6 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
@@ -1,5 +1,5 @@
 dune_add_test(NAME test_md_embedded1d3d_1p2c_richards2c
-              LABELS multidomain
+              LABELS multidomain 1pnc
               SOURCES main.cc
               CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
index 8cc7894b3c1062234557d11c4e37c991fc529ac0..d24a7c42644611f121b459f3be20a9fd2fe81eea 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 
 dune_add_test(NAME test_1p2c_transport_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2c_transport_box
 
 dune_add_test(NAME test_1p2c_transport_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_1p2c_transport_tpfa
 
 dune_add_test(NAME test_1p2c_transport_mpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
index 934b5e4c7d43a75c711750e9a3ebedda69287f92..e80915cf25c2a677f452c0f2385567da7b2e1ad2 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
@@ -3,6 +3,7 @@ add_input_file_links()
 # salt-water intrusion test using the box model
 dune_add_test(NAME test_1p2c_saltwaterintrusion_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=SaltWaterIntrusionTest
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
index 5c5ea113d7ac365319be0cf4b58730e726c3c9d3..e0ec87a6451cfe2b6db0a78a7a49ea4912011220 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 # conduction
 dune_add_test(NAME test_1p2cni_conduction_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2cni_conduction_box
 
 dune_add_test(NAME test_1p2cni_conduction_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa
 
 dune_add_test(NAME test_1p2cni_conduction_mpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
index f9a915fb1a5726214e43aabe3232d3c1cfc866b2..59c631957f5eadcbce68a61073974f0854bb418d 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 # convection
 dune_add_test(NAME test_1p2cni_convection_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2cni_convection_box
 
 dune_add_test(NAME test_1p2cni_convection_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa
 
 dune_add_test(NAME test_1p2cni_convection_mpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
index 4ca17d93c0bb906553d8b79a201e05641b9e29b1..9e1955b1242d208a3b100f4beb1b65056a6cfba7 100644
--- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links()
 # conduction
 dune_add_test(NAME test_1p2c_nonequilibrium_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2c_nonequilibrium_box
 
 dune_add_test(NAME test_1p2c_nonequilibrium_tpfa
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
index 0f9f73e76b25aa69c333206c545c203cae38bb92..73ddd44e9e0b30108594a5c38e0e2c71f9b4279a 100644
--- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 
 dune_add_test(NAME test_1pncminni_box
               SOURCES main.cc
+              LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=ThermoChemBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy