diff --git a/test/porousmediumflow/3p/implicit/grids/infiltration3p.dgf b/test/porousmediumflow/3p/implicit/grids/infiltration3p.dgf
deleted file mode 100644
index 8f483f4fc36edac128826f3b1d1c101db65d433b..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p/implicit/grids/infiltration3p.dgf
+++ /dev/null
@@ -1,17 +0,0 @@
-DGF
-Interval
-0 0   % first corner 
-500 10   % second corner
-50 10   % cells in x and 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/3p/implicit/grids/test_3pniconduction.dgf b/test/porousmediumflow/3p/implicit/grids/test_3pniconduction.dgf
deleted file mode 100644
index c3b8edac50dbe7e12bb1d10ec7f368a8b45e1966..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p/implicit/grids/test_3pniconduction.dgf
+++ /dev/null
@@ -1,11 +0,0 @@
-DGF
-Interval
-0 0   % first corner 
-5 1   % second corner
-200 1  % number of cells in x and y direction
-# 
-
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
diff --git a/test/porousmediumflow/3p/implicit/grids/test_3pniconvection.dgf b/test/porousmediumflow/3p/implicit/grids/test_3pniconvection.dgf
deleted file mode 100644
index 83adf4b1bfef3e63d58d08dbad7ba314b94ac2ab..0000000000000000000000000000000000000000
--- a/test/porousmediumflow/3p/implicit/grids/test_3pniconvection.dgf
+++ /dev/null
@@ -1,11 +0,0 @@
-DGF
-Interval
-0 0   % first corner 
-20 1   % second corner
-80 1  % number of cells in x and y direction
-# 
-
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
diff --git a/test/porousmediumflow/3p/implicit/test_box3p.input b/test/porousmediumflow/3p/implicit/test_box3p.input
index 1d36a705d485bca0cf1d9746ac8dcfa61851bc53..edd8a86f233adbb0cbaa2229763fe06de8a7f24e 100644
--- a/test/porousmediumflow/3p/implicit/test_box3p.input
+++ b/test/porousmediumflow/3p/implicit/test_box3p.input
@@ -3,7 +3,8 @@ DtInitial = 60 # [s]
 TEnd = 3600 # [s]
 
 [Grid]
-File = ./grids/infiltration3p.dgf
+UpperRight = 500 10
+Cells = 50 10
 
 [Problem]
 Name = infiltration3pbox
diff --git a/test/porousmediumflow/3p/implicit/test_box3pniconduction.input b/test/porousmediumflow/3p/implicit/test_box3pniconduction.input
index d0cf675dc5389bd4a43b0182424cffb0d5d5c0f6..2492431958113698456d3f5169e0ed5339560ccd 100644
--- a/test/porousmediumflow/3p/implicit/test_box3pniconduction.input
+++ b/test/porousmediumflow/3p/implicit/test_box3pniconduction.input
@@ -4,7 +4,8 @@ TEnd = 1e5 # [s]
 MaxTimeStepSize = 1e10
 
 [Grid]
-File = ./grids/test_3pniconduction.dgf
+UpperRight = 5 1
+Cells = 200 1
 
 [Problem]
 Name = test_box3pniconduction # name passed to the output routines
diff --git a/test/porousmediumflow/3p/implicit/test_box3pniconvection.input b/test/porousmediumflow/3p/implicit/test_box3pniconvection.input
index 736f1effdaed06dc43918b087e6d561886d14a8b..5dc7d07dbdc79866c820bf651548a6a26481f09d 100644
--- a/test/porousmediumflow/3p/implicit/test_box3pniconvection.input
+++ b/test/porousmediumflow/3p/implicit/test_box3pniconvection.input
@@ -4,7 +4,8 @@ TEnd = 3e4 # [s]
 MaxTimeStepSize = 1e3
 
 [Grid]
-File = ./grids/test_3pniconvection.dgf
+UpperRight = 20 1
+Cells = 80 1
 
 [Problem]
 Name = test_box3pniconvection # name passed to the output routines
diff --git a/test/porousmediumflow/3p/implicit/test_cc3p.input b/test/porousmediumflow/3p/implicit/test_cc3p.input
index d2926112a51abaf0d2cbec416e794df36a2e665a..08652caa0f1966db45b69feded08c298bc2ec9e7 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3p.input
+++ b/test/porousmediumflow/3p/implicit/test_cc3p.input
@@ -3,7 +3,8 @@ DtInitial = 60 # [s]
 TEnd = 3600 # [s]
 
 [Grid]
-File = ./grids/infiltration3p.dgf
+UpperRight = 500 10
+Cells = 50 10
 
 [Problem]
 Name = infiltration3pcc
diff --git a/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
index 8112e4317a34ded9ebd574999d8767dae6032bb9..42fb551f9b6a4a78d44272188c88321a03f1e661 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
+++ b/test/porousmediumflow/3p/implicit/test_cc3pniconduction.input
@@ -4,7 +4,8 @@ TEnd = 1e5 # [s]
 MaxTimeStepSize = 1e10
 
 [Grid]
-File = ./grids/test_3pniconduction.dgf
+UpperRight = 5 1
+Cells = 200 1
 
 [Problem]
 Name = test_cc3pniconduction # name passed to the output routines
diff --git a/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
index 67f8a7067e7703f0bb4ee01d348078cc791c3ace..2cd99fed09f035001799b6a185290f3904d4e5b9 100644
--- a/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
+++ b/test/porousmediumflow/3p/implicit/test_cc3pniconvection.input
@@ -4,7 +4,8 @@ TEnd = 3e4 # [s]
 MaxTimeStepSize = 1e3
 
 [Grid]
-File = ./grids/test_3pniconvection.dgf
+UpperRight = 20 1
+Cells = 80 1
 
 [Problem]
 Name = test_cc3pniconvection # name passed to the output routines