diff --git a/test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf b/test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf
deleted file mode 100644
index 3a7f451a5eb91465fdf8eab508834e383b9588da..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/mpnc/implicit/grids/forchheimer1d.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0    % first corner
-1   % second corner
-100   % 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/mpnc/implicit/grids/obstacle_24x16.dgf b/test/porousmediumflow/mpnc/implicit/grids/obstacle_24x16.dgf
deleted file mode 100644
index 457306bbd3dc408b2588ac8461108dedd3215b28..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/mpnc/implicit/grids/obstacle_24x16.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-60 40   % second corner
-24 16   % 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/mpnc/implicit/grids/obstacle_48x32.dgf b/test/porousmediumflow/mpnc/implicit/grids/obstacle_48x32.dgf
deleted file mode 100644
index 6242c812d54634e876d34eaec46404159de21afc..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/mpnc/implicit/grids/obstacle_48x32.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-60 40   % second corner
-48 32   % 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/mpnc/implicit/test_boxmpnc.input b/test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
index 1c63f15fbe00251391aace6b9ad9034b0737b202..1c58b3803a46e181d2e84bb74183dd297754da68 100644
--- a/test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
+++ b/test/porousmediumflow/mpnc/implicit/test_boxmpnc.input
@@ -3,7 +3,8 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/obstacle_24x16.dgf
+UpperRight = 60 40
+Cells = 24 16
 
 [LinearSolver]
 ResidualReduction = 1e-12
diff --git a/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input b/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
index ac0e738ef6ddfea4921d23ebc342c5f8193a8c58..dbb4c29d38778bbf0932af044daa023205ceb5d5 100644
--- a/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
+++ b/test/porousmediumflow/mpnc/implicit/test_ccmpnc.input
@@ -3,7 +3,8 @@ DtInitial = 250 # [s]
 TEnd = 1e4 # [s]
 
 [Grid]
-File = ./grids/obstacle_24x16.dgf
+UpperRight = 60 40
+Cells = 24 16
 
 [LinearSolver]
 ResidualReduction = 1e-12
diff --git a/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input b/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
index bc0015963edcb49a7acdcbeddd352593e9c6b735..0acf3f7e82b94589bef0d6a5c566c8fb8f63844b 100644
--- a/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
+++ b/test/porousmediumflow/mpnc/implicit/test_forchheimer1p.input
@@ -3,7 +3,8 @@ DtInitial = 1e7 # [s]
 TEnd =     1e7 # [s]
 
 [Grid]
-File = ./grids/forchheimer1d.dgf
+UpperRight = 1
+Cells = 100
 
 [Problem]
 pMin 		= 1e5
diff --git a/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input b/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
index 8a9f6e4e6d2479188f9edcbde967f6d86f9cbe54..90028d6f98fa33f06b07f19d78b2c381839957e7 100644
--- a/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
+++ b/test/porousmediumflow/mpnc/implicit/test_forchheimer2p.input
@@ -3,10 +3,11 @@ DtInitial = 330 # [s]
 TEnd =     3e3 # [s]
 
 [Grid]
-File = ./grids/obstacle_24x16.dgf
+UpperRight = 60 40
+Cells = 24 16
 
 [Problem]
-pMin 		=    1e5
+pMin 		= 1e5
 pMax 		= 42e5
 outputName 	= test_forchheimer2p