diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5527fa1b..2d64ada3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@ Version 100:
 * Fix doc convenience includes
 * Fix doc includes
 * Remove unused test header
+* Rename test macros
 
 --------------------------------------------------------------------------------
 
diff --git a/test/beast/core/base64.cpp b/test/beast/core/base64.cpp
index 7b04596e..3bc4357f 100644
--- a/test/beast/core/base64.cpp
+++ b/test/beast/core/base64.cpp
@@ -53,7 +53,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(base64,core,beast);
+BEAST_DEFINE_TESTSUITE(base64,core,beast);
 
 } // detail
 } // beast
diff --git a/test/beast/core/bind_handler.cpp b/test/beast/core/bind_handler.cpp
index f404c0b9..38d0bb9d 100644
--- a/test/beast/core/bind_handler.cpp
+++ b/test/beast/core/bind_handler.cpp
@@ -67,7 +67,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(bind_handler,core,beast);
+BEAST_DEFINE_TESTSUITE(bind_handler,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffer_cat.cpp b/test/beast/core/buffer_cat.cpp
index d818af26..ec10db13 100644
--- a/test/beast/core/buffer_cat.cpp
+++ b/test/beast/core/buffer_cat.cpp
@@ -264,7 +264,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(buffer_cat,core,beast);
+BEAST_DEFINE_TESTSUITE(buffer_cat,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffer_prefix.cpp b/test/beast/core/buffer_prefix.cpp
index 98ecaddf..c1f7412e 100644
--- a/test/beast/core/buffer_prefix.cpp
+++ b/test/beast/core/buffer_prefix.cpp
@@ -186,7 +186,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(buffer_prefix,core,beast);
+BEAST_DEFINE_TESTSUITE(buffer_prefix,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffered_read_stream.cpp b/test/beast/core/buffered_read_stream.cpp
index 6bcd5b85..6b89ed16 100644
--- a/test/beast/core/buffered_read_stream.cpp
+++ b/test/beast/core/buffered_read_stream.cpp
@@ -219,7 +219,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(buffered_read_stream,core,beast);
+BEAST_DEFINE_TESTSUITE(buffered_read_stream,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffers_adapter.cpp b/test/beast/core/buffers_adapter.cpp
index 0f1d2ede..ec347303 100644
--- a/test/beast/core/buffers_adapter.cpp
+++ b/test/beast/core/buffers_adapter.cpp
@@ -202,7 +202,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(buffers_adapter,core,beast);
+BEAST_DEFINE_TESTSUITE(buffers_adapter,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/clamp.cpp b/test/beast/core/clamp.cpp
index c4890eb2..e1361b06 100644
--- a/test/beast/core/clamp.cpp
+++ b/test/beast/core/clamp.cpp
@@ -33,7 +33,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(clamp,core,beast);
+BEAST_DEFINE_TESTSUITE(clamp,core,beast);
 
 } // detail
 } // beast
diff --git a/test/beast/core/consuming_buffers.cpp b/test/beast/core/consuming_buffers.cpp
index 9f0abf25..9c54f081 100644
--- a/test/beast/core/consuming_buffers.cpp
+++ b/test/beast/core/consuming_buffers.cpp
@@ -179,7 +179,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(consuming_buffers,core,beast);
+BEAST_DEFINE_TESTSUITE(consuming_buffers,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/detail/variant.cpp b/test/beast/core/detail/variant.cpp
index d16127c6..053332f7 100644
--- a/test/beast/core/detail/variant.cpp
+++ b/test/beast/core/detail/variant.cpp
@@ -446,7 +446,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(variant,core,beast);
+BEAST_DEFINE_TESTSUITE(variant,core,beast);
 
 } // detail
 } // beast
diff --git a/test/beast/core/detail/varint.cpp b/test/beast/core/detail/varint.cpp
index d2e19bb3..237a9338 100644
--- a/test/beast/core/detail/varint.cpp
+++ b/test/beast/core/detail/varint.cpp
@@ -46,7 +46,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(varint,core,beast);
+BEAST_DEFINE_TESTSUITE(varint,core,beast);
 
 } // detail
 } // beast
