diff --git a/dune/fem-dg/test/advdiff/CMakeLists.txt b/dune/fem-dg/test/advdiff/CMakeLists.txt
index 3a7cd761b12fa5dab6980a77704d4023cbfcea8f..2a1724c9d43106d67636e75dcbe9ae0388c5d5ea 100644
--- a/dune/fem-dg/test/advdiff/CMakeLists.txt
+++ b/dune/fem-dg/test/advdiff/CMakeLists.txt
@@ -19,14 +19,15 @@ add_definitions( "-DFLUX=${FLUX}" )
 add_definitions( "-DPRIMALDG" )
 add_definitions( "-DUSE_ASSERT_THROW" ) 
 
-add_executable( advdiffall  "${MAININCLUDE_PATH}/main_0.cc" 
+add_executable( advdiffall "${MAININCLUDE_PATH}/main.cc"  
+                            "${MAININCLUDE_PATH}/main_0.cc" 
                             "${MAININCLUDE_PATH}/main_1.cc"
                             "${MAININCLUDE_PATH}/main_2.cc" 
                             "${MAININCLUDE_PATH}/main_3.cc")
 
 dune_target_link_libraries(advdiffall "${DUNE_LIBS}")
 
-add_executable( advdiff "${MAININCLUDE_PATH}/main_pol.cc")
+add_executable( advdiff "${MAININCLUDE_PATH}/main.cc" "${MAININCLUDE_PATH}/main_pol.cc")
 dune_target_link_libraries(advdiff "${DUNE_LIBS}")
 set_property(TARGET advdiff APPEND PROPERTY 
              COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")
diff --git a/dune/fem-dg/test/euler/CMakeLists.txt b/dune/fem-dg/test/euler/CMakeLists.txt
index fd5eb115f24196451a3ff8d787cb77ee4716e87d..282a816e4e8ba97dc45a4d77bebe45d0087b05e8 100644
--- a/dune/fem-dg/test/euler/CMakeLists.txt
+++ b/dune/fem-dg/test/euler/CMakeLists.txt
@@ -17,7 +17,8 @@ add_definitions( "-DFLUX=${FLUX}" )
 add_definitions( "-D${DIFFFLUXTYPE}" )
 add_definitions( "-DWANT_CACHED_COMM_MANAGER=0" )
 
-add_executable( eulerall "${MAININCLUDE_PATH}/main_0.cc" 
+add_executable( eulerall "${MAININCLUDE_PATH}/main.cc" 
+                         "${MAININCLUDE_PATH}/main_0.cc" 
                          "${MAININCLUDE_PATH}/main_1.cc"
                          "${MAININCLUDE_PATH}/main_2.cc" 
                          "${MAININCLUDE_PATH}/main_3.cc" chorjo.cc )
@@ -25,7 +26,7 @@ dune_target_link_libraries(eulerall ${DUNE_LIBS})
 set_property(TARGET eulerall APPEND PROPERTY 
   COMPILE_DEFINITIONS "LIMITER")
 
-add_executable( euler "${MAININCLUDE_PATH}/main_pol.cc" chorjo.cc )
+add_executable( euler "${MAININCLUDE_PATH}/main.cc" "${MAININCLUDE_PATH}/main_pol.cc" chorjo.cc )
 dune_target_link_libraries(euler ${DUNE_LIBS})
 set_property(TARGET euler APPEND PROPERTY 
              COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")
diff --git a/dune/fem-dg/test/navierstokes/CMakeLists.txt b/dune/fem-dg/test/navierstokes/CMakeLists.txt
index b63b09f732075e25eb40bedd54799832f87e5da6..8ea3c82fb46a613067274789054c2b38f7147fe3 100644
--- a/dune/fem-dg/test/navierstokes/CMakeLists.txt
+++ b/dune/fem-dg/test/navierstokes/CMakeLists.txt
@@ -19,7 +19,8 @@ add_definitions( "-DFLUX=${FLUX}" )
 add_definitions( "-D${DIFFFLUX}" )
 add_definitions( "-DPROBLEM=${PROBLEM}" )
 
-add_executable( navierstokesall "${MAININCLUDE_PATH}/main_0.cc" 
+add_executable( navierstokesall "${MAININCLUDE_PATH}/main.cc" 
+                                "${MAININCLUDE_PATH}/main_0.cc" 
                                 "${MAININCLUDE_PATH}/main_1.cc"
                                 "${MAININCLUDE_PATH}/main_2.cc" 
                                 "${MAININCLUDE_PATH}/main_3.cc")
@@ -27,7 +28,7 @@ dune_target_link_libraries(navierstokesall ${DUNE_LIBS})
 set_property(TARGET navierstokesall APPEND PROPERTY 
              COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")
 
-add_executable( navierstokes "${MAININCLUDE_PATH}/main_pol.cc" )
+add_executable( navierstokes "${MAININCLUDE_PATH}/main.cc" "${MAININCLUDE_PATH}/main_pol.cc" )
 dune_target_link_libraries(navierstokes ${DUNE_LIBS})
 set_property(TARGET navierstokes APPEND PROPERTY 
   COMPILE_DEFINITIONS "LIMITER")
diff --git a/dune/fem-dg/test/poisson/CMakeLists.txt b/dune/fem-dg/test/poisson/CMakeLists.txt
index 25568d4c6602c96a4e254d4023441350e333c8b7..895532851a6c40eb9417f293f2aa7f4f7a99c6d9 100644
--- a/dune/fem-dg/test/poisson/CMakeLists.txt
+++ b/dune/fem-dg/test/poisson/CMakeLists.txt
@@ -19,13 +19,14 @@ add_definitions( "-DFLUX=${FLUX}" )
 add_definitions( "-DPRIMALDG" )
 add_definitions( "-DUSE_ASSERT_THROW" ) 
 
-add_executable( poissonall "${MAININCLUDE_PATH}/main_0.cc" 
+add_executable( poissonall "${MAININCLUDE_PATH}/main.cc" 
+                           "${MAININCLUDE_PATH}/main_0.cc" 
                            "${MAININCLUDE_PATH}/main_1.cc"
                            "${MAININCLUDE_PATH}/main_2.cc" 
                            "${MAININCLUDE_PATH}/main_3.cc")
 dune_target_link_libraries(poissonall ${DUNE_LIBS})
 
-add_executable( poisson "${MAININCLUDE_PATH}/main_pol.cc")
+add_executable( poisson "${MAININCLUDE_PATH}/main.cc" "${MAININCLUDE_PATH}/main_pol.cc")
 dune_target_link_libraries(poisson ${DUNE_LIBS})
 set_property(TARGET poisson APPEND PROPERTY 
              COMPILE_DEFINITIONS "ONLY_ONE_P;POLORDER=${POLORDER}")