diff --git a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
index 681253a7f..0c0b59a57 100644
--- a/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
+++ b/opm/autodiff/SimulatorFullyImplicitBlackoilOutput.hpp
@@ -134,7 +134,7 @@ namespace Opm
         void writeTimeStep(const SimulatorTimerInterface& timer,
                            const SimulatorState& state,
                            const WellState&,
-                           bool substep = false)
+                           bool /*substep*/ = false)
         {
             outputStateVtk(grid_, state, timer.currentStepNum(), outputDir_);
         }
@@ -164,7 +164,7 @@ namespace Opm
         void writeTimeStep(const SimulatorTimerInterface& timer,
                            const SimulatorState& reservoirState,
                            const WellState& wellState,
-                           bool substep = false)
+                           bool /*substep*/ = false)
         {
             const BlackoilState* state =
                 dynamic_cast< const BlackoilState* > (&reservoirState);
diff --git a/tests/test_boprops_ad.cpp b/tests/test_boprops_ad.cpp
index a345d399f..6fbb34130 100644
--- a/tests/test_boprops_ad.cpp
+++ b/tests/test_boprops_ad.cpp
@@ -26,9 +26,11 @@
 
 #define BOOST_TEST_MODULE FluidPropertiesTest
 
-#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
-
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+
+#include <opm/autodiff/BlackoilPropsAdFromDeck.hpp>
 
 #include <opm/core/grid/GridManager.hpp>
 #include <opm/core/utility/Units.hpp>