diff --git a/opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp b/opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp
index 9ffb75106..0e21b1dbc 100644
--- a/opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp
+++ b/opm/parser/eclipse/Deck/tests/DeckDoubleItemTests.cpp
@@ -20,8 +20,11 @@
 
 #define BOOST_TEST_MODULE DeckItemTests
 
-#include <stdexcept>
+#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 <stdexcept>
 #include <opm/parser/eclipse/Deck/DeckIntItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckDoubleItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckStringItem.hpp>
diff --git a/opm/parser/eclipse/Deck/tests/DeckFloatItemTests.cpp b/opm/parser/eclipse/Deck/tests/DeckFloatItemTests.cpp
index 3b2ff9ca1..9f2d21c81 100644
--- a/opm/parser/eclipse/Deck/tests/DeckFloatItemTests.cpp
+++ b/opm/parser/eclipse/Deck/tests/DeckFloatItemTests.cpp
@@ -20,8 +20,11 @@
 
 #define BOOST_TEST_MODULE DeckItemTests
 
-#include <stdexcept>
+#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 <stdexcept>
 #include <opm/parser/eclipse/Deck/DeckItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckIntItem.hpp>
 #include <opm/parser/eclipse/Deck/DeckFloatItem.hpp>
diff --git a/opm/parser/eclipse/Deck/tests/DeckIntItemTests.cpp b/opm/parser/eclipse/Deck/tests/DeckIntItemTests.cpp
index 5ebe16e6a..2799b88dd 100644
--- a/opm/parser/eclipse/Deck/tests/DeckIntItemTests.cpp
+++ b/opm/parser/eclipse/Deck/tests/DeckIntItemTests.cpp
@@ -17,11 +17,13 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
 #define BOOST_TEST_MODULE DeckItemTests
 
-#include <stdexcept>
+#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 <stdexcept>
 #include <opm/parser/eclipse/Deck/DeckIntItem.hpp>
 
 using namespace Opm;
diff --git a/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp b/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp
index 310a367a0..226c0ee4b 100644
--- a/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp
+++ b/opm/parser/eclipse/Deck/tests/DeckKeywordTests.cpp
@@ -18,10 +18,15 @@
  */
 
 
+#include <stdexcept>
+
 #define BOOST_TEST_MODULE DeckKeywordTests
 
-#include <stdexcept>
+#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/parser/eclipse/Deck/DeckKeyword.hpp>
 
 using namespace Opm;
diff --git a/opm/parser/eclipse/Deck/tests/DeckStringItemTests.cpp b/opm/parser/eclipse/Deck/tests/DeckStringItemTests.cpp
index f07ed757b..d36272464 100644
--- a/opm/parser/eclipse/Deck/tests/DeckStringItemTests.cpp
+++ b/opm/parser/eclipse/Deck/tests/DeckStringItemTests.cpp
@@ -17,11 +17,14 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+#include <stdexcept>
 
 #define BOOST_TEST_MODULE DeckStringItemTests
 
-#include <stdexcept>
+#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/parser/eclipse/Deck/DeckStringItem.hpp>
 
 using namespace Opm;
diff --git a/opm/parser/eclipse/Deck/tests/DeckTests.cpp b/opm/parser/eclipse/Deck/tests/DeckTests.cpp
index 8bf975ba7..a216ca328 100644
--- a/opm/parser/eclipse/Deck/tests/DeckTests.cpp
+++ b/opm/parser/eclipse/Deck/tests/DeckTests.cpp
@@ -18,11 +18,13 @@
  */
 
 
-#define BOOST_TEST_MODULE DeckTests
-
 #include <stdexcept>
 
+#define BOOST_TEST_MODULE DeckTests
+
+#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/parser/eclipse/OpmLog/CounterLog.hpp>
 #include <opm/parser/eclipse/OpmLog/OpmLog.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/BoxTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/BoxTests.cpp
index c4fe0b4e5..0b85b9d0a 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/BoxTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/BoxTests.cpp
@@ -20,11 +20,14 @@
 #include <stdexcept>
 #include <iostream>
 #include <memory>
-#include <boost/filesystem.hpp>
 
 #define BOOST_TEST_MODULE BoxManagereTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/EclipseState/Grid/Box.hpp>
 
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp
index 7fe574683..9086a6bee 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/EclipseGridTests.cpp
@@ -23,8 +23,11 @@
 #include <cstdio>
 
 #define BOOST_TEST_MODULE EclipseGridTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/FaultTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/FaultTests.cpp
index 642218310..380a4497b 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/FaultTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/FaultTests.cpp
@@ -19,11 +19,14 @@
 
 #include <stdexcept>
 #include <iostream>
-#include <boost/filesystem.hpp>
 
 #define BOOST_TEST_MODULE FaultTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