diff --git a/test/beast/core/drain_buffer.cpp b/test/beast/core/drain_buffer.cpp
index 95564548..082ed7f2 100644
--- a/test/beast/core/drain_buffer.cpp
+++ b/test/beast/core/drain_buffer.cpp
@@ -49,7 +49,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(drain_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(drain_buffer,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/empty_base_optimization.cpp b/test/beast/core/empty_base_optimization.cpp
index 54221894..efb68eda 100644
--- a/test/beast/core/empty_base_optimization.cpp
+++ b/test/beast/core/empty_base_optimization.cpp
@@ -91,7 +91,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(empty_base_optimization,core,beast);
+BEAST_DEFINE_TESTSUITE(empty_base_optimization,core,beast);
 
 } // detail
 } // beast
diff --git a/test/beast/core/file_posix.cpp b/test/beast/core/file_posix.cpp
index bef89d5a..888770bf 100644
--- a/test/beast/core/file_posix.cpp
+++ b/test/beast/core/file_posix.cpp
@@ -33,7 +33,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(file_posix,core,beast);
+BEAST_DEFINE_TESTSUITE(file_posix,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/file_stdio.cpp b/test/beast/core/file_stdio.cpp
index 45f2520e..447f6e95 100644
--- a/test/beast/core/file_stdio.cpp
+++ b/test/beast/core/file_stdio.cpp
@@ -31,7 +31,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(file_stdio,core,beast);
+BEAST_DEFINE_TESTSUITE(file_stdio,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/file_win32.cpp b/test/beast/core/file_win32.cpp
index 54bf7f93..05763efa 100644
--- a/test/beast/core/file_win32.cpp
+++ b/test/beast/core/file_win32.cpp
@@ -33,7 +33,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(file_win32,core,beast);
+BEAST_DEFINE_TESTSUITE(file_win32,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/flat_buffer.cpp b/test/beast/core/flat_buffer.cpp
index c5b9118d..5c399290 100644
--- a/test/beast/core/flat_buffer.cpp
+++ b/test/beast/core/flat_buffer.cpp
@@ -349,7 +349,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(flat_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(flat_buffer,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/flat_static_buffer.cpp b/test/beast/core/flat_static_buffer.cpp
index 553d84eb..b8364983 100644
--- a/test/beast/core/flat_static_buffer.cpp
+++ b/test/beast/core/flat_static_buffer.cpp
@@ -232,7 +232,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(flat_static_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(flat_static_buffer,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/handler_alloc.cpp b/test/beast/core/handler_alloc.cpp
index 52d063f5..905d715c 100644
--- a/test/beast/core/handler_alloc.cpp
+++ b/test/beast/core/handler_alloc.cpp
@@ -61,7 +61,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(handler_alloc,core,beast);
+BEAST_DEFINE_TESTSUITE(handler_alloc,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/handler_ptr.cpp b/test/beast/core/handler_ptr.cpp
index 5eadd66a..71df39de 100644
--- a/test/beast/core/handler_ptr.cpp
+++ b/test/beast/core/handler_ptr.cpp
@@ -77,7 +77,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(handler_ptr,core,beast);
+BEAST_DEFINE_TESTSUITE(handler_ptr,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/multi_buffer.cpp b/test/beast/core/multi_buffer.cpp
index 68617548..4b01a25b 100644
--- a/test/beast/core/multi_buffer.cpp
+++ b/test/beast/core/multi_buffer.cpp
@@ -590,7 +590,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(multi_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(multi_buffer,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/ostream.cpp b/test/beast/core/ostream.cpp
index fe8544b5..051777ba 100644
--- a/test/beast/core/ostream.cpp
+++ b/test/beast/core/ostream.cpp
@@ -63,7 +63,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(ostream,core,beast);
+BEAST_DEFINE_TESTSUITE(ostream,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/read_size.cpp b/test/beast/core/read_size.cpp
index 852666d3..9f31f80e 100644
--- a/test/beast/core/read_size.cpp
+++ b/test/beast/core/read_size.cpp
@@ -42,7 +42,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(read_size,core,beast);
+BEAST_DEFINE_TESTSUITE(read_size,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/sha1.cpp b/test/beast/core/sha1.cpp
index 75e69cb0..b60c3cfc 100644
--- a/test/beast/core/sha1.cpp
+++ b/test/beast/core/sha1.cpp
@@ -76,7 +76,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(sha1,core,beast);
+BEAST_DEFINE_TESTSUITE(sha1,core,beast);
 
 } // test
 } // beast
diff --git a/test/beast/core/span.cpp b/test/beast/core/span.cpp
index b79a74eb..d215505f 100644
--- a/test/beast/core/span.cpp
+++ b/test/beast/core/span.cpp
@@ -54,7 +54,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(span,core,beast);
+BEAST_DEFINE_TESTSUITE(span,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/static_buffer.cpp b/test/beast/core/static_buffer.cpp
index acc9dd6f..dfb1ce03 100644
--- a/test/beast/core/static_buffer.cpp
+++ b/test/beast/core/static_buffer.cpp
@@ -232,7 +232,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(static_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(static_buffer,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/static_string.cpp b/test/beast/core/static_string.cpp
index a5d16eb1..f5d4e309 100644
--- a/test/beast/core/static_string.cpp
+++ b/test/beast/core/static_string.cpp
@@ -1474,7 +1474,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(static_string,core,beast);
+BEAST_DEFINE_TESTSUITE(static_string,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/core/string_param.cpp b/test/beast/core/string_param.cpp
index abdb33d8..76bbff12 100644
--- a/test/beast/core/string_param.cpp
+++ b/test/beast/core/string_param.cpp
@@ -77,7 +77,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(string_param,core,beast);
+BEAST_DEFINE_TESTSUITE(string_param,core,beast);
 
 } // beast
 } // boost
diff --git a/test/beast/http/basic_parser.cpp b/test/beast/http/basic_parser.cpp
index 8d631368..50696d9b 100644
--- a/test/beast/http/basic_parser.cpp
+++ b/test/beast/http/basic_parser.cpp
@@ -1240,7 +1240,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(basic_parser,http,beast);
+BEAST_DEFINE_TESTSUITE(basic_parser,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/chunk_encode.cpp b/test/beast/http/chunk_encode.cpp
index 119f3997..e73ef784 100644
--- a/test/beast/http/chunk_encode.cpp
+++ b/test/beast/http/chunk_encode.cpp
@@ -304,7 +304,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(chunk_encode,http,beast);
+BEAST_DEFINE_TESTSUITE(chunk_encode,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/dynamic_body.cpp b/test/beast/http/dynamic_body.cpp
index 12e3290c..f43258e3 100644
--- a/test/beast/http/dynamic_body.cpp
+++ b/test/beast/http/dynamic_body.cpp
@@ -71,7 +71,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(dynamic_body,http,beast);
+BEAST_DEFINE_TESTSUITE(dynamic_body,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/error.cpp b/test/beast/http/error.cpp
index 418df713..8bf94155 100644
--- a/test/beast/http/error.cpp
+++ b/test/beast/http/error.cpp
@@ -65,7 +65,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(error,http,beast);
+BEAST_DEFINE_TESTSUITE(error,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/field.cpp b/test/beast/http/field.cpp
index 2c969718..7eee1267 100644
--- a/test/beast/http/field.cpp
+++ b/test/beast/http/field.cpp
@@ -402,7 +402,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(field,http,beast);
+BEAST_DEFINE_TESTSUITE(field,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/fields.cpp b/test/beast/http/fields.cpp
index db6f6c1a..00e96626 100644
--- a/test/beast/http/fields.cpp
+++ b/test/beast/http/fields.cpp
@@ -935,7 +935,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(fields,http,beast);
+BEAST_DEFINE_TESTSUITE(fields,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/file_body.cpp b/test/beast/http/file_body.cpp
index 2bca5385..ed668a12 100644
--- a/test/beast/http/file_body.cpp
+++ b/test/beast/http/file_body.cpp
@@ -109,7 +109,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(file_body,http,beast);
+BEAST_DEFINE_TESTSUITE(file_body,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/message.cpp b/test/beast/http/message.cpp
index 61ee3f2f..062dbe66 100644
--- a/test/beast/http/message.cpp
+++ b/test/beast/http/message.cpp
@@ -373,7 +373,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(message,http,beast);
+BEAST_DEFINE_TESTSUITE(message,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/parser.cpp b/test/beast/http/parser.cpp
index 67c629c0..406d9eaa 100644
--- a/test/beast/http/parser.cpp
+++ b/test/beast/http/parser.cpp
@@ -341,7 +341,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(parser,http,beast);
+BEAST_DEFINE_TESTSUITE(parser,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/read.cpp b/test/beast/http/read.cpp
index e9961c24..adac1bfe 100644
--- a/test/beast/http/read.cpp
+++ b/test/beast/http/read.cpp
@@ -465,7 +465,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(read,http,beast);
+BEAST_DEFINE_TESTSUITE(read,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/rfc7230.cpp b/test/beast/http/rfc7230.cpp
index aca61cd9..758a504d 100644
--- a/test/beast/http/rfc7230.cpp
+++ b/test/beast/http/rfc7230.cpp
@@ -354,7 +354,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(rfc7230,http,beast);
+BEAST_DEFINE_TESTSUITE(rfc7230,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/serializer.cpp b/test/beast/http/serializer.cpp
index 906a5db3..1970da6d 100644
--- a/test/beast/http/serializer.cpp
+++ b/test/beast/http/serializer.cpp
@@ -122,7 +122,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(serializer,http,beast);
+BEAST_DEFINE_TESTSUITE(serializer,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/span_body.cpp b/test/beast/http/span_body.cpp
index 1c437b22..6634900d 100644
--- a/test/beast/http/span_body.cpp
+++ b/test/beast/http/span_body.cpp
@@ -73,7 +73,7 @@ struct span_body_test
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(span_body,http,beast);
+BEAST_DEFINE_TESTSUITE(span_body,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/status.cpp b/test/beast/http/status.cpp
index 5d5ea7b6..c31ed759 100644
--- a/test/beast/http/status.cpp
+++ b/test/beast/http/status.cpp
@@ -172,7 +172,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(status,http,beast);
+BEAST_DEFINE_TESTSUITE(status,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/verb.cpp b/test/beast/http/verb.cpp
index d02de651..20f98a1d 100644
--- a/test/beast/http/verb.cpp
+++ b/test/beast/http/verb.cpp
@@ -124,7 +124,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(verb,http,beast);
+BEAST_DEFINE_TESTSUITE(verb,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/http/write.cpp b/test/beast/http/write.cpp
index 26d0dd3e..830cb0ec 100644
--- a/test/beast/http/write.cpp
+++ b/test/beast/http/write.cpp
@@ -860,7 +860,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(write,http,beast);
+BEAST_DEFINE_TESTSUITE(write,http,beast);
 
 } // http
 } // beast
diff --git a/test/beast/websocket/error.cpp b/test/beast/websocket/error.cpp
index 5b9d4f4c..d7bdbeb5 100644
--- a/test/beast/websocket/error.cpp
+++ b/test/beast/websocket/error.cpp
@@ -44,7 +44,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(error,websocket,beast);
+BEAST_DEFINE_TESTSUITE(error,websocket,beast);
 
 } // websocket
 } // beast
diff --git a/test/beast/websocket/frame.cpp b/test/beast/websocket/frame.cpp
index 7a300994..48d08863 100644
--- a/test/beast/websocket/frame.cpp
+++ b/test/beast/websocket/frame.cpp
@@ -249,7 +249,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(frame,websocket,beast);
+BEAST_DEFINE_TESTSUITE(frame,websocket,beast);
 
 } // detail
 } // websocket
diff --git a/test/beast/websocket/mask.cpp b/test/beast/websocket/mask.cpp
index 5ae8aad2..77a14c59 100644
--- a/test/beast/websocket/mask.cpp
+++ b/test/beast/websocket/mask.cpp
@@ -50,7 +50,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(mask,websocket,beast);
+BEAST_DEFINE_TESTSUITE(mask,websocket,beast);
 
 } // detail
 } // websocket
diff --git a/test/beast/websocket/rfc6455.cpp b/test/beast/websocket/rfc6455.cpp
index 93398405..15d5a429 100644
--- a/test/beast/websocket/rfc6455.cpp
+++ b/test/beast/websocket/rfc6455.cpp
@@ -46,7 +46,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(rfc6455,websocket,beast);
+BEAST_DEFINE_TESTSUITE(rfc6455,websocket,beast);
 
 } // websocket
 } // beast
diff --git a/test/beast/websocket/stream.cpp b/test/beast/websocket/stream.cpp
index b0a5880a..9e01e21a 100644
--- a/test/beast/websocket/stream.cpp
+++ b/test/beast/websocket/stream.cpp
@@ -1997,7 +1997,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(stream,websocket,beast);
+BEAST_DEFINE_TESTSUITE(stream,websocket,beast);
 
 } // websocket
 } // beast
diff --git a/test/beast/websocket/utf8_checker.cpp b/test/beast/websocket/utf8_checker.cpp
index 7cb9f5e6..2ab0f83d 100644
--- a/test/beast/websocket/utf8_checker.cpp
+++ b/test/beast/websocket/utf8_checker.cpp
@@ -390,7 +390,7 @@ public:
 };
 
 #if defined(NDEBUG) && ! BOOST_BEAST_NO_SLOW_TESTS
-BOOST_BEAST_DEFINE_TESTSUITE(utf8_checker,websocket,beast);
+BEAST_DEFINE_TESTSUITE(utf8_checker,websocket,beast);
 #endif
 
 } // detail
diff --git a/test/beast/zlib/deflate_stream.cpp b/test/beast/zlib/deflate_stream.cpp
index 9d840371..1e861b24 100644
--- a/test/beast/zlib/deflate_stream.cpp
+++ b/test/beast/zlib/deflate_stream.cpp
@@ -313,7 +313,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(deflate_stream,core,beast);
+BEAST_DEFINE_TESTSUITE(deflate_stream,core,beast);
 
 } // zlib
 } // beast
diff --git a/test/beast/zlib/error.cpp b/test/beast/zlib/error.cpp
index d2cbb961..279b84db 100644
--- a/test/beast/zlib/error.cpp
+++ b/test/beast/zlib/error.cpp
@@ -58,7 +58,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(error,zlib,beast);
+BEAST_DEFINE_TESTSUITE(error,zlib,beast);
 
 } // zlib
 } // beast
diff --git a/test/beast/zlib/inflate_stream.cpp b/test/beast/zlib/inflate_stream.cpp
index 546faa50..bf337558 100644
--- a/test/beast/zlib/inflate_stream.cpp
+++ b/test/beast/zlib/inflate_stream.cpp
@@ -372,7 +372,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(inflate_stream,core,beast);
+BEAST_DEFINE_TESTSUITE(inflate_stream,core,beast);
 
 } // zlib
 } // beast
diff --git a/test/bench/buffers/bench_buffers.cpp b/test/bench/buffers/bench_buffers.cpp
index d845ae10..b2851272 100644
--- a/test/bench/buffers/bench_buffers.cpp
+++ b/test/bench/buffers/bench_buffers.cpp
@@ -236,7 +236,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(buffers,benchmarks,beast);
+BEAST_DEFINE_TESTSUITE(buffers,benchmarks,beast);
 
 } // beast
 } // boost
diff --git a/test/bench/parser/bench_parser.cpp b/test/bench/parser/bench_parser.cpp
index c4f99a51..a887b39d 100644
--- a/test/bench/parser/bench_parser.cpp
+++ b/test/bench/parser/bench_parser.cpp
@@ -300,7 +300,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(parser,benchmarks,beast);
+BEAST_DEFINE_TESTSUITE(parser,benchmarks,beast);
 
 } // http
 } // beast
diff --git a/test/bench/utf8_checker/bench_utf8_checker.cpp b/test/bench/utf8_checker/bench_utf8_checker.cpp
index ba958003..5d27aa17 100644
--- a/test/bench/utf8_checker/bench_utf8_checker.cpp
+++ b/test/bench/utf8_checker/bench_utf8_checker.cpp
@@ -150,7 +150,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(utf8_checker,benchmarks,beast);
+BEAST_DEFINE_TESTSUITE(utf8_checker,benchmarks,beast);
 
 } // beast
 } // boost
diff --git a/test/bench/zlib/deflate_stream.cpp b/test/bench/zlib/deflate_stream.cpp
index f69361ee..4ba214d8 100644
--- a/test/bench/zlib/deflate_stream.cpp
+++ b/test/bench/zlib/deflate_stream.cpp
@@ -193,7 +193,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(deflate_stream,zlib,beast);
+BEAST_DEFINE_TESTSUITE(deflate_stream,zlib,beast);
 
 } // zlib
 } // beast
