diff --git a/CHANGELOG.md b/CHANGELOG.md
index 956c2a0c..0fdc6b50 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Version 91:
 * Adjust redirect html
 * Don't build pre-C++11
 * source.dox is path-independent
+* Tidy up namespace qualifiers
 
 --------------------------------------------------------------------------------
 
diff --git a/include/boost/beast/http/impl/error.ipp b/include/boost/beast/http/impl/error.ipp
index d96b3144..45075f5c 100644
--- a/include/boost/beast/http/impl/error.ipp
+++ b/include/boost/beast/http/impl/error.ipp
@@ -13,6 +13,7 @@
 #include <type_traits>
 
 namespace boost {
+
 namespace system {
 template<>
 struct is_error_code_enum<beast::http::error>
@@ -20,9 +21,7 @@ struct is_error_code_enum<beast::http::error>
     static bool const value = true;
 };
 } // system
-} // boost
 
-namespace boost {
 namespace beast {
 namespace http {
 namespace detail {
diff --git a/include/boost/beast/websocket/impl/error.ipp b/include/boost/beast/websocket/impl/error.ipp
index e2772ec1..0c20a615 100644
--- a/include/boost/beast/websocket/impl/error.ipp
+++ b/include/boost/beast/websocket/impl/error.ipp
@@ -11,6 +11,7 @@
 #define BOOST_BEAST_WEBSOCKET_IMPL_ERROR_IPP
 
 namespace boost {
+
 namespace system {
 template<>
 struct is_error_code_enum<beast::websocket::error>
@@ -18,9 +19,7 @@ struct is_error_code_enum<beast::websocket::error>
     static bool const value = true;
 };
 } // system
-} // boost
 
-namespace boost {
 namespace beast {
 namespace websocket {
 namespace detail {
diff --git a/include/boost/beast/websocket/rfc6455.hpp b/include/boost/beast/websocket/rfc6455.hpp
index bb418efd..744d80d7 100644
--- a/include/boost/beast/websocket/rfc6455.hpp
+++ b/include/boost/beast/websocket/rfc6455.hpp
@@ -38,12 +38,12 @@ namespace websocket {
     @code
     void handle_connection(boost::asio::ip::tcp::socket& sock)
     {
-        beast::flat_buffer buffer;
-        beast::http::request<beast::http::string_body> req;
-        beast::http::read(sock, buffer, req);
-        if(beast::websocket::is_upgrade(req))
+        boost::beast::flat_buffer buffer;
+        boost::beast::http::request<boost::beast::http::string_body> req;
+        boost::beast::http::read(sock, buffer, req);
+        if(boost::beast::websocket::is_upgrade(req))
         {
-            beast::websocket::stream<decltype(sock)> ws{std::move(sock)};
+            boost::beast::websocket::stream<decltype(sock)> ws{std::move(sock)};
             ws.accept(req);
         }
     }
diff --git a/include/boost/beast/zlib/impl/error.ipp b/include/boost/beast/zlib/impl/error.ipp
index 820e7cf0..c14de15e 100644
--- a/include/boost/beast/zlib/impl/error.ipp
+++ b/include/boost/beast/zlib/impl/error.ipp
@@ -41,6 +41,7 @@
 #include <type_traits>
 
 namespace boost {
+
 namespace system {
 template<>
 struct is_error_code_enum<beast::zlib::error>
@@ -48,9 +49,7 @@ struct is_error_code_enum<beast::zlib::error>
     static bool const value = true;
 };
 } // system
-} // boost
 
-namespace boost {
 namespace beast {
 namespace zlib {
 namespace detail {
diff --git a/test/server/tests.cpp b/test/server/tests.cpp
index f3eb75f7..aedee753 100644
--- a/test/server/tests.cpp
+++ b/test/server/tests.cpp
@@ -70,22 +70,22 @@ public:
     void
     doOptions(Stream& stream, error_code& ec)
     {
-        beast::http::request<beast::http::empty_body> req;
+        http::request<http::empty_body> req;
         req.version = 11;
-        req.method(beast::http::verb::options);
+        req.method(http::verb::options);
         req.target("*");
-        req.set(beast::http::field::user_agent, "test");
-        req.set(beast::http::field::connection, "close");
+        req.set(http::field::user_agent, "test");
+        req.set(http::field::connection, "close");
         
-        beast::http::write(stream, req, ec);
+        http::write(stream, req, ec);
         if(! BEAST_EXPECTS(
-            ec == beast::http::error::end_of_stream,
+            ec == http::error::end_of_stream,
                 ec.message()))
             return;
 
         beast::flat_buffer b;
-        beast::http::response<beast::http::string_body> res;
-        beast::http::read(stream, b, res, ec);
+        http::response<http::string_body> res;
+        http::read(stream, b, res, ec);
         if(! BEAST_EXPECTS(! ec, ec.message()))
             return;
     }