diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.cc b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.cc
index 13cf39e86723471124cde52ff1d1cf49a5052e0d..705d9e36d752fe1d241bbcbfab3baf1a9cbc7189 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.cc
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.cc
@@ -23,6 +23,8 @@
  */
 #include <config.h>
 
+#if HAVE_UG
+
 #include "test_adaptive2p2c2dproblem.hh"
 #include <dumux/common/start.hh>
 
@@ -53,12 +55,18 @@ void usage(const char *progName, const std::string &errorMsg)
 // The main function using the standard start procedure
 int main(int argc, char** argv)
 {
-#if HAVE_DUNE_ALUGRID
     typedef TTAG(Adaptive2p2c2d) TypeTag;
     return Dumux::start<TypeTag>(argc, argv, usage);
+}
+
 #else
-#warning dune-ALUGrid needed for this test.
-    std::cerr << "dune-ALUGrid needed for this test. Aborting." << std::endl;
+
+#include <iostream>
+
+int main()
+{
+#warning You need to have UGGrid to run this test
+    std::cerr << "You need to have UGGrid to run this test\n";
     return 77;
-#endif
 }
+#endif
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.input b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.input
index 43f306fcc87d8b86583e01959ebe809853b709fc..830c1289b681a26c51be4374b8e6b7bf4756ca7b 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.input
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2d.input
@@ -22,6 +22,6 @@ DtInitial = 200
 
 [Grid]
 Cells = 10 10 # [-] level 0 resolution in x- and y-direction
-
 UpperRight = 10 10# [m] dimension of the grid
+ClosureType = None
 
diff --git a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
index e72e7158c0d8132fccc3e20f9b4f46fedd31830b..c1d1456f7713159d3e7b4ffa1560eae86200c4c8 100644
--- a/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
+++ b/test/porousmediumflow/2p2c/sequential/test_adaptive2p2c2dproblem.hh
@@ -45,11 +45,7 @@ namespace Properties
 NEW_TYPE_TAG(Adaptive2p2c2d, INHERITS_FROM(SequentialTwoPTwoCAdaptive,Test2P2CSpatialParams));
 
 // Set the grid type
-#if HAVE_DUNE_ALUGRID
-SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
-#else
-SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::YaspGrid<2>);
-#endif
+SET_TYPE_PROP(Adaptive2p2c2d, Grid, Dune::UGGrid<2>);
 
 // Set the problem property
 SET_TYPE_PROP(Adaptive2p2c2d, Problem, Dumux::Adaptive2p2c2d<TTAG(Adaptive2p2c2d)>);
@@ -249,7 +245,7 @@ Scalar initConcentrationAtPos(const GlobalPosition& globalPos) const
 }
 
 private:
-Grid grid_;
+//Grid grid_;
 Dumux::VtkMultiWriter<GridView> debugWriter_;
 };
 } //end namespace