diff --git a/test/io/gridmanager/CMakeLists.txt b/test/io/gridmanager/CMakeLists.txt
index 7092ebcc7999b81004215e2cbd5ddeb6a0da2b6a..17ec758e07a4474542d976b9cf5b3467fb0ea8b0 100644
--- a/test/io/gridmanager/CMakeLists.txt
+++ b/test/io/gridmanager/CMakeLists.txt
@@ -56,7 +56,8 @@ 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 io
+              LABELS unit io parallel
+              TIMEOUT 300
               CMAKE_GUARD dune-alugrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -81,7 +82,8 @@ 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 io
+              LABELS unit io parallel
+              TIMEOUT 300
               CMAKE_GUARD dune-uggrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -106,7 +108,8 @@ 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 io
+              LABELS unit io parallel
+              TIMEOUT 300
               CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -133,7 +136,8 @@ 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 io
+              LABELS unit io parallel
+              TIMEOUT 300
               CMAKE_GUARD "( dune-uggrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -162,7 +166,8 @@ 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 io
+              LABELS unit io parallel
+              TIMEOUT 300
               CMAKE_GUARD "( dune-alugrid_FOUND AND MPI_FOUND )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"rank":100}
@@ -193,7 +198,8 @@ 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 io
+              LABELS unit io parallel
+              TIMEOUT 300
               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/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt
index 5280467d21eb77494d5db09f9038e452d2196107..36de824f99672c201e8fdc875cebca726ee1d478 100644
--- a/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt
+++ b/test/porousmediumflow/1p/implicit/periodicbc/CMakeLists.txt
@@ -20,7 +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
+              LABELS porousmediumflow 1p parallel
               CMAKE_GUARD dune-spgrid_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS  --script fuzzy
diff --git a/test/porousmediumflow/2p/sequential/CMakeLists.txt b/test/porousmediumflow/2p/sequential/CMakeLists.txt
index ea330edaea7c3fd165293ef05e05d0eb4b0c4c0e..deaec0808bfc303f9431270740372b3b0820138b 100644
--- a/test/porousmediumflow/2p/sequential/CMakeLists.txt
+++ b/test/porousmediumflow/2p/sequential/CMakeLists.txt
@@ -33,7 +33,7 @@ set_tests_properties(test_impesadaptiverestart PROPERTIES DEPENDS test_impesadap
 
 if(MPI_FOUND)
   dune_add_test(NAME test_impeswithamg
-                LABELS porousmediumflow 2p
+                LABELS porousmediumflow 2p parallel
                 SOURCES test_impeswithamg.cc
                 COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
                 CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
index a840c8179f37973f39024014aee026f195adf857..0f1e9fc9e75025e5aabd857ed7e88b939cb641b2 100644
--- a/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
+++ b/test/porousmediumflow/richards/implicit/lens/CMakeLists.txt
@@ -25,7 +25,7 @@ dune_add_test(TARGET test_richards_lens_tpfa
 
 dune_add_test(NAME test_richards_lens_box_parallel_yasp
               TARGET test_richards_lens_box
-              LABELS porousmediumflow richards
+              LABELS porousmediumflow richards parallel
               CMAKE_GUARD MPI_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
@@ -37,7 +37,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_yasp
 
 dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp
               TARGET test_richards_lens_tpfa
-              LABELS porousmediumflow richards
+              LABELS porousmediumflow richards parallel
               CMAKE_GUARD MPI_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100}
@@ -51,7 +51,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp
 # This is why we need a bit higher saturation threshold since pc-sw is very sensitive to pressure for saturations close to 0
 dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart
               TARGET test_richards_lens_tpfa
-              LABELS porousmediumflow richards
+              LABELS porousmediumflow richards parallel
               CMAKE_GUARD MPI_FOUND
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy --zeroThreshold {"process rank":100,"S_liq":1e-3,"water content":1e-3}
@@ -65,7 +65,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_yasp_restart
 set_tests_properties(test_richards_lens_tpfa_parallel_yasp_restart PROPERTIES DEPENDS test_richards_lens_tpfa_parallel_yasp)
 
 dune_add_test(NAME test_richards_lens_box_parallel_ug
-              LABELS porousmediumflow richards
+              LABELS porousmediumflow richards parallel
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::UGGrid<2>
@@ -76,7 +76,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_ug
                        --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_ug params.input -Problem.Name test_richards_lens_box_parallel_ug")
 
 dune_add_test(NAME test_richards_lens_tpfa_parallel_ug
-              LABELS porousmediumflow richards
+              LABELS porousmediumflow richards parallel
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND HAVE_UG )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::UGGrid<2>
@@ -87,7 +87,7 @@ dune_add_test(NAME test_richards_lens_tpfa_parallel_ug
                        --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_tpfa_parallel_ug params.input -Problem.Name test_richards_lens_tpfa_parallel_ug")
 
 dune_add_test(NAME test_richards_lens_box_parallel_alu
-              LABELS porousmediumflow richards
+              LABELS porousmediumflow richards parallel
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensBox GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>
@@ -98,7 +98,7 @@ dune_add_test(NAME test_richards_lens_box_parallel_alu
                        --command "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_richards_lens_box_parallel_alu params.input -Problem.Name test_richards_lens_box_parallel_alu")
 
 dune_add_test(NAME test_richards_lens_tpfa_parallel_alu
-              LABELS porousmediumflow richards
+              LABELS porousmediumflow richards parallel
               SOURCES main.cc
               CMAKE_GUARD "( MPI_FOUND AND dune-alugrid_FOUND )"
               COMPILE_DEFINITIONS TYPETAG=RichardsLensCC GRIDTYPE=Dune::ALUGrid<2,2,Dune::cube,Dune::nonconforming>