diff --git a/test/boxmodels/2p2cni/waterairproblem.hh b/test/boxmodels/2p2cni/waterairproblem.hh
index 3ed52272261f509ac2c88451bd7aae9ed5173b73..f90226585ff710275a44708be78107781caffa3f 100644
--- a/test/boxmodels/2p2cni/waterairproblem.hh
+++ b/test/boxmodels/2p2cni/waterairproblem.hh
@@ -24,8 +24,8 @@
  * \brief Non-isothermal gas injection problem where a gas (e.g. air)
  *        is injected into a fully water saturated medium.
  */
-#ifndef DUMUX_WATERAIRPROBLEM_HH
-#define DUMUX_WATERAIRPROBLEM_HH
+#ifndef DUMUX_WATER_AIR_PROBLEM_HH
+#define DUMUX_WATER_AIR_PROBLEM_HH
 
 #include <dune/grid/io/file/dgfparser/dgfug.hh>
 #include <dune/grid/io/file/dgfparser/dgfs.hh>
diff --git a/test/boxmodels/2p2cni/waterairspatialparameters.hh b/test/boxmodels/2p2cni/waterairspatialparameters.hh
index 0c0a2cd19f1383ef9001ed7b153d1c7fd2ad52fc..81e1cff228b5c3928deaf904af8efd97a9f27842 100644
--- a/test/boxmodels/2p2cni/waterairspatialparameters.hh
+++ b/test/boxmodels/2p2cni/waterairspatialparameters.hh
@@ -255,8 +255,8 @@ public:
         // arithmetic mean of the liquid saturation and the porosity
         const int i = fvElemGeom.subContVolFace[scvfIdx].i;
         const int j = fvElemGeom.subContVolFace[scvfIdx].j;
-        Scalar Sl = std::max(0.0, (vDat[i].saturation(lPhaseIdx) +
-                                     vDat[j].saturation(lPhaseIdx)) / 2);
+        Scalar Sl = std::max<Scalar>(0.0, (vDat[i].saturation(lPhaseIdx) +
+                                           vDat[j].saturation(lPhaseIdx)) / 2);
         Scalar poro = (porosity(element, fvElemGeom, i) +
                        porosity(element, fvElemGeom, j)) / 2;