+#include <boost/filesystem.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/EclipseState/Grid/FaultCollection.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/Fault.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertiesTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertiesTests.cpp
index 5aaaa9592..e8adab86a 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertiesTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertiesTests.cpp
@@ -19,11 +19,14 @@
 
 #include <stdexcept>
 #include <iostream>
-#include <boost/filesystem.hpp>
 
 #define BOOST_TEST_MODULE EclipseGridTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp b/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp
index 17feb4450..06c1c9d3e 100644
--- a/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Grid/tests/GridPropertyTests.cpp
@@ -20,11 +20,14 @@
 #include <stdexcept>
 #include <iostream>
 #include <memory>
-#include <boost/filesystem.hpp>
 
 #define BOOST_TEST_MODULE EclipseGridTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 
 #include <ert/ecl/EclKW.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp b/opm/parser/eclipse/EclipseState/Schedule/Well.hpp
index 714dbbb00..a54f8326f 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/Well.hpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/Well.hpp
@@ -30,8 +30,12 @@
 #include <opm/parser/eclipse/EclipseState/Schedule/WellPolymerProperties.hpp>
 #include <opm/parser/eclipse/EclipseState/Grid/EclipseGrid.hpp>
 
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+
 #include <boost/optional.hpp>
 
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+
 #include <memory>
 #include <string>
 #include <limits>
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp
index 47a4bcc91..fe73b2192 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/ScheduleTests.cpp
@@ -22,8 +22,11 @@
 #include <boost/filesystem.hpp>
 
 #define BOOST_TEST_MODULE ScheduleTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/parser/eclipse/Deck/DeckIntItem.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp
index 0188f0cce..84cd9bc30 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/TimeMapTest.cpp
@@ -22,8 +22,11 @@
 #include <boost/filesystem.hpp>
 
 #define BOOST_TEST_MODULE TimeMapTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 
 
diff --git a/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp b/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp
index 9af01eea4..2bf72839d 100644
--- a/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Schedule/tests/WellSolventTests.cpp
@@ -17,9 +17,12 @@
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include <boost/filesystem.hpp>
 #define BOOST_TEST_MODULE WellSolventTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/EclipseState/Schedule/Schedule.hpp>
 #include <opm/parser/eclipse/Deck/DeckIntItem.hpp>
diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp b/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp
index bc241beb4..516306ba3 100644
--- a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp
+++ b/opm/parser/eclipse/EclipseState/SimulationConfig/tests/SimulationConfigTest.cpp
@@ -21,8 +21,10 @@
 
 #define BOOST_TEST_MODULE SimulationConfigTests
 
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.hpp>
diff --git a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/ThresholdPressureTest.cpp b/opm/parser/eclipse/EclipseState/SimulationConfig/tests/ThresholdPressureTest.cpp
index baf140728..3dd435650 100644
--- a/opm/parser/eclipse/EclipseState/SimulationConfig/tests/ThresholdPressureTest.cpp
+++ b/opm/parser/eclipse/EclipseState/SimulationConfig/tests/ThresholdPressureTest.cpp
@@ -19,12 +19,14 @@
 
 
 
-#define BOOST_TEST_MODULE ThresholdPressureTests
-
 #include <algorithm>
 
