diff --git a/test/freeflow/rans/CMakeLists.txt b/test/freeflow/rans/CMakeLists.txt
index d1f64ce4dbc27e299b34af1971eecc4633ff5ccd..8ccfb3b6ff7f9d40fd38751dfa3cf5a7effb7846 100644
--- a/test/freeflow/rans/CMakeLists.txt
+++ b/test/freeflow/rans/CMakeLists.txt
@@ -8,6 +8,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_twolayers
TARGET test_ff_rans_lauferpipe_kepsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_kepsilon_twolayers-reference.vtu
@@ -19,6 +20,7 @@ dune_add_test(NAME test_ff_rans_lauferpipe_kepsilon_wallfunction
TARGET test_ff_rans_lauferpipe_kepsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_rans_lauferpipe_kepsilon_wallfunction-reference.vtu
@@ -85,6 +87,7 @@ dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_twolayers
TARGET test_ff_ransni_lauferpipe_kepsilon
LABELS freeflow rans
CMAKE_GUARD HAVE_UMFPACK
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_ransni_lauferpipe_kepsilon_twolayers-reference.vtu
@@ -95,6 +98,7 @@ dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_twolayers
dune_add_test(NAME test_ff_ransni_lauferpipe_kepsilon_wallfunction
TARGET test_ff_ransni_lauferpipe_kepsilon
LABELS freeflow rans
+ TIMEOUT 1500
CMAKE_GUARD HAVE_UMFPACK
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
diff --git a/test/freeflow/shallowwater/dambreak/CMakeLists.txt b/test/freeflow/shallowwater/dambreak/CMakeLists.txt
index 96cd98c561a820bb2145732d204a3e32a7902422..2918b2832baebfbfe49e1f32d3343d7c8b75ee42 100644
--- a/test/freeflow/shallowwater/dambreak/CMakeLists.txt
+++ b/test/freeflow/shallowwater/dambreak/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_symlink_to_source_files(FILES "params.input")
dune_add_test(NAME test_shallowwater_dambreak
SOURCES main.cc
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_ff_shallowwater_dambreak-reference.vtu
diff --git a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
index 8a10954fcd970ff2a8d0836b63ed5d32508abf1b..7f97585b7031c7480adf39127f35fad524f6f00f 100644
--- a/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p2c_richards2c/CMakeLists.txt
@@ -2,6 +2,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p2c_richards2c
LABELS multidomain multidomain_embedded 1pnc richardsnc
SOURCES main.cc
CMAKE_GUARD "( dune-foamgrid_FOUND AND HAVE_UG )"
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p2c_richards2c_1d-reference.vtp
diff --git a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
index 58fef8c775e9afb0f9bc31be2faff080bf966a92..f2df766e43ecb9046472574d5cc86a29591f2559 100644
--- a/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
+++ b/test/multidomain/embedded/1d3d/1p_richards/CMakeLists.txt
@@ -4,6 +4,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfatpfa
COMPILE_DEFINITIONS SOILTYPETAG=SoilCC
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
+ TIMEOUT 1500
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-00004.vtp
@@ -18,6 +19,7 @@ dune_add_test(NAME test_md_embedded1d3d_1p_richards_tpfabox
COMPILE_DEFINITIONS SOILTYPETAG=SoilBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMAKE_GUARD dune-foamgrid_FOUND
+ TIMEOUT 1500
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_embedded1d3d_1p_richards_tpfatpfa_1d-reference.vtp
${CMAKE_CURRENT_BINARY_DIR}/test_md_embedded1d3d_1p_richards_tpfabox_1d-00004.vtp
diff --git a/test/multidomain/facet/tracer_tracer/CMakeLists.txt b/test/multidomain/facet/tracer_tracer/CMakeLists.txt
index 7f9c54c4aed14baa728367027f4c07d0784e683d..e523bae44dbf809fe79276e803b7403c794a2c2e 100644
--- a/test/multidomain/facet/tracer_tracer/CMakeLists.txt
+++ b/test/multidomain/facet/tracer_tracer/CMakeLists.txt
@@ -29,6 +29,7 @@ dune_add_test(NAME test_md_facet_tracertracer_mpfa
COMPILE_DEFINITIONS TRACERBULKTYPETAG=TracerBulkMpfa
COMPILE_DEFINITIONS TRACERLOWDIMTYPETAG=TracerLowDimMpfa
CMAKE_GUARD "( dune-foamgrid_FOUND AND dune-alugrid_FOUND )"
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_facet_tracertracer_mpfa_onep_bulk-reference.vtu
diff --git a/test/multidomain/poromechanics/el2p/CMakeLists.txt b/test/multidomain/poromechanics/el2p/CMakeLists.txt
index 61514e8a3aa4d9036f441495caa7890c5dcf8a03..1434109db6b9190c37fff106b49a7ede975323ef 100644
--- a/test/multidomain/poromechanics/el2p/CMakeLists.txt
+++ b/test/multidomain/poromechanics/el2p/CMakeLists.txt
@@ -4,6 +4,7 @@ dune_add_test(NAME test_md_poromechanics_el2p
LABELS multidomain poromechanics 2p poroelastic
SOURCES main.cc
CMAKE_GUARD HAVE_UMFPACK
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_md_poromechanics_el2p_2p-reference.vtu
diff --git a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
index b850ef4d7e86b6b7236194814612cbad01e69d58..cd8c94eaa523f1b7b5c3cb1baa6414d6e364e12b 100644
--- a/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/boxdfm/CMakeLists.txt
@@ -31,6 +31,7 @@ dune_add_test(NAME test_2p_boxdfm_quads_ug
# triangles alu
dune_add_test(NAME test_2p_boxdfm_trias_alu
LABELS porousmediumflow 2p
+ TIMEOUT 1500
SOURCES main.cc
CMAKE_GUARD dune-foamgrid_FOUND
CMAKE_GUARD dune-alugrid_FOUND
@@ -45,6 +46,7 @@ dune_add_test(NAME test_2p_boxdfm_trias_alu
# triangles ug
dune_add_test(NAME test_2p_boxdfm_trias_ug
LABELS porousmediumflow 2p
+ TIMEOUT 1500
SOURCES main.cc
CMAKE_GUARD dune-uggrid_FOUND
CMAKE_GUARD dune-foamgrid_FOUND
diff --git a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
index c4215a9d32a74204843b70d3b98455d939a3de2b..53ca55e3eb2c0f1058f5c706f1317ea4ee888bac 100644
--- a/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
+++ b/test/porousmediumflow/2p/implicit/fracture/CMakeLists.txt
@@ -26,6 +26,7 @@ dune_add_test(NAME test_2p_fracture_tpfa
dune_add_test(NAME test_2p_fracture_mpfa
LABELS porousmediumflow 2p
SOURCES main.cc
+ TIMEOUT 1500
COMPILE_DEFINITIONS TYPETAG=FractureCCMpfa
CMAKE_GUARD dune-foamgrid_FOUND
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
@@ -58,6 +59,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
+ TIMEOUT 1500
CMAKE_GUARD dune-foamgrid_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 deaec0808bfc303f9431270740372b3b0820138b..a5282b4394b05c1dc97d8282bfc34114a7692adf 100644
--- a/test/porousmediumflow/2p/sequential/CMakeLists.txt
+++ b/test/porousmediumflow/2p/sequential/CMakeLists.txt
@@ -129,6 +129,7 @@ dune_add_test(NAME test_3d2pmimeticadaptive
dune_add_test(NAME test_3d2pmpfal
LABELS porousmediumflow 2p
SOURCES test_3d2p.cc
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_3d2pmpfal-reference.vtu
diff --git a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt
index dc8f9e0c5c3e94790856b044b1511a2bf888214d..43879a388453cda005124ed7505c5d458cffcac5 100644
--- a/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt
+++ b/test/porousmediumflow/2p2c/implicit/waterair/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links(FILES params.input)
dune_add_test(NAME test_2p2cni_waterair_box
LABELS porousmediumflow 2p2c 2p2cni
SOURCES main.cc
+ TIMEOUT 1500
COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_2p2cni_waterair_box
dune_add_test(NAME test_2p2cni_waterair_buoyancy_box
LABELS porousmediumflow 2p2c 2p2cni
TARGET test_2p2cni_waterair_box
+ TIMEOUT 1500
COMPILE_DEFINITIONS TYPETAG=WaterAirBox ENABLECACHING=0
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -24,6 +26,7 @@ dune_add_test(NAME test_2p2cni_waterair_buoyancy_box
dune_add_test(NAME test_2p2cni_waterair_tpfa
LABELS porousmediumflow 2p2c 2p2cni
SOURCES main.cc
+ TIMEOUT 1500
COMPILE_DEFINITIONS TYPETAG=WaterAirCCTpfa ENABLECACHING=0
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
index 4b2d0333cec72ace9e6a7d270aaccd356095d6ef..eb412f736f26ff180620e8c19f29ee3e6124fd04 100644
--- a/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/2pncmin/implicit/CMakeLists.txt
@@ -5,6 +5,7 @@ dune_add_test(NAME test_2pncmin_dissolution_box
LABELS porousmediumflow 2pncmin
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=DissolutionBox
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2pncmin_dissolution_box-reference.vtu
@@ -27,6 +28,7 @@ dune_add_test(NAME test_2pncmin_dissolution_tpfa
LABELS porousmediumflow 2pncmin
SOURCES main.cc
COMPILE_DEFINITIONS TYPETAG=DissolutionCCTpfa
+ TIMEOUT 1500
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
--files ${CMAKE_SOURCE_DIR}/test/references/test_2pncmin_dissolution_tpfa-reference.vtu
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
index 21c58ecc0264e35510174a1a19cc65f4e0ba6d67..99554f507bf9875abc5fb65c695e988db9f1d07b 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
+++ b/test/porousmediumflow/3p3c/implicit/columnxylol/CMakeLists.txt
@@ -4,6 +4,7 @@ add_input_file_links(FILES params.input)
dune_add_test(NAME test_3p3cni_columnxylol_box
LABELS porousmediumflow 3p3c 3p3cni
SOURCES main.cc
+ TIMEOUT 1500
COMPILE_DEFINITIONS TYPETAG=ColumnBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
@@ -14,6 +15,7 @@ dune_add_test(NAME test_3p3cni_columnxylol_box
dune_add_test(NAME test_3p3cni_columnxylol_tpfa
LABELS porousmediumflow 3p3c 3p3cni
SOURCES main.cc
+ TIMEOUT 1500
COMPILE_DEFINITIONS TYPETAG=ColumnCCTpfa
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy
diff --git a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
index 1674b5cc503cdb8a6846a794a22087f42b7faeb4..cd423a18b53c89968d8e8d83f363dc1a586ded48 100644
--- a/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/3pwateroil/implicit/CMakeLists.txt
@@ -3,6 +3,7 @@ add_input_file_links(FILES params.input)
dune_add_test(NAME test_3pwateroil_sagd_box
LABELS porousmediumflow 3pwateroil
SOURCES main.cc
+ TIMEOUT 1500
COMPILE_DEFINITIONS TYPETAG=ThreePWaterOilSagdBox
COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
CMD_ARGS --script fuzzy