diff --git a/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt b/test/porousmediumflow/1p/implicit/compressible/instationary/CMakeLists.txt
index 16854c65f40d1defefc5e08f5d6b1652b6a81674..6b7f57041b8e4b3fd5eeddf555b9f25a86b8c580 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 tpfa
               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 mpfa
               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 box
               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..e01c6f1a32e051f1bb82d94f78df573f8e907eda 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 tpfa
               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 mpfa
               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 box
               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..4c3e1238c0ff5fa0e99c0a90f589d60a6d46ce8c 100644
--- a/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/fracture2d3d/CMakeLists.txt
@@ -3,7 +3,8 @@ add_input_file_links()
 dune_symlink_to_source_files(FILES grids)
 
 # dim < dimWorld tests with Dune::Foamgrid<2,3>
-dune_add_test(NAME test_1p_fracture2d3d_box
+dune_add_test(NAME test_0p_fracture2d3d_box
+              LABELS porousmediumflow 0p box
               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 tpfa
               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 mpfa
               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..2cf1177c02502ec730e0ddf4f237e315c2cd8b82 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 tpfa
               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 tpfa
               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 mpfa
               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 box
               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 tpfa
               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 box
               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 tpfa
               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 mpfa
               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 box
               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 box
               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 mpfa
               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..d5c55a28e8539d0f2cc216e79bd0aa424dab7915 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 tpfa
               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 mpfa
               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 box
               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 tpfa
               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..71f246465054b6012b6f2e4f244682220428cb7c 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 tpfa
               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 box
               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..e27b2320452fcae16c1cf7998a5125e077c4438c 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 box 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 box 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 box 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 tpfa 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 tpfa 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 mpfa 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..e3c876e2f0bd8c0c48b5da27d01e23b6bab20184 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 tpfa
               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 tpfa
               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 tpfa
               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 tpfa
               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 box
               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..a73372361139a12481f23a77ef74754e2132071c 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 tpfa
               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..d9233b6988de81a67aa9f62bf76c12bae853f84c 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 tpfa
               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 box
               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..f99512bc6ebce56d0fb488ad04d2ec8a7fb5677d 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 box
               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 tpfa
               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 mpfa
               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..df51128b8fa19075b3125c09f02dbc2fa99df8a3 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 box
               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..7164a0c9c66ce628bac5deb06d2e2f8d838ffd8a 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 box 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 tpfa 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 mpfa 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..b4da1c487f100fecff868ae1960307103167f49b 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 box 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 tpfa 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 mpfa 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..d0ebb9b5048950d8b4eb1ca0550a904f2584bf94 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 box 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 box 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 tpfa 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 tpfa 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 mpfa 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 mpfa 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..9c766fbde567c9d8ecd9a35077910779f26f3ef9 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 box
               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 tpfa
               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..8d84982a0de759a4c729299dd18cf83072fc9445 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 box 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..5f3b28fae695bd24190415e26b093ae7145de37a 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 tpfa
               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 tpfa
               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 mpfa
              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 box
               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..80d0c6523aec9d1727843c6d1335a318c31b4e6a 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 box
               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 box
               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 box
              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 box
              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 box
               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 box
               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..cd31eded817982d97438b287d9c5e855706792d9 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 tpfa
               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..ab505a8b487641cf78b28a450901ef86f7c4d51e 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 box
               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 tpfa
               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 mpfa
               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 box
               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 tpfa
               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 mpfa
               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..b20ec650c1f22a50aecf37f9a88023cb1838242b 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 tpfa
               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 tpfa
               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 box
               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 box
               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 tpfa
               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 mpfa
               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..2a6c9434974e1e05bfd430681f7d7f616d41b82a 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 box 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 box 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 tpfa 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 tpfa 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..0317e82c30586d2f22f6256d7973a8b3801f481c 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 mpfa
               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 mpfa
               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 mpfa
               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 mpfa
               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 mpfa
               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..d26fc68fe206c85e75f1080ca8c36d3e5808a494 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 box 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 tpfa 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 box 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 tpfa 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..340ebb06ed5e8c6a5f0fdffdd21a82b05a3721c1 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 box
               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 box
               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 tpfa
               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 mpfa
               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 box
               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 tpfa
               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 mpfa
               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..ed1e053dc0a9d2a92d69420621d819caddade22f 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 box
               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 tpfa
               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..1a5cfc50438535f8e54ca40552a2c9267f681345 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 box 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 box 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 tpfa 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..85136d274f0d58c1d59ae8ce9ef7f1164ecb404a 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 tpfa
               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 tpfa
               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..5302c0442a64c37bee62412a601f7dadb839214b 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 box
               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 tpfa
               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 box 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..eecfb536be2ca432e1527ec188c0e73b6c8a3674 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 box
               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 box
               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 tpfa
               SOURCES main.cc
               COMPILE_DEFINITIONS TYPETAG=DissolutionCCTpfa
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py