diff --git a/test/common/boundingboxtree/CMakeLists.txt b/test/common/boundingboxtree/CMakeLists.txt
index c40a8ee1e99414d6a75e932dfbd806ea5eb58884..b49cf7edb81bd22b5b0d0d617cfcfa5f4232efff 100644
--- a/test/common/boundingboxtree/CMakeLists.txt
+++ b/test/common/boundingboxtree/CMakeLists.txt
@@ -1,19 +1,23 @@
 # build the tests for the bounding box tree
 dune_add_test(NAME test_bboxtree_dim1
               SOURCES test_bboxtree.cc
-              COMPILE_DEFINITIONS WORLD_DIMENSION=1)
+              COMPILE_DEFINITIONS WORLD_DIMENSION=1
+              LABELS unit)
 
 dune_add_test(NAME test_bboxtree_dim2
               SOURCES test_bboxtree.cc
-              COMPILE_DEFINITIONS WORLD_DIMENSION=2)
+              COMPILE_DEFINITIONS WORLD_DIMENSION=2
+              LABELS unit)
 
 dune_add_test(NAME test_bboxtree_dim3
               SOURCES test_bboxtree.cc
-              COMPILE_DEFINITIONS WORLD_DIMENSION=3)
+              COMPILE_DEFINITIONS WORLD_DIMENSION=3
+              LABELS unit)
 
 dune_add_test(NAME test_geometry_fracture
               SOURCES test_geometry_fracture.cc
-              CMAKE_GUARD dune-foamgrid_FOUND)
+              CMAKE_GUARD dune-foamgrid_FOUND
+              LABELS unit)
 
 # symlink the input file in the build directory
 dune_symlink_to_source_files(FILES "network1d.msh" "network2d.msh" "fracture.msh")
