diff --git a/test/freeflow/stokes2c/stokes2ctestproblem.hh b/test/freeflow/stokes2c/stokes2ctestproblem.hh
index 9d0efb8272ab606a57aea02539b6f527c5a53f18..768bbee5120d92a63aa7ae64c599355aec6b0935 100644
--- a/test/freeflow/stokes2c/stokes2ctestproblem.hh
+++ b/test/freeflow/stokes2c/stokes2ctestproblem.hh
@@ -23,8 +23,6 @@
 #ifndef DUMUX_STOKES2CTESTPROBLEM_HH
 #define DUMUX_STOKES2CTESTPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2oair.hh>
 
 #include <dumux/freeflow/stokesnc/model.hh>
diff --git a/test/geomechanics/el2p/el2pproblem.hh b/test/geomechanics/el2p/el2pproblem.hh
index ea161cd420b4559dfb73f7ebfe6f495616cb3548..58b334306570587c25b695551e440b9cc303dc78 100644
--- a/test/geomechanics/el2p/el2pproblem.hh
+++ b/test/geomechanics/el2p/el2pproblem.hh
@@ -24,7 +24,6 @@
 #ifndef DUMUX_EL2P_TESTPROBLEM_HH
 #define DUMUX_EL2P_TESTPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 #include <dune/pdelab/finiteelementmap/qkfem.hh>
 
 #include <dumux/material/fluidsystems/brineco2.hh>
diff --git a/test/geomechanics/elastic/elasticmatrixproblem.hh b/test/geomechanics/elastic/elasticmatrixproblem.hh
index db9111eceb72e035c80eff89c076b4360f0b07ac..7c6b13ab3eb942e4550c73bd10a4cca12d1107a4 100644
--- a/test/geomechanics/elastic/elasticmatrixproblem.hh
+++ b/test/geomechanics/elastic/elasticmatrixproblem.hh
@@ -24,8 +24,6 @@
 #ifndef DUMUX_ELASTICMATRIXPROBLEM_HH
 #define DUMUX_ELASTICMATRIXPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/geomechanics/elastic/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
index 405b28f00a1216db20aa54b8ec3b78a6e648fc82..28ce18cc5aa2c25483811dce8d54bb13b5bb5237 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivityjohansenproblem.hh
@@ -24,8 +24,6 @@
 #ifndef DUMUX_THERMAL_CONDUCTIVITY_JOHANSEN_PROBLEM_HH
 #define DUMUX_THERMAL_CONDUCTIVITY_JOHANSEN_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2on2.hh>
 
 #include <dumux/porousmediumflow/2p2c/implicit/model.hh>
diff --git a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
index 48edf47f9b6313d2f5a868096e54d477dcf3462f..2fc820f82884a641096d94057519853507536a5e 100644
--- a/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
+++ b/test/material/fluidmatrixinteractions/2p/thermalconductivitysomertonproblem.hh
@@ -24,8 +24,6 @@
 #ifndef DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
 #define DUMUX_THERMAL_CONDUCTIVITY_SOMERTON_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2on2.hh>
 
 #include <dumux/porousmediumflow/2p2c/implicit/model.hh>
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
index 1186c626de8cb2be4553e429bd5f4eeed3a88b37..3c6ad884022e6f2444f259a372733cc76eda2b09 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivityconstanttauproblem.hh
@@ -24,8 +24,6 @@
 #ifndef DUMUX_EFFECTIVE_DIFFUSIVITY_CONSTANT_TAU_PROBLEM_HH
 #define DUMUX_EFFECTIVE_DIFFUSIVITY_CONSTANT_TAU_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2on2.hh>
 
 #include <dumux/porousmediumflow/2p2c/implicit/model.hh>
