diff --git a/dune/solvers/test/CMakeLists.txt b/dune/solvers/test/CMakeLists.txt
index 4b3700376e005daae3055140559ef8ddc807914c..74c87a825ec4393d370c073e5d2d673636817729 100644
--- a/dune/solvers/test/CMakeLists.txt
+++ b/dune/solvers/test/CMakeLists.txt
@@ -1,20 +1,25 @@
-set(TESTS
+set(GRID_BASED_TESTS
   cgsteptest
+  multigridtest
+  projectedgradienttest
+  obstacletnnmgtest
+  )
+
+set(OTHER_TESTS
   genericvectortoolstest
   lowrankoperatortest
-  multigridtest
   nulloperatortest
-  obstacletnnmgtest
-  projectedgradienttest
   sumoperatortest
   )
 
 set(TESTS_IPOPT mmgtest quadraticipoptsolvertest)
 
 if(HAVE_IPOPT)
-  list(APPEND TESTS ${TESTS_IPOPT})
+  list(APPEND GRID_BASED_TESTS ${TESTS_IPOPT})
 endif()
 
+set(TESTS ${OTHER_TESTS} ${GRID_BASED_TESTS})
+
 foreach(_test ${TESTS})
   add_executable(${_test} EXCLUDE_FROM_ALL ${_test}.cc)
   target_link_dune_default_libraries(${_test})
@@ -27,5 +32,12 @@ if(HAVE_IPOPT)
   endforeach()
 endif()
 
+# Add external grid manager flags
+foreach(_test ${GRID_BASED_TESTS})
+  if(HAVE_UG)
+    add_dune_ug_flags(${_test})
+  endif(HAVE_UG)
+endforeach()
+
 add_directory_test_target(_test_target)
 add_dependencies(${_test_target} ${TESTS})