diff --git a/asio/include/asio/detail/config.hpp b/asio/include/asio/detail/config.hpp
index 008e4d7..11fff00 100644
--- a/asio/include/asio/detail/config.hpp
+++ b/asio/include/asio/detail/config.hpp
@@ -12,6 +12,7 @@
 #define ASIO_DETAIL_CONFIG_HPP
 
 #if defined(ASIO_STANDALONE)
+# define ASIO_DISABLE_BOOST_ARRAY 1
 # define ASIO_DISABLE_BOOST_ASSERT 1
 # define ASIO_DISABLE_BOOST_BIND 1
 # define ASIO_DISABLE_BOOST_CHRONO 1
@@ -590,6 +591,13 @@
 # endif // !defined(ASIO_DISABLE_BOOST_STATIC_CONSTANT)
 #endif // !defined(ASIO_STATIC_CONSTANT)
 
+// Boost array library.
+#if !defined(ASIO_HAS_BOOST_ARRAY)
+# if !defined(ASIO_DISABLE_BOOST_ARRAY)
+#  define ASIO_HAS_BOOST_ARRAY 1
+# endif // !defined(ASIO_DISABLE_BOOST_ARRAY)
+#endif // !defined(ASIO_HAS_BOOST_ARRAY)
+
 // Boost assert macro.
 #if !defined(ASIO_HAS_BOOST_ASSERT)
 # if !defined(ASIO_DISABLE_BOOST_ASSERT)
diff --git a/asio/src/tests/unit/buffers_iterator.cpp b/asio/src/tests/unit/buffers_iterator.cpp
index 5d729bf..5ead2de 100644
--- a/asio/src/tests/unit/buffers_iterator.cpp
+++ b/asio/src/tests/unit/buffers_iterator.cpp
@@ -38,7 +38,7 @@
 
 #if defined(ASIO_HAS_BOOST_ARRAY)
 using boost::array;
-#else // defined(ASIO_HAS_BOOST_ARRAY)
+#elif defined(ASIO_HAS_STD_ARRAY)
 using std::array;
 #endif // defined(ASIO_HAS_BOOST_ARRAY)
 using std::vector;