diff --git a/dune/fem-dg/test/advdiff/CMakeLists.txt b/dune/fem-dg/test/advdiff/CMakeLists.txt
index 8ce20e8a6c96559e045462137178e67ba3f45bc2..d16d99af8dce3ec4835d1a3cba6e0098f37f83d7 100644
--- a/dune/fem-dg/test/advdiff/CMakeLists.txt
+++ b/dune/fem-dg/test/advdiff/CMakeLists.txt
@@ -17,6 +17,7 @@ if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
   add_executable( advdiffall main.cc )
   set_property(TARGET advdiffall APPEND PROPERTY 
                COMPILE_DEFINITIONS "POLORDER=2" )
+  dune_target_enable_all_packages( advdiff advdiffall )
   dune_add_test( advdiff advdiffall )
 else()
   dune_add_test( NAME advdiff 
diff --git a/dune/fem-dg/test/dataio/CMakeLists.txt b/dune/fem-dg/test/dataio/CMakeLists.txt
index 1cb42f54f2a4d45adcb0a557e2761ad0d6c5cf6d..f3fedf82e973bfc839cc1ddde4c1e1e61d9fb069 100644
--- a/dune/fem-dg/test/dataio/CMakeLists.txt
+++ b/dune/fem-dg/test/dataio/CMakeLists.txt
@@ -18,6 +18,7 @@ if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
   message( STATUS "Using old test build system (2.4 compability mode) " )
   add_executable( dataconvert dataconvert.cc )
   add_executable( checkpointing main.cc )
+  dune_target_enable_all_packages( dataconvert checkpointing )
   dune_add_test( dataconvert checkpointing )
 else()
   dune_add_test( NAME dataconvert
diff --git a/dune/fem-dg/test/euler/CMakeLists.txt b/dune/fem-dg/test/euler/CMakeLists.txt
index e4e7bc82f59024b71f01a38346c0de3d0300a422..62282de4f40896981f997e828ba56739aec516fe 100644
--- a/dune/fem-dg/test/euler/CMakeLists.txt
+++ b/dune/fem-dg/test/euler/CMakeLists.txt
@@ -12,10 +12,11 @@ add_definitions( "-DPRIMALDG" )
 
 if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
   message( STATUS "Using old test build system (2.4 compability mode) " )
-  add_executable( euler main.cc )
-  add_executable( eulerall main.cc )
+  add_executable( euler main.cc problems/chorjo.cc )
+  add_executable( eulerall main.cc problems/chorjo.cc )
   set_property(TARGET eulerall APPEND PROPERTY 
                COMPILE_DEFINITIONS "POLORDER=2" )
+  dune_target_enable_all_packages( euler eulerall )
   dune_add_test( euler eulerall )
 else()
   dune_add_test( NAME eulerall
diff --git a/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt b/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
index e175b3b590e95cc2fd8de8b086e0a72b6bef536e..3b0d9e951b4ef6080f0dca882681f335cec93a9b 100644
--- a/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
+++ b/dune/fem-dg/test/incompnavierstokes/CMakeLists.txt
@@ -13,6 +13,7 @@ if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
   add_executable( incompnavierstokesall main.cc )
   set_property(TARGET incompnavierstokesall APPEND PROPERTY 
                COMPILE_DEFINITIONS "POLORDER=2" )
+  dune_target_enable_all_packages( incompnavierstokes incompnavierstokesall )
   dune_add_test( incompnavierstokes incompnavierstokesall )
 else()
   dune_add_test( NAME incompnavierstokesall
diff --git a/dune/fem-dg/test/navierstokes/CMakeLists.txt b/dune/fem-dg/test/navierstokes/CMakeLists.txt
index 4669057ef969b844ac49ad37d25957a7822c9bcf..fbeb835eabb9dc07ae3c82d214bb75eea0f20edb 100644
--- a/dune/fem-dg/test/navierstokes/CMakeLists.txt
+++ b/dune/fem-dg/test/navierstokes/CMakeLists.txt
@@ -15,6 +15,7 @@ if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
   add_executable( navierstokesall main.cc )
   set_property(TARGET navierstokesall APPEND PROPERTY 
                COMPILE_DEFINITIONS "POLORDER=2" )
+  dune_target_enable_all_packages( navierstokes navierstokesall )
   dune_add_test( navierstokes navierstokesall )
 else()
   dune_add_test( NAME navierstokes
diff --git a/dune/fem-dg/test/poisson/CMakeLists.txt b/dune/fem-dg/test/poisson/CMakeLists.txt
index ffba4172a08e254bcd4bda9f60e99297f43a30c4..01241971828e0289589b4117e741d464eefcbccd 100644
--- a/dune/fem-dg/test/poisson/CMakeLists.txt
+++ b/dune/fem-dg/test/poisson/CMakeLists.txt
@@ -15,6 +15,7 @@ if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
   add_executable( poissonall main.cc )
   set_property(TARGET poissonall APPEND PROPERTY 
                COMPILE_DEFINITIONS "POLORDER=2" )
+  dune_target_enable_all_packages( poisson poissonall )
   dune_add_test( poisson poissonall )
 else()
   dune_add_test( NAME poissonall 
diff --git a/dune/fem-dg/test/stokes/CMakeLists.txt b/dune/fem-dg/test/stokes/CMakeLists.txt
index 09ba9606bca8c638d9252a8d89b741a657921441..182ee75736c4c04c93b30dee34a3a18784f98e8e 100644
--- a/dune/fem-dg/test/stokes/CMakeLists.txt
+++ b/dune/fem-dg/test/stokes/CMakeLists.txt
@@ -14,6 +14,7 @@ if( DUNE_FEM_DG_VERSION VERSION_LESS "2.4.1" )
   add_executable( stokesall main.cc )
   set_property(TARGET stokesall APPEND PROPERTY 
                COMPILE_DEFINITIONS "POLORDER=2" )
+  dune_target_enable_all_packages( stokes stokesall )
   dune_add_test( stokes stokesall )
 else() 
   dune_add_test( NAME stokes