diff --git a/CMakeLists.txt b/CMakeLists.txt
index 69182d370edc2ebfa574f448edc4cfdefc2e95e6..f587dd4ccf69d49b6375c939df8322cb4bceff53 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -388,7 +388,7 @@ add_test(tutorial_coupled tutorial/tutorial_coupled 1 1)
 add_test(tutorial_decoupled tutorial/tutorial_decoupled 1)
 
 if(SUPERLU_FOUND AND DUNE_pdelab_FOUND)
-  add_test(test_stokes test/freeflow/stokes/test_stokes)
-  add_test(test_stokes2c test/freeflow/stokes2c/test_stokes2c)
-  add_test(test_stokes2cni test/freeflow/stokes2cni/test_stokes2cni)
+  add_test(test_stokes test/freeflow/stokes/test_stokes test/freeflow/stokes/grids/test_stokes.dgf 10 1e-2)
+  add_test(test_stokes2c test/freeflow/stokes2c/test_stokes2c test/freeflow/stokes2c/grids/test_stokes2c.dgf 10 1e-2)
+  add_test(test_stokes2cni test/freeflow/stokes2cni/test_stokes2cni test/freeflow/stokes2cni/grids/test_stokes2cni.dgf 0.1 5e-3)
 endif(SUPERLU_FOUND AND DUNE_pdelab_FOUND)
diff --git a/test/freeflow/stokes/CMakeLists.txt b/test/freeflow/stokes/CMakeLists.txt
index a4b0c8f033af5f6764fe7d7957a45682b816cdc0..af41c1df5b8fb8bd19c08827696d29f79ddd96bb 100644
--- a/test/freeflow/stokes/CMakeLists.txt
+++ b/test/freeflow/stokes/CMakeLists.txt
@@ -8,4 +8,12 @@ target_link_libraries("test_stokes" ${SUPERLU_LIBS})
 
 # add required libraries and includes to the build flags
 link_directories(${DumuxLinkDirectories})
-include_directories(${DumuxIncludeDirectories}) 
\ No newline at end of file
+include_directories(${DumuxIncludeDirectories})
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_stokes"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")
diff --git a/test/freeflow/stokes2c/CMakeLists.txt b/test/freeflow/stokes2c/CMakeLists.txt
index 5380199e81df59bb0564b274a92df39bb93df898..7d32ce5baca3da2fe900200cd04a1420d0b3d084 100644
--- a/test/freeflow/stokes2c/CMakeLists.txt
+++ b/test/freeflow/stokes2c/CMakeLists.txt
@@ -8,4 +8,12 @@ target_link_libraries("test_stokes2c" ${SUPERLU_LIBS})
 
 # add required libraries and includes to the build flags
 link_directories(${DumuxLinkDirectories})
-include_directories(${DumuxIncludeDirectories}) 
\ No newline at end of file
+include_directories(${DumuxIncludeDirectories})
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_stokes2c"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")
diff --git a/test/freeflow/stokes2cni/CMakeLists.txt b/test/freeflow/stokes2cni/CMakeLists.txt
index d0933b5cbd44513ae9628fd235fadb171327ff51..d167fb4076c8765890175c33601fd77b35af5ac7 100644
--- a/test/freeflow/stokes2cni/CMakeLists.txt
+++ b/test/freeflow/stokes2cni/CMakeLists.txt
@@ -8,4 +8,12 @@ target_link_libraries("test_stokes2cni" ${SUPERLU_LIBS})
 
 # add required libraries and includes to the build flags
 link_directories(${DumuxLinkDirectories})
-include_directories(${DumuxIncludeDirectories}) 
\ No newline at end of file
+include_directories(${DumuxIncludeDirectories})
+
+# make sure the grids are present in the build directory
+add_custom_command(TARGET "test_stokes2cni"
+                   POST_BUILD
+                   COMMAND ${CMAKE_COMMAND} -E
+                        copy_directory 
+                           "${CMAKE_CURRENT_SOURCE_DIR}/grids"
+                           "${CMAKE_CURRENT_BINARY_DIR}/grids")