diff --git a/test/bench/zlib/inflate_stream.cpp b/test/bench/zlib/inflate_stream.cpp
index ddb5b7f3..eb401c14 100644
--- a/test/bench/zlib/inflate_stream.cpp
+++ b/test/bench/zlib/inflate_stream.cpp
@@ -238,7 +238,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(inflate_stream,zlib,beast);
+BEAST_DEFINE_TESTSUITE(inflate_stream,zlib,beast);
 
 } // zlib
 } // beast
diff --git a/test/doc/core_examples.cpp b/test/doc/core_examples.cpp
index 9c286d62..83e02aaa 100644
--- a/test/doc/core_examples.cpp
+++ b/test/doc/core_examples.cpp
@@ -81,7 +81,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(examples,core,beast);
+BEAST_DEFINE_TESTSUITE(examples,core,beast);
 
 } // beast
 } // boost
diff --git a/test/doc/http_examples.cpp b/test/doc/http_examples.cpp
index 96413d04..984c3d0a 100644
--- a/test/doc/http_examples.cpp
+++ b/test/doc/http_examples.cpp
@@ -451,7 +451,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(examples,http,beast);
+BEAST_DEFINE_TESTSUITE(examples,http,beast);
 
 } // http
 } // beast
diff --git a/test/example/server/tests.cpp b/test/example/server/tests.cpp
index aedee753..9a9eda36 100644
--- a/test/example/server/tests.cpp
+++ b/test/example/server/tests.cpp
@@ -324,7 +324,7 @@ public:
     }
 };
 
