diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 4035fd75736fbd73201cdafbfd0b88c74c463443..b1a268f13fe44ede63c4e355b5e1640b3e61dfce 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -18,12 +18,7 @@ set(TESTS
   targetspacetest
 )
 
-add_directory_test_target(_test_target)
-add_dependencies(${_test_target} ${TESTS})
-
 foreach(_test ${TESTS})
-  add_executable(${_test} ${_test}.cc)
-  target_link_libraries(${_test} ${DUNE_LIBS})
-  add_dune_ug_flags(${_test})
-  add_test(${_test} ${_test})
+  dune_add_test(SOURCES ${_test}.cc)
+  target_compile_options(${_test} PRIVATE -g)
 endforeach()