diff --git a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
index ccc426d9510d3b11d7cd999ebe57fd2bc006d144..810937e275222a9afe64688559e23fbeab719ff6 100644
--- a/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
+++ b/test/porousmediumflow/1p/sequential/test_diffusionproblem3d.hh
@@ -51,8 +51,10 @@ NEW_TYPE_TAG(DiffusionTestProblem, INHERITS_FROM(SequentialTwoP, TestDiffusionSp
 // Set the grid type
 #if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::ALUGrid<3, 3, Dune::cube, Dune::nonconforming>);
-#else
+#elif HAVE_UG
 SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::UGGrid<3>);
+#else
+SET_TYPE_PROP(DiffusionTestProblem, Grid, Dune::YaspGrid<3>);
 #endif
 
 SET_TYPE_PROP(DiffusionTestProblem, Problem, Dumux::TestDiffusion3DProblem<TypeTag>);
diff --git a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
index 08cbe04e9e4251977477bd419731a4aa190b9239..165bdaf21dd6d6cb18a15c31f85ca7f2a8d6f17c 100644
--- a/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
+++ b/test/porousmediumflow/2p/sequential/test_mpfa2pproblem.hh
@@ -59,7 +59,11 @@ namespace Properties
 NEW_TYPE_TAG(MPFATwoPTestProblem, INHERITS_FROM(Test2PSpatialParams));
 
 // Set the grid type
+#if HAVE_UG
 SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::UGGrid<2>);
+#else
+SET_TYPE_PROP(MPFATwoPTestProblem, Grid, Dune::YaspGrid<2>);
+#endif
 
 // Set the problem property
 SET_TYPE_PROP(MPFATwoPTestProblem, Problem, Dumux::MPFATwoPTestProblem<TypeTag>);
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index c1d1456f7713159d3e7b4ffa1560eae86200c4c8..902d8fcebddd92b937517365d76c21490c553b7c 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -45,7 +45,11 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c2d, INHERITS_FROM(SequentialTwoPTwoCAdaptive,Test2P2CSpatialParams));
 
 // Set the grid type
+#if HAVE_UG
 SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::UGGrid<2>);
+#else
+SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::YaspGrid<3>);
+#endif
 
 // Set the problem property
 SET_TYPE_PROP(Adaptive2p2c2d, Problem, Dumux::Adaptive2p2c2d<TTAG(Adaptive2p2c2d)>);
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
index 00f007870b5bf7360d2b42726272904804057987..0a3f5963f72b2a77e58f63fc340251d0998cf9c2 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c3dproblem.hh
@@ -44,7 +44,11 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c3d, INHERITS_FROM(SequentialTwoPTwoCAdaptive,Test2P2CSpatialParams, MPFAProperties));
 
 // Set the grid type
+#if HAVE_UG
 SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::UGGrid<3>);
+#else
+SET_TYPE_PROP(Adaptive2p2c3d, Grid, Dune::YaspGrid<3>);
+#endif
 
 // Set the problem property
 SET_TYPE_PROP(Adaptive2p2c3d, Problem, Dumux::Adaptive2p2c3d<TTAG(Adaptive2p2c3d)>);