diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt
index 6710a285d346d3294145c8fc1935508d5a669624..d74193f31913083ef9ac6272c0f6b4870c41e001 100644
--- a/test/freeflow/navierstokes/CMakeLists.txt
+++ b/test/freeflow/navierstokes/CMakeLists.txt
@@ -72,9 +72,20 @@ dune_add_test(NAME test_channel_navierstokes
                                      ${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes-00002.vtu
                              --command "${CMAKE_CURRENT_BINARY_DIR}/test_channel_navierstokes")
 
+dune_add_test(NAME test_stokes_donea_no_caching
+              SOURCES test_donea.cc
+              CMAKE_GUARD HAVE_UMFPACK
+              COMPILE_DEFINITIONS ENABLECACHING=0
+              COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
+              CMD_ARGS       --script fuzzy
+                             --files ${CMAKE_SOURCE_DIR}/test/references/stokes-donea-reference.vtu
+                                     ${CMAKE_CURRENT_BINARY_DIR}/test_donea-00001.vtu
+                             --command "${CMAKE_CURRENT_BINARY_DIR}/test_stokes_donea_no_caching test_stokes_donea.input")
+
 dune_add_test(NAME test_stokes_donea
               SOURCES test_donea.cc
               CMAKE_GUARD HAVE_UMFPACK
+              COMPILE_DEFINITIONS ENABLECACHING=1
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS       --script fuzzy
                              --files ${CMAKE_SOURCE_DIR}/test/references/stokes-donea-reference.vtu
diff --git a/test/freeflow/navierstokes/doneatestproblem.hh b/test/freeflow/navierstokes/doneatestproblem.hh
index 74b67e2a6cb98b215f939a53b567c51b527543be..8010fd045df936a54f1b5e82797204fcae04109b 100644
--- a/test/freeflow/navierstokes/doneatestproblem.hh
+++ b/test/freeflow/navierstokes/doneatestproblem.hh
@@ -24,6 +24,10 @@
 #ifndef DUMUX_DONEA_TEST_PROBLEM_HH
 #define DUMUX_DONEA_TEST_PROBLEM_HH
 
+#ifndef ENABLECACHING
+#define ENABLECACHING 0
+#endif
+
 #include <dune/grid/yaspgrid.hh>
 
 #include <dumux/material/fluidsystems/1pliquid.hh>
@@ -57,10 +61,10 @@ SET_TYPE_PROP(DoneaTestTypeTag, Grid, Dune::YaspGrid<2>);
 // Set the problem property
 SET_TYPE_PROP(DoneaTestTypeTag, Problem, Dumux::DoneaTestProblem<TypeTag> );
 
-SET_BOOL_PROP(DoneaTestTypeTag, EnableFVGridGeometryCache, true);
-
-SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFluxVariablesCache, true);
-SET_BOOL_PROP(DoneaTestTypeTag, EnableGridVolumeVariablesCache, true);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableFVGridGeometryCache, ENABLECACHING);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFluxVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableGridVolumeVariablesCache, ENABLECACHING);
+SET_BOOL_PROP(DoneaTestTypeTag, EnableGridFaceVariablesCache, ENABLECACHING);
 
 #if ENABLE_NAVIERSTOKES
 SET_BOOL_PROP(DoneaTestTypeTag, EnableInertiaTerms, true);