diff --git a/test/common/geometry/CMakeLists.txt b/test/common/geometry/CMakeLists.txt
index b20b36ca512d99a7494b45cdde85454227704f9e..789a8c5c548b3b02612825d35ba5a55c4c096737 100644
--- a/test/common/geometry/CMakeLists.txt
+++ b/test/common/geometry/CMakeLists.txt
@@ -1,7 +1,7 @@
-dune_add_test(SOURCES test_1d3d_intersection.cc)
-dune_add_test(SOURCES test_2d3d_intersection.cc)
-dune_add_test(SOURCES test_graham_convex_hull.cc)
-dune_add_test(SOURCES test_makegeometry.cc)
+dune_add_test(SOURCES test_1d3d_intersection.cc LABELS unit)
+dune_add_test(SOURCES test_2d3d_intersection.cc LABELS unit)
+dune_add_test(SOURCES test_graham_convex_hull.cc LABELS unit)
+dune_add_test(SOURCES test_makegeometry.cc LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/common/math/CMakeLists.txt b/test/common/math/CMakeLists.txt
index f5836ca31593b4e2dbd52e693fa2e3ca4e3237f7..4f59e6e0a5c5b0200d57fbc1501407fe21d903b7 100644
--- a/test/common/math/CMakeLists.txt
+++ b/test/common/math/CMakeLists.txt
@@ -1,5 +1,6 @@
 # build the test for the property system
-dune_add_test(SOURCES test_math.cc)
+dune_add_test(SOURCES test_math.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/common/parameters/CMakeLists.txt b/test/common/parameters/CMakeLists.txt
index 4262657f96117eee35cee2c978f4f0934ab68d02..214246941a566cbe86b7399be36c84e4837c44d4 100644
--- a/test/common/parameters/CMakeLists.txt
+++ b/test/common/parameters/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_loggingparametertree.cc)
+dune_add_test(SOURCES test_loggingparametertree.cc
+              LABELS unit)
 dune_symlink_to_source_files(FILES "params.input")
 
 #install sources
diff --git a/test/common/propertysystem/CMakeLists.txt b/test/common/propertysystem/CMakeLists.txt
index 2d82ac1646dc02c50f04bbc74688e4928ac1d276..f15c1a0c67732a766656ec714d8f7e04351f1e4b 100644
--- a/test/common/propertysystem/CMakeLists.txt
+++ b/test/common/propertysystem/CMakeLists.txt
@@ -1,7 +1,9 @@
 # build the test for the property system
-dune_add_test(SOURCES test_propertysystem.cc)
+dune_add_test(SOURCES test_propertysystem.cc
+              LABELS unit)
 # build the test for the property system using the old macros (deprecated)
-dune_add_test(SOURCES test_propertysystem_macros.cc)
+dune_add_test(SOURCES test_propertysystem_macros.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/common/spline/CMakeLists.txt b/test/common/spline/CMakeLists.txt
index 6044398e603f77e5a5bffc4f34aff92234bafd52..0ad622d9d147d38e31c28902693ea2ab89361454 100644
--- a/test/common/spline/CMakeLists.txt
+++ b/test/common/spline/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_spline.cc)
+dune_add_test(SOURCES test_spline.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/common/timeloop/CMakeLists.txt b/test/common/timeloop/CMakeLists.txt
index 9bfd94b5b603acf63d7516f1939b87a09fd5c6cb..b22b3eeecb99b5dbe063893e702a523606b15b6c 100644
--- a/test/common/timeloop/CMakeLists.txt
+++ b/test/common/timeloop/CMakeLists.txt
@@ -1 +1,2 @@
-dune_add_test(SOURCES test_timeloop.cc)
+dune_add_test(SOURCES test_timeloop.cc
+              LABELS unit)
diff --git a/test/common/typetraits/CMakeLists.txt b/test/common/typetraits/CMakeLists.txt
index 48df1479fd3bd5e3a7de18601a5abd58a9b37b06..2b0fd0023981e54e5aecf6cfd25daf3562d98ef6 100644
--- a/test/common/typetraits/CMakeLists.txt
+++ b/test/common/typetraits/CMakeLists.txt
@@ -1 +1,2 @@
-dune_add_test(SOURCES test_isvalid.cc)
+dune_add_test(SOURCES test_isvalid.cc
+              LABELS unit)
diff --git a/test/discretization/box/CMakeLists.txt b/test/discretization/box/CMakeLists.txt
index 91a9d142adf257c23646ee554c5f0ad4cfe88d0f..5bbe00764e5a6e9257a7cefbc4e632ca8dc9d390 100644
--- a/test/discretization/box/CMakeLists.txt
+++ b/test/discretization/box/CMakeLists.txt
@@ -1,10 +1,12 @@
 dune_add_test(NAME test_boxfvgeometry
               SOURCES test_boxfvgeometry.cc
-              COMPILE_DEFINITIONS ENABLE_CACHING=false)
+              COMPILE_DEFINITIONS ENABLE_CACHING=false
+              LABELS unit)
 
 dune_add_test(NAME test_boxfvgeometry_caching
               SOURCES test_boxfvgeometry.cc
-              COMPILE_DEFINITIONS ENABLE_CACHING=true)
+              COMPILE_DEFINITIONS ENABLE_CACHING=true
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/discretization/cellcentered/tpfa/CMakeLists.txt b/test/discretization/cellcentered/tpfa/CMakeLists.txt
index 74de3de84290aed94dbbdcbe2de3f1965286c029..813ea9e4e75ed418f6e2550d4f3251c849f44379 100644
--- a/test/discretization/cellcentered/tpfa/CMakeLists.txt
+++ b/test/discretization/cellcentered/tpfa/CMakeLists.txt
@@ -1,17 +1,21 @@
 dune_add_test(NAME test_tpfafvgeometry
               SOURCES test_tpfafvgeometry.cc
-              COMPILE_DEFINITIONS ENABLE_CACHING=false)
+              COMPILE_DEFINITIONS ENABLE_CACHING=false
+              LABELS unit)
 
 dune_add_test(NAME test_tpfafvgeometry_caching
               SOURCES test_tpfafvgeometry.cc
-              COMPILE_DEFINITIONS ENABLE_CACHING=true)
+              COMPILE_DEFINITIONS ENABLE_CACHING=true
+              LABELS unit)
 
 dune_add_test(NAME test_tpfafvgeometry_nonconforming
               SOURCES test_tpfafvgeometry_nonconforming.cc
               COMPILE_DEFINITIONS ENABLE_CACHING=false
-              CMAKE_GUARD dune-alugrid_FOUND)
+              CMAKE_GUARD dune-alugrid_FOUND
+              LABELS unit)
 
 dune_add_test(NAME test_cachedtpfafvgeometry_nonconforming
               SOURCES test_tpfafvgeometry_nonconforming.cc
               COMPILE_DEFINITIONS ENABLE_CACHING=true
-              CMAKE_GUARD dune-alugrid_FOUND)
+              CMAKE_GUARD dune-alugrid_FOUND
+              LABELS unit)
diff --git a/test/discretization/staggered/CMakeLists.txt b/test/discretization/staggered/CMakeLists.txt
index ca77cf7288376bf9f6b0554b8d5beca0b3403115..e5e3e4fcc918b20e68a7a3fd7c933299976b3bf1 100644
--- a/test/discretization/staggered/CMakeLists.txt
+++ b/test/discretization/staggered/CMakeLists.txt
@@ -1,8 +1,10 @@
 dune_add_test(NAME test_staggeredfvgeometry
-              SOURCES test_staggeredfvgeometry.cc)
+              SOURCES test_staggeredfvgeometry.cc
+              LABELS unit)
 
 dune_add_test(NAME test_staggered_free_flow_geometry
-              SOURCES test_staggered_free_flow_geometry.cc)
+              SOURCES test_staggered_free_flow_geometry.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/io/container/CMakeLists.txt b/test/io/container/CMakeLists.txt
index 92b788a39a6e51c4fc57dbc709a91294e252bab4..e5a8c694c38422c0034e99b69d6ec51dca1483a5 100644
--- a/test/io/container/CMakeLists.txt
+++ b/test/io/container/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_container_io.cc)
+dune_add_test(SOURCES test_container_io.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/io/gnuplotinterface/CMakeLists.txt b/test/io/gnuplotinterface/CMakeLists.txt
index 9dadc24d6480a6852a2cc7878629e9300c5f4d2d..7f8bc31246e5774f4975248337b69fb336782137 100644
--- a/test/io/gnuplotinterface/CMakeLists.txt
+++ b/test/io/gnuplotinterface/CMakeLists.txt
@@ -1,5 +1,6 @@
 file(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output")
-dune_add_test(SOURCES test_gnuplotinterface.cc)
+dune_add_test(SOURCES test_gnuplotinterface.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/io/gridmanager/CMakeLists.txt b/test/io/gridmanager/CMakeLists.txt
index 4f8f9c0532f55094ed47b53a96b78e7e82a276d8..14a3491889f07c72d8810afa6246dd17751c3443 100644
--- a/test/io/gridmanager/CMakeLists.txt
+++ b/test/io/gridmanager/CMakeLists.txt
@@ -3,6 +3,7 @@ dune_symlink_to_source_files(FILES grids)
 
 dune_add_test(NAME test_gridmanager_cake
               SOURCES test_gridmanager_cake.cc
+              LABELS unit
               CMAKE_GUARD "( dune-uggrid_FOUND OR dune-alugrid_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -12,6 +13,7 @@ dune_add_test(NAME test_gridmanager_cake
 
 dune_add_test(NAME test_gridmanager_subgrid
               SOURCES test_gridmanager_subgrid.cc
+              LABELS unit
               CMAKE_GUARD dune-subgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -28,6 +30,7 @@ target_compile_definitions(test_gridmanager_gmsh_3d_alu PUBLIC GRIDTYPE=Dune::AL
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
               TARGET test_gridmanager_gmsh_3d_alu
+              LABELS unit
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -37,6 +40,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_alu_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_alu_parallel
               TARGET test_gridmanager_gmsh_3d_alu
+              LABELS unit
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -49,6 +53,7 @@ target_compile_definitions(test_gridmanager_gmsh_3d_ug PUBLIC GRIDTYPE=Dune::UGG
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
               TARGET test_gridmanager_gmsh_3d_ug
+              LABELS unit
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -60,6 +65,7 @@ dune_add_test(NAME test_gridmanager_gmsh_3d_ug_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_3d_ug_parallel
               TARGET test_gridmanager_gmsh_3d_ug
+              LABELS unit
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -74,6 +80,7 @@ target_compile_definitions(test_gridmanager_gmsh_e_markers_alu PUBLIC GRIDTYPE=D
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
               TARGET test_gridmanager_gmsh_e_markers_alu
+              LABELS unit
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -85,6 +92,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_alu_parallel
               TARGET test_gridmanager_gmsh_e_markers_alu
+              LABELS unit
               CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -99,6 +107,7 @@ target_compile_definitions(test_gridmanager_gmsh_e_markers_ug PUBLIC GRIDTYPE=Du
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
               TARGET test_gridmanager_gmsh_e_markers_ug
+              LABELS unit
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -110,6 +119,7 @@ dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_sequential
 
 dune_add_test(NAME test_gridmanager_gmsh_e_markers_ug_parallel
               TARGET test_gridmanager_gmsh_e_markers_ug
+              LABELS unit
               CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -124,6 +134,7 @@ target_compile_definitions(test_gridmanager_dgf_alu PUBLIC GRIDTYPE=Dune::ALUGri
 
 dune_add_test(NAME test_gridmanager_dgf_alu_sequential
               TARGET test_gridmanager_dgf_alu
+              LABELS unit
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -137,6 +148,7 @@ dune_add_test(NAME test_gridmanager_dgf_alu_sequential
 
 dune_add_test(NAME test_gridmanager_dgf_alu_parallel
               TARGET test_gridmanager_dgf_alu
+              LABELS unit
               CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -153,6 +165,7 @@ target_compile_definitions(test_gridmanager_dgf_ug PUBLIC GRIDTYPE=Dune::UGGrid<
 
 dune_add_test(NAME test_gridmanager_dgf_ug_sequential
               TARGET test_gridmanager_dgf_ug
+              LABELS unit
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -166,6 +179,7 @@ dune_add_test(NAME test_gridmanager_dgf_ug_sequential
 
 dune_add_test(NAME test_gridmanager_dgf_ug_parallel
               TARGET test_gridmanager_dgf_ug
+              LABELS unit
               CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
diff --git a/test/io/vtk/CMakeLists.txt b/test/io/vtk/CMakeLists.txt
index 5df147f211c4285ff5f0fbee0699655d3d6e36f3..b4344da7edcff23aff566e46b7fe9262684d1914 100644
--- a/test/io/vtk/CMakeLists.txt
+++ b/test/io/vtk/CMakeLists.txt
@@ -2,6 +2,7 @@ add_input_file_links()
 
 dune_add_test(NAME test_vtkreader_3d
               SOURCES test_vtkreader.cc
+              LABELS unit
               CMAKE_GUARD dune-alugrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<3,3,Dune::cube,Dune::nonconforming>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -18,6 +19,7 @@ dune_add_test(NAME test_vtkreader_3d
 
 dune_add_test(NAME test_vtkreader_2d
               SOURCES test_vtkreader.cc
+              LABELS unit
               CMAKE_GUARD dune-alugrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -29,6 +31,7 @@ dune_add_test(NAME test_vtkreader_2d
 
 dune_add_test(NAME test_vtkreader_2d3d
               SOURCES test_vtkreader.cc
+              LABELS unit
               CMAKE_GUARD dune-foamgrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::FoamGrid<2,3>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -40,6 +43,7 @@ dune_add_test(NAME test_vtkreader_2d3d
 
 dune_add_test(NAME test_vtkreader_1d
               SOURCES test_vtkreader.cc
+              LABELS unit
               CMAKE_GUARD dune-foamgrid_FOUND
               COMPILE_DEFINITIONS GRIDTYPE=Dune::FoamGrid<1,3>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -50,4 +54,5 @@ dune_add_test(NAME test_vtkreader_1d
                                ${CMAKE_CURRENT_BINARY_DIR}/test-1d.vtp)
 
 dune_add_test(NAME test_vtk_staggeredfreeflowpvnames
-              SOURCES test_vtk_staggeredfreeflowpvnames.cc)
+              SOURCES test_vtk_staggeredfreeflowpvnames.cc
+              LABELS unit)
diff --git a/test/material/components/CMakeLists.txt b/test/material/components/CMakeLists.txt
index 5a819923ee29ee2060341289121760756ccb478c..682a95a382f880fcb8e00291e9fc90d35f850a05 100644
--- a/test/material/components/CMakeLists.txt
+++ b/test/material/components/CMakeLists.txt
@@ -1,104 +1,125 @@
 dune_add_test(SOURCES test_componenttraits.cc
-              COMPILE_ONLY)
+              COMPILE_ONLY
+              LABELS unit)
 
 add_executable(plot_component plotproperties.cc)
 
 dune_add_test(NAME plot_air
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "Air")
+              CMD_ARGS "Air"
+              LABELS unit)
 
 dune_add_test(NAME plot_benzene
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "Benzene")
+              CMD_ARGS "Benzene"
+              LABELS unit)
 
 dune_add_test(NAME plot_brine
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "Brine")
+              CMD_ARGS "Brine"
+              LABELS unit)
 
 dune_add_test(NAME plot_calcite
             TARGET plot_component
             COMMAND ./plot_component
-            CMD_ARGS "Calcite")
+            CMD_ARGS "Calcite"
+            LABELS unit)
 
 dune_add_test(NAME plot_calciumion
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "CalciumIon")
+              CMD_ARGS "CalciumIon"
+              LABELS unit)
 
 dune_add_test(NAME plot_cao
             TARGET plot_component
             COMMAND ./plot_component
-            CMD_ARGS "CaO")
+            CMD_ARGS "CaO"
+            LABELS unit)
 
 dune_add_test(NAME plot_cao2h2
             TARGET plot_component
             COMMAND ./plot_component
-            CMD_ARGS "CaO2H2")
+            CMD_ARGS "CaO2H2"
+            LABELS unit)
 
 dune_add_test(NAME plot_carbonateion
             TARGET plot_component
             COMMAND ./plot_component
-            CMD_ARGS "CarbonateIon")
+            CMD_ARGS "CarbonateIon"
+            LABELS unit)
 
 dune_add_test(NAME plot_ch4
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "CH4")
+              CMD_ARGS "CH4"
+              LABELS unit)
 
 dune_add_test(NAME plot_granite
             TARGET plot_component
             COMMAND ./plot_component
-            CMD_ARGS "Granite")
+            CMD_ARGS "Granite"
+            LABELS unit)
 
 dune_add_test(NAME plot_h2
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "H2")
+              CMD_ARGS "H2"
+              LABELS unit)
 
 dune_add_test(NAME plot_h2o
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "H2O")
+              CMD_ARGS "H2O"
+              LABELS unit)
 
 dune_add_test(NAME plot_heavyoil
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "HeavyOil")
+              CMD_ARGS "HeavyOil"
+              LABELS unit)
 
 dune_add_test(NAME plot_mesitylene
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "Mesitylene")
+              CMD_ARGS "Mesitylene"
+              LABELS unit)
 
 dune_add_test(NAME plot_n2
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "N2")
+              CMD_ARGS "N2"
+              LABELS unit)
 
 dune_add_test(NAME plot_nacl
-            TARGET plot_component
-            COMMAND ./plot_component
-            CMD_ARGS "NaCl")
+              TARGET plot_component
+              COMMAND ./plot_component
+              CMD_ARGS "NaCl"
+              LABELS unit)
 
 dune_add_test(NAME plot_o2
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "O2")
+              CMD_ARGS "O2"
+              LABELS unit)
 
 dune_add_test(NAME plot_simpleh2o
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "SimpleH2O")
+              CMD_ARGS "SimpleH2O"
+              LABELS unit)
 
 dune_add_test(NAME plot_trichloroethene
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "Trichloroethene")
+              CMD_ARGS "Trichloroethene"
+              LABELS unit)
 
 dune_add_test(NAME plot_xylene
               TARGET plot_component
               COMMAND ./plot_component
-              CMD_ARGS "Xylene")
+              CMD_ARGS "Xylene"
+              LABELS unit)
diff --git a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
index 2ccc832ec1e001f13b593d4bde6b7bfffd1e8c52..aac20abc087c35f0b7b7989de03cf6ce73a61770 100644
--- a/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
+++ b/test/material/fluidmatrixinteractions/2p/CMakeLists.txt
@@ -1,4 +1,5 @@
 dune_add_test(SOURCES test_thermalconductivityjohansen.cc
+              LABELS unit
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                        --files ${CMAKE_SOURCE_DIR}/test/references/thermalconductivityjohansen-reference.dat
@@ -6,6 +7,7 @@ dune_add_test(SOURCES test_thermalconductivityjohansen.cc
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_thermalconductivityjohansen")
 
 dune_add_test(SOURCES test_thermalconductivitysomerton.cc
+              LABELS unit
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                       --files ${CMAKE_SOURCE_DIR}/test/references/thermalconductivitysomerton-reference.dat
diff --git a/test/material/fluidmatrixinteractions/CMakeLists.txt b/test/material/fluidmatrixinteractions/CMakeLists.txt
index 1b172d15a1e34b984b363461aba074d8bd8f7df3..61065922147d26b6f212e5d278b993b0c6a77a11 100644
--- a/test/material/fluidmatrixinteractions/CMakeLists.txt
+++ b/test/material/fluidmatrixinteractions/CMakeLists.txt
@@ -1,6 +1,7 @@
 add_subdirectory("2p")
 
 dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc
+              LABELS unit
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                        --files ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivitymillingtonquirk-reference.dat
@@ -8,6 +9,7 @@ dune_add_test(SOURCES test_effectivediffusivitymillingtonquirk.cc
                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_effectivediffusivitymillingtonquirk")
 
 dune_add_test(SOURCES test_effectivediffusivityconstanttortuosity.cc
+              LABELS unit
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzyData --delimiter " "
                        --files ${CMAKE_SOURCE_DIR}/test/references/effectivediffusivityconstanttau-reference.dat
diff --git a/test/material/fluidsystems/CMakeLists.txt b/test/material/fluidsystems/CMakeLists.txt
index c99a1284c2d2c32795f575efa758ba120243e985..ad18b80fb743d328b55e9893008daf98c830589f 100644
--- a/test/material/fluidsystems/CMakeLists.txt
+++ b/test/material/fluidsystems/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_fluidsystems.cc)
+dune_add_test(SOURCES test_fluidsystems.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/material/immiscibleflash/CMakeLists.txt b/test/material/immiscibleflash/CMakeLists.txt
index 9f59a9d652447975bc5245d8d36d32c06ce642c1..0071d936bd051c140e8da346c54c3022e0c60b69 100644
--- a/test/material/immiscibleflash/CMakeLists.txt
+++ b/test/material/immiscibleflash/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_immiscibleflash.cc)
+dune_add_test(SOURCES test_immiscibleflash.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/material/ncpflash/CMakeLists.txt b/test/material/ncpflash/CMakeLists.txt
index adf8dd2fe66f6b5259b8a975a290018904397f5f..82bed8effd59d0f9c7ed5fe00c5559ad2a8c1ef2 100644
--- a/test/material/ncpflash/CMakeLists.txt
+++ b/test/material/ncpflash/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_ncpflash.cc)
+dune_add_test(SOURCES test_ncpflash.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/material/pengrobinson/CMakeLists.txt b/test/material/pengrobinson/CMakeLists.txt
index 166b1bf86c18928fa61644b0a5d5806e6e0b87e8..f19e349c3f056e8ca2c05bf6950ebc163997ca85 100644
--- a/test/material/pengrobinson/CMakeLists.txt
+++ b/test/material/pengrobinson/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_pengrobinson.cc)
+dune_add_test(SOURCES test_pengrobinson.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/material/solidsystems/CMakeLists.txt b/test/material/solidsystems/CMakeLists.txt
index 58662ab8fb8cdde02ccde5ca17e6bae6af5d3767..143515d4863fb94f3212fb0213a38c7d8d78d8f5 100644
--- a/test/material/solidsystems/CMakeLists.txt
+++ b/test/material/solidsystems/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_solidsystems.cc)
+dune_add_test(SOURCES test_solidsystems.cc
+              LABELS unit)
 
 #install sources
 install(FILES
diff --git a/test/material/tabulation/CMakeLists.txt b/test/material/tabulation/CMakeLists.txt
index ae90653e332ca50b65b70dbff99e09d071e3d370..2e5485b509efaeecb694ed55b87a6ee7c4270c7e 100644
--- a/test/material/tabulation/CMakeLists.txt
+++ b/test/material/tabulation/CMakeLists.txt
@@ -1,4 +1,5 @@
-dune_add_test(SOURCES test_tabulation.cc)
+dune_add_test(SOURCES test_tabulation.cc
+              LABELS unit)
 
 #install sources
 install(FILES