diff --git a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
index c3e760f61d24063c32c54a373d245b89e2d64f4e..4131a81ef59b70821ab850f9c9292fe1df43643c 100644
--- a/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
+++ b/test/material/fluidmatrixinteractions/effectivediffusivitymillingtonquirkproblem.hh
@@ -24,8 +24,6 @@
 #ifndef DUMUX_EFFECTIVE_DIFFUSIVITY_MILLINGTON_QUIRK_PROBLEM_HH
 #define DUMUX_EFFECTIVE_DIFFUSIVITY_MILLINGTON_QUIRK_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2on2.hh>
 
 #include <dumux/porousmediumflow/2p2c/implicit/model.hh>
diff --git a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
index 4c267d66626461366d582337d052599adff4a552..ed17084769b08b3419fd74fd0976b3b014276ffb 100644
--- a/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
+++ b/test/multidomain/2cnistokes2p2cni/2cnistokes2p2cniproblem.hh
@@ -35,7 +35,6 @@
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/common/gridinfo.hh>
 #include <dune/grid/multidomaingrid.hh>
-#include <dune/grid/io/file/dgfparser.hh>
 
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/multidomain/2cnistokes2p2cni/localoperator.hh>
diff --git a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
index 600bfa48745da4efeb4e72c15c1a3fe3720fbe8d..ae86e59051f6c93f004ca0d8142d89e82b4ee8ae 100644
--- a/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
+++ b/test/multidomain/2cnizeroeq2p2cni/2cnizeroeq2p2cniproblem.hh
@@ -26,7 +26,6 @@
 
 #include <dune/grid/multidomaingrid.hh>
 #include <dune/grid/common/gridinfo.hh>
-#include <dune/grid/io/file/dgfparser.hh>
 
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/multidomain/2cnistokes2p2cni/localoperator.hh>
diff --git a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
index d38dd88f0a7383a5231f936bab3bce6b03444cbc..97ea6ea2d239378f9dd7294127aa53b1113355a2 100644
--- a/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
+++ b/test/multidomain/2cstokes2p2c/2cstokes2p2cproblem.hh
@@ -35,7 +35,6 @@
 #include <dune/common/float_cmp.hh>
 #include <dune/grid/common/gridinfo.hh>
 #include <dune/grid/multidomaingrid.hh>
-#include <dune/grid/io/file/dgfparser.hh>
 
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/multidomain/2cstokes2p2c/localoperator.hh>
diff --git a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
index f8b64bd5ac5ef6131121bb4a7a235f6165cb90e8..f128e62569ff848d71b609c820aa40a07c0bdd1c 100644
--- a/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
+++ b/test/multidomain/2czeroeq2p2c/2czeroeq2p2cproblem.hh
@@ -26,7 +26,6 @@
 
 #include <dune/grid/multidomaingrid.hh>
 #include <dune/grid/common/gridinfo.hh>
-#include <dune/grid/io/file/dgfparser.hh>
 
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/multidomain/2cstokes2p2c/localoperator.hh>
diff --git a/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
index 64d0ea9a0b40f164e8e33a2935764b115e48d6b0..3065e429cc54e89084c34392e699f9873538be39 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2cniconductionproblem.hh
@@ -25,8 +25,6 @@
 #ifndef DUMUX_1P2CNI_CONDUCTION_PROBLEM_HH
 #define DUMUX_1P2CNI_CONDUCTION_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/1p2c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
diff --git a/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
index 3cffb90c27f564cdf6f53c6a8b8dffc81f3d2464..e43f564d7e5540057790653ad9170c563b6e23b2 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2cniconvectionproblem.hh
@@ -26,8 +26,6 @@
 #ifndef DUMUX_1P2CNI_CONVECTION_PROBLEM_HH
 #define DUMUX_1P2CNI_CONVECTION_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/1p2c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/material/components/h2o.hh>
diff --git a/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh b/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
index 473de62ad5aec82c27cbf6fee0bf5166ae0203f8..a57fd329e54b1af8df1dd0505badffd0748d5918 100644
--- a/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
+++ b/test/porousmediumflow/1p2c/implicit/1p2coutflowproblem.hh
@@ -24,11 +24,6 @@
 #ifndef DUMUX_1P2C_OUTFLOW_PROBLEM_HH
 #define DUMUX_1P2C_OUTFLOW_PROBLEM_HH
 
