diff --git a/test/unit/parser.cpp b/test/unit/parser.cpp
index d67f34a5..552b501c 100644
--- a/test/unit/parser.cpp
+++ b/test/unit/parser.cpp
@@ -14,10 +14,10 @@
 #include <boost/http_proto/request_parser.hpp>
 #include <boost/http_proto/response_parser.hpp>
 #include <boost/http_proto/service/zlib_service.hpp>
-#include <boost/buffers/buffer.hpp>
 #include <boost/buffers/buffer_copy.hpp>
 #include <boost/buffers/buffer_size.hpp>
 #include <boost/buffers/flat_buffer.hpp>
+#include <boost/buffers/make_buffer.hpp>
 #include <boost/buffers/string_buffer.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include <vector>
@@ -238,7 +238,7 @@ struct parser_test
             auto const n =
                 buffers::buffer_copy(
                 pr.prepare(),
-                buffers::buffer(
+                buffers::make_buffer(
                     s.data(), s.size()));
             pr.commit(n);
             s.remove_prefix(n);
@@ -304,7 +304,7 @@ struct parser_test
         auto const n =
             buffers::buffer_copy(
             pr.prepare(),
-            buffers::buffer(
+            buffers::make_buffer(
                 s.data(), s.size()));
         pr.commit(n);
         BOOST_TEST_EQ(n, s.size());
diff --git a/test/unit/serializer.cpp b/test/unit/serializer.cpp
index 55d58799..b77c6432 100644
--- a/test/unit/serializer.cpp
+++ b/test/unit/serializer.cpp
@@ -12,10 +12,10 @@
 
 #include <boost/http_proto/response.hpp>
 #include <boost/http_proto/string_body.hpp>
-#include <boost/buffers/buffer.hpp>
 #include <boost/buffers/buffer_copy.hpp>
 #include <boost/buffers/buffer_size.hpp>
 #include <boost/buffers/const_buffer.hpp>
+#include <boost/buffers/make_buffer.hpp>
 #include <boost/buffers/mutable_buffer.hpp>
 #include <boost/core/ignore_unused.hpp>
 #include "test_helpers.hpp"
@@ -47,7 +47,7 @@ struct serializer_test
             rv.bytes =
                 buffers::buffer_copy(
                     b,
-                    buffers::buffer(
+                    buffers::make_buffer(
                         s_.data(),
                         s_.size()));
             s_ = s_.substr(rv.bytes);
@@ -337,7 +337,7 @@ struct serializer_test
             "\r\n",
             test_source{std::string(2048, '*')},
             [](core::string_view s){
-                core::string_view expected_header = 
+                core::string_view expected_header =
                     "HTTP/1.1 200 OK\r\n"
                     "Server: test\r\n"
                     "Transfer-Encoding: chunked\r\n"
@@ -355,7 +355,7 @@ struct serializer_test
             "\r\n",
             test_source{""},
             [](core::string_view s){
-                core::string_view expected_header = 
+                core::string_view expected_header =
                     "HTTP/1.1 200 OK\r\n"
                     "Server: test\r\n"
                     "Transfer-Encoding: chunked\r\n"
diff --git a/test/unit/test_helpers.hpp b/test/unit/test_helpers.hpp
index b132f08a..db5c1cab 100644
--- a/test/unit/test_helpers.hpp
+++ b/test/unit/test_helpers.hpp
@@ -13,9 +13,9 @@
 #include <boost/http_proto/fields.hpp>
 #include <boost/http_proto/request.hpp>
 #include <boost/http_proto/response.hpp>
-#include <boost/buffers/buffer.hpp>
 #include <boost/buffers/buffer_copy.hpp>
 #include <boost/buffers/buffer_size.hpp>
+#include <boost/buffers/make_buffer.hpp>
 #include <boost/url/grammar/parse.hpp>
 #include <boost/core/detail/string_view.hpp>
 
@@ -43,7 +43,7 @@ test_to_string(Buffers const& bs)
     std::string s(
         buffers::buffer_size(bs), 0);
     s.resize(buffers::buffer_copy(
-        buffers::buffer(&s[0], s.size()),
+        buffers::make_buffer(&s[0], s.size()),
         bs));
     return s;
 }