diff --git a/test/freeflow/navierstokes/sincos/CMakeLists.txt b/test/freeflow/navierstokes/sincos/CMakeLists.txt
index 1695b8e370e6132e71185be8789b4924ade9cc91..5a01b30e834c577f7f8c731857e2f8cc42d0abe3 100644
--- a/test/freeflow/navierstokes/sincos/CMakeLists.txt
+++ b/test/freeflow/navierstokes/sincos/CMakeLists.txt
@@ -40,7 +40,7 @@ dumux_add_test(NAME test_ff_navierstokes_sincos_uzawapreconditioner_factory
               SOURCES main.cc
               LABELS freeflow
               TIMEOUT 5000
-              CMAKE_GUARD "( HAVE_UMFPACK AND ( ( DUNE_ISTL_VERSION VERSION_GREATER 2.7 ) OR ( DUNE_ISTL_VERSION VERSION_EQUAL 2.7 ) ) )"
+              CMAKE_GUARD HAVE_UMFPACK
               COMPILE_DEFINITIONS LINEARSOLVER=IstlSolverFactoryBackend<LinearSolverTraits<MassGridGeometry>,LinearAlgebraTraitsFromAssembler<Assembler>>
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
diff --git a/test/io/vtk/CMakeLists.txt b/test/io/vtk/CMakeLists.txt
index e9266f7eb2188f646441b3c27bc6e4ad84a50eb1..95130f32c9246af066affdde396666d57275b398 100644
--- a/test/io/vtk/CMakeLists.txt
+++ b/test/io/vtk/CMakeLists.txt
@@ -70,35 +70,17 @@ dumux_add_test(NAME test_vtk_staggeredfreeflowpvnames
               SOURCES test_vtk_staggeredfreeflowpvnames.cc
               LABELS unit io)
 
-# VTKOutputModule precision tests (before dune 2.7 everything was Float32)
-if(${DUNE_GRID_VERSION} VERSION_LESS 2.7)
-    dumux_add_test(NAME test_vtkoutputmodule
-                   SOURCES test_vtkoutputmodule.cc
-                   LABELS unit io
-                   COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-                   CMD_ARGS --script fuzzy
-                            --command "${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule"
-                            --files ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_allfloat-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_allfloat-00000.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_allfloat-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_float-00000.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_allfloat-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_double-00000.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_allfloat-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_doublecoord-00000.vtu)
-else()
-    dumux_add_test(NAME test_vtkoutputmodule
-                   SOURCES test_vtkoutputmodule.cc
-                   LABELS unit io
-                   COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
-                   CMD_ARGS --script fuzzy
-                            --command "${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule"
-                            --files ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_allfloat-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_allfloat-00000.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_float-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_float-00000.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_double-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_double-00000.vtu
-                                    ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_doublecoord-reference.vtu
-                                    ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_doublecoord-00000.vtu)
-endif()
+dumux_add_test(NAME test_vtkoutputmodule
+               SOURCES test_vtkoutputmodule.cc
+               LABELS unit io
+               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+               CMD_ARGS --script fuzzy
+                        --command "${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule"
+                        --files ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_allfloat-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_allfloat-00000.vtu
+                                ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_float-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_float-00000.vtu
+                                ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_double-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_double-00000.vtu
+                                ${CMAKE_SOURCE_DIR}/test/references/test_vtkoutputmodule_doublecoord-reference.vtu
+                                ${CMAKE_CURRENT_BINARY_DIR}/test_vtkoutputmodule_doublecoord-00000.vtu)