diff --git a/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt b/test/multidomain/boundary/darcydarcy/1p_1p/CMakeLists.txt
index d38e8c96538c99fbba123dc883ebbc4d185e8220..2e2da08cbcfd9d49f66a9b3b838a7bbb1175b74f 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 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 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..137c333c605b0147168255bd0cdb4b0182da2b26 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 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..b3c774b70a84dc7b343ea1e688f68b8d6941fa8e 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 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 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 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_2p2c/CMakeLists.txt b/test/multidomain/boundary/stokesdarcy/1p2c_2p2c/CMakeLists.txt
index 5079e4ecedb35d8ee165664e363f0746ac7833f7..540a878ea72fd906b16fe29e2e7b256f53c0bc30 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 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 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..5f25265f26dc30dcb1e79701f95074ab3f357c27 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 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..ec0fce3a9e9e6dedbdf08e1c237f1120f4652798 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 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 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..8f4048eb6cf13c4046bd914ef641e4b8d4854046 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 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..bf17c8ae1fc61ca1b1e4c4db7f1abc94705c867d 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 boundary 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..64e01fd6297733910f57a6f55faf55b52bb963ef 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 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 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 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 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 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 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 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..302557f6116b62e2d5c7e03a0acfc83b070a885d 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 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 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..78909ad4fda9b038a0d57553ca83366816e9286b 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 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 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..641ff734865592bd59c6bb049114fd14c84ae3e2 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 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 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..3bca894a60009fe3773867eeeb95c634e2d407c6 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 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 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 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 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..881243625f3531841cff9827dc71fcd1de115493 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 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 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 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 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 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 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 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 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..d1226e4bd67aab336121c9f6174ad02ba070d022 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 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..8df4cd3942ae14e37b61f382b3ea0e15440dafba 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 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 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 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 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 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 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 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 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 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 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 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..17a08d9774bdd54e12ca00d4f394e6fb065d6367 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 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 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 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