diff --git a/test/decoupled/1p/CMakeLists.txt b/test/decoupled/1p/CMakeLists.txt
index aae229e6095942e46aa88e9c5b0a459d2c0c0177..2fdd35971f30ac4e0cfcd573c494377c3137ac17 100644
--- a/test/decoupled/1p/CMakeLists.txt
+++ b/test/decoupled/1p/CMakeLists.txt
@@ -21,5 +21,3 @@ add_dumux_test(test_diffusion3d test_diffusion3d test_diffusion3d.cc
   ${CMAKE_CURRENT_BINARY_DIR}/test_diffusion3d_mimetic-00001.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_diffusion3d
   -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_diffusion3d_reference.input)
-add_dune_alugrid_flags(test_diffusion3d)
-add_dune_ug_flags(test_diffusion3d)
diff --git a/test/decoupled/2p/CMakeLists.txt b/test/decoupled/2p/CMakeLists.txt
index d44f78d46083f3124261bf38b179285c4b4aa43a..a17bc5cf6701c812b7b4be399055e57729e03cb3 100644
--- a/test/decoupled/2p/CMakeLists.txt
+++ b/test/decoupled/2p/CMakeLists.txt
@@ -11,7 +11,6 @@ add_dumux_test(test_impesadaptive test_impesadaptive test_impesadaptive.cc
   ${CMAKE_SOURCE_DIR}/test/references/test_2padaptive-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_2padaptive-00007.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_impesadaptive)
-add_dune_alugrid_flags(test_impesadaptive)
 
 add_executable("test_impeswithamg" EXCLUDE_FROM_ALL test_impeswithamg.cc)
 if(MPI_FOUND)
@@ -23,8 +22,6 @@ if(MPI_FOUND)
     "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_impeswithamg"
     -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_impeswithamg.input
     -TimeManager.TEnd 7e7)
-  add_dune_superlu_flags(test_impeswithamg)
-  add_dune_mpi_flags(test_impeswithamg)
 else()
   add_dumux_test(test_impeswithamg test_impeswithamg test_impeswithamg.cc
     ${CMAKE_SOURCE_DIR}/bin/runTest.sh
@@ -67,5 +64,3 @@ add_dumux_test(test_mpfal2padaptive test_mpfa2p test_mpfa2p.cc
   ${CMAKE_CURRENT_BINARY_DIR}/test_mpfa2p
   -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_mpfa2p.input
   -ModelType MPFALAdaptive)
-add_dune_alugrid_flags(test_mpfa2p)
-add_dune_superlu_flags(test_mpfa2p)
diff --git a/test/decoupled/2p2c/CMakeLists.txt b/test/decoupled/2p2c/CMakeLists.txt
index 9daa470cfbb21f635dccb5fc49e419970b9726f2..62b21fc8815cc73b40eaacd2d269fdd4f88919ed 100644
--- a/test/decoupled/2p2c/CMakeLists.txt
+++ b/test/decoupled/2p2c/CMakeLists.txt
@@ -4,7 +4,6 @@ add_dumux_test(test_adaptive2p2c2d test_adaptive2p2c2d test_adaptive2p2c2d.cc
   ${CMAKE_SOURCE_DIR}/test/references/test_adaptive2p2c2d-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c2d-00008.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_adaptive2p2c2d)
-add_dune_alugrid_flags(test_adaptive2p2c2d)
 
 add_dumux_test(test_dec2p2c test_dec2p2c test_dec2p2c.cc
   ${CMAKE_SOURCE_DIR}/bin/runTest.sh
diff --git a/test/freeflow/navierstokes/CMakeLists.txt b/test/freeflow/navierstokes/CMakeLists.txt
index 16daf9ef46ad09e40b42eb71d443a02c02ae4c52..b46e231882ce17b783da19bff93be4c54ea3ddd3 100644
--- a/test/freeflow/navierstokes/CMakeLists.txt
+++ b/test/freeflow/navierstokes/CMakeLists.txt
@@ -4,6 +4,3 @@ add_dumux_test(test_navierstokes test_navierstokes test_navierstokes.cc
   ${CMAKE_SOURCE_DIR}/test/references/navierstokes-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/navierstokes-00008.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_navierstokes)
-add_dune_superlu_flags(test_navierstokes)
-add_dune_alugrid_flags(test_navierstokes)
-add_dune_ug_flags(test_navierstokes)
diff --git a/test/freeflow/stokes/CMakeLists.txt b/test/freeflow/stokes/CMakeLists.txt
index dac6117ebf819994b87052c52cc818fd65772384..a8f9dabba6a6aeb09dec4760ad0d5f278ff1867c 100644
--- a/test/freeflow/stokes/CMakeLists.txt
+++ b/test/freeflow/stokes/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_stokes test_stokes test_stokes.cc
   ${CMAKE_SOURCE_DIR}/test/references/stokes-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/stokes-00014.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_stokes)
-add_dune_superlu_flags(test_stokes)
diff --git a/test/freeflow/stokes2c/CMakeLists.txt b/test/freeflow/stokes2c/CMakeLists.txt
index b541c42b0fbde981068d12d01856667da8a00bd1..247411e8d8847803ef2596a1f6c796c5f0165283 100644
--- a/test/freeflow/stokes2c/CMakeLists.txt
+++ b/test/freeflow/stokes2c/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_stokes2c test_stokes2c test_stokes2c.cc
   ${CMAKE_SOURCE_DIR}/test/references/stokes2c-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/stokes2c-00007.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2c)
