diff --git a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
index f5fdec65fbdff512314e34b68584c99999b67986..abeb5618f6ea4d8ecd931f7685068a95f741f93f 100644
--- a/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqchanneltestproblem.hh
@@ -40,11 +40,7 @@ namespace Properties
 NEW_TYPE_TAG(ZeroEqChannelTestProblem, INHERITS_FROM(BoxZeroEq));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(ZeroEqChannelTestProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(ZeroEqChannelTestProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(ZeroEqChannelTestProblem, Problem, Dumux::ZeroEqChannelTestProblem<TypeTag>);
diff --git a/test/freeflow/zeroeq/zeroeqtestproblem.hh b/test/freeflow/zeroeq/zeroeqtestproblem.hh
index b9fd860116cb42a18bad22418e650444fe9f2238..d9d899fb0c36ae6c43eef0a2472db71ce3e5901d 100644
--- a/test/freeflow/zeroeq/zeroeqtestproblem.hh
+++ b/test/freeflow/zeroeq/zeroeqtestproblem.hh
@@ -43,11 +43,7 @@ namespace Properties
 NEW_TYPE_TAG(ZeroEqTestProblem, INHERITS_FROM(BoxZeroEq));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(ZeroEqTestProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(ZeroEqTestProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(ZeroEqTestProblem, Problem, Dumux::ZeroEqTestProblem<TypeTag>);
diff --git a/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh b/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
index fbd211a05bd85709a835c1ee85061cf0f5ce6340..a690e851fe41d2c2f1174922cbb528b4cd0d6692 100644
--- a/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
+++ b/test/freeflow/zeroeq2c/zeroeq2ctestproblem.hh
@@ -40,11 +40,7 @@ namespace Properties
 NEW_TYPE_TAG(ZeroEq2cTestProblem, INHERITS_FROM(BoxZeroEqnc));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(ZeroEq2cTestProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(ZeroEq2cTestProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 // Set the problem property
 SET_TYPE_PROP(ZeroEq2cTestProblem, Problem, Dumux::ZeroEq2cTestProblem<TypeTag>);
diff --git a/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh b/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
index 0beda49ab1c2669da593f1fba2b85c8fd829f672..20408ae30921af7f661f14ef8a106ab98eee3c7c 100644
--- a/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
+++ b/test/freeflow/zeroeq2cni/zeroeq2cnitestproblem.hh
@@ -40,11 +40,7 @@ namespace Properties
 NEW_TYPE_TAG(ZeroEq2cniTestProblem, INHERITS_FROM(BoxZeroEqncni));
 
 // Set the grid type
-#if HAVE_UG
-SET_TYPE_PROP(ZeroEq2cniTestProblem, Grid, Dune::UGGrid<2>);
-#else
 SET_TYPE_PROP(ZeroEq2cniTestProblem, Grid, Dune::YaspGrid<2>);
-#endif
 
 //Set the problem property
 SET_TYPE_PROP(ZeroEq2cniTestProblem, Problem, Dumux::ZeroEq2cniTestProblem<TypeTag>);