-#if HAVE_UG
-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#endif
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/1p2c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
diff --git a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
index 549b535f105b2c01cdebe7c30020362da8cdeead..b566fbb4b90727164b296056fbb2d4442ef3d984 100644
--- a/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconductionproblem.hh
@@ -25,7 +25,6 @@
 #define DUMUX_3PNI_CONDUCTION_PROBLEM_HH
 
 #include <math.h>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 
 #include <dumux/porousmediumflow/3p/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
diff --git a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
index 90ce0bdc11ab3c2b095b972062793e47a57be5a2..d1204c35af6c6ce92052595b4b089424a3e0d49d 100644
--- a/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
+++ b/test/porousmediumflow/3p/implicit/3pniconvectionproblem.hh
@@ -25,7 +25,6 @@
 #define DUMUX_3PNI_CONVECTION_PROBLEM_HH
 
 #include <math.h>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 
 #include <dumux/porousmediumflow/3p/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
diff --git a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
index b54bbab5d4bc64508e3826b2f955f9ace5cce44a..7a73d40545438b5a058dddb3f8fcf506ef051079 100644
--- a/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
+++ b/test/porousmediumflow/3p/implicit/infiltration3pproblem.hh
@@ -25,8 +25,6 @@
 #ifndef DUMUX_INFILTRATION_THREEP_PROBLEM_HH
 #define DUMUX_INFILTRATION_THREEP_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/3p/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
diff --git a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
index 118469524175cf065ee08ddc856bfd772f81da77..a15091f919437a17df30abe56b11ccd114983327 100644
--- a/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/columnxylolproblem.hh
@@ -25,8 +25,6 @@
 #ifndef DUMUX_COLUMNXYLOLPROBLEM_HH
 #define DUMUX_COLUMNXYLOLPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2oairxylene.hh>
 
 #include <dumux/porousmediumflow/3p3c/implicit/model.hh>
diff --git a/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh b/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
index 6c94ee7d5d62f76f992ea703a71bc72929391b2f..1f27b6daffe6dd967d960d277b506c18304f2868 100644
--- a/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/infiltrationproblem.hh
@@ -25,8 +25,6 @@
 #ifndef DUMUX_INFILTRATIONPROBLEM_HH
 #define DUMUX_INFILTRATIONPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 
 #include <dumux/porousmediumflow/3p3c/implicit/model.hh>
diff --git a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
index 5d6e32e03de59ee2949357ff4eac165c6f7789b2..0a8ce317c366e4df9d308a246e3b33b3c894f3fa 100644
--- a/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
+++ b/test/porousmediumflow/3p3c/implicit/kuevetteproblem.hh
@@ -27,7 +27,6 @@
 #define DUMUX_KUEVETTE3P3CNIPROBLEM_HH
 
 #include <dune/common/float_cmp.hh>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 
 #include <dumux/material/fluidsystems/h2oairmesitylene.hh>
 
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
index 04130b70c02d0374d194d1a32c597a99616ab511..aa73b0431161154c28818a935b1961bc072096bf 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblem.hh
@@ -24,13 +24,6 @@
 #ifndef DUMUX_HETEROGENEOUS_PROBLEM_HH
 #define DUMUX_HETEROGENEOUS_PROBLEM_HH
 
-#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/grid.hh>
-#else
-#warning ALUGrid is necessary for this test.
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-#endif
-
 #include <dumux/porousmediumflow/co2/implicit/model.hh>
 #include <dumux/porousmediumflow/co2/implicit/volumevariables.hh>
 #include <dumux/material/fluidsystems/brineco2.hh>
diff --git a/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh b/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
index d4ec03bc809ceee264c739840889cc88ea337064..c561781f7faacf413f23e1d11ce8c006622d1950 100644
--- a/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
+++ b/test/porousmediumflow/co2/implicit/heterogeneousproblemni.hh
@@ -24,13 +24,6 @@
 #ifndef DUMUX_HETEROGENEOUS_PROBLEM_NI_HH
 #define DUMUX_HETEROGENEOUS_PROBLEM_NI_HH
 
