diff --git a/test/common/include/test_common/buffer_concat.hpp b/test/common/include/test_common/buffer_concat.hpp
index da4bff1c4..f2e003e49 100644
--- a/test/common/include/test_common/buffer_concat.hpp
+++ b/test/common/include/test_common/buffer_concat.hpp
@@ -8,6 +8,7 @@
 #ifndef BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_BUFFER_CONCAT_HPP
 #define BOOST_MYSQL_TEST_COMMON_INCLUDE_TEST_COMMON_BUFFER_CONCAT_HPP
 
+#include <boost/config.hpp>
 #include <boost/core/span.hpp>
 
 #include <cstdint>
@@ -19,9 +20,10 @@ namespace mysql {
 namespace test {
 
 // ARM gcc raises a spurious warning here
-#ifdef BOOST_GCC
+#if BOOST_GCC >= 110000
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
+#pragma GCC diagnostic ignored "-Wrestrict"
 #endif
 inline void concat(std::vector<std::uint8_t>& lhs, span<const std::uint8_t> rhs)
 {
@@ -32,7 +34,7 @@ inline void concat(std::vector<std::uint8_t>& lhs, span<const std::uint8_t> rhs)
         std::memcpy(lhs.data() + current_size, rhs.data(), rhs.size());
     }
 }
-#ifdef BOOST_GCC
+#if BOOST_GCC >= 110000
 #pragma GCC diagnostic pop
 #endif