diff --git a/test/freeflow/stokes2cni/grids/test_stokes2cni.dgf b/test/freeflow/stokes2cni/grids/test_stokes2cni.dgf
deleted file mode 100644
index bd986a56988c06439c784e3e234430ef18da48b0..0000000000000000000000000000000000000000
--- a/test/freeflow/stokes2cni/grids/test_stokes2cni.dgf
+++ /dev/null
@@ -1,16 +0,0 @@
-DGF
-Interval
-0 0   % first corner 
-1.0 1.0 % second corner
-18 18 % 120 30   % 24 cells in x and 16 in y direction
-# 
-#GridParameter
-#overlap 0 
-#periodic 
-#closure green
-#copies none
-#heapsize 500
-BOUNDARYDOMAIN
-default 1    % all boundaries have id 1
-#BOUNDARYDOMAIN
-# unitcube.dgf 
diff --git a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
index 4998e6d50c0a18a1611524409abcb290f021533d..f4dd73d526f66f28019a5cff1d8d4ee1c21dbc2b 100644
--- a/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
+++ b/test/freeflow/stokes2cni/stokes2cnitestproblem.hh
@@ -23,8 +23,6 @@
 #ifndef DUMUX_STOKES2CNITESTPROBLEM_HH
 #define DUMUX_STOKES2CNITESTPROBLEM_HH
 
-#include <dune/grid/io/file/dgfparser/dgfyasp.hh>
-
 #if HAVE_PARDISO
 #include <dumux/linear/pardisobackend.hh>
 #endif
diff --git a/test/freeflow/stokes2cni/test_stokes2cni.input b/test/freeflow/stokes2cni/test_stokes2cni.input
index 900375c777bffba06bbf36d667f0fbdfb542843b..5da6ca323746445998ded9a0b74e459043e0aebb 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni.input
@@ -3,7 +3,9 @@ DtInitial = 0.1 # [s]
 TEnd = 3 # [s]
 
 [Grid]
-File = ./grids/test_stokes2cni.dgf
+LowerLeft = 0 0
+UpperRight = 1 1
+Cells = 18 18
 
 [Stokes]
 StabilizationAlpha = -1.0 # a stabilization factor. Set to zero for no stabilization
diff --git a/test/freeflow/stokes2cni/test_stokes2cni_conduction.input b/test/freeflow/stokes2cni/test_stokes2cni_conduction.input
index 0f082f22d1356ce77a003003192e42d21cb17aeb..3e2bf4f37e57b17c9c4d83afa874fb2592fac230 100644
--- a/test/freeflow/stokes2cni/test_stokes2cni_conduction.input
+++ b/test/freeflow/stokes2cni/test_stokes2cni_conduction.input
@@ -3,7 +3,9 @@ DtInitial = 0.1 # [s]
 TEnd = 3 # [s]
 
 [Grid]
-File = ./grids/test_stokes2cni.dgf
+LowerLeft = 0 0
+UpperRight = 1 1
+Cells = 18 18
 
 [Stokes]
 StabilizationAlpha = -1.0 # a stabilization factor. Set to zero for no stabilization