diff --git a/test/freeflow/navierstokes/angeli/CMakeLists.txt b/test/freeflow/navierstokes/angeli/CMakeLists.txt
index 9d44798759f9814e1d99f44816bef86155478ba4..e882aeb795c4665259fff05808929d6d3d1f2341 100644
--- a/test/freeflow/navierstokes/angeli/CMakeLists.txt
+++ b/test/freeflow/navierstokes/angeli/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_navierstokes_angeli
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
index 039eab0b4370df81ccc7e511b3bab0a1a5001c3c..90b3ccc8e1ab97483b6c4adcbe9e39995fc69684 100644
--- a/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
+++ b/test/freeflow/navierstokes/channel/1d/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_navierstokes_1d
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
index cdb8a2f05ca34e0560f8eeef4b47c2fa72b06378..b71f53c06bc93bb57e9f1c802c9ce61abfa5494c 100644
--- a/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
+++ b/test/freeflow/navierstokes/channel/2d/CMakeLists.txt
@@ -4,7 +4,7 @@ add_executable(test_ff_channel EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_ff_stokes_channel
               TARGET test_ff_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -15,7 +15,7 @@ dune_add_test(NAME test_ff_stokes_channel
 
 dune_add_test(NAME test_ff_navierstokes_channel
               TARGET test_ff_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -30,7 +30,7 @@ target_compile_definitions(test_ff_stokesni_channel PUBLIC "NONISOTHERMAL=1")
 
 dune_add_test(NAME test_ff_stokesni_channel_convection
               TARGET test_ff_stokesni_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -41,7 +41,7 @@ dune_add_test(NAME test_ff_stokesni_channel_convection
 
 dune_add_test(NAME test_ff_stokesni_channel_conduction
               TARGET test_ff_stokesni_channel
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
index 771f84986bb4b4abdcf4bf0df7d4eb6ea42d09bc..ab06fb4cd5becd3a4e438a3a8853d5ef86ce092d 100644
--- a/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
+++ b/test/freeflow/navierstokes/channel/3d/CMakeLists.txt
@@ -1,4 +1,5 @@
 dune_add_test(NAME test_ff_stokes_channel_3d
+              LABELS freeflow navierstokes
               SOURCES main.cc
               LABELS freeflow
               COMPILE_DEFINITIONS DIM_3D=1
@@ -12,6 +13,7 @@ dune_add_test(NAME test_ff_stokes_channel_3d
                              --zeroThreshold {"velocity_liq \(m/s\)":1e-12})
 
 dune_add_test(NAME test_ff_stokes_channel_pseudo3d
+              LABELS freeflow navierstokes
               SOURCES main.cc
               LABELS freeflow
               COMPILE_DEFINITIONS DIM_3D=0
diff --git a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
index bfc3911a00eaf0a6484bb3adc7560f65b9b9d7a6..3bbeb20f2f547493fd81d1a2f2deae3dd42e0c53 100644
--- a/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
+++ b/test/freeflow/navierstokes/closedsystem/CMakeLists.txt
@@ -2,7 +2,7 @@ add_executable(test_ff_navierstokes_closedsystem EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
               TARGET test_ff_navierstokes_closedsystem
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -13,7 +13,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1
 
 dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000
               TARGET test_ff_navierstokes_closedsystem
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -24,7 +24,7 @@ dune_add_test(NAME test_ff_navierstokes_closedsystem_ldc_re1000
 
 dune_add_test(NAME test_ff_navierstokes_closedsystem_hydrostaticpressure
               TARGET test_ff_navierstokes_closedsystem
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokes/donea/CMakeLists.txt b/test/freeflow/navierstokes/donea/CMakeLists.txt
index 2e96fd605a19d0b8e40701306ecdd9e8e9247184..859d6a1f8554ccb0d3f11261a147b138256d65f4 100644
--- a/test/freeflow/navierstokes/donea/CMakeLists.txt
+++ b/test/freeflow/navierstokes/donea/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_stokes_donea_nocaching
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -11,8 +11,8 @@ dune_add_test(NAME test_ff_stokes_donea_nocaching
                              -Problem.Name test_ff_stokes_donea_nocaching")
 
 dune_add_test(NAME test_ff_stokes_donea
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS ENABLECACHING=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
diff --git a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
index 018401d1af9346afc8a7bd5ea433b942f511cb87..f549843b312c1e46c5a53c91d6af8746889a7d06 100644
--- a/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
+++ b/test/freeflow/navierstokes/kovasznay/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_navierstokes_kovasznay
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -11,7 +11,7 @@ dune_add_test(NAME test_ff_navierstokes_kovasznay
 
 dune_add_test(NAME test_ff_navierstokes_kovasznay_higherorder
               TARGET test_ff_navierstokes_kovasznay
-              LABELS freeflow
+              LABELS freeflow navierstokes
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
                              --files ${CMAKE_SOURCE_DIR}/test/references/test_ff_navierstokes_kovasznay_higherorder-reference.vtu
diff --git a/test/freeflow/navierstokesnc/channel/CMakeLists.txt b/test/freeflow/navierstokesnc/channel/CMakeLists.txt
index 379fa0066a8a9c15f559192b7d342009689a69d8..e34842fcd454dad9a1e541e73bad9b7c22d17a34 100644
--- a/test/freeflow/navierstokesnc/channel/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/channel/CMakeLists.txt
@@ -5,7 +5,7 @@ target_compile_definitions(test_ff_stokes2c_mass PUBLIC "USE_MASS=1")
 
 dune_add_test(NAME test_ff_stokes2c_diffusion_mass
               TARGET test_ff_stokes2c_mass
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -19,7 +19,7 @@ add_executable(test_ff_stokes2c EXCLUDE_FROM_ALL main.cc)
 
 dune_add_test(NAME test_ff_stokes2c_diffusion_mole
               TARGET test_ff_stokes2c
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -31,7 +31,7 @@ dune_add_test(NAME test_ff_stokes2c_diffusion_mole
 
 dune_add_test(NAME test_ff_stokes2c_advection
               TARGET test_ff_stokes2c
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -42,7 +42,7 @@ dune_add_test(NAME test_ff_stokes2c_advection
 
 dune_add_test(NAME test_ff_stokes2c_advection_nocaching
               SOURCES main.cc
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS ENABLECACHING=0
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -57,7 +57,7 @@ target_compile_definitions(test_ff_stokes2cni PUBLIC "NONISOTHERMAL=1")
 
 dune_add_test(NAME test_ff_stokes2cni_advection
               TARGET test_ff_stokes2cni
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
@@ -68,7 +68,7 @@ dune_add_test(NAME test_ff_stokes2cni_advection
 
 dune_add_test(NAME test_ff_stokes2cni_diffusion
               TARGET test_ff_stokes2cni
-              LABELS freeflow
+              LABELS freeflow navierstokes
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
index 62574cdd452c47800f571a368ac9b81342e40bae..6d4ac045dabd692eb379a7dc55e556baad04bc5c 100644
--- a/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/densitydrivenflow/CMakeLists.txt
@@ -1,7 +1,7 @@
 
 dune_add_test(NAME test_ff_stokes2c_densitydrivenflow
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
index ea08a973d6bae8b1c507f7926a7db1b853d921e1..1407ddc5d92d5b21c38e1c8dab4ed9b402122dfd 100644
--- a/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
+++ b/test/freeflow/navierstokesnc/maxwellstefan/CMakeLists.txt
@@ -1,6 +1,6 @@
 dune_add_test(NAME test_ff_stokes2c_maxwellstefan
+              LABELS freeflow navierstokes
               SOURCES main.cc
-              LABELS freeflow
               CMAKE_GUARD HAVE_UMFPACK
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy