diff --git a/dune/fufem/test/CMakeLists.txt b/dune/fufem/test/CMakeLists.txt
index 1078f422ff4047c01ea3b4d9b4513ce17df38b9b..12f527ad5c00f2f389cb42d28f74130e741e8684 100644
--- a/dune/fufem/test/CMakeLists.txt
+++ b/dune/fufem/test/CMakeLists.txt
@@ -1,51 +1,37 @@
-# Put your test in here if it needs access to external grids
-set(GRID_BASED_TESTS
-  basisgridfunctiontest
-  basisinterpolatortest
-  assembletransferoperatortest
-  boundarypatchtest
-  boundarypatchprolongatortest
-  coarsegridfunctionwrappertest
-  constructboundarydofstest
-  dunefunctionsipdgassemblertest
-  functionintegratortest
-  functionspacebasistest
-  generalizedlaplaceassemblertest
-  gradientassemblertest
-  gridconstructiontest
-  gridfunctiontest
-  gridfunctionadaptortest
-  h1functionalassemblertest
-  integraloperatorassemblertest
-  istlbackendtest
-  laplaceassemblertest
-  localassemblertest
-  secondorderassemblertest
-  subgridxyfunctionalassemblertest
-  tensortest
-  transferoperatorassemblertest
-  vintagebasisgridfunctiontest
-  )
-
-if (ADOLC_FOUND)
-    set(GRID_BASED_TESTS ${GRID_BASED_TESTS} adolctest)
-endif(ADOLC_FOUND)
-
+# Tests that should be run unconditionally
+dune_add_test(SOURCES assembletransferoperatortest.cc)
+dune_add_test(SOURCES basisgridfunctiontest.cc)
+dune_add_test(SOURCES basisinterpolatortest.cc)
+dune_add_test(SOURCES boundarypatchprolongatortest.cc)
+dune_add_test(SOURCES boundarypatchtest.cc)
+dune_add_test(SOURCES coarsegridfunctionwrappertest.cc)
+dune_add_test(SOURCES constructboundarydofstest.cc)
+dune_add_test(SOURCES dunefunctionsipdgassemblertest.cc)
+dune_add_test(SOURCES functionintegratortest.cc)
+dune_add_test(SOURCES functionspacebasistest.cc)
+dune_add_test(SOURCES generalizedlaplaceassemblertest.cc)
+dune_add_test(SOURCES gradientassemblertest.cc)
+dune_add_test(SOURCES gridconstructiontest.cc)
+dune_add_test(SOURCES gridfunctionadaptortest.cc)
+dune_add_test(SOURCES gridfunctiontest.cc)
+dune_add_test(SOURCES h1functionalassemblertest.cc)
+dune_add_test(SOURCES integraloperatorassemblertest.cc)
+dune_add_test(SOURCES istlbackendtest.cc)
+dune_add_test(SOURCES laplaceassemblertest.cc)
+dune_add_test(SOURCES localassemblertest.cc)
 dune_add_test(SOURCES makerefinedsimplexgeometrytest.cc)
 dune_add_test(SOURCES mappedmatrixtest.cc)
 dune_add_test(SOURCES newpfeassemblertest.cc)
 dune_add_test(SOURCES pgmtest.cc)
 dune_add_test(SOURCES ppmtest.cc)
 dune_add_test(SOURCES refinedsimplexgeometrytest.cc)
-dune_add_test(SOURCES test-polyhedral-minimisation.cc)
+dune_add_test(SOURCES secondorderassemblertest.cc)
+dune_add_test(SOURCES subgridxyfunctionalassemblertest.cc)
 dune_add_test(SOURCES symmetricmatrixtest.cc)
-
-set(TESTS ${GRID_BASED_TESTS})
-
-# Setup targets, register tests, and add dune flags
-foreach(_test ${TESTS})
-  dune_add_test(SOURCES ${_test}.cc)
-endforeach()
+dune_add_test(SOURCES tensortest.cc)
+dune_add_test(SOURCES test-polyhedral-minimisation.cc)
+dune_add_test(SOURCES transferoperatorassemblertest.cc)
+dune_add_test(SOURCES vintagebasisgridfunctiontest.cc)
 
 # PYTHONLIBS_FOUND is just placed for backward compatibility with 2.7 Core tests
 # and can be removed once tests against 2.7 Core are disabled
@@ -60,6 +46,7 @@ if (Python3_FOUND OR PYTHONLIBS_FOUND)
 endif()
 
 if (ADOLC_FOUND)
+    dune_add_test(SOURCES adolctest.cc)
     add_dune_adolc_flags(adolctest)
 endif()