-add_dune_superlu_flags(test_stokes2c)
diff --git a/test/freeflow/stokes2cni/CMakeLists.txt b/test/freeflow/stokes2cni/CMakeLists.txt
index 091da92cd14d444f0fa6faef9da8af4ee86810d6..e1f4f197e1e8b97c4c243e814f77e2368e8c24bb 100644
--- a/test/freeflow/stokes2cni/CMakeLists.txt
+++ b/test/freeflow/stokes2cni/CMakeLists.txt
@@ -4,5 +4,3 @@ add_dumux_test(test_stokes2cni test_stokes2cni test_stokes2cni.cc
   ${CMAKE_SOURCE_DIR}/test/references/stokes2cni-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/stokes2cni-00008.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_stokes2cni)
-add_dune_superlu_flags(test_stokes2cni)
-add_dune_umfpack_flags(test_stokes2cni)
diff --git a/test/geomechanics/el1p2c/CMakeLists.txt b/test/geomechanics/el1p2c/CMakeLists.txt
index 48d5ff7703e33d1380de963261f280ec194bab13..662c4c3c22c0333ddf0323be9781463c4a0dacc9 100644
--- a/test/geomechanics/el1p2c/CMakeLists.txt
+++ b/test/geomechanics/el1p2c/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_el1p2c test_el1p2c test_el1p2c.cc
   ${CMAKE_SOURCE_DIR}/test/references/el1p2c-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/el1p2c-00015.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_el1p2c)
-add_dune_superlu_flags(test_el1p2c)
diff --git a/test/geomechanics/el2p/CMakeLists.txt b/test/geomechanics/el2p/CMakeLists.txt
index c63ee6270071be34ffe971c37c27ceb672723f82..3b4823d71e96d45ea91f6993c7ac2bd232cb93bb 100644
--- a/test/geomechanics/el2p/CMakeLists.txt
+++ b/test/geomechanics/el2p/CMakeLists.txt
@@ -5,4 +5,3 @@ add_dumux_test(test_el2p test_el2p test_el2p.cc
   ${CMAKE_CURRENT_BINARY_DIR}/el2p-00003.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_el2p
   ${CMAKE_CURRENT_SOURCE_DIR}/grids/test_el2p.dgf 100 200 100)
-add_dune_superlu_flags(test_el2p)
diff --git a/test/geomechanics/elastic/CMakeLists.txt b/test/geomechanics/elastic/CMakeLists.txt
index d8395760d2f426b0fb1783f0f65319bff98ad93b..65c20e8fe1f7133ac4620913294c8c948909d910 100644
--- a/test/geomechanics/elastic/CMakeLists.txt
+++ b/test/geomechanics/elastic/CMakeLists.txt
@@ -4,4 +4,3 @@ add_dumux_test(test_elastic test_elastic test_elastic.cc
   ${CMAKE_SOURCE_DIR}/test/references/elasticmatrix-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/elasticmatrix-00002.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_elastic)