-BOOST_BEAST_DEFINE_TESTSUITE(server,websocket,beast);
+BEAST_DEFINE_TESTSUITE(server,websocket,beast);
 
 } // websocket
 } // beast
diff --git a/test/extras/include/boost/beast/unit_test/suite.hpp b/test/extras/include/boost/beast/unit_test/suite.hpp
index 6e1fbe0b..937745ae 100644
--- a/test/extras/include/boost/beast/unit_test/suite.hpp
+++ b/test/extras/include/boost/beast/unit_test/suite.hpp
@@ -626,7 +626,7 @@ run(runner& r)
 
 // detail:
 // This inserts the suite with the given manual flag
-#define BOOST_BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,manual) \
+#define BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,manual) \
     static beast::unit_test::detail::insert_suite <Class##_test>   \
         Library ## Module ## Class ## _test_instance(             \
             #Class, #Module, #Library, manual)
@@ -638,15 +638,15 @@ run(runner& r)
 // If this is already defined, don't redefine it. This allows
 // programs to provide custom behavior for testsuite definitions
 //
-#ifndef BOOST_BEAST_DEFINE_TESTSUITE
+#ifndef BEAST_DEFINE_TESTSUITE
 
 /** Enables insertion of test suites into the global container.
     The default is to insert all test suite definitions into the global
-    container. If BOOST_BEAST_DEFINE_TESTSUITE is user defined, this macro
+    container. If BEAST_DEFINE_TESTSUITE is user defined, this macro
     has no effect.
 */