+#define BOOST_TEST_MODULE ThresholdPressureTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/filesystem.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/EclipseState/SimulationConfig/ThresholdPressure.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp b/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp
index 40f3a3666..b052a4185 100644
--- a/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/VFPInjTable.hpp
@@ -22,8 +22,13 @@
 #define OPM_PARSER_ECLIPSE_ECLIPSESTATE_TABLES_VFPINJTABLE_HPP_
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+
 #include <boost/multi_array.hpp>
 
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
+
 namespace Opm {
 
 /**
diff --git a/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp b/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp
index 61225f4ed..68faf3e48 100644
--- a/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp
+++ b/opm/parser/eclipse/EclipseState/Tables/VFPProdTable.hpp
@@ -21,8 +21,12 @@
 #define OPM_PARSER_ECLIPSE_ECLIPSESTATE_TABLES_VFPPRODTABLE_HPP_
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+
 #include <boost/multi_array.hpp>
 
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 
 namespace Opm {
diff --git a/opm/parser/eclipse/EclipseState/Tables/tests/TableTests.cpp b/opm/parser/eclipse/EclipseState/Tables/tests/TableTests.cpp
index 5d1a16440..ee2d144e6 100644
--- a/opm/parser/eclipse/EclipseState/Tables/tests/TableTests.cpp
+++ b/opm/parser/eclipse/EclipseState/Tables/tests/TableTests.cpp
@@ -16,8 +16,12 @@
   You should have received a copy of the GNU General Public License
   along with OPM.  If not, see <http://www.gnu.org/licenses/>.
  */
+
 #define BOOST_TEST_MODULE SingleRecordTableTests
+
+#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/parser/eclipse/Parser/Parser.hpp>
 #include <opm/parser/eclipse/Parser/ParseMode.hpp>
diff --git a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
index a3837a155..bec571acf 100644
--- a/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
+++ b/opm/parser/eclipse/EclipseState/tests/EclipseStateTests.cpp
@@ -22,8 +22,11 @@
 #include <boost/filesystem.hpp>
 
 #define BOOST_TEST_MODULE EclipseStateTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/OpmLog/OpmLog.hpp>
 #include <opm/parser/eclipse/OpmLog/CounterLog.hpp>
diff --git a/opm/parser/eclipse/Generator/tests/KeywordLoaderTests.cpp b/opm/parser/eclipse/Generator/tests/KeywordLoaderTests.cpp
index 9d9606e0a..7851e608e 100644
--- a/opm/parser/eclipse/Generator/tests/KeywordLoaderTests.cpp
+++ b/opm/parser/eclipse/Generator/tests/KeywordLoaderTests.cpp
@@ -19,12 +19,15 @@
 
 #include <stdexcept>
 #include <iostream>
-#include <boost/filesystem.hpp>
 #include <cstdio>
 
 #define BOOST_TEST_MODULE InputKeywordTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
+#include <boost/filesystem.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/date_time/posix_time/posix_time.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 
 #include <opm/parser/eclipse/Generator/KeywordLoader.hpp>
diff --git a/opm/parser/eclipse/IntegrationTests/BoxTest.cpp b/opm/parser/eclipse/IntegrationTests/BoxTest.cpp
index efde8be0f..54cf3c965 100644
--- a/opm/parser/eclipse/IntegrationTests/BoxTest.cpp
+++ b/opm/parser/eclipse/IntegrationTests/BoxTest.cpp
@@ -18,8 +18,11 @@
  */
 
 #define BOOST_TEST_MODULE BoxTest
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/opm/parser/eclipse/IntegrationTests/NNCTests.cpp b/opm/parser/eclipse/IntegrationTests/NNCTests.cpp
index 8eb1b578a..95bf944fd 100644
--- a/opm/parser/eclipse/IntegrationTests/NNCTests.cpp
+++ b/opm/parser/eclipse/IntegrationTests/NNCTests.cpp
@@ -31,7 +31,10 @@
 #define NVERBOSE // to suppress our messages when throwing
 
 #define BOOST_TEST_MODULE NNCTests
+
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 using namespace Opm;
 
diff --git a/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp b/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp
index 3ab36ffc8..e7068036f 100644
--- a/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp
+++ b/opm/parser/eclipse/IntegrationTests/ParsePVTO.cpp
@@ -20,8 +20,10 @@
 #define BOOST_TEST_MODULE ParserIntegrationTests
 #include <math.h>
 
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/EclipseState/Tables/PvtoTable.hpp>
 
diff --git a/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp b/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp
index a018e8efe..13ab5bb6e 100644
--- a/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp
+++ b/opm/parser/eclipse/IntegrationTests/ParseTOPS.cpp
@@ -20,8 +20,10 @@
 #define BOOST_TEST_MODULE ParserIntegrationTests
 #include <math.h>
 
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp b/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp
index fef279845..29f0cee6a 100644
--- a/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp
+++ b/opm/parser/eclipse/IntegrationTests/ParseVFPPROD.cpp
@@ -20,8 +20,10 @@
 #define BOOST_TEST_MODULE ParserIntegrationTests
 #include <math.h>
 
+#include <opm/core/utility/platform_dependent/disable_warnings.h>
 #include <boost/test/unit_test.hpp>
 #include <boost/test/test_tools.hpp>
+#include <opm/core/utility/platform_dependent/reenable_warnings.h>
 
 #include <opm/parser/eclipse/Deck/Deck.hpp>
 #include <opm/parser/eclipse/Parser/Parser.hpp>
diff --git a/opm/parser/eclipse/OpmLog/tests/OpmLogTests.cpp b/opm/parser/eclipse/OpmLog/tests/OpmLogTests.cpp
index 229e75ed3..55a1f5a15 100644
--- a/opm/parser/eclipse/OpmLog/tests/OpmLogTests.cpp
+++ b/opm/parser/eclipse/OpmLog/tests/OpmLogTests.cpp
@@ -20,11 +20,14 @@
 
 #define BOOST_TEST_MODULE LogTests
 
+#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 <stdexcept>
 #include <iostream>
 #include <sstream>
 
-#include <boost/test/unit_test.hpp>
 #include <opm/parser/eclipse/OpmLog/OpmLog.hpp>
 #include <opm/parser/eclipse/OpmLog/LogBackend.hpp>
 #include <opm/parser/eclipse/OpmLog/CounterLog.hpp>
diff --git a/opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp b/opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp
index 73665723b..83fabc59d 100644
--- a/opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp
+++ b/opm/parser/eclipse/Parser/tests/ParserKeywordTests.cpp
@@ -19,7 +19,10 @@
 
 
 #define BOOST_TEST_MODULE ParserTests
+
+#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/json/JsonObject.hpp>
 #include <opm/parser/eclipse/Parser/ParserKeyword.hpp>