diff --git a/include/boost/histogram/unlimited_storage.hpp b/include/boost/histogram/unlimited_storage.hpp
index d84e11b3..4645c254 100644
--- a/include/boost/histogram/unlimited_storage.hpp
+++ b/include/boost/histogram/unlimited_storage.hpp
@@ -9,20 +9,20 @@
 
 #include <algorithm>
 #include <boost/assert.hpp>
-#include <boost/config.hpp>
+#include <boost/config/workaround.hpp>
 #include <boost/cstdint.hpp>
 #include <boost/histogram/detail/meta.hpp>
 #include <boost/histogram/fwd.hpp>
 #include <boost/iterator/iterator_facade.hpp>
 #include <boost/mp11/algorithm.hpp>
 #include <boost/mp11/list.hpp>
-#if defined BOOST_CLANG
+#if BOOST_WORKAROUND(BOOST_CLANG, >= 1)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-parameter"
 #endif
 // warning-ignore required in Boost-1.66 for cpp_int.hpp:822
 #include <boost/multiprecision/cpp_int.hpp>
-#if defined BOOST_CLANG
+#if BOOST_WORKAROUND(BOOST_CLANG, >= 1)
 #pragma clang diagnostic pop
 #endif
 #include <limits>
diff --git a/test/boost_accumulators_support_test.cpp b/test/boost_accumulators_support_test.cpp
index 5e7df7ac..273f3dda 100644
--- a/test/boost_accumulators_support_test.cpp
+++ b/test/boost_accumulators_support_test.cpp
@@ -7,13 +7,13 @@
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wmisleading-indentation"
 #endif
-#if defined(BOOST_CLANG)
+#if BOOST_WORKAROUND(BOOST_CLANG, >= 1)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wdeprecated-declarations"
 #endif
 #include <boost/accumulators/accumulators.hpp>
 #include <boost/accumulators/statistics.hpp>
-#if defined(BOOST_CLANG)
+#if BOOST_WORKAROUND(BOOST_CLANG, >= 1)
 #pragma clang diagnostic pop
 #endif
 #if BOOST_WORKAROUND(BOOST_GCC, >= 60000)