-#if HAVE_DUNE_ALUGRID
-#include <dune/alugrid/grid.hh>
-#else
-#warning ALUGrid is necessary for this test.
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-#endif
-
 #include <dumux/porousmediumflow/co2/implicit/volumevariables.hh>
 #include <dumux/porousmediumflow/co2/implicit/model.hh>
 #include <dumux/material/fluidsystems/brineco2.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
index 0228027de250a1795d36f9fcb10a8b407d933328..70911d47447e6997c16ba5865e961ff9b2bcf06c 100644
--- a/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/evaporationatmosphereproblem.hh
@@ -48,8 +48,6 @@
 
 #include <dune/common/parametertreeparser.hh>
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/mpnc/implicit/modelkinetic.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/porousmediumflow/mpnc/implicit/velomodelnewtoncontroller.hh>
diff --git a/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh b/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
index be7c53eb1a68b92eb709710525343ee5bfb48d23..7b964d7fdcab5c56c3a0aba97a54afb50c16e594 100644
--- a/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/forchheimer1pproblem.hh
@@ -27,8 +27,6 @@
 
 #include <dune/common/parametertreeparser.hh>
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/mpnc/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
diff --git a/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh b/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
index 8f67f7f6d969a215c9dbb9e9c495cd4bd9184c7c..107a9da4915a87bdd3b861ceed9855445fe6badf 100644
--- a/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/forchheimer2pproblem.hh
@@ -25,8 +25,6 @@
 
 #include <dune/common/parametertreeparser.hh>
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/mpnc/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
diff --git a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
index 8da0ca7fc9783d827f9391ca5c0864c477841e8e..239124a4080ebb0385ed56a825c8fbf39136e4ec 100644
--- a/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
+++ b/test/porousmediumflow/mpnc/implicit/obstacleproblem.hh
@@ -27,8 +27,6 @@
 
 #include <dune/common/parametertreeparser.hh>
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/mpnc/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 
diff --git a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
index 575ce2009652d3c05b8e5c9b49b811b32f6470ca..22a558fb9946ac28d5b814fac1910658ff075030 100644
--- a/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsanalyticalproblem.hh
@@ -31,7 +31,6 @@
 #include <cmath>
 #include <dune/geometry/type.hh>
 #include <dune/geometry/quadraturerules.hh>
-#include <dune/grid/io/file/dgfparser.hh>
 
 #include <dumux/porousmediumflow/richards/implicit/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
diff --git a/test/porousmediumflow/richards/implicit/richardslensproblem.hh b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
index 3da0da5e75c1797d9e49dff254aafec54c983ab4..56f745e350df8ce744a948ed87eddd7eb0416ed2 100644
--- a/test/porousmediumflow/richards/implicit/richardslensproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardslensproblem.hh
@@ -26,8 +26,6 @@
 #ifndef DUMUX_RICHARDS_LENSPROBLEM_HH
 #define DUMUX_RICHARDS_LENSPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser.hh>
-
 #include <dumux/porousmediumflow/richards/implicit/model.hh>
 #include <dumux/material/components/simpleh2o.hh>
 #include <dumux/material/fluidsystems/liquidphase.hh>
diff --git a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
index df706668e06677be9739dfb38bbb900b6ecd566d..f756acafba2e55867b95e712b77702ec8ed85828 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconductionproblem.hh
@@ -26,7 +26,6 @@
 #define DUMUX_RICHARDS_CONDUCTION_PROBLEM_HH
 
 #include <math.h>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/porousmediumflow/richards/implicit/model.hh>
diff --git a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
index c9b66a728ff6706ac23cc9352c4ea1f41fa39018..3ad247468d0ee15ba117b2e9b4ddc24abe8b5fba 100644
--- a/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
+++ b/test/porousmediumflow/richards/implicit/richardsniconvectionproblem.hh
@@ -27,7 +27,6 @@
 #define DUMUX_1PNI_CONVECTION_PROBLEM_HH
 
 #include <math.h>
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
 
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/porousmediumflow/richards/implicit/model.hh>