diff --git a/dune/stuff/test/CMakeLists.txt b/dune/stuff/test/CMakeLists.txt
index 8b2f7f03325b091a26e390ffa9c4a192c7f50df6..7441c60c274459be8d90a2c6bc88418af41485da 100644
--- a/dune/stuff/test/CMakeLists.txt
+++ b/dune/stuff/test/CMakeLists.txt
@@ -4,15 +4,17 @@ HEADERCHECK( ${stuff} )
 DEPENDENCYCHECK( ${stuff} )
 
 set_source_files_properties( ${DUNE_HEADERS} PROPERTIES HEADER_FILE_ONLY 1 )
-include_dir(${CMAKE_CURRENT_SOURCE_DIR} )
+include_sys_dir(${CMAKE_CURRENT_SOURCE_DIR}/gtest )
 
 file( GLOB test_sources "${CMAKE_CURRENT_SOURCE_DIR}/*.cc" )
 
+add_library(gtest_dune_stuff STATIC ${CMAKE_CURRENT_SOURCE_DIR}/gtest/gtest-all.cc)
+
 foreach( source ${test_sources} )
 	get_filename_component(testname ${source} NAME_WE)
-	add_executable( test_${testname} ${source} ${DUNE_HEADERS} ${CMAKE_CURRENT_SOURCE_DIR}/gtest/gtest-all.cc)
+	add_executable( test_${testname} ${source} )
 	add_test( test_${testname} ${CMAKE_CURRENT_BINARY_DIR}/${testname} )
-	target_link_libraries( test_${testname} ${COMMON_LIBS} pthread )
+	target_link_libraries( test_${testname} ${COMMON_LIBS} pthread gtest_dune_stuff )
 	list(APPEND testnames test_${testname} )
 endforeach( source )
 
diff --git a/dune/stuff/test/gtest/gtest-all.cc b/dune/stuff/test/gtest/gtest-all.cc
index 43459a5552488e8bbb2d9b31526ba7ccdb1ada79..7bc493fec7a3a16220f875a808c9310773628d03 100644
--- a/dune/stuff/test/gtest/gtest-all.cc
+++ b/dune/stuff/test/gtest/gtest-all.cc
@@ -36,7 +36,7 @@
 
 // This line ensures that gtest.h can be compiled on its own, even
 // when it's fused.
-#include "gtest/gtest.h"
+#include "gtest.h"
 
 // The following lines pull in the real gtest *.cc files.
 // Copyright 2005, Google Inc.