diff --git a/test/freeflow/zeroeq/grids/channel.dgf b/test/freeflow/zeroeq/grids/channel.dgf
deleted file mode 100644
index 8b84fd446c444657eb51c6fcf552a8e0014b4c36..0000000000000000000000000000000000000000
--- a/test/freeflow/zeroeq/grids/channel.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-5.0 1.5  % second corner
-25 15 % cells in x and y direction
-#
-
-Cube
-0 1 2 3
-#
-
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/freeflow/zeroeq/grids/pipe.dgf b/test/freeflow/zeroeq/grids/pipe.dgf
deleted file mode 100644
index 06d6510435a9076fb1ce8393a69546bc921c1c7d..0000000000000000000000000000000000000000
--- a/test/freeflow/zeroeq/grids/pipe.dgf
+++ /dev/null
@@ -1,15 +0,0 @@
-DGF
-Interval
-0 0   % first corner
-10 0.2469  % second corner
-20 40 % cells in x and y direction
-#
-
-Cube
-0 1 2 3
-#
-
-BOUNDARYDOMAIN
-default 1 % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf
diff --git a/test/freeflow/zeroeq/test_zeroeq.input b/test/freeflow/zeroeq/test_zeroeq.input
index e12d1be523cc12af2643ae1a978bd2fa5f9ed119..4ee0d2cd3ad003961cdfa68c3b0551f1c6843a1c 100644
--- a/test/freeflow/zeroeq/test_zeroeq.input
+++ b/test/freeflow/zeroeq/test_zeroeq.input
@@ -3,7 +3,9 @@ DtInitial = 5 # [s]
 TEnd = 50 # [s]
 
 [Grid]
-File = grids/pipe.dgf
+LowerLeft = 0 0
+UpperRight = 10 0.2469
+Cells = 20 40
 
 [Problem]
 OutputName = "zeroeq"
diff --git a/test/freeflow/zeroeq/test_zeroeq_channel.input b/test/freeflow/zeroeq/test_zeroeq_channel.input
index db94a2c6439cece3a340e8e2544ea1c1c6a4d35e..5e013aee656a29d8ceeeab0d059b2ca29e72613f 100644
--- a/test/freeflow/zeroeq/test_zeroeq_channel.input
+++ b/test/freeflow/zeroeq/test_zeroeq_channel.input
@@ -3,7 +3,9 @@ DtInitial = 0.001 # [s]
 TEnd = 10 # [s]
 
 [Grid]
-File = grids/channel.dgf
+LowerLeft = 0 0
+UpperRight = 5.0 1.5
+Cells = 25 15
 
 [Problem]
 OutputName = "zeroeqchannel"
diff --git a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
index 7442c972f14d3616540677a51eb51ee2362f42db..f5fdec65fbdff512314e34b68584c99999b67986 100644
--- a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
@@ -23,12 +23,6 @@
 #ifndef DUMUX_ZEROEQCHANNELTESTPROBLEM_HH
 #define DUMUX_ZEROEQCHANNELTESTPROBLEM_HH
 
-#if HAVE_UG
-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#else
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-#endif
-
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>
 
diff --git a/test/freeflow/zeroeq/zeroeqtestproblem.hh b/test/freeflow/zeroeq/zeroeqtestproblem.hh
index 0f3b8814c7d51fa315a07b39582ab3b951ac6914..b9fd860116cb42a18bad22418e650444fe9f2238 100644
--- a/test/freeflow/zeroeq/zeroeqtestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqtestproblem.hh
@@ -26,12 +26,6 @@
 #ifndef DUMUX_ZEROEQTESTPROBLEM_HH
 #define DUMUX_ZEROEQTESTPROBLEM_HH
 
-#if HAVE_UG
-#include <dune/grid/io/file/dgfparser/dgfug.hh>
-#else
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-#endif
-
 #include <dumux/material/fluidsystems/h2oair.hh>
 #include <dumux/material/fluidsystems/gasphase.hh>