diff --git a/test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf b/test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf
deleted file mode 100644
index f2df78b633fa77cd16e94866ae3fb4fe50096b4a..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p2c/implicit/grids/test_2p2c.dgf
+++ /dev/null
@@ -1,10 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-60 40   % second corner
-24 16   % 24 cells in x and 16 in y direction
-#
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf b/test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf
deleted file mode 100644
index 058d853f663f91bb056afbffd09cb1af33ce9910..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/2p2c/implicit/grids/test_2p2cni.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-40 40   % second corner
-64 64   % 24 cells in x and 16 in y direction
-#
-GridParameter
-overlap 0
-periodic
-closure green
-#GridParameter
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
index e21ccb82587a2b00396fda9251c4dc9f4ce73bb8..ff1a318faf86955438119db8884284980a6d6ce0 100644
--- a/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/injectionproblem.hh
@@ -24,8 +24,6 @@
 #ifndef DUMUX_INJECTION_PROBLEM_HH
 #define DUMUX_INJECTION_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/porousmediumflow/2p2c/implicit/model.hh>
 #include <dumux/porousmediumflow/implicit/problem.hh>
 #include <dumux/material/fluidsystems/h2on2.hh>
@@ -123,7 +121,6 @@ class InjectionProblem : public ImplicitPorousMediaProblem<TypeTag>
     typedef typename GridView::Intersection Intersection;
 
     typedef typename GET_PROP_TYPE(TypeTag, FVElementGeometry) FVElementGeometry;
-    typedef typename GET_PROP_TYPE(TypeTag, GridCreator) GridCreator;
 
     typedef Dune::FieldVector<Scalar, dimWorld> GlobalPosition;
 
@@ -141,7 +138,7 @@ public:
      */
     InjectionProblem(TimeManager &timeManager,
                      const GridView &gridView)
-        : ParentType(timeManager, GridCreator::grid().leafGridView())
+        : ParentType(timeManager, gridView)
     {
             nTemperature_       = GET_RUNTIME_PARAM(TypeTag, int, Problem.NTemperature);
             nPressure_          = GET_RUNTIME_PARAM(TypeTag, int, Problem.NPressure);
diff --git a/test/porousmediumflow/2p2c/implicit/test_box2p2c.input b/test/porousmediumflow/2p2c/implicit/test_box2p2c.input
index ddde44d71314e8c50ab940952a67e14ad1dc2606..04fdad3190c5a8bea7e5b291b1bd46557f7e1917 100644
--- a/test/porousmediumflow/2p2c/implicit/test_box2p2c.input
+++ b/test/porousmediumflow/2p2c/implicit/test_box2p2c.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/test_2p2c.dgf
+LowerLeft = 0 0
+UpperRight = 60 40
+Cells = 24 16
 
 [Problem]
 Name = injectionbox # [-] the name of the output files
diff --git a/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input b/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
index b166d6eaa212352498d5972827fe1e63620a73d9..e742c23188a2d02cdd2e8f5587832993467ef82f 100644
--- a/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
+++ b/test/porousmediumflow/2p2c/implicit/test_box2p2cni.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
 
 [Problem]
 Name = waterairbox
diff --git a/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input b/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
index b166d6eaa212352498d5972827fe1e63620a73d9..e742c23188a2d02cdd2e8f5587832993467ef82f 100644
--- a/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
+++ b/test/porousmediumflow/2p2c/implicit/test_box2p2cni_reference.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
 
 [Problem]
 Name = waterairbox
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
index a817ff2f3e07f3ecb942dc42ee806333f10a7658..7237f3520e39a77953763c4c28c99fd7c3411436 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2c.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/test_2p2c.dgf
+LowerLeft = 0 0
+UpperRight = 60 40
+Cells = 24 16
 
 [Problem]
 Name = injectioncc # [-] the name of the output files
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
index 7edffc9adebf47f1bebfbaf334e76e611a7d6c8d..0d8d8bf2075807b89694892ae4d71a131132d52e 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
 
 [Problem]
 Name = wateraircc
diff --git a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
index 7edffc9adebf47f1bebfbaf334e76e611a7d6c8d..0d8d8bf2075807b89694892ae4d71a131132d52e 100644
--- a/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
+++ b/test/porousmediumflow/2p2c/implicit/test_cc2p2cni_reference.input
@@ -3,7 +3,9 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/test_2p2cni.dgf
+LowerLeft = 0 0
+UpperRight = 40 40
+Cells = 64 64
 
 [Problem]
 Name = wateraircc
diff --git a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
index 3a77dd188da2df383c5731f44973bb17a96a508d..1ff7e8ea3650d38405a1547a75225fa8ea52b18b 100644
--- a/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
+++ b/test/porousmediumflow/2p2c/implicit/waterairproblem.hh
@@ -25,8 +25,6 @@
 #ifndef DUMUX_WATER_AIR_PROBLEM_HH
 #define DUMUX_WATER_AIR_PROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #include <dumux/material/fluidsystems/h2on2.hh>
 
 #include <dumux/porousmediumflow/2p2c/implicit/model.hh>