diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 9138791..c799160 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -16,8 +16,6 @@ project : requirements
    # set warnings as errors for those compilers we know we get warning free:
    <toolset>gcc:<cxxflags>-Wextra
    <toolset>gcc:<cxxflags>-Wno-uninitialized
-   <toolset>gcc:<cxxflags>-Wno-int-in-bool-context
-   <toolset>gcc:<cxxflags>-Wno-bool-operation
    <toolset>gcc:<warnings-as-errors>on
    <toolset>intel:<warnings-as-errors>on
    <toolset>sun:<warnings-as-errors>on
diff --git a/test/has_complement_test.cpp b/test/has_complement_test.cpp
index f761ac4..394ecca 100644
--- a/test/has_complement_test.cpp
+++ b/test/has_complement_test.cpp
@@ -3,6 +3,10 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#if defined(__GNUC__) && (__GNUC__ >= 7)
+#pragma GCC diagnostic ignored "-Wbool-operation"
+#endif
+
 #ifdef TEST_STD
 #  include <type_traits>
 #else
diff --git a/test/has_left_shift_test.cpp b/test/has_left_shift_test.cpp
index 8dc6979..9339764 100644
--- a/test/has_left_shift_test.cpp
+++ b/test/has_left_shift_test.cpp
@@ -3,6 +3,10 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#if defined(__GNUC__) && (__GNUC__ >= 7)
+#pragma GCC diagnostic ignored "-Wint-in-bool-context"
+#endif
+
 #ifdef TEST_STD
 #  include <type_traits>
 #else
diff --git a/test/has_multiplies_test.cpp b/test/has_multiplies_test.cpp
index a3565eb..7569b3f 100644
--- a/test/has_multiplies_test.cpp
+++ b/test/has_multiplies_test.cpp
@@ -3,6 +3,10 @@
 //  Boost Software License, Version 1.0. (See accompanying file
 //  LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
 
+#if defined(__GNUC__) && (__GNUC__ >= 7)
+#pragma GCC diagnostic ignored "-Wint-in-bool-context"
+#endif
+
 #ifdef TEST_STD
 #  include <type_traits>
 #else