diff --git a/test/freeflow/navierstokes/angeli/CMakeLists.txt b/test/freeflow/navierstokes/angeli/CMakeLists.txt
index 9d44798759f9814e1d99f44816bef86155478ba4..e882aeb795c4665259fff05808929d6d3d1f2341 100644
--- a/test/freeflow/navierstokes/angeli/CMakeLists.txt
+++ b/test/freeflow/navierstokes/angeli/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_navierstokes_angeli
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
index 039eab0b4370df81ccc7e511b3bab0a1a5001c3c..90b3ccc8e1ab97483b6c4adcbe9e39995fc69684 100644
--- a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
+++ b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_navierstokes_1d
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
index cdb8a2f05ca34e0560f8eeef4b47c2fa72b06378..b71f53c06bc93bb57e9f1c802c9ce61abfa5494c 100644
--- a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
+++ b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(test_ff_channel EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_ff_stokes_channel
               TARGET test_ff_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -15,7 +15,7 @@ dune_add_test(NAME test_ff_stokes_channel
 
 dune_add_test(NAME test_ff_navierstokes_channel
               TARGET test_ff_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -30,7 +30,7 @@ target_compile_definitions(test_ff_stokesni_channel PUBLIC "NONISOTHERMAL=1")
 
 dune_add_test(NAME test_ff_stokesni_channel_convection
               TARGET test_ff_stokesni_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -41,7 +41,7 @@ dune_add_test(NAME test_ff_stokesni_channel_convection
 
 dune_add_test(NAME test_ff_stokesni_channel_conduction
               TARGET test_ff_stokesni_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
index 771f84986bb4b4abdcf4bf0df7d4eb6ea42d09bc..ab06fb4cd5becd3a4e438a3a8853d5ef86ce092d 100644
--- a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
+++ b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
@@ -1,4 +1,5 @@
 dune_add_test(NAME test_ff_stokes_channel_3d
+              LABELS freeflow navierstokes
               SOURCES main.cc
               LABELS freeflow
               COMPILE_DEFINITIONS DIM_3D=1
@@ -12,6 +13,7 @@ dune_add_test(NAME test_ff_stokes_channel_3d
                              --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
 
 dune_add_test(NAME test_ff_stokes_channel_pseudo3d
+              LABELS freeflow navierstokes
               SOURCES main.cc
               LABELS freeflow
               COMPILE_DEFINITIONS DIM_3D=0
diff --git a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
index bfc3911a00eaf0a6484bb3adc7560f65b9b9d7a6..3bbeb20f2f547493fd81d1a2f2deae3dd42e0c53 100644
--- a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
+++ b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
@@ -2,7 +2,7 @@ add_executable(test_ff_navierstokes_closedsystem EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
               TARGET test_ff_navierstokes_closedsystem
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -13,7 +13,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
 
 dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000
               TARGET test_ff_navierstokes_closedsystem
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -24,7 +24,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000
 
 dune_add_test(NAME test_ff_navierstokes_closedsystem_hydrostaticpressure
               TARGET test_ff_navierstokes_closedsystem
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/donea/CMakeLists.txt b/test/freeflow/navierstokes/donea/CMakeLists.txt
index 2e96fd605a19d0b8e40701306ecdd9e8e9247184..859d6a1f8554ccb0d3f11261a147b138256d65f4 100644
--- a/test/freeflow/navierstokes/donea/CMakeLists.txt
+++ b/test/freeflow/navierstokes/donea/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_stokes_donea_nocaching
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,8 +11,8 @@ dune_add_test(NAME test_ff_stokes_donea_nocaching
                              -Problem.Name test_ff_stokes_donea_nocaching")
 
 dune_add_test(NAME test_ff_stokes_donea
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS ENABLECACHING=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
index 018401d1af9346afc8a7bd5ea433b942f511cb87..f549843b312c1e46c5a53c91d6af8746889a7d06 100644
--- a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
+++ b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_navierstokes_kovasznay
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -11,7 +11,7 @@ dune_add_test(NAME test_ff_navierstokes_kovasznay
 
 dune_add_test(NAME test_ff_navierstokes_kovasznay_higherorder
               TARGET test_ff_navierstokes_kovasznay
-              LABELS freeflow
+              LABELS freeflow navierstokes
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
                              --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_kovasznay_higherorder-reference.vtu
diff --git a/test/freeflow/navierstokesnc/channel/CMakeLists.txt b/test/freeflow/navierstokesnc/channel/CMakeLists.txt
index 379fa0066a8a9c15f559192b7d342009689a69d8..e34842fcd454dad9a1e541e73bad9b7c22d17a34 100644
--- a/test/freeflow/navierstokesnc/channel/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/channel/CMakeLists.txt
@@ -5,7 +5,7 @@ target_compile_definitions(test_ff_stokes2c_mass PUBLIC "USE_MASS=1")
 
 dune_add_test(NAME test_ff_stokes2c_diffusion_mass
               TARGET test_ff_stokes2c_mass
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -19,7 +19,7 @@ add_executable(test_ff_stokes2c EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_ff_stokes2c_diffusion_mole
               TARGET test_ff_stokes2c
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -31,7 +31,7 @@ dune_add_test(NAME test_ff_stokes2c_diffusion_mole
 
 dune_add_test(NAME test_ff_stokes2c_advection
               TARGET test_ff_stokes2c
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -42,7 +42,7 @@ dune_add_test(NAME test_ff_stokes2c_advection
 
 dune_add_test(NAME test_ff_stokes2c_advection_nocaching
               SOURCES main.cc
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -57,7 +57,7 @@ target_compile_definitions(test_ff_stokes2cni PUBLIC "NONISOTHERMAL=1")
 
 dune_add_test(NAME test_ff_stokes2cni_advection
               TARGET test_ff_stokes2cni
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -68,7 +68,7 @@ dune_add_test(NAME test_ff_stokes2cni_advection
 
 dune_add_test(NAME test_ff_stokes2cni_diffusion
               TARGET test_ff_stokes2cni
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
index 62574cdd452c47800f571a368ac9b81342e40bae..6d4ac045dabd692eb379a7dc55e556baad04bc5c 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 dune_add_test(NAME test_ff_stokes2c_densitydrivenflow
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
index ea08a973d6bae8b1c507f7926a7db1b853d921e1..1407ddc5d92d5b21c38e1c8dab4ed9b402122dfd 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_stokes2c_maxwellstefan
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/geomechanics/elastic/CMakeLists.txt b/test/geomechanics/elastic/CMakeLists.txt
index a7b5a3501cc0e20a005300041bc0b45d39b55c80..40026851b4e94946c28290d5bdc34772f8ac0eeb 100644
--- a/test/geomechanics/elastic/CMakeLists.txt
+++ b/test/geomechanics/elastic/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
 
 # using box
 dune_add_test(NAME test_elastic_box
+              LABELS geomechanics elastic
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/geomechanics/poroelastic/CMakeLists.txt b/test/geomechanics/poroelastic/CMakeLists.txt
index b842bcd4e10fa59eec3b0e4926e04f3741403091..0e1d1d26a9abc12bb526a171914dd07ddf9cb5d1 100644
--- a/test/geomechanics/poroelastic/CMakeLists.txt
+++ b/test/geomechanics/poroelastic/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
 
 # using box and numeric differentiation
 dune_add_test(NAME test_poroelastic_box
+              LABELS geomechanics poroelastic
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/io/container/CMakeLists.txt b/test/io/container/CMakeLists.txt
index 2ce265eedcc138f979bfaf6abcd0ab9b6aad988d..24b77145920a4aa2fd077decb6cc1dd0b51e2b14 100644
--- a/test/io/container/CMakeLists.txt
+++ b/test/io/container/CMakeLists.txt
@@ -1,2 +1,2 @@
 dune_add_test(SOURCES test_container_io.cc
-              LABELS unit)
+              LABELS unit io)
diff --git a/test/io/gnuplotinterface/CMakeLists.txt b/test/io/gnuplotinterface/CMakeLists.txt
index 4339856ebe8f525be646625f5604be4bc212fd39..0d209d496edeae3b3b87cb940d33cde69d3c5c60 100644
--- a/test/io/gnuplotinterface/CMakeLists.txt
+++ b/test/io/gnuplotinterface/CMakeLists.txt
@@ -1,3 +1,3 @@
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output")
 dune_add_test(SOURCES test_gnuplotinterface.cc
-              LABELS unit)
+              LABELS unit io)
diff --git a/test/io/gridmanager/CMakeLists.txt b/test/io/gridmanager/CMakeLists.txt
index d89013d04b379f014aa8e8d0ce66638c87583fb7..77a99ba9a647807c798d79c790de74ebbf41d4e2 100644
--- a/test/io/gridmanager/CMakeLists.txt
+++ b/test/io/gridmanager/CMakeLists.txt
@@ -5,7 +5,7 @@ add_executable(test_gridmanager_cake EXCLUDE_FROM_ALL test_gridmanager_cake.cc)
 
 dune_add_test(NAME test_gridmanager_cake_360
               TARGET test_gridmanager_cake
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -17,7 +17,7 @@ dune_add_test(NAME test_gridmanager_cake_360
 
 dune_add_test(NAME test_gridmanager_cake_210
               TARGET test_gridmanager_cake
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -29,7 +29,7 @@ dune_add_test(NAME test_gridmanager_cake_210
 
 dune_add_test(NAME test_gridmanager_subgrid
               SOURCES test_gridmanager_subgrid.cc
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-subgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -46,7 +46,7 @@ target_compile_definitions(test_gridmanager_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::AL
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
               TARGET test_gridmanager_gmsh_3d_alu
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -56,7 +56,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel
               TARGET test_gridmanager_gmsh_3d_alu
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -69,7 +69,7 @@ target_compile_definitions(test_gridmanager_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGG
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
               TARGET test_gridmanager_gmsh_3d_ug
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -81,7 +81,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel
               TARGET test_gridmanager_gmsh_3d_ug
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -94,7 +94,7 @@ target_compile_definitions(test_gridmanager_gmsh_e_markers_alu PUBLIC GRIDTYPE=D
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
               TARGET test_gridmanager_gmsh_e_markers_alu
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -106,7 +106,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel
               TARGET test_gridmanager_gmsh_e_markers_alu
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -121,7 +121,7 @@ target_compile_definitions(test_gridmanager_gmsh_e_markers_ug PUBLIC GRIDTYPE=Du
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
               TARGET test_gridmanager_gmsh_e_markers_ug
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -133,7 +133,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel
               TARGET test_gridmanager_gmsh_e_markers_ug
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -148,7 +148,7 @@ target_compile_definitions(test_gridmanager_dgf_alu PUBLIC GRIDTYPE=Dune::ALUGri
 
 dune_add_test(NAME test_gridmanager_dgf_alu_sequential
               TARGET test_gridmanager_dgf_alu
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -162,7 +162,7 @@ dune_add_test(NAME test_gridmanager_dgf_alu_sequential
 
 dune_add_test(NAME test_gridmanager_dgf_alu_parallel
               TARGET test_gridmanager_dgf_alu
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -179,7 +179,7 @@ target_compile_definitions(test_gridmanager_dgf_ug PUBLIC GRIDTYPE=Dune::UGGrid<
 
 dune_add_test(NAME test_gridmanager_dgf_ug_sequential
               TARGET test_gridmanager_dgf_ug
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -193,7 +193,7 @@ dune_add_test(NAME test_gridmanager_dgf_ug_sequential
 
 dune_add_test(NAME test_gridmanager_dgf_ug_parallel
               TARGET test_gridmanager_dgf_ug
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
diff --git a/test/io/vtk/CMakeLists.txt b/test/io/vtk/CMakeLists.txt
index b4344da7edcff23aff566e46b7fe9262684d1914..451a04ded382b52afb4d2e5c28d166b8ae780b24 100644
--- a/test/io/vtk/CMakeLists.txt
+++ b/test/io/vtk/CMakeLists.txt
@@ -2,7 +2,7 @@ add_input_file_links()
 
 dune_add_test(NAME test_vtkreader_3d
               SOURCES test_vtkreader.cc
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-alugrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<3,3,Dune::cube,Dune::nonconforming>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -19,7 +19,7 @@ dune_add_test(NAME test_vtkreader_3d
 
 dune_add_test(NAME test_vtkreader_2d
               SOURCES test_vtkreader.cc
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-alugrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -31,7 +31,7 @@ dune_add_test(NAME test_vtkreader_2d
 
 dune_add_test(NAME test_vtkreader_2d3d
               SOURCES test_vtkreader.cc
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-foamgrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::FoamGrid<2,3>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -43,7 +43,7 @@ dune_add_test(NAME test_vtkreader_2d3d
 
 dune_add_test(NAME test_vtkreader_1d
               SOURCES test_vtkreader.cc
-              LABELS unit
+              LABELS unit io
               CMAKE_GUARD dune-foamgrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::FoamGrid<1,3>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -55,4 +55,4 @@ dune_add_test(NAME test_vtkreader_1d
 
 dune_add_test(NAME test_vtk_staggeredfreeflowpvnames
               SOURCES test_vtk_staggeredfreeflowpvnames.cc
-              LABELS unit)
+              LABELS unit io)
diff --git a/test/material/components/CMakeLists.txt b/test/material/components/CMakeLists.txt
index 682a95a382f880fcb8e00291e9fc90d35f850a05..46f3c0bb215c6669c77141b323d7b869086deb77 100644
--- a/test/material/components/CMakeLists.txt
+++ b/test/material/components/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(SOURCES test_componenttraits.cc
               COMPILE_ONLY
-              LABELS unit)
+              LABELS unit material)
 
 add_executable(plot_component plotproperties.cc)
 
@@ -8,118 +8,118 @@ dune_add_test(NAME plot_air
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "Air"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_benzene
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "Benzene"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_brine
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "Brine"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_calcite
             TARGET plot_component
             COMMAND ./plot_component
             CMD_ARGS "Calcite"
-            LABELS unit)
+            LABELS unit material)
 
 dune_add_test(NAME plot_calciumion
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "CalciumIon"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_cao
             TARGET plot_component
             COMMAND ./plot_component
             CMD_ARGS "CaO"
-            LABELS unit)
+            LABELS unit material)
 
 dune_add_test(NAME plot_cao2h2
             TARGET plot_component
             COMMAND ./plot_component
             CMD_ARGS "CaO2H2"
-            LABELS unit)
+            LABELS unit material)
 
 dune_add_test(NAME plot_carbonateion
             TARGET plot_component
             COMMAND ./plot_component
             CMD_ARGS "CarbonateIon"
-            LABELS unit)
+            LABELS unit material)
 
 dune_add_test(NAME plot_ch4
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "CH4"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_granite
             TARGET plot_component
             COMMAND ./plot_component
             CMD_ARGS "Granite"
-            LABELS unit)
+            LABELS unit material)
 
 dune_add_test(NAME plot_h2
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "H2"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_h2o
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "H2O"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_heavyoil
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "HeavyOil"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_mesitylene
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "Mesitylene"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_n2
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "N2"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_nacl
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "NaCl"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_o2
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "O2"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_simpleh2o
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "SimpleH2O"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_trichloroethene
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "Trichloroethene"
-              LABELS unit)
+              LABELS unit material)
 
 dune_add_test(NAME plot_xylene
               TARGET plot_component
               COMMAND ./plot_component
               CMD_ARGS "Xylene"
-              LABELS unit)
+              LABELS unit material)
diff --git a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
index 0865389cb6be58c40415b0533f2106ae41658996..0c003b94181fca673f66bbf5c52311c9d9f95643 100644
--- a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
+++ b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
@@ -1,5 +1,5 @@
 dune_add_test(SOURCES test_thermalconductivityjohansen.cc
-              LABELS unit
+              LABELS unit material
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                        --files ${CMAKE_SOURCE_DIR}/test/references/thermalconductivityjohansen-reference.dat
@@ -7,7 +7,7 @@ dune_add_test(SOURCES test_thermalconductivityjohansen.cc
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_thermalconductivityjohansen")
 
 dune_add_test(SOURCES test_thermalconductivitysomerton.cc
-              LABELS unit
+              LABELS unit material
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                       --files ${CMAKE_SOURCE_DIR}/test/references/thermalconductivitysomerton-reference.dat
diff --git a/test/material/fluidmatrixinteractions/CMakeLists.txt b/test/material/fluidmatrixinteractions/CMakeLists.txt
index 06e695f7e5afe8ef4828aadfbc5ed39dd38d0761..9dc48993b2e76e44edfe1eed58b74c0797a0a8f9 100644
--- a/test/material/fluidmatrixinteractions/CMakeLists.txt
+++ b/test/material/fluidmatrixinteractions/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_subdirectory(2p)
 
 dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc
-              LABELS unit
+              LABELS unit material
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                        --files ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivitymillingtonquirk-reference.dat
@@ -9,7 +9,7 @@ dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_effectivediffusivitymillingtonquirk")
 
 dune_add_test(SOURCES test_effectivediffusivityconstanttortuosity.cc
-              LABELS unit
+              LABELS unit material
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                        --files ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivityconstanttau-reference.dat
diff --git a/test/material/fluidsystems/CMakeLists.txt b/test/material/fluidsystems/CMakeLists.txt
index f471ca738fb9cb32a5b9d0d31651284895e021e8..659c138e7a4044336d5f464ee9258df02fa702f0 100644
--- a/test/material/fluidsystems/CMakeLists.txt
+++ b/test/material/fluidsystems/CMakeLists.txt
@@ -1,2 +1,2 @@
 dune_add_test(SOURCES test_fluidsystems.cc
-              LABELS unit)
+              LABELS unit material)
diff --git a/test/material/immiscibleflash/CMakeLists.txt b/test/material/immiscibleflash/CMakeLists.txt
index 4c955a241f9cde3967ac2d707903e18ae3e4dfe5..5f714d0e878209b28b093175bfd9eca7b85b494c 100644
--- a/test/material/immiscibleflash/CMakeLists.txt
+++ b/test/material/immiscibleflash/CMakeLists.txt
@@ -1,2 +1,2 @@
 dune_add_test(SOURCES test_immiscibleflash.cc
-              LABELS unit)
+              LABELS unit material)
diff --git a/test/material/ncpflash/CMakeLists.txt b/test/material/ncpflash/CMakeLists.txt
index eb6e36a0ed9c9667cc8df5f6904bd7191902b3f2..fccaf9b1ff689552185708ee246e65aff2746be3 100644
--- a/test/material/ncpflash/CMakeLists.txt
+++ b/test/material/ncpflash/CMakeLists.txt
@@ -1,2 +1,2 @@
 dune_add_test(SOURCES test_ncpflash.cc
-              LABELS unit)
+              LABELS unit material)
diff --git a/test/material/pengrobinson/CMakeLists.txt b/test/material/pengrobinson/CMakeLists.txt
index 54bfbe047b0ab1e6e60397897fce166d50a26ab7..1fb81455c590daa2af9791de96f3a5416a3c9e3b 100644
--- a/test/material/pengrobinson/CMakeLists.txt
+++ b/test/material/pengrobinson/CMakeLists.txt
@@ -1,2 +1,2 @@
 dune_add_test(SOURCES test_pengrobinson.cc
-              LABELS unit)
+              LABELS unit material)
diff --git a/test/material/solidsystems/CMakeLists.txt b/test/material/solidsystems/CMakeLists.txt
index 5ba057cfae1a2e6e47853ab52f7d965a731f5b53..a89f504362b3575ed54aa414c0b946323a7ad4b1 100644
--- a/test/material/solidsystems/CMakeLists.txt
+++ b/test/material/solidsystems/CMakeLists.txt
@@ -1,2 +1,2 @@
 dune_add_test(SOURCES test_solidsystems.cc
-              LABELS unit)
+              LABELS unit material)
diff --git a/test/material/tabulation/CMakeLists.txt b/test/material/tabulation/CMakeLists.txt
index 554102e524ccd5df5cf8a6c95883b02f2c0ebc12..2174ab13e395902a47318d9a706fa5365f2364ea 100644
--- a/test/material/tabulation/CMakeLists.txt
+++ b/test/material/tabulation/CMakeLists.txt
@@ -1,2 +1,2 @@
 dune_add_test(SOURCES test_tabulation.cc
-              LABELS unit)
+              LABELS unit material)
diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt
index d38e8c96538c99fbba123dc883ebbc4d185e8220..5a550556b9190ab4c2dcfd34e7d6524ff1e41e88 100644
--- a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt
+++ b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt
@@ -1,5 +1,5 @@
 dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_half
-              LABELS multidomain
+              LABELS multidomain multidomain_boundary darcydarcy 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS DOMAINSPLIT=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -10,7 +10,7 @@ dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_half
                                    -Vtk.OutputName test_md_boundary_darcy1p_darcy1p_half")
 
 dune_add_test(NAME test_md_boundary_darcy1p_darcy1p_lens
-              LABELS multidomain
+              LABELS multidomain multidomain_boundary darcydarcy 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS DOMAINSPLIT=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt
index 9de88ef3662de539f151b18ed9ed21577df03b8b..13a0d8c0fc8e6725cc9e67a66883bd97cb027c17 100644
--- a/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt
+++ b/test/multidomain/boundary/darcydarcy/1p_2p/CMakeLists.txt
@@ -1,5 +1,5 @@
 dune_add_test(NAME test_md_boundary_darcy1p_darcy2p
-              LABELS multidomain
+              LABELS multidomain multidomain_boundary darcydarcy 1p 2p
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-subgrid_FOUND
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt
index ea50de05e3be37906bf376ad4d7d27318642249b..4f4ce94937cb4ab879f831923a5180b4147e3453 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/CMakeLists.txt
@@ -5,7 +5,7 @@ add_input_file_links()
 add_executable(test_md_boundary_darcy1p2c_stokes1p2c EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal
-              LABELS multidomain freeflow 1pnc
+              LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes
               TARGET test_md_boundary_darcy1p2c_stokes1p2c
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -18,7 +18,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_horizontal
                                   -Vtk.OutputName test_md_boundary_darcy1p2c_stokes1p2c_horizontal")
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_vertical_diffusion
-              LABELS multidomain freeflow 1pnc
+              LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes
               TARGET test_md_boundary_darcy1p2c_stokes1p2c
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -32,7 +32,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 1pnc
+              LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes
               TARGET test_md_boundary_darcy1p2c_stokes1p2c
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_1p2c/diffusionlawcomparison/CMakeLists.txt
index 2ef7d1d18781895fa5363e66ce377237f39b6cfe..8ecf1527f44ebd8e4c55c2dbb5aee2eaaa5f96de 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 1pnc
+              LABELS multidomain multidomain_boundary freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag>
@@ -16,7 +16,7 @@ dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_maxwellstefan
                                         -Problem.Name test_md_boundary_darcy1p2c_stokes1p2c_comparison_ms")
 
 dune_add_test(NAME test_md_boundary_darcy1p2c_stokes1p2c_fickslaw
-              LABELS multidomain freeflow 1pnc
+              LABELS multidomain multidomain_boundary freeflow 1pnc
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS DIFFUSIONTYPE=FicksLaw<TypeTag>
diff --git a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt
index 5079e4ecedb35d8ee165664e363f0746ac7833f7..b0fe3c01d5c944665b0f0c946b1c4267a63020a1 100644
--- a/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal
-              LABELS multidomain freeflow
+              LABELS multidomain multidomain_boundary stokesdarcy 2p2c navierstokes
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -15,7 +15,7 @@ dune_add_test(NAME test_md_boundary_darcy2p2c_stokes1p2c_horizontal
                              -Vtk.OutputName test_md_boundary_darcy2p2c_stokes1p2c_horizontal")
 
 dune_add_test(NAME test_md_boundary_darcy2p2cni_stokes1p2cni_horizontal
-              LABELS multidomain freeflow
+              LABELS multidomain multidomain_boundary stokesdarcy 2p2c navierstokes
               SOURCES main.cc
               COMPILE_DEFINITIONS NONISOTHERMAL=1
               CMAKE_GUARD HAVE_UMFPACK
diff --git a/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p3c_1p3c/CMakeLists.txt
index f668fd1c3f16c11a43524a8ca7f79037759303e8..01c98f5a8cba664707b554694d899262652d73ee 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 1pnc
+              LABELS multidomain multidomain_boundary stokesdarcy 1pnc navierstokes
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt
index 021f50dad725d2bf2096419111958a40b75bcb39..67d8b85b22d895bb68ee74b582c1ea8e518cc768 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p_1p/CMakeLists.txt
@@ -3,7 +3,7 @@ add_input_file_links()
 add_executable(test_md_boundary_darcy1p_stokes1p EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_horizontal
-              LABELS multidomain freeflow
+              LABELS multidomain multidomain_boundary stokesdarcy 1p navierstokes
               TARGET test_md_boundary_darcy1p_stokes1p
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -16,7 +16,7 @@ dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_horizontal
                                    -Vtk.OutputName test_md_boundary_darcy1p_stokes1p_horizontal")
 
 dune_add_test(NAME test_md_boundary_darcy1p_stokes1p_vertical
-              LABELS multidomain freeflow
+              LABELS multidomain multidomain_boundary stokesdarcy 1p navierstokes
               TARGET test_md_boundary_darcy1p_stokes1p
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
index 5dc4a860913c887172fd4a5322da264f4b841604..07eb26fe2d50778efe8eb363010ea6356a733abc 100644
--- a/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
+++ b/test/multidomain/boundary/stokesdarcy/1p_2p/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_md_boundary_darcy2p_stokes1p_vertical
-              LABELS multidomain freeflow
+              LABELS multidomain multidomain_boundary stokesdarcy 1p navierstokes
               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 4a0d8365047dbf9621973a8b0c9a3f4cb389f739..8a10954fcd970ff2a8d0836b63ed5d32508abf1b 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 1pnc
+              LABELS multidomain multidomain_embedded 1pnc richardsnc
               SOURCES main.cc
               CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
index cba840d801e9577a83fa089a9c39d53a9b8997da..35b6f52d68c3134169a3e384387c7bd20d470872 100644
--- a/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p_1p/CMakeLists.txt
@@ -1,5 +1,5 @@
 dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_average
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -13,7 +13,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_average
                                    -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfatpfa_average")
 
 dune_add_test(NAME test_md_embedded1d3d_1p1p_boxtpfa_average
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -27,7 +27,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_boxtpfa_average
                                    -Vtk.OutputName test_md_embedded1d3d_1p1p_boxtpfa_average -Tissue.Grid.Cells \"19 19 19\"")
 
 dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfabox_average
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -41,7 +41,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfabox_average
                                    -Vtk.OutputName test_md_embedded1d3d_1p1p_tpfabox_average")
 
 dune_add_test(NAME test_md_embedded1d3d_1p1p_boxbox_average
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueBox LOWDIMTYPETAG=BloodFlowBox COUPLINGMODE=EmbeddedCouplingMode::average
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -56,7 +56,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_boxbox_average
 
 # make sure these configurations compile and run too
 dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::cylindersources
               COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources
@@ -64,7 +64,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_cylindersources
               CMD_ARGS params.input)
 
 dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_line
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::line
               COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_line
@@ -72,7 +72,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_line
               CMD_ARGS params.input)
 
 dune_add_test(NAME test_md_embedded1d3d_1p1p_tpfatpfa_kernel
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=TissueCC LOWDIMTYPETAG=BloodFlowCC COUPLINGMODE=EmbeddedCouplingMode::kernel
               COMMAND ./test_md_embedded1d3d_1p1p_tpfatpfa_kernel
diff --git a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
index 77b3b06fb7b1abfdd8cd7425296e26b010e57b3f..58fef8c775e9afb0f9bc31be2faff080bf966a92 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
@@ -1,5 +1,5 @@
 dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p richards
               SOURCES main.cc
               COMPILE_DEFINITIONS SOILTYPETAG=SoilCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -13,7 +13,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa
                                    -Vtk.OutputName test_md_embedded1d3d_1p_richards_tpfatpfa")
 
 dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfabox
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p richards
               SOURCES main.cc
               COMPILE_DEFINITIONS SOILTYPETAG=SoilBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
index e099e929815a6342e76c3fc91b755b84e45549f0..79f2e3942dca5c079194009fd9b9663fdcb8324d 100644
--- a/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
+++ b/test/multidomain/embedded/2d3d/1p_1p/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_executable(test_md_embedded2d3d_fracture1p_tpfa EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_linearsolver
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               TARGET test_md_embedded2d3d_fracture1p_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -14,7 +14,7 @@ dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_linearsolver
                                    -Vtk.OutputName test_md_embedded2d3d_fracture1p_tpfa_linearsolver -Problem.SolverType linear")
 
 dune_add_test(NAME test_md_embedded2d3d_fracture1p_tpfa_nonlinearsolver
-              LABELS multidomain
+              LABELS multidomain multidomain_embedded 1p
               TARGET test_md_embedded2d3d_fracture1p_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMAKE_GUARD dune-foamgrid_FOUND
diff --git a/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt b/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt
index 1411b11f98d67b24d28f8692157d825b7fa7ebb9..0fc80dc223a31aafe88ae71112a08a58322d47f5 100644
--- a/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt
+++ b/test/multidomain/facet/1p_1p/analytical/CMakeLists.txt
@@ -1,7 +1,7 @@
 dune_symlink_to_source_files(FILES "grids" "params.input" "convergencetest.py")
 
 dune_add_test(NAME test_md_facet_1p1p_tpfa_convergence
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND )"
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=OnePBulkTpfa LOWDIMTYPETAG=OnePLowDimTpfa
@@ -9,7 +9,7 @@ dune_add_test(NAME test_md_facet_1p1p_tpfa_convergence
               CMD_ARGS test_md_facet_1p1p_tpfa_convergence 1e-4)
 
 dune_add_test(NAME test_md_facet_1p1p_box_convergence
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND AND gmsh_FOUND )"
               SOURCES main.cc
               COMPILE_DEFINITIONS BULKTYPETAG=OnePBulkBox LOWDIMTYPETAG=OnePLowDimBox
diff --git a/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt b/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt
index bb7170d24cf78741b6ce42fbba0399bc2a171977..ab6c576d8b655fea4777c74c635bf80d0de9d9a1 100644
--- a/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt
+++ b/test/multidomain/facet/1p_1p/gravity/CMakeLists.txt
@@ -16,7 +16,7 @@ target_compile_definitions(test_md_facet_1p1p_gravity_mpfa
                                   BULKGRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>)
 
 dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_gravity_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -28,8 +28,9 @@ dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_gravity_tpfa params.input \
                                                               -Vtk.OutputName test_md_facet_1p1p_gravity_xi1_tpfa")
 
+
 dune_add_test(NAME test_md_facet_1p1p_gravity_xi066_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_gravity_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -44,7 +45,7 @@ dune_add_test(NAME test_md_facet_1p1p_gravity_xi066_tpfa
 
 
 dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_mpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_gravity_mpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -57,7 +58,7 @@ dune_add_test(NAME test_md_facet_1p1p_gravity_xi1_mpfa
                                                               -Vtk.OutputName test_md_facet_1p1p_gravity_xi1_mpfa")
 
 dune_add_test(NAME test_md_facet_1p1p_gravity_xi066_mpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_gravity_mpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt b/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt
index 01ec53a3247d226a29217f7245c4292844321ed6..7ce074ca1ec76d23cd4aa23a5a3fcdb25b4dc8ae 100644
--- a/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt
+++ b/test/multidomain/facet/1p_1p/linearprofile/CMakeLists.txt
@@ -29,7 +29,7 @@ target_compile_definitions(test_md_facet_1p1p_linearprofile_surface_mpfa
                                    BULKGRIDTYPE=Dune::ALUGrid<2,3,Dune::cube,Dune::nonconforming>)
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -41,7 +41,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_md_facet_1p1p_linearprofile_tpfa params.input")
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -55,7 +55,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_tpfa
                                                                -Vtk.OutputName test_md_facet_1p1p_linearprofile_xi066_tpfa")
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_surface_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -68,7 +68,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_tpfa
                                                               -Vtk.OutputName test_md_facet_1p1p_linearprofile_surface_xi1_tpfa")
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi066_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_surface_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -82,7 +82,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi066_tpfa
                                                                -Vtk.OutputName test_md_facet_1p1p_linearprofile_surface_xi066_tpfa")
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_mpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_mpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -95,7 +95,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi1_mpfa
                                                               -Vtk.OutputName test_md_facet_1p1p_linearprofile_xi1_mpfa")
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_mpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_mpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -109,7 +109,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_xi066_mpfa
                                                             -Vtk.OutputName test_md_facet_1p1p_linearprofile_xi066_mpfa")
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_mpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_surface_mpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -122,7 +122,7 @@ dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi1_mpfa
                                                               -Vtk.OutputName test_md_facet_1p1p_linearprofile_surface_xi1_mpfa")
 
 dune_add_test(NAME test_md_facet_1p1p_linearprofile_surface_xi066_mpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               TARGET test_md_facet_1p1p_linearprofile_surface_mpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt b/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt
index 5485864944be00a9ee86ed55879b5b7384343ec8..b3cf38a9ab1ed52218ebff58a12274fd15866f17 100644
--- a/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt
+++ b/test/multidomain/facet/1p_1p/threedomain/CMakeLists.txt
@@ -1,7 +1,7 @@
 dune_symlink_to_source_files(FILES "grids" "params.input")
 
 dune_add_test(NAME test_md_facet_1p1p_threedomain_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet 1p
               SOURCES main.cc
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/multidomain/facet/CMakeLists.txt b/test/multidomain/facet/CMakeLists.txt
index d5776afddb3af7870d34865025ac963b27855fc8..fbf63a63d95669a263ab2112d0b6a645514daed4 100644
--- a/test/multidomain/facet/CMakeLists.txt
+++ b/test/multidomain/facet/CMakeLists.txt
@@ -4,7 +4,7 @@ add_subdirectory(tracer_tracer)
 dune_symlink_to_source_files(FILES "grid.msh" "grid2.msh" "test_gridmanager.input" "test_vertexmapper.input" "test_couplingmapper_boundary.input" "2d_grid.msh" "3d_grid.msh")
 
 dune_add_test(NAME test_facetgridmanager_alu
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming>
               SOURCES test_gridmanager.cc
@@ -12,7 +12,7 @@ dune_add_test(NAME test_facetgridmanager_alu
               CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetgridmanager_ug
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3>
               SOURCES test_gridmanager.cc
@@ -20,7 +20,7 @@ dune_add_test(NAME test_facetgridmanager_ug
               CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetcouplingmapper_tpfa_alu
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming>
               SOURCES test_facetcouplingmapper.cc
@@ -28,15 +28,15 @@ dune_add_test(NAME test_facetcouplingmapper_tpfa_alu
               CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetcouplingmapper_tpfa_ug
-              LABELS multidomain
-             CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )"
-             COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3>
-             SOURCES test_facetcouplingmapper.cc
-             COMMAND ./test_facetcouplingmapper_tpfa_ug
-             CMD_ARGS test_gridmanager.input)
+              LABELS multidomain multidomain_facet
+              CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )"
+              COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3>
+              SOURCES test_facetcouplingmapper.cc
+              COMMAND ./test_facetcouplingmapper_tpfa_ug
+              CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetcouplingmapper_mpfa_alu
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming>
               COMPILE_DEFINITIONS USEMPFAINBULK=true
@@ -45,7 +45,7 @@ dune_add_test(NAME test_facetcouplingmapper_mpfa_alu
               CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetcouplingmapper_mpfa_ug
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3>
               COMPILE_DEFINITIONS USEMPFAINBULK=true
@@ -54,7 +54,7 @@ dune_add_test(NAME test_facetcouplingmapper_mpfa_ug
               CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetcouplingmapper_box_alu
-              LABELS multidomain
+              LABELS multidomain facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming>
               COMPILE_DEFINITIONS USEBOXINBULK=true
@@ -63,7 +63,7 @@ dune_add_test(NAME test_facetcouplingmapper_box_alu
               CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetcouplingmapper_box_ug
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<3>
               COMPILE_DEFINITIONS USEBOXINBULK=true
@@ -72,7 +72,7 @@ dune_add_test(NAME test_facetcouplingmapper_box_ug
               CMD_ARGS test_gridmanager.input)
 
 dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_alu
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>
               SOURCES test_facetcouplingmapper_boundary.cc
@@ -80,7 +80,7 @@ dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_alu
               CMD_ARGS test_couplingmapper_boundary.input)
 
 dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_ug
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-uggrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::UGGrid<2>
               SOURCES test_facetcouplingmapper_boundary.cc
@@ -88,7 +88,7 @@ dune_add_test(NAME test_facetcouplingmapper_tpfa_boundary_ug
               CMD_ARGS test_couplingmapper_boundary.input)
 
 dune_add_test(NAME test_vertexmapper_alu_3d
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<3,3,Dune::simplex,Dune::conforming>
               COMPILE_DEFINITIONS FACETGRIDTYPE=Dune::FoamGrid<2,3>
@@ -97,7 +97,7 @@ dune_add_test(NAME test_vertexmapper_alu_3d
               CMD_ARGS test_vertexmapper.input -Grid.File 3d_grid.msh)
 
 dune_add_test(NAME test_vertexmapper_alu_2d
-              LABELS multidomain
+              LABELS multidomain multidomain_facet
               CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS BULKGRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::conforming>
               COMPILE_DEFINITIONS FACETGRIDTYPE=Dune::FoamGrid<1,2>
diff --git a/test/multidomain/facet/tracer_tracer/CMakeLists.txt b/test/multidomain/facet/tracer_tracer/CMakeLists.txt
index cfdb893ce248f652f8e69856eab6b8bcc52f623a..7f9c54c4aed14baa728367027f4c07d0784e683d 100644
--- a/test/multidomain/facet/tracer_tracer/CMakeLists.txt
+++ b/test/multidomain/facet/tracer_tracer/CMakeLists.txt
@@ -1,7 +1,7 @@
 dune_symlink_to_source_files(FILES "grids" "params.input")
 
 dune_add_test(NAME test_md_facet_tracertracer_tpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS ONEPBULKTYPETAG=OnePBulkTpfa
               COMPILE_DEFINITIONS ONEPLOWDIMTYPETAG=OnePLowDimTpfa
@@ -22,7 +22,7 @@ dune_add_test(NAME test_md_facet_tracertracer_tpfa
                                                               -Vtk.OutputName test_md_facet_tracertracer_tpfa")
 
 dune_add_test(NAME test_md_facet_tracertracer_mpfa
-              LABELS multidomain
+              LABELS multidomain multidomain_facet tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS ONEPBULKTYPETAG=OnePBulkMpfa
               COMPILE_DEFINITIONS ONEPLOWDIMTYPETAG=OnePLowDimMpfa
@@ -43,7 +43,7 @@ dune_add_test(NAME test_md_facet_tracertracer_mpfa
                                                               -Vtk.OutputName test_md_facet_tracertracer_mpfa")
 
 dune_add_test(NAME test_md_facet_tracertracer_box
-              LABELS multidomain
+              LABELS multidomain multidomain_facet tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS ONEPBULKTYPETAG=OnePBulkBox
               COMPILE_DEFINITIONS ONEPLOWDIMTYPETAG=OnePLowDimBox
diff --git a/test/multidomain/poromechanics/el1p/CMakeLists.txt b/test/multidomain/poromechanics/el1p/CMakeLists.txt
index 254d68d1e349f250061ae11eb118d8086eff0dab..e4a7bf67f3a0ebeb2277f9c1283be3f2fb770916 100644
--- a/test/multidomain/poromechanics/el1p/CMakeLists.txt
+++ b/test/multidomain/poromechanics/el1p/CMakeLists.txt
@@ -1,7 +1,7 @@
 dune_symlink_to_source_files(FILES "params.input")
 
 dune_add_test(NAME test_md_poromechanics_el1p
-              LABELS multidomain
+              LABELS multidomain poromechanics 1p poroelastic
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/multidomain/poromechanics/el2p/CMakeLists.txt b/test/multidomain/poromechanics/el2p/CMakeLists.txt
index 840e147da8043187700546a6548c4e122c9f9d91..61514e8a3aa4d9036f441495caa7890c5dcf8a03 100644
--- a/test/multidomain/poromechanics/el2p/CMakeLists.txt
+++ b/test/multidomain/poromechanics/el2p/CMakeLists.txt
@@ -1,7 +1,7 @@
 dune_symlink_to_source_files(FILES "params.input")
 
 dune_add_test(NAME test_md_poromechanics_el2p
-              LABELS multidomain
+              LABELS multidomain poromechanics 2p poroelastic
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt
index 16854c65f40d1defefc5e08f5d6b1652b6a81674..76426275cbf09a50bf29cce7454d56b3820e7b73 100644
--- a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
 
 # compressible instationary
 dune_add_test(NAME test_1p_compressible_instationary_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_1p_compressible_instationary_tpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_instationary_tpfa params.input -Problem.Name test_1p_compressible_instationary_tpfa")
 
 dune_add_test(NAME test_1p_compressible_instationary_mpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -20,6 +22,7 @@ dune_add_test(NAME test_1p_compressible_instationary_mpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_instationary_mpfa params.input -Problem.Name test_1p_compressible_instationary_mpfa")
 
 dune_add_test(NAME test_1p_compressible_instationary_box
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt
index 360552bfdbe5fb2c761aded3ef0f5bb0389ecd76..039a99519f1d0a129f51d2f648fda74e3061130a 100644
--- a/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/compressible/stationary/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
 
 # compressible stationary
 dune_add_test(NAME test_1p_compressible_stationary_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePCompressibleTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_1p_compressible_stationary_tpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_tpfa params.input -Problem.Name test_1p_compressible_stationary_tpfa")
 
 dune_add_test(NAME test_1p_compressible_stationary_mpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePCompressibleMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -20,6 +22,7 @@ dune_add_test(NAME test_1p_compressible_stationary_mpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_compressible_stationary_mpfa params.input -Problem.Name test_1p_compressible_stationary_mpfa")
 
 dune_add_test(NAME test_1p_compressible_stationary_box
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePCompressibleBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt b/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt
index af08a1590a004e9611312ecf290eab4080bcdbe5..850331e529c79050c4673efaa7e90c3896501d73 100644
--- a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt
@@ -4,6 +4,7 @@ dune_symlink_to_source_files(FILES grids)
 
 # dim < dimWorld tests with Dune::Foamgrid<2,3>
 dune_add_test(NAME test_1p_fracture2d3d_box
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FractureBox
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p_fracture2d3d_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_fracture2d3d_box params.input -Problem.Name test_1p_fracture2d3d_box")
 
 dune_add_test(NAME test_1p_fracture2d3d_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -24,6 +26,7 @@ dune_add_test(NAME test_1p_fracture2d3d_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_fracture2d3d_tpfa params.input -Problem.Name test_1p_fracture2d3d_tpfa")
 
 dune_add_test(NAME test_1p_fracture2d3d_mpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa
               CMAKE_GUARD dune-foamgrid_FOUND
diff --git a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
index 793b31ac32b9fe358e7570c3cdfe56a7c8cdd852..aaa60aeea5f094bc97d1cbc9a90894b6438f4a1c 100644
--- a/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/incompressible/CMakeLists.txt
@@ -16,6 +16,7 @@ target_compile_definitions(test_1p_incompressible_box_anadiff PUBLIC "TYPETAG=On
 # using tpfa and analytical Jacobian
 dune_add_test(NAME test_1p_incompressible_tpfa
               TARGET test_1p_incompressible_tpfa_anadiff
+              LABELS porousmediumflow 1p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_cc-reference.vtu
@@ -24,6 +25,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa
 
 # using tpfa, analytical Jacobian and quad precision
 dune_add_test(NAME test_1p_incompressible_tpfa_quad
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               CMAKE_GUARD HAVE_QUAD
               COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfaQuad NUMDIFFMETHOD=DiffMethod::analytic
@@ -37,6 +39,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_quad
 # using mpfa and analytical Jacobian
 dune_add_test(NAME test_1p_incompressible_mpfa
               TARGET test_1p_incompressible_mpfa_anadiff
+              LABELS porousmediumflow 1p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_cc-reference.vtu
@@ -48,6 +51,7 @@ dune_add_test(NAME test_1p_incompressible_mpfa
 # using box and analytical Jacobian
 dune_add_test(NAME test_1p_incompressible_box
               TARGET test_1p_incompressible_box_anadiff
+              LABELS porousmediumflow 1p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
                         --files ${CMAKE_SOURCE_DIR}/test/references/test_1p_box-reference.vtu
@@ -56,6 +60,7 @@ dune_add_test(NAME test_1p_incompressible_box
 
 # using tpfa and numeric differentiation
 dune_add_test(NAME test_1p_incompressible_tpfa_numdiff
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa NUMDIFFMETHOD=DiffMethod::numeric
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -68,6 +73,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_numdiff
 
 # using box and numeric differentiation
 dune_add_test(NAME test_1p_incompressible_box_numdiff
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox NUMDIFFMETHOD=DiffMethod::numeric
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -81,6 +87,7 @@ dune_add_test(NAME test_1p_incompressible_box_numdiff
 # using tpfa and analytical Jacobian with extrusion factor
 dune_add_test(NAME test_1p_incompressible_tpfa_extrude
               TARGET test_1p_incompressible_tpfa_anadiff
+              LABELS porousmediumflow 1p
               COMMAND ./test_1p_incompressible_tpfa_anadiff
               CMD_ARGS params.input -Problem.Name test_1p_incompressible_tpfa_extrude
                                     -Problem.ExtrusionFactor 10
@@ -91,6 +98,7 @@ dune_add_test(NAME test_1p_incompressible_tpfa_extrude
 # using mpfa and analytical Jacobian with extrusion factor
 dune_add_test(NAME test_1p_incompressible_mpfa_extrude
               TARGET test_1p_incompressible_mpfa_anadiff
+              LABELS porousmediumflow 1p
               COMMAND ./test_1p_incompressible_mpfa_anadiff
               CMD_ARGS params.input -Problem.Name test_1p_incompressible_mpfa_extrude
                                     -Problem.ExtrusionFactor 10
@@ -101,6 +109,7 @@ dune_add_test(NAME test_1p_incompressible_mpfa_extrude
 # using box and analytical Jacobian with extrusion factor
 dune_add_test(NAME test_1p_incompressible_box_extrude
               TARGET test_1p_incompressible_box_anadiff
+              LABELS porousmediumflow 1p
               COMMAND ./test_1p_incompressible_box_anadiff
               CMD_ARGS params.input -Problem.Name test_1p_incompressible_box_extrude
                                     -Problem.ExtrusionFactor 10
@@ -110,6 +119,7 @@ dune_add_test(NAME test_1p_incompressible_box_extrude
 
 # using box and analytical Jacobian with extrusion factor on distorted grid
 dune_add_test(NAME test_1p_incompressible_box_extrude_distorted
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               CMAKE_GUARD dune-uggrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
@@ -124,6 +134,7 @@ dune_add_test(NAME test_1p_incompressible_box_extrude_distorted
 
 # using mpfa and analytical Jacobian with extrusion factor on distorted grid
 dune_add_test(NAME test_1p_incompressible_mpfa_extrude_distorted
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               CMAKE_GUARD dune-uggrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
diff --git a/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt b/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt
index d128954ef7b69962b07200a01595b77e75c4f281..da2aa7369c26eaf29f9a8547f6603efc2746bb63 100644
--- a/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/isothermal/CMakeLists.txt
@@ -4,6 +4,7 @@ add_gstat_file_links()
 
 # isothermal tests
 dune_add_test(NAME test_1p_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -13,6 +14,7 @@ dune_add_test(NAME test_1p_tpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_tpfa params.input -Problem.Name test_1p_tpfa")
 
 dune_add_test(NAME test_1p_mpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTestCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -22,6 +24,7 @@ dune_add_test(NAME test_1p_mpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_mpfa params.input -Problem.Name test_1p_mpfa")
 
 dune_add_test(NAME test_1p_box
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTestBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -31,6 +34,7 @@ dune_add_test(NAME test_1p_box
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_box params.input -Problem.Name test_1p_box")
 
 dune_add_test(NAME test_1p_forchheimer_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa FORCHHEIMER=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -42,6 +46,7 @@ dune_add_test(NAME test_1p_forchheimer_tpfa
 
 # a gstat test (becaue it's a random permeability field we can't test against a reference solution)
 dune_add_test(NAME test_1p_gstat
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTestCCTpfa
               CMAKE_GUARD HAVE_GSTAT
diff --git a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt
index 12485a41678f105eb9dabcff57a6ca9002e43d34..abe971e90e8892bb9c24d6e070c81b6a1ef7c326 100644
--- a/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/network1d3d/CMakeLists.txt
@@ -6,6 +6,7 @@ dune_symlink_to_source_files(FILES "convergencetest.py")
 
 # dim < dimWorld tests with Dune::Foamgrid<1,3>
 dune_add_test(NAME test_1p_network1d3d_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TubesTestCCTpfa
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -13,6 +14,7 @@ dune_add_test(NAME test_1p_network1d3d_tpfa
               CMD_ARGS test_1p_network1d3d_tpfa params.input -Problem.Name test_1p_network1d3d_tpfa)
 
 dune_add_test(NAME test_1p_network1d3d_box
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TubesTestBox
               CMAKE_GUARD dune-foamgrid_FOUND
diff --git a/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt
index c36d8c27ac3a3491d76377abfba0d11576567c5a..1f591c069918f2f719189926d8bf02d8eebfb56d 100644
--- a/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/nonisothermal/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 
 # non-isothermal tests
 dune_add_test(NAME test_1pni_conduction_box
+              LABELS porousmediumflow 1p  1pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePNIConductionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -16,6 +17,7 @@ target_compile_definitions(test_1pni_convection_box PUBLIC TYPETAG=OnePNIConvect
 
 dune_add_test(NAME test_1pni_convection_box
               TARGET test_1pni_convection_box
+              LABELS porousmediumflow 1p  1pni
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_1pni_convection_box-reference.vtp
@@ -25,6 +27,7 @@ dune_add_test(NAME test_1pni_convection_box
 
 dune_add_test(NAME test_1pni_convection_box_restart
               TARGET test_1pni_convection_box
+              LABELS porousmediumflow 1p  1pni
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_1pni_convection_box-reference.vtp
@@ -36,6 +39,7 @@ dune_add_test(NAME test_1pni_convection_box_restart
 set_tests_properties(test_1pni_convection_box_restart PROPERTIES DEPENDS test_1pni_convection_box)
 
 dune_add_test(NAME test_1pni_conduction_tpfa
+              LABELS porousmediumflow 1p  1pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -46,6 +50,7 @@ dune_add_test(NAME test_1pni_conduction_tpfa
                        --zeroThreshold {"velocity":1e-8})
 
 dune_add_test(NAME test_1pni_convection_tpfa
+              LABELS porousmediumflow 1p  1pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePNIConvectionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -55,6 +60,7 @@ dune_add_test(NAME test_1pni_convection_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pni_convection_tpfa params_convection.input -Problem.Name test_1pni_convection_tpfa")
 
 dune_add_test(NAME test_1pni_conduction_mpfa
+              LABELS porousmediumflow 1p  1pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePNIConductionCCMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt
index 570aadb5434beb398560d38839e1a064dcf549de..5280467d21eb77494d5db09f9038e452d2196107 100644
--- a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "periodic.dgf")
 
 # test using periodic boundary conditions
 dune_add_test(NAME test_1p_periodic_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa FVGEOMCACHING=false
               CMAKE_GUARD dune-spgrid_FOUND
@@ -9,6 +10,7 @@ dune_add_test(NAME test_1p_periodic_tpfa
 
 dune_add_test(NAME test_1p_periodic_tpfa_sequential
               TARGET test_1p_periodic_tpfa
+              LABELS porousmediumflow 1p
               CMAKE_GUARD dune-spgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -18,6 +20,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_sequential
 
 dune_add_test(NAME test_1p_periodic_tpfa_parallel
               TARGET test_1p_periodic_tpfa
+              LABELS porousmediumflow 1p
               CMAKE_GUARD dune-spgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -27,6 +30,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_parallel
                         --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_1p_periodic_tpfa params.input -Problem.Name test_1p_periodic_tpfa_parallel")
 
 dune_add_test(NAME test_1p_periodic_tpfa_caching
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleTpfa FVGEOMCACHING=true
               CMAKE_GUARD dune-spgrid_FOUND
@@ -37,6 +41,7 @@ dune_add_test(NAME test_1p_periodic_tpfa_caching
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_periodic_tpfa params.input -Problem.Name test_1p_periodic_tpfa_caching")
 
 dune_add_test(NAME test_1p_periodic_box
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePIncompressibleBox
               CMAKE_GUARD dune-spgrid_FOUND
diff --git a/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt b/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt
index 4b775ca8cc3accae0339a13ffd7dca499ac30345..303a4a87f5ca715405db82813d61ef4d7146e4aa 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/pointsources/timedependent/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links("params.input")
 
 dune_add_test(NAME test_1p_pointsources_timedependent_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               COMPILE_DEFINITIONS TYPETAG=OnePSingularityTimeDependentCCTpfa
diff --git a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt
index 4360055d0d8e4da5bd49fbc736f034d37c77c012..06d7f95dddbb8ce28fbc3afe6c9b185c604bc750 100644
--- a/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/pointsources/timeindependent/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links("params.input")
 
 dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               COMPILE_DEFINITIONS TYPETAG=OnePSingularityCCTpfa
@@ -10,6 +11,7 @@ dune_add_test(NAME test_1p_pointsources_timeindependent_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_1p_pointsources_timeindependent_tpfa params.input -Problem.Name test_1p_pointsources_timeindependent_tpfa")
 
 dune_add_test(NAME test_1p_pointsources_timeindependent_box
+              LABELS porousmediumflow 1p
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               COMPILE_DEFINITIONS TYPETAG=OnePSingularityBox
diff --git a/test/porousmediumflow/1p/sequential/CMakeLists.txt b/test/porousmediumflow/1p/sequential/CMakeLists.txt
index 4c141e9b0c17011de07213d1b1a2c7c2471f9367..3931539ef46610a622aa382c3959a1edb65883cb 100644
--- a/test/porousmediumflow/1p/sequential/CMakeLists.txt
+++ b/test/porousmediumflow/1p/sequential/CMakeLists.txt
@@ -2,14 +2,16 @@ add_input_file_links()
 dune_symlink_to_source_files(FILES grids)
 
 dune_add_test(NAME test_dec1p
-               SOURCES test_1p.cc
-               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-               CMD_ARGS --script fuzzy
-                        --files ${CMAKE_SOURCE_DIR}/test/references/test_1p-reference.vtu
-                                ${CMAKE_CURRENT_BINARY_DIR}/test_1p-00000.vtu
-                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_dec1p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_1p.input")
+              LABELS porousmediumflow 1p
+              SOURCES test_1p.cc
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS --script fuzzy
+                       --files ${CMAKE_SOURCE_DIR}/test/references/test_1p-reference.vtu
+                               ${CMAKE_CURRENT_BINARY_DIR}/test_1p-00000.vtu
+                       --command "${CMAKE_CURRENT_BINARY_DIR}/test_dec1p -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_1p.input")
 
 dune_add_test(NAME test_diffusion
+              LABELS porousmediumflow 1p
               SOURCES test_diffusion.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -18,6 +20,7 @@ dune_add_test(NAME test_diffusion
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_diffusion")
 
 dune_add_test(NAME test_diffusion3d
+              LABELS porousmediumflow 1p
               SOURCES test_diffusion3d.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
index d24a7c42644611f121b459f3be20a9fd2fe81eea..3067934423e41a790956903fc66d679c348e6325 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/CMakeLists.txt
@@ -3,6 +3,7 @@ add_subdirectory(saltwaterintrusion)
 add_input_file_links()
 
 dune_add_test(NAME test_1p2c_transport_box
+              LABELS porousmediumflow 1p2c
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestBox
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2c_transport_box
                         --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15})
 
 dune_add_test(NAME test_1p2c_transport_tpfa
+              LABELS porousmediumflow 1p2c
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCTpfa
@@ -25,6 +27,7 @@ dune_add_test(NAME test_1p2c_transport_tpfa
                         --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15})
 
 dune_add_test(NAME test_1p2c_transport_mpfa
+              LABELS porousmediumflow 1p2c
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCTestCCMpfa
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
index d55b3f3ad60e3ccc1b382cdfacfde5a7e55282cb..421ca7572930fba12243a6406de44dcc41135f17 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/isothermal/saltwaterintrusion/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 
 # salt-water intrusion test using the box model
 dune_add_test(NAME test_1p2c_saltwaterintrusion_box
+              LABELS porousmediumflow 1p2c
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=SaltWaterIntrusionTest
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
index e0ec87a6451cfe2b6db0a78a7a49ea4912011220..c1b2a48ae8377eab9859f02ba396fb70c59901b6 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/conduction/CMakeLists.txt
@@ -3,6 +3,7 @@ add_input_file_links()
 # non-isothermal tests
 # conduction
 dune_add_test(NAME test_1p2cni_conduction_box
+              LABELS porousmediumflow 1p2c  1p2cni
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionBox
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2cni_conduction_box
                         --zeroThreshold {"velocity_liq \(m/s\)":1e-9})
 
 dune_add_test(NAME test_1p2cni_conduction_tpfa
+              LABELS porousmediumflow 1p2c  1p2cni
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCTpfa
@@ -25,6 +27,7 @@ dune_add_test(NAME test_1p2cni_conduction_tpfa
                         --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9})
 
 dune_add_test(NAME test_1p2cni_conduction_mpfa
+              LABELS porousmediumflow 1p2c  1p2cni
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConductionCCMpfa
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
index 59c631957f5eadcbce68a61073974f0854bb418d..04c5f32837a1e8d279f895fad8b485343fe46d80 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/convection/CMakeLists.txt
@@ -3,6 +3,7 @@ add_input_file_links()
 # non-isothermal tests
 # convection
 dune_add_test(NAME test_1p2cni_convection_box
+              LABELS porousmediumflow 1p2c  1p2cni
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionBox
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2cni_convection_box
                         --zeroThreshold {"velocity_liq \(m/s\)":1e-9})
 
 dune_add_test(NAME test_1p2cni_convection_tpfa
+              LABELS porousmediumflow 1p2c  1p2cni
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCTpfa
@@ -25,6 +27,7 @@ dune_add_test(NAME test_1p2cni_convection_tpfa
                         --zeroThreshold {"velocity_liq \(m/s\)_0":1e-9})
 
 dune_add_test(NAME test_1p2cni_convection_mpfa
+              LABELS porousmediumflow 1p2c  1p2cni
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNIConvectionCCMpfa
diff --git a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt
index 49b26a67f80ec59ff035962758fef528787a4a28..dba370d293a5abf5228f9c4e7c6f3d1c9423213b 100644
--- a/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/1p2c/nonisothermal/transientbc/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_1pncni_transientbc_box_caching
+              LABELS porousmediumflow 1pnc  1pncni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=1
               LABELS caching
@@ -12,6 +13,7 @@ dune_add_test(NAME test_1pncni_transientbc_box_caching
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_box_caching params.input -Problem.Name test_1p2cni_transientbc_box_caching")
 
 dune_add_test(NAME test_1pncni_transientbc_box
+              LABELS porousmediumflow 1pnc  1pncni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCBox ENABLECACHING=0
               LABELS caching
@@ -23,6 +25,7 @@ dune_add_test(NAME test_1pncni_transientbc_box
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_box params.input -Problem.Name test_1p2cni_transientbc_box")
 
 dune_add_test(NAME test_1pncni_transientbc_tpfa_caching
+              LABELS porousmediumflow 1pnc  1pncni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=1
               LABELS caching
@@ -34,6 +37,7 @@ dune_add_test(NAME test_1pncni_transientbc_tpfa_caching
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_tpfa_caching params.input -Problem.Name test_1p2cni_transientbc_tpfa_caching")
 
 dune_add_test(NAME test_1pncni_transientbc_tpfa
+              LABELS porousmediumflow 1pnc  1pncni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCTpfa ENABLECACHING=0
               LABELS caching
@@ -45,6 +49,7 @@ dune_add_test(NAME test_1pncni_transientbc_tpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_tpfa params.input -Problem.Name test_1p2cni_transientbc_tpfa")
 
 dune_add_test(NAME test_1pncni_transientbc_mpfa_caching
+              LABELS porousmediumflow 1pnc  1pncni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCMpfa ENABLECACHING=1
               LABELS caching
@@ -56,6 +61,7 @@ dune_add_test(NAME test_1pncni_transientbc_mpfa_caching
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_1pncni_transientbc_mpfa_caching params.input -Problem.Name test_1p2cni_transientbc_mpfa_caching")
 
 dune_add_test(NAME test_1pncni_transientbc_mpfa
+              LABELS porousmediumflow 1pnc  1pncni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCNITransientBCCCMpfa ENABLECACHING=0
               LABELS caching
diff --git a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
index 9e1955b1242d208a3b100f4beb1b65056a6cfba7..7086d76dc333e1f594b815638349468b65f8b1fb 100644
--- a/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
+++ b/test/porousmediumflow/1pnc/implicit/nonequilibrium/CMakeLists.txt
@@ -3,6 +3,7 @@ add_input_file_links()
 # non-isothermal tests
 # conduction
 dune_add_test(NAME test_1p2c_nonequilibrium_box
+              LABELS porousmediumflow 1p2c
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumBox
@@ -14,6 +15,7 @@ dune_add_test(NAME test_1p2c_nonequilibrium_box
                         --zeroThreshold {"velocity_liq \(m/s\)_1":1e-15})
 
 dune_add_test(NAME test_1p2c_nonequilibrium_tpfa
+              LABELS porousmediumflow 1p2c
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=OnePTwoCThermalNonequilibriumCCTpfa
diff --git a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
index bba6b2da9f18213ab7b6c504e95e7f4827dd59bb..6aa7f7de4bbb755a0b5d8ac792769ac188603e36 100644
--- a/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/1pncmin/implicit/nonisothermal/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_1pncminni_box
+              LABELS porousmediumflow 1pncmin  1pncminni
               SOURCES main.cc
               LABELS 1pnc
               COMPILE_DEFINITIONS TYPETAG=ThermoChemBox
diff --git a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt
index b28dbbb99667d51cba8f24b965701b499165ec80..31544af40648da3c6615fcdaae9b05ac5b4467ae 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/adaptive/CMakeLists.txt
@@ -4,6 +4,7 @@ dune_symlink_to_source_files(FILES "initialsolutionbox.txt")
 
 # using tpfa
 dune_add_test(NAME test_2p_adaptive_tpfa
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveTpfa
               CMAKE_GUARD dune-alugrid_FOUND
@@ -15,6 +16,7 @@ dune_add_test(NAME test_2p_adaptive_tpfa
 
 # using tpfa and point source
 dune_add_test(NAME test_2p_pointsource_adaptive_tpfa
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPAdaptivePointSource
               CMAKE_GUARD dune-alugrid_FOUND
@@ -26,6 +28,7 @@ dune_add_test(NAME test_2p_pointsource_adaptive_tpfa
 
 # using mpfa
 dune_add_test(NAME test_2p_adaptive_mpfa
+              LABELS porousmediumflow 2p
              SOURCES main.cc
              COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveMpfa
              CMAKE_GUARD dune-alugrid_FOUND
@@ -37,6 +40,7 @@ dune_add_test(NAME test_2p_adaptive_mpfa
 
 # using box
 dune_add_test(NAME test_2p_adaptive_box
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleAdaptiveBox
               CMAKE_GUARD dune-uggrid_FOUND
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
index f5d11b48644cf7758b63b38f9f121be7f4c6fedb..b850ef4d7e86b6b7236194814612cbad01e69d58 100644
--- a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "grids")
 
 # quadrilaterals alu grid
 dune_add_test(NAME test_2p_boxdfm_quads_alu
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               CMAKE_GUARD dune-alugrid_FOUND
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -15,6 +16,7 @@ dune_add_test(NAME test_2p_boxdfm_quads_alu
 
 # quadrilaterals ug grid
 dune_add_test(NAME test_2p_boxdfm_quads_ug
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               CMAKE_GUARD dune-uggrid_FOUND
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -28,6 +30,7 @@ dune_add_test(NAME test_2p_boxdfm_quads_ug
 
 # triangles alu
 dune_add_test(NAME test_2p_boxdfm_trias_alu
+              LABELS porousmediumflow 2p
              SOURCES main.cc
              CMAKE_GUARD dune-foamgrid_FOUND
              CMAKE_GUARD dune-alugrid_FOUND
@@ -41,6 +44,7 @@ dune_add_test(NAME test_2p_boxdfm_trias_alu
 
 # triangles ug
 dune_add_test(NAME test_2p_boxdfm_trias_ug
+              LABELS porousmediumflow 2p
              SOURCES main.cc
              CMAKE_GUARD dune-uggrid_FOUND
              CMAKE_GUARD dune-foamgrid_FOUND
@@ -54,6 +58,7 @@ dune_add_test(NAME test_2p_boxdfm_trias_ug
 
 # tetrahedra alu
 dune_add_test(NAME test_2p_boxdfm_tets_alu
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               CMAKE_GUARD dune-foamgrid_FOUND
               CMAKE_GUARD dune-alugrid_FOUND
@@ -67,6 +72,7 @@ dune_add_test(NAME test_2p_boxdfm_tets_alu
 
 # tetrahedra ug
 dune_add_test(NAME test_2p_boxdfm_tets_ug
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               CMAKE_GUARD dune-uggrid_FOUND
               CMAKE_GUARD dune-foamgrid_FOUND
diff --git a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt
index 9396ab5c70592b7d09b77680ed59449a32f6204f..3e6095f55030f01a8d3330954bf2b4c8a3150d14 100644
--- a/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/cornerpoint/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
 dune_symlink_to_source_files(FILES grids)
 
 dune_add_test(NAME test_2p_cornerpoint
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               CMAKE_GUARD HAVE_OPM_GRID
               COMPILE_DEFINITIONS HAVE_ECL_INPUT=1
diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
index 83ac13d59b4434c90bee7ed700070c1b3f17fc6e..c4215a9d32a74204843b70d3b98455d939a3de2b 100644
--- a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input" "grids")
 
 # tests without gravity
 dune_add_test(NAME test_2p_fracture_box
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FractureBox
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -12,6 +13,7 @@ dune_add_test(NAME test_2p_fracture_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_box params.input -Problem.Name test_2p_fracture_box")
 
 dune_add_test(NAME test_2p_fracture_tpfa
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FractureCCTpfa
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -22,6 +24,7 @@ dune_add_test(NAME test_2p_fracture_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p_fracture_tpfa params.input -Problem.Name test_2p_fracture_tpfa")
 
 dune_add_test(NAME test_2p_fracture_mpfa
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa
               CMAKE_GUARD dune-foamgrid_FOUND
@@ -34,6 +37,7 @@ dune_add_test(NAME test_2p_fracture_mpfa
 # tests with gravity
 dune_add_test(NAME test_2p_fracture_gravity_box
               TARGET test_2p_fracture_box
+              LABELS porousmediumflow 2p
               CMAKE_GUARD dune-foamgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -43,6 +47,7 @@ dune_add_test(NAME test_2p_fracture_gravity_box
 
 dune_add_test(NAME test_2p_fracture_gravity_tpfa
               TARGET test_2p_fracture_tpfa
+              LABELS porousmediumflow 2p
               CMAKE_GUARD dune-foamgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -52,6 +57,7 @@ dune_add_test(NAME test_2p_fracture_gravity_tpfa
 
 dune_add_test(NAME test_2p_fracture_gravity_mpfa
               TARGET test_2p_fracture_mpfa
+              LABELS porousmediumflow 2p
               CMAKE_GUARD dune-foamgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
index f9222f7b78e0b0269fe1944d49d9628e1b089949..9cf5b051891d917abf74d4ee693cd6c02ce93b94 100644
--- a/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/incompressible/CMakeLists.txt
@@ -6,6 +6,7 @@ target_compile_definitions(test_2p_incompressible_tpfa PUBLIC TYPETAG=TwoPIncomp
 
 dune_add_test(NAME test_2p_incompressible_tpfa
               TARGET test_2p_incompressible_tpfa
+              LABELS porousmediumflow 2p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_cc-reference.vtu
@@ -15,6 +16,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa
 # using tpfa
 dune_add_test(NAME test_2p_incompressible_tpfa_restart
               TARGET test_2p_incompressible_tpfa
+              LABELS porousmediumflow 2p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2p_incompressible_cc-reference.vtu
@@ -26,6 +28,7 @@ set_tests_properties(test_2p_incompressible_tpfa_restart PROPERTIES DEPENDS test
 
 # using box
 dune_add_test(NAME test_2p_incompressible_box
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -36,6 +39,7 @@ dune_add_test(NAME test_2p_incompressible_box
 
 # using box with interface solver
 dune_add_test(NAME test_2p_incompressible_box_ifsolver
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleBox
               COMPILE_DEFINITIONS ENABLEINTERFACESOLVER=true
@@ -49,6 +53,7 @@ dune_add_test(NAME test_2p_incompressible_box_ifsolver
 
 # using tpfa with an oil-wet lens
 dune_add_test(NAME test_2p_incompressible_tpfa_oilwet
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -63,6 +68,7 @@ dune_add_test(NAME test_2p_incompressible_tpfa_oilwet
 
 # using mpfa
 dune_add_test(NAME test_2p_incompressible_mpfa
+              LABELS porousmediumflow 2p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPIncompressibleMpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
index d43fd41bf8cd43568ec9c1b64343dcb751012c44..e31b201261aa09e4b1283d3983675d718c705e68 100644
--- a/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/nonisothermal/CMakeLists.txt
@@ -1,6 +1,7 @@
 dune_symlink_to_source_files(FILES "params.input")
 
 dune_add_test(NAME test_2pni_box_simplex
+              LABELS porousmediumflow 2p  2pni
               SOURCES main.cc
               CMAKE_GUARD dune-uggrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::UGGrid<2>
@@ -12,6 +13,7 @@ dune_add_test(NAME test_2pni_box_simplex
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_simplex params.input -Problem.Name test_2pni_box_simplex -Grid.CellType Simplex")
 
 dune_add_test(NAME test_2pni_box_cube
+              LABELS porousmediumflow 2p  2pni
               SOURCES main.cc
               COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
               COMPILE_DEFINITIONS TYPETAG=InjectionBox2PNITypeTag
@@ -22,6 +24,7 @@ dune_add_test(NAME test_2pni_box_cube
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_box_cube params.input -Problem.Name test_2pni_box_cube")
 
 dune_add_test(NAME test_2pni_tpfa_simplex
+              LABELS porousmediumflow 2p  2pni
               SOURCES main.cc
               CMAKE_GUARD dune-alugrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::simplex,Dune::nonconforming>
@@ -33,6 +36,7 @@ dune_add_test(NAME test_2pni_tpfa_simplex
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pni_tpfa_simplex params.input -Problem.Name test_2pni_tpfa_simplex -Grid.CellType Simplex")
 
 dune_add_test(NAME test_2pni_tpfa_cube
+              LABELS porousmediumflow 2p  2pni
               SOURCES main.cc
               COMPILE_DEFINITIONS GRIDTYPE=Dune::YaspGrid<2>
               COMPILE_DEFINITIONS TYPETAG=InjectionCC2PNITypeTag
diff --git a/test/porousmediumflow/2p/sequential/CMakeLists.txt b/test/porousmediumflow/2p/sequential/CMakeLists.txt
index 0d68f1fef00b25f4eea9bd30508addf3eaed8043..ea330edaea7c3fd165293ef05e05d0eb4b0c4c0e 100644
--- a/test/porousmediumflow/2p/sequential/CMakeLists.txt
+++ b/test/porousmediumflow/2p/sequential/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 dune_symlink_to_source_files(FILES grids)
 
 dune_add_test(NAME test_impes
+              LABELS porousmediumflow 2p
               SOURCES test_impes.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -10,6 +11,7 @@ dune_add_test(NAME test_impes
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_impes")
 
 dune_add_test(NAME test_impesadaptive
+              LABELS porousmediumflow 2p
               SOURCES test_impesadaptive.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -18,6 +20,7 @@ dune_add_test(NAME test_impesadaptive
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_impesadaptive")
 
 dune_add_test(NAME test_impesadaptiverestart
+              LABELS porousmediumflow 2p
               SOURCES test_impesadaptiverestart.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -30,6 +33,7 @@ set_tests_properties(test_impesadaptiverestart PROPERTIES DEPENDS test_impesadap
 
 if(MPI_FOUND)
   dune_add_test(NAME test_impeswithamg
+                LABELS porousmediumflow 2p
                 SOURCES test_impeswithamg.cc
                 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                 CMD_ARGS --script fuzzy
@@ -38,6 +42,7 @@ if(MPI_FOUND)
                          --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_impeswithamg.input -TimeManager.TEnd 7e7")
 else()
   dune_add_test(NAME test_impeswithamg
+                LABELS porousmediumflow 2p
                 SOURCES test_impeswithamg.cc
                 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                 CMD_ARGS --script fuzzy
@@ -47,6 +52,7 @@ else()
 endif()
 
 dune_add_test(NAME test_transport
+              LABELS porousmediumflow 2p
               SOURCES test_transport.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -58,6 +64,7 @@ dune_add_test(NAME test_transport
 add_executable(test_mpfa2p test_mpfa2p.cc)
 dune_add_test(NAME test_mpfao2p
               TARGET test_mpfa2p
+              LABELS porousmediumflow 2p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_mpfao2p-reference.vtu
@@ -66,6 +73,7 @@ dune_add_test(NAME test_mpfao2p
 
 dune_add_test(NAME test_mpfal2p
               TARGET test_mpfa2p
+              LABELS porousmediumflow 2p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_mpfal2p-reference.vtu
@@ -74,6 +82,7 @@ dune_add_test(NAME test_mpfal2p
 
 dune_add_test(NAME test_mpfal2padaptive
               TARGET test_mpfa2p
+              LABELS porousmediumflow 2p
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_mpfal2padaptive-reference.vtu
@@ -82,6 +91,7 @@ dune_add_test(NAME test_mpfal2padaptive
 
 # 3d tests
 dune_add_test(NAME test_3d2pfv
+              LABELS porousmediumflow 2p
               SOURCES test_3d2p.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -90,6 +100,7 @@ dune_add_test(NAME test_3d2pfv
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pfv -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pfv -ModelType FV")
 
 dune_add_test(NAME test_3d2pfvadaptive
+              LABELS porousmediumflow 2p
               SOURCES test_3d2p.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -98,6 +109,7 @@ dune_add_test(NAME test_3d2pfvadaptive
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pfvadaptive -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pfvadaptive -ModelType FVAdaptive")
 
 dune_add_test(NAME test_3d2pmimetic
+              LABELS porousmediumflow 2p
               SOURCES test_3d2p.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -106,6 +118,7 @@ dune_add_test(NAME test_3d2pmimetic
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmimetic -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pmimetic -ModelType Mimetic")
 
 dune_add_test(NAME test_3d2pmimeticadaptive
+              LABELS porousmediumflow 2p
               SOURCES test_3d2p.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -114,6 +127,7 @@ dune_add_test(NAME test_3d2pmimeticadaptive
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmimeticadaptive -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pmimeticadaptive -ModelType MimeticAdaptive")
 
 dune_add_test(NAME test_3d2pmpfal
+              LABELS porousmediumflow 2p
               SOURCES test_3d2p.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -122,6 +136,7 @@ dune_add_test(NAME test_3d2pmpfal
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3d2pmpfal -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_3d2p.input -Problem.OutputName test_3d2pmpfal -ModelType MPFAL")
 
 dune_add_test(NAME test_3d2pmpfaladaptive
+              LABELS porousmediumflow 2p
               SOURCES test_3d2p.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
index 94953d3aa0eb4215509d37f7524b3a1fc851bf12..d1fd72aeef0ecdc0a29b98a10275cb659128f64d 100644
--- a/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2p1c/implicit/CMakeLists.txt
@@ -8,6 +8,7 @@ add_executable(test_2p1cni_steaminjection_box EXCLUDE_FROM_ALL main.cc)
 target_compile_definitions(test_2p1cni_steaminjection_box PUBLIC "TYPETAG=TwoPOneCNIBox")
 
 dune_add_test(NAME test_2p1cni_steaminjection_waterwet_box
+              LABELS porousmediumflow 2p1c  2p1cni
               TARGET test_2p1cni_steaminjection_box
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -16,6 +17,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_waterwet_box
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_box params_box.input -Problem.Name test_2p1cni_steaminjection_waterwet_box")
 
 dune_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa
+              LABELS porousmediumflow 2p1c  2p1cni
               TARGET test_2p1cni_steaminjection_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_waterwet_tpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p1cni_steaminjection_tpfa params_tpfa.input -Problem.Name test_2p1cni_steaminjection_waterwet_tpfa")
 
 dune_add_test(NAME test_2p1cni_steaminjection_gaswet_box
+              LABELS porousmediumflow 2p1c  2p1cni
               TARGET test_2p1cni_steaminjection_box
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -34,6 +37,7 @@ dune_add_test(NAME test_2p1cni_steaminjection_gaswet_box
                                                                                -SpatialParams.GasWetting true")
 
 dune_add_test(NAME test_2p1cni_steaminjection_gaswet_tpfa
+              LABELS porousmediumflow 2p1c  2p1cni
               TARGET test_2p1cni_steaminjection_tpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt
index 89e45721320f8db07e559e7b39960c128f50dc38..03a3b2816848c50bb58c68d9f3bceefd7afe40cc 100644
--- a/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/implicit/injection/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links(FILES params.input)
 
 dune_add_test(NAME test_2p2c_injection_box
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_2p2c_injection_box
 
 dune_add_test(NAME test_2p2c_injection_box_restart
               TARGET test_2p2c_injection_box
+              LABELS porousmediumflow 2p2c
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_2p2c_injection_box-reference.vtu
@@ -21,6 +23,7 @@ dune_add_test(NAME test_2p2c_injection_box_restart
 set_tests_properties(test_2p2c_injection_box_restart PROPERTIES DEPENDS test_2p2c_injection_box)
 
 dune_add_test(NAME test_2p2c_injection_tpfa
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -30,6 +33,7 @@ dune_add_test(NAME test_2p2c_injection_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_tpfa params.input -Problem.Name test_2p2c_injection_tpfa")
 
 dune_add_test(NAME test_2p2c_injection_mpfa
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfa ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -40,6 +44,7 @@ dune_add_test(NAME test_2p2c_injection_mpfa
 
 # isothermal tests with caching
 dune_add_test(NAME test_2p2c_injection_box_caching
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InjectionBox ENABLECACHING=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -49,6 +54,7 @@ dune_add_test(NAME test_2p2c_injection_box_caching
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_box_caching params.input -Problem.Name test_2p2c_injection_box_caching")
 
 dune_add_test(NAME test_2p2c_injection_tpfa_caching
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InjectionCCTpfa ENABLECACHING=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -58,6 +64,7 @@ dune_add_test(NAME test_2p2c_injection_tpfa_caching
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_injection_tpfa_caching params.input -Problem.Name test_2p2c_injection_tpfa_caching")
 
 dune_add_test(NAME test_2p2c_injection_mpfa_caching
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InjectionCCMpfa ENABLECACHING=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt
index 72d43f7d47025bab59e021edf89339f8dac3df18..fa0fc24558b16a852111be49c4d7af5f3d09af73 100644
--- a/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/implicit/mpnccomparison/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_2p2c_mpnc_comparison_box
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -10,6 +11,7 @@ dune_add_test(NAME test_2p2c_mpnc_comparison_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2c_mpnc_comparison_box params.input -Problem.Name test_2p2c_mpnc_comparison_box")
 
 dune_add_test(NAME test_2p2c_mpnc_comparison_tpfa
+              LABELS porousmediumflow 2p2c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPTwoCComparisonCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt
index d0cb6a651849cb2dc7a6fb385eb5e4560f552dc4..dc8f9e0c5c3e94790856b044b1511a2bf888214d 100644
--- a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # non-isothermal tests
 dune_add_test(NAME test_2p2cni_waterair_box
+              LABELS porousmediumflow 2p2c  2p2cni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_2p2cni_waterair_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2cni_waterair_box params.input -Problem.Name test_2p2cni_waterair_box")
 
 dune_add_test(NAME test_2p2cni_waterair_buoyancy_box
+              LABELS porousmediumflow 2p2c  2p2cni
               TARGET test_2p2cni_waterair_box
               COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -20,6 +22,7 @@ dune_add_test(NAME test_2p2cni_waterair_buoyancy_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2p2cni_waterair_box params.input -Problem.Name test_2p2cni_waterair_buoyancy_box -TimeLoop.DtInitial 150")
 
 dune_add_test(NAME test_2p2cni_waterair_tpfa
+              LABELS porousmediumflow 2p2c  2p2cni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=WaterAirCCTpfa ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/2p2c/sequential/CMakeLists.txt b/test/porousmediumflow/2p2c/sequential/CMakeLists.txt
index 31032eff520a899d0216e081dd6a05b8b24c43df..b8cae7a5bb6b6a2b9060ad70b1b25121e02e9792 100644
--- a/test/porousmediumflow/2p2c/sequential/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/sequential/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links()
 
 dune_add_test(NAME test_adaptive2p2c2d
+              LABELS porousmediumflow 2p2c
               SOURCES test_adaptive2p2c2d.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -9,6 +10,7 @@ dune_add_test(NAME test_adaptive2p2c2d
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c2d")
 
 dune_add_test(NAME test_adaptive2p2c3d
+              LABELS porousmediumflow 2p2c
               SOURCES test_adaptive2p2c3d.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -17,6 +19,7 @@ dune_add_test(NAME test_adaptive2p2c3d
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c3d")
 
 dune_add_test(NAME test_dec2p2c
+              LABELS porousmediumflow 2p2c
               SOURCES test_dec2p2c.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -25,6 +28,7 @@ dune_add_test(NAME test_dec2p2c
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_dec2p2c")
 
 dune_add_test(NAME test_multiphysics2p2c
+              LABELS porousmediumflow 2p2c
               SOURCES test_multiphysics2p2c.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt
index 56227e9e2b0f7597bf0e18c2501108ff7ee09a31..3f0687d8b89d1f3c7cb6534281d4706cef58aa51 100644
--- a/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt
+++ b/test/porousmediumflow/2pnc/implicit/diffusion/CMakeLists.txt
@@ -1,6 +1,7 @@
 dune_symlink_to_source_files(FILES params.input)
 
 dune_add_test(NAME test_2pnc_maxwellstefan_tpfa
+              LABELS porousmediumflow 2pnc
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=MaxwellStefansLaw<TypeTag>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -10,6 +11,7 @@ dune_add_test(NAME test_2pnc_maxwellstefan_tpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_maxwellstefan_tpfa params.input -Problem.Name test_2pnc_maxwellstefan_tpfa")
 
 dune_add_test(NAME test_2pnc_fickslaw_tpfa
+              LABELS porousmediumflow 2pnc
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TwoPNCDiffusion DIFFUSIONTYPE=FicksLaw<TypeTag>
               COMMAND  ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt b/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt
index 7a6d1ee8d93787bb93b6b3957cf249ef4ac61ae5..b5a982f5a0ed22dfd381601d5381c91c14b2e574 100644
--- a/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt
+++ b/test/porousmediumflow/2pnc/implicit/fuelcell/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES params.input)
 
 # isothermal tests
 dune_add_test(NAME test_2pnc_fuelcell_box
+              LABELS porousmediumflow 2pnc
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FuelCellBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_2pnc_fuelcell_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pnc_fuelcell_box -ParameterFile params.input -Problem.Name test_2pnc_fuelcell_box")
 
 dune_add_test(NAME test_2pnc_fuelcell_tpfa
+              LABELS porousmediumflow 2pnc
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FuelCellCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -21,6 +23,7 @@ dune_add_test(NAME test_2pnc_fuelcell_tpfa
 
 
 dune_add_test(NAME test_2pncni_fuelcell_box
+              LABELS porousmediumflow 2pnc  2pncni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=FuelCellNIBox NONISOTHERMAL=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
index 48262029e9c080e5fb8eeae6a1658634b7497640..4b2d0333cec72ace9e6a7d270aaccd356095d6ef 100644
--- a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES params.input)
 
 # isothermal tests
 dune_add_test(NAME test_2pncmin_dissolution_box
+              LABELS porousmediumflow 2pncmin
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=DissolutionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_2pncmin_dissolution_box -ParameterFile params.input -Problem.Name test_2pncmin_dissolution_box")
 
 dune_add_test(NAME test_2pncmin_dissolution_box_restart
+              LABELS porousmediumflow 2pncmin
               TARGET  test_2pncmin_dissolution_box
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -22,6 +24,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box_restart
 set_tests_properties(test_2pncmin_dissolution_box_restart PROPERTIES DEPENDS test_2pncmin_dissolution_box)
 
 dune_add_test(NAME test_2pncmin_dissolution_tpfa
+              LABELS porousmediumflow 2pncmin
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=DissolutionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt b/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt
index 32b3f8168efafcd52c4815f6c82f24f574939886..3b7d45575974e3554e9e1bdb293da08b28728d62 100644
--- a/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt
+++ b/test/porousmediumflow/3p/implicit/conduction/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links(FILES params.input)
 
 dune_add_test(NAME test_3pni_conduction_box
+              LABELS porousmediumflow 3p 3pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=ThreePNIConductionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_3pni_conduction_box
                             --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8})
 
 dune_add_test(NAME test_3pni_conduction_tpfa
+              LABELS porousmediumflow 3p 3pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=ThreePNIConductionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt b/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt
index cdb45ba694eca21400aaacf6a7be1b508e3e92b8..1a1b15d0609a2059096688ff592281087ecc26f0 100644
--- a/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt
+++ b/test/porousmediumflow/3p/implicit/convection/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links(FILES params.input)
 
 dune_add_test(NAME test_3pni_convection_box
+              LABELS porousmediumflow 3p 3pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=ThreePNIConvectionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_3pni_convection_box
                             --zeroThreshold {"velocity_aq \(m/s\)_1":1e-8})
 
 dune_add_test(NAME test_3pni_convection_tpfa
+              LABELS porousmediumflow 3p 3pni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=ThreePNIConvectionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt b/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt
index eb79d69c48f4ad2f9d94a9402f300d45a183eb23..b10d963fef74edcbccb226d3252dc63d28abd507 100644
--- a/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt
+++ b/test/porousmediumflow/3p/implicit/infiltration/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # isothermal tests
 dune_add_test(NAME test_3p_infiltration_box
+              LABELS porousmediumflow 3p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_3p_infiltration_box
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p_infiltration_box params.input -Problem.Name test_3p_infiltration_box")
 
 dune_add_test(NAME test_3p_infiltration_tpfa
+              LABELS porousmediumflow 3p
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
index a465b7dade6501f168513c477309ad41c0c1cfa4..21c58ecc0264e35510174a1a19cc65f4e0ba6d67 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
+++ b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # non-isothermal tests
 dune_add_test(NAME test_3p3cni_columnxylol_box
+              LABELS porousmediumflow 3p3c 3p3cni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=ColumnBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_3p3cni_columnxylol_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_columnxylol_box params.input -Problem.Name test_3p3cni_columnxylol_box")
 
 dune_add_test(NAME test_3p3cni_columnxylol_tpfa
+              LABELS porousmediumflow 3p3c 3p3cni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=ColumnCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt
index 9de2bfa2860a8a3c432b0ed0ad9d980b45f0b640..379da7cbccd70cbb6aabd2bf56948159a0590339 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt
+++ b/test/porousmediumflow/3p3c/implicit/infiltration/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # isothermal tests
 dune_add_test(NAME test_3p3c_infiltration_box
+              LABELS porousmediumflow 3p3c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePThreeCBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_3p3c_infiltration_box
                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p3c_infiltration_box params.input -Problem.Name test_3p3c_infiltration_box")
 
 dune_add_test(NAME test_3p3c_infiltration_tpfa
+              LABELS porousmediumflow 3p3c
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=InfiltrationThreePThreeCCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt
index bcb756b5c14a9e0f52974debd43d325902b6c8ea..2af313da9edc1a3dc76efa84fa90cc627706ec36 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt
+++ b/test/porousmediumflow/3p3c/implicit/kuevette/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links(FILES params.input)
 
 dune_add_test(NAME test_3p3cni_kuevette_box
+              LABELS porousmediumflow 3p3c 3p3cni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=KuevetteBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -10,6 +11,7 @@ dune_add_test(NAME test_3p3cni_kuevette_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_3p3cni_kuevette_box params.input -Problem.Name test_3p3cni_kuevette_box")
 
 dune_add_test(NAME test_3p3cni_kuevette_tpfa
+              LABELS porousmediumflow 3p3c 3p3cni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=KuevetteCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
index 5a16b6e0b479458e39f6fcc6ad51d83b07ebf1fd..1674b5cc503cdb8a6846a794a22087f42b7faeb4 100644
--- a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links(FILES params.input)
 
 dune_add_test(NAME test_3pwateroil_sagd_box
+              LABELS porousmediumflow 3pwateroil
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=ThreePWaterOilSagdBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/co2/implicit/CMakeLists.txt b/test/porousmediumflow/co2/implicit/CMakeLists.txt
index 84669a1a73b6a0433bfb90204eb70733847de3b3..b228f539651c897db7a2f3a3ab32b3b773960f55 100644
--- a/test/porousmediumflow/co2/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/co2/implicit/CMakeLists.txt
@@ -6,7 +6,7 @@ dune_symlink_to_source_files(FILES grids)
 # but the default 2p2c implementation outputs porosity per vertex.
 # Depending on the order of the elements, the porosity would differ in these cases.
 dune_add_test(NAME test_co2_box
-              LABELS co2
+              LABELS porousmediumflow co2
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousBox
               CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
@@ -18,7 +18,7 @@ dune_add_test(NAME test_co2_box
                        --zeroThreshold {"porosity":1})
 
 dune_add_test(NAME test_co2_tpfa
-              LABELS co2
+              LABELS porousmediumflow co2
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousCCTpfa
               CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
@@ -30,7 +30,7 @@ dune_add_test(NAME test_co2_tpfa
 
 # build target for the CO2 non-isothermal test problem
 dune_add_test(NAME test_co2ni_box
-              LABELS co2
+              LABELS porousmediumflow co2 co2ni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousNIBox
                                   ISOTHERMAL=0
@@ -43,7 +43,7 @@ dune_add_test(NAME test_co2ni_box
                        --zeroThreshold {"porosity":1})
 
 dune_add_test(NAME test_co2ni_tpfa
-              LABELS co2
+              LABELS porousmediumflow co2 co2ni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousNICCTpfa
                                   ISOTHERMAL=0
diff --git a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
index 2b1d74df78f9e46dbba7baabaa36b0e8eb6073ee..d1b73d131d5bd2d6babfedc28c8129b0afbf2e52 100644
--- a/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/2p2ccomparison/CMakeLists.txt
@@ -1,8 +1,8 @@
 add_input_file_links()
 
 dune_add_test(NAME test_mpnc_2p2c_comparison_box
+              LABELS porousmediumflow mpnc
               SOURCES main.cc
-              LABELS mpnc
               COMPILE_DEFINITIONS TYPETAG=MPNCComparisonBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -11,8 +11,8 @@ dune_add_test(NAME test_mpnc_2p2c_comparison_box
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_2p2c_comparison_box params.input -Problem.Name test_mpnc_2p2c_comparison_box")
 
 dune_add_test(NAME test_mpnc_2p2c_comparison_tpfa
+              LABELS porousmediumflow mpnc
               SOURCES main.cc
-              LABELS mpnc
               COMPILE_DEFINITIONS TYPETAG=MPNCComparisonCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
index e36c7cf9a22b5bc2110abc400d19008424b6797d..e767af623d7a043307ac78e773fc5c002bab1577 100644
--- a/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/kinetic/CMakeLists.txt
@@ -2,8 +2,8 @@ add_input_file_links()
 
 # build target for the full kinetic test problem
 dune_add_test(NAME test_mpnc_kinetic_box
+              LABELS porousmediumflow mpnc
               SOURCES main.cc
-              LABELS mpnc
               COMPILE_DEFINITIONS TYPETAG=EvaporationAtmosphereBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt
index aed66030e9ae9ceb9714fdd70912314eaa4ab223..6ed82bab494431c88b98e4a173c198242fd1d6b8 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/obstacle/CMakeLists.txt
@@ -2,8 +2,8 @@ add_input_file_links()
 dune_symlink_to_source_files(FILES grids)
 
 dune_add_test(NAME test_mpnc_obstacle_box
+              LABELS porousmediumflow mpnc
               SOURCES main.cc
-              LABELS mpnc
               COMPILE_DEFINITIONS TYPETAG=ObstacleBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
@@ -12,8 +12,8 @@ dune_add_test(NAME test_mpnc_obstacle_box
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_mpnc_obstacle_box params.input -Problem.Name test_mpnc_obstacle_box")
 
 dune_add_test(NAME test_mpnc_obstacle_tpfa
+              LABELS porousmediumflow mpnc
               SOURCES main.cc
-              LABELS mpnc
               COMPILE_DEFINITIONS TYPETAG=ObstacleCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt
index f730d5cdfb14f35b3b46b2dc137a65dd1f33326e..885586d20fa133b276e1a503d7420896a49fc288 100644
--- a/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt
+++ b/test/porousmediumflow/mpnc/implicit/thermalnonequilibrium/CMakeLists.txt
@@ -4,8 +4,8 @@ dune_symlink_to_source_files(FILES grids)
 # 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_mpnc_thermalnonequil_box
+              LABELS porousmediumflow mpnc
               SOURCES main.cc
-              LABELS mpnc
               COMPILE_DEFINITIONS TYPETAG=CombustionOneComponentBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt
index 95edd4df9572407e43df81a86840b3d027701f42..bca5c6115faebb6927e814ec682477c80be2eb2d 100644
--- a/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/analytical/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # comparison to analytical solution - only with tpfa
 dune_add_test(NAME test_richards_analytical_tpfa
+              LABELS porousmediumflow richards
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsAnalyticalCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
index 4bf55b7c8dc1eafee8fcc00170718c94fe166dd7..a840c8179f37973f39024014aee026f195adf857 100644
--- a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
@@ -8,6 +8,7 @@ add_executable(test_richards_lens_box EXCLUDE_FROM_ALL main.cc)
 target_compile_definitions(test_richards_lens_box PUBLIC TYPETAG=RichardsLensBox)
 
 dune_add_test(TARGET test_richards_lens_box
+              LABELS porousmediumflow richards
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_box-reference.vtu
@@ -15,6 +16,7 @@ dune_add_test(TARGET test_richards_lens_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box params.input -Problem.Name test_richards_lens_box")
 
 dune_add_test(TARGET test_richards_lens_tpfa
+              LABELS porousmediumflow richards
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
                        --files ${CMAKE_SOURCE_DIR}/test/references/test_richards_lens_tpfa-reference.vtu
@@ -23,6 +25,7 @@ dune_add_test(TARGET test_richards_lens_tpfa
 
 dune_add_test(NAME test_richards_lens_box_parallel_yasp
               TARGET test_richards_lens_box
+              LABELS porousmediumflow richards
               CMAKE_GUARD MPI_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
@@ -34,6 +37,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_yasp
 
 dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp
               TARGET test_richards_lens_tpfa
+              LABELS porousmediumflow richards
               CMAKE_GUARD MPI_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
@@ -47,6 +51,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp
 # This is why we need a bit higher saturation threshold since pc-sw is very sensitive to pressure for saturations close to 0
 dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart
               TARGET test_richards_lens_tpfa
+              LABELS porousmediumflow richards
               CMAKE_GUARD MPI_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_liq":1e-3,"water content":1e-3}
@@ -60,6 +65,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart
 set_tests_properties(test_richards_lens_tpfa_parallel_yasp_restart PROPERTIES DEPENDS test_richards_lens_tpfa_parallel_yasp)
 
 dune_add_test(NAME test_richards_lens_box_parallel_ug
+              LABELS porousmediumflow richards
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::UGGrid<2>
@@ -70,6 +76,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_ug
                        --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_ug params.input -Problem.Name test_richards_lens_box_parallel_ug")
 
 dune_add_test(NAME test_richards_lens_tpfa_parallel_ug
+              LABELS porousmediumflow richards
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::UGGrid<2>
@@ -80,6 +87,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_ug
                        --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_parallel_ug params.input -Problem.Name test_richards_lens_tpfa_parallel_ug")
 
 dune_add_test(NAME test_richards_lens_box_parallel_alu
+              LABELS porousmediumflow richards
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
@@ -90,6 +98,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_alu
                        --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_alu params.input -Problem.Name test_richards_lens_box_parallel_alu")
 
 dune_add_test(NAME test_richards_lens_tpfa_parallel_alu
+              LABELS porousmediumflow richards
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt
index 4852904c095d306d91ba6e48623a024ee80142b5..2986737159bf3bbe60b80a72da77bd12d2665de0 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/conduction/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # non-isothermal tests
 dune_add_test(NAME test_richardsni_conduction_box
+              LABELS porousmediumflow richards richardsni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_richardsni_conduction_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_conduction_box params.input -Problem.Name test_richardsni_conduction_box")
 
 dune_add_test(NAME test_richardsni_conduction_tpfa
+              LABELS porousmediumflow richards richardsni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsNIConductionCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt
index 52cf0c14539bb999258745eafe19197e63a691d8..0212ad9595cfb386f270b97f051eba6f12ee1e3b 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/convection/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # non-isothermal tests
 dune_add_test(NAME test_richardsni_convection_box
+              LABELS porousmediumflow richards richardsni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_richardsni_convection_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_convection_box params.input -Problem.Name test_richardsni_convection_box")
 
 dune_add_test(NAME test_richardsni_convection_tpfa
+              LABELS porousmediumflow richards richardsni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsNIConvectionCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt
index f542655f03d95981906f350be69f6e1e23915612..4e282aa697aff19c21a09d555724be00e416e2ce 100644
--- a/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/nonisothermal/evaporation/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links(FILES params.input)
 
 # non-isothermal tests
 dune_add_test(NAME test_richardsni_evaporation_tpfa
+              LABELS porousmediumflow richards richardsni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_richardsni_evaporation_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsni_evaporation_tpfa params.input -Problem.Name test_richardsni_evaporation_tpfa")
 
 dune_add_test(NAME test_richardsni_evaporation_box
+              LABELS porousmediumflow richards richardsni
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsNIEvaporationBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
index 8bf96901bd617d92ed08477f6eb33ea1a06828c0..9e2e31a8a170bfd8374bb07510ac5650ccbea213 100644
--- a/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/richardsnc/implicit/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_input_file_links(FILES params.input)
 
 dune_add_test(NAME test_richardsnc_box
+              LABELS porousmediumflow richardsnc
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -10,6 +11,7 @@ dune_add_test(NAME test_richardsnc_box
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_richardsnc_box params.input -Problem.Name test_richardsnc_box")
 
 dune_add_test(NAME test_richardsnc_tpfa
+              LABELS porousmediumflow richardsnc
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=RichardsWellTracerCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/solidenergy/CMakeLists.txt b/test/porousmediumflow/solidenergy/CMakeLists.txt
index bc1b644fd3895304c8fb5800065c29fc77fa84b4..85e5b735abf4fd634a07fa43fa1899e470c80d48 100644
--- a/test/porousmediumflow/solidenergy/CMakeLists.txt
+++ b/test/porousmediumflow/solidenergy/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 
 # non-isothermal tests
 dune_add_test(NAME test_solidenergy_tpfa
+              LABELS porousmediumflow solidenergy
               SOURCES main.cc
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
index c0a572e5f378b0bb8dc95c0e192b86bc66d8eaf1..87d53d5880bf2de9d83bff1f91b2942bca4b59e9 100644
--- a/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/1ptracer/CMakeLists.txt
@@ -1,6 +1,7 @@
 dune_symlink_to_source_files(FILES "params.input")
 
 dune_add_test(NAME test_1ptracer
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/porousmediumflow/tracer/constvel/CMakeLists.txt b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
index 9f2213bc424319c13623628dfb60a0dc1013559c..4eec6bed15b039ebeed940d53ceadfbfb77324dd 100644
--- a/test/porousmediumflow/tracer/constvel/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/constvel/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
 
 # explicit tracer tests (mass fractions)
 dune_add_test(NAME test_tracer_explicit_tpfa
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=false
               CMAKE_GUARD HAVE_UMFPACK
@@ -12,6 +13,7 @@ dune_add_test(NAME test_tracer_explicit_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa params.input -Problem.Name test_tracer_explicit_tpfa")
 
 dune_add_test(NAME test_tracer_explicit_box
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=false
               CMAKE_GUARD HAVE_UMFPACK
@@ -23,6 +25,7 @@ dune_add_test(NAME test_tracer_explicit_box
 
 # explicit tracer tests (mole fractions, should yield same result)
 dune_add_test(NAME test_tracer_explicit_tpfa_mol
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=false USEMOLES=true
               CMAKE_GUARD HAVE_UMFPACK
@@ -33,6 +36,7 @@ dune_add_test(NAME test_tracer_explicit_tpfa_mol
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_explicit_tpfa_mol params.input -Problem.Name test_tracer_explicit_tpfa_mol")
 
 dune_add_test(NAME test_tracer_explicit_box_mol
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=false USEMOLES=true
               CMAKE_GUARD HAVE_UMFPACK
@@ -44,6 +48,7 @@ dune_add_test(NAME test_tracer_explicit_box_mol
 
 # implicit tracer tests
 dune_add_test(NAME test_tracer_implicit_tpfa
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TracerTestTpfa IMPLICIT=true USEMOLES=false
               CMAKE_GUARD HAVE_UMFPACK
@@ -54,6 +59,7 @@ dune_add_test(NAME test_tracer_implicit_tpfa
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_implicit_tpfa params.input -Problem.Name test_tracer_implicit_tpfa")
 
 dune_add_test(NAME test_tracer_implicit_box
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=TracerTestBox IMPLICIT=true USEMOLES=false
               CMAKE_GUARD HAVE_UMFPACK
diff --git a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
index 4b9282be437c3d9150250ec9e6ba3afbb9c20bb5..bbba1bf7679bb1dbcfe19007494aa7a63b5a8d45 100644
--- a/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
+++ b/test/porousmediumflow/tracer/multicomp/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 
 # tracer tests
 dune_add_test(NAME test_tracer_maxwellstefan_tpfa
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestCC
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,6 +12,7 @@ dune_add_test(NAME test_tracer_maxwellstefan_tpfa
                         --command "${CMAKE_CURRENT_BINARY_DIR}/test_tracer_maxwellstefan_tpfa params.input -Problem.Name test_tracer_maxwellstefan_tpfa")
 
 dune_add_test(NAME test_tracer_maxwellstefan_box
+              LABELS porousmediumflow tracer
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=MaxwellStefanTestBox
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py