diff --git a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc b/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
index 6b08d95bbce979318d7013f5979d18f07b8d02c0..41a582a551a333989ebcc4ecf740c384147dd4d4 100644
--- a/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
+++ b/test/porousmediumflow/2p/implicit/adaptive/test_2p_adaptive_fv.cc
@@ -68,9 +68,13 @@ NEW_TYPE_TAG(TwoPIncompressibleAdaptiveBox, INHERITS_FROM(TwoPIncompressibleBox)
 NEW_TYPE_TAG(TwoPAdaptivePointSource, INHERITS_FROM(TwoPIncompressibleAdaptiveTpfa));
 
 //! Use non-conforming refinement in the cell-centered tests, conforming for box
+#if HAVE_DUNE_ALUGRID
 SET_TYPE_PROP(TwoPIncompressibleAdaptiveTpfa, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
 SET_TYPE_PROP(TwoPIncompressibleAdaptiveMpfa, Grid, Dune::ALUGrid<2, 2, Dune::cube, Dune::nonconforming>);
+#endif
+#if HAVE_DUNE_UGGRID
 SET_TYPE_PROP(TwoPIncompressibleAdaptiveBox, Grid, Dune::UGGrid<2>);
+#endif
 SET_TYPE_PROP(TwoPAdaptivePointSource, Problem, PointSourceTestProblem<TypeTag>);
 } // end namespace Properties
 } // end namespace Dumux
diff --git a/test/porousmediumflow/co2/implicit/CMakeLists.txt b/test/porousmediumflow/co2/implicit/CMakeLists.txt
index 6cadda160adcfedc68e3553007a1a8c07b5fb2a8..af7116b2f007fda067997410f775a0bcdb3ceecd 100644
--- a/test/porousmediumflow/co2/implicit/CMakeLists.txt
+++ b/test/porousmediumflow/co2/implicit/CMakeLists.txt
@@ -43,7 +43,7 @@ dune_add_test(NAME test_co2_tpfa
 dune_add_test(NAME test_co2ni_box
               SOURCES test_co2_fv.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousNIBoxTypeTag
-              COMPILE_DEFINITIONS ISOTHERMAL=0
+                                  ISOTHERMAL=0
               CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy
@@ -55,7 +55,7 @@ dune_add_test(NAME test_co2ni_box
 dune_add_test(NAME test_co2ni_tpfa
               SOURCES test_co2_fv.cc
               COMPILE_DEFINITIONS TYPETAG=HeterogeneousNICCTpfaTypeTag
-              COMPILE_DEFINITIONS ISOTHERMAL=0
+                                  ISOTHERMAL=0
               CMAKE_GUARD "( dune-alugrid_FOUND AND DUNE_GRID_EXPERIMENTAL_GRID_EXTENSIONS )"
               COMMAND ${CMAKE_SOURCE_DIR}/bin/testing/runtest.py
               CMD_ARGS --script fuzzy