-#ifndef BOOST_BEAST_NO_UNIT_TEST_INLINE
-#define BOOST_BEAST_NO_UNIT_TEST_INLINE 0
+#ifndef BEAST_NO_UNIT_TEST_INLINE
+#define BEAST_NO_UNIT_TEST_INLINE 0
 #endif
 
 /** Define a unit test suite.
@@ -671,15 +671,15 @@ run(runner& r)
     The macro invocation must appear in the same namespace as the test class.
 */
 
-#if BOOST_BEAST_NO_UNIT_TEST_INLINE
-#define BOOST_BEAST_DEFINE_TESTSUITE(Class,Module,Library)
+#if BEAST_NO_UNIT_TEST_INLINE
+#define BEAST_DEFINE_TESTSUITE(Class,Module,Library)
 
 #else
 #include <boost/beast/unit_test/global_suites.hpp>
-#define BOOST_BEAST_DEFINE_TESTSUITE(Class,Module,Library) \
-        BOOST_BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false)
-#define BOOST_BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \
-        BOOST_BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,true)
+#define BEAST_DEFINE_TESTSUITE(Class,Module,Library) \
+        BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,false)
+#define BEAST_DEFINE_TESTSUITE_MANUAL(Class,Module,Library) \
+        BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,true)
 
 #endif