-add_dune_superlu_flags(test_elastic)
diff --git a/test/implicit/1p/CMakeLists.txt b/test/implicit/1p/CMakeLists.txt
index 879defce4786b6c4593bdea6356855735478779d..f174b5991a0534e48cc84f8bba0b575234fe3222 100644
--- a/test/implicit/1p/CMakeLists.txt
+++ b/test/implicit/1p/CMakeLists.txt
@@ -25,5 +25,3 @@ add_dumux_test(test_cc1pwithamg test_cc1pwithamg test_cc1pwithamg.cc
   ${CMAKE_SOURCE_DIR}/test/references/1ptestcc-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/1ptestccwithamg-00002.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_cc1pwithamg)
-
-add_dune_alugrid_flags(test_cc1pwithamg test_box1pwithamg)
diff --git a/test/implicit/2pdfm/CMakeLists.txt b/test/implicit/2pdfm/CMakeLists.txt
index bdf30553c7463da14f66e3e909235b552af648d9..d8606118eac27c9c29d6a4594c7d71de238abad3 100644
--- a/test/implicit/2pdfm/CMakeLists.txt
+++ b/test/implicit/2pdfm/CMakeLists.txt
@@ -4,5 +4,3 @@ add_dumux_test(test_2pdfm test_2pdfm test_2pdfm.cc
   ${CMAKE_SOURCE_DIR}/test/references/2pdfm-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/2pdfm-00011.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_2pdfm)
-target_link_libraries(test_2pdfm ${DUNE_LIBS}  ${MPI_LIBRARIES})
-add_dune_ug_flags(test_2pdfm)
diff --git a/test/implicit/co2/CMakeLists.txt b/test/implicit/co2/CMakeLists.txt
index 504e1be92c52256bc51ad48399f1a8c47346bc5e..af86f94561cc77030de17cb305d359016806b0fe 100644
--- a/test/implicit/co2/CMakeLists.txt
+++ b/test/implicit/co2/CMakeLists.txt
@@ -5,7 +5,6 @@ add_dumux_test(test_boxco2 test_boxco2 test_boxco2.cc
   ${CMAKE_SOURCE_DIR}/test/references/co2box-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/heterogeneousbox-00020.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_boxco2)
-add_dune_alugrid_flags(test_boxco2)
 
 add_dumux_test(test_ccco2 test_ccco2 test_ccco2.cc
   ${CMAKE_SOURCE_DIR}/bin/runTest.sh
@@ -13,7 +12,6 @@ add_dumux_test(test_ccco2 test_ccco2 test_ccco2.cc
   ${CMAKE_SOURCE_DIR}/test/references/co2cc-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/heterogeneouscc-00019.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_ccco2)
-add_dune_alugrid_flags(test_ccco2)
 
 add_dumux_test(test_restartco2 test_ccco2 test_ccco2.cc
   ${CMAKE_SOURCE_DIR}/bin/runTest.sh
diff --git a/test/implicit/co2ni/CMakeLists.txt b/test/implicit/co2ni/CMakeLists.txt
index 2b510e11691c9b022326451190b423c8a696b333..6e7ea0343f2b62260c43e99c05237e0d1a65c9e4 100644
--- a/test/implicit/co2ni/CMakeLists.txt
+++ b/test/implicit/co2ni/CMakeLists.txt
@@ -5,7 +5,6 @@ add_dumux_test(test_boxco2ni test_boxco2ni test_boxco2ni.cc
   ${CMAKE_SOURCE_DIR}/test/references/co2nibox-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/heterogeneousboxni-00020.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_boxco2ni)
-add_dune_alugrid_flags(test_boxco2ni)
 
 add_dumux_test(test_ccco2ni test_ccco2ni test_ccco2ni.cc
   ${CMAKE_SOURCE_DIR}/bin/runTest.sh
@@ -13,4 +12,3 @@ add_dumux_test(test_ccco2ni test_ccco2ni test_ccco2ni.cc
   ${CMAKE_SOURCE_DIR}/test/references/co2nicc-reference.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/heterogeneousccni-00019.vtu
   ${CMAKE_CURRENT_BINARY_DIR}/test_ccco2ni)
-add_dune_alugrid_flags(test_ccco2ni)
diff --git a/test/implicit/mpnc/CMakeLists.txt b/test/implicit/mpnc/CMakeLists.txt
index b564a926c0b66f489e8e9f31d89fb785f1058999..d0bd9d586da0a6e59568db697c9d3dfe3707245b 100644
--- a/test/implicit/mpnc/CMakeLists.txt
+++ b/test/implicit/mpnc/CMakeLists.txt
@@ -43,8 +43,3 @@ add_dumux_test(test_boxmpncthermalnonequil test_boxmpncthermalnonequil test_boxm
   ${CMAKE_SOURCE_DIR}/test/references/combustion-reference.vtp
   ${CMAKE_CURRENT_BINARY_DIR}/combustion-00078.vtp
   ${CMAKE_CURRENT_BINARY_DIR}/test_boxmpncthermalnonequil)
-add_dune_superlu_flags(test_boxmpncthermalnonequil)
-
-target_link_libraries(test_boxmpnckinetic ${DUNE_LIBS}  ${MPI_LIBRARIES})
-add_dune_alugrid_flags(test_boxmpnckinetic)
-add_dune_ug_flags(test_boxmpnckinetic)
diff --git a/test/implicit/richards/CMakeLists.txt b/test/implicit/richards/CMakeLists.txt
index 7439ecfa233d9f16771d1d8e9535c6313ed92a62..8defc79b558fb479de3c9f0818a2201aa8f56c23 100644
--- a/test/implicit/richards/CMakeLists.txt
+++ b/test/implicit/richards/CMakeLists.txt
@@ -5,7 +5,6 @@ if(MPI_CXX_FOUND)
     ${CMAKE_SOURCE_DIR}/test/references/richardslensbox-reference-parallel.vtu
     ${CMAKE_CURRENT_BINARY_DIR}/s0002-p0000-richardslensbox-00008.vtu
     "${MPIEXEC} -np 2 ${CMAKE_CURRENT_BINARY_DIR}/test_boxrichards")
-  add_dune_mpi_flags(test_boxrichards)
 else()
   add_dumux_test(test_boxrichards test_boxrichards test_boxrichards.cc
     ${CMAKE_SOURCE_DIR}/bin/runTest.sh
diff --git a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
index c31bfec8bb149eedb01ce3e703a2aaf2ef0e68cc..46f46054ec2dd23bcb8aa411679d1b9ec5d8d887 100644
--- a/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
+++ b/test/multidomain/2cnistokes2p2cni/CMakeLists.txt
@@ -7,8 +7,6 @@ add_dumux_test(test_2cnistokes2p2cni_1ff test_2cnistokes2p2cni test_2cnistokes2p
   ${CMAKE_CURRENT_BINARY_DIR}/test_2cnistokes2p2cni
   -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cnistokes2p2cni_reference.input
   )
-add_dune_superlu_flags(test_2cnistokes2p2cni)
-add_dune_ug_flags(test_2cnistokes2p2cni)
 
 # test: test_2cnistokes2p2cni_2pm
 add_dumux_test(test_2cnistokes2p2cni_2pm test_2cnistokes2p2cni test_2cnistokes2p2cni.cc
diff --git a/test/multidomain/2cstokes2p2c/CMakeLists.txt b/test/multidomain/2cstokes2p2c/CMakeLists.txt
index 67e425d6d4e996cd3c853c00f899039449bce4fc..077f21b94e1f3a79cc1aabcbe30f5cd14012ea27 100644
--- a/test/multidomain/2cstokes2p2c/CMakeLists.txt
+++ b/test/multidomain/2cstokes2p2c/CMakeLists.txt
@@ -7,8 +7,6 @@ add_dumux_test(test_2cstokes2p2c_1ff test_2cstokes2p2c test_2cstokes2p2c.cc
   ${CMAKE_CURRENT_BINARY_DIR}/test_2cstokes2p2c
   -ParameterFile ${CMAKE_CURRENT_SOURCE_DIR}/test_2cstokes2p2c_reference.input  
   )
-add_dune_superlu_flags(test_2cstokes2p2c)
-add_dune_ug_flags(test_2cstokes2p2c)
 
 # test: test_2cstokes2p2c_2pm
 add_dumux_test(test_2cstokes2p2c_2pm test_2cstokes2p2c test_2cstokes2p2c.cc