diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d64ada3..2301e0b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,7 @@ Version 100:
 * Fix doc includes
 * Remove unused test header
 * Rename test macros
+* Reorder define test macro params
 
 --------------------------------------------------------------------------------
 
diff --git a/test/beast/core/base64.cpp b/test/beast/core/base64.cpp
index 3bc4357f..56549937 100644
--- a/test/beast/core/base64.cpp
+++ b/test/beast/core/base64.cpp
@@ -53,7 +53,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(base64,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,base64);
 
 } // detail
 } // beast
diff --git a/test/beast/core/bind_handler.cpp b/test/beast/core/bind_handler.cpp
index 38d0bb9d..481ee744 100644
--- a/test/beast/core/bind_handler.cpp
+++ b/test/beast/core/bind_handler.cpp
@@ -67,7 +67,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(bind_handler,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,bind_handler);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffer_cat.cpp b/test/beast/core/buffer_cat.cpp
index ec10db13..2f95a32d 100644
--- a/test/beast/core/buffer_cat.cpp
+++ b/test/beast/core/buffer_cat.cpp
@@ -264,7 +264,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(buffer_cat,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,buffer_cat);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffer_prefix.cpp b/test/beast/core/buffer_prefix.cpp
index c1f7412e..0a0208f6 100644
--- a/test/beast/core/buffer_prefix.cpp
+++ b/test/beast/core/buffer_prefix.cpp
@@ -186,7 +186,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(buffer_prefix,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,buffer_prefix);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffered_read_stream.cpp b/test/beast/core/buffered_read_stream.cpp
index 6b89ed16..92ae1273 100644
--- a/test/beast/core/buffered_read_stream.cpp
+++ b/test/beast/core/buffered_read_stream.cpp
@@ -219,7 +219,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(buffered_read_stream,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,buffered_read_stream);
 
 } // beast
 } // boost
diff --git a/test/beast/core/buffers_adapter.cpp b/test/beast/core/buffers_adapter.cpp
index ec347303..326a2111 100644
--- a/test/beast/core/buffers_adapter.cpp
+++ b/test/beast/core/buffers_adapter.cpp
@@ -202,7 +202,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(buffers_adapter,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,buffers_adapter);
 
 } // beast
 } // boost
diff --git a/test/beast/core/clamp.cpp b/test/beast/core/clamp.cpp
index e1361b06..9427d13a 100644
--- a/test/beast/core/clamp.cpp
+++ b/test/beast/core/clamp.cpp
@@ -33,7 +33,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(clamp,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,clamp);
 
 } // detail
 } // beast
diff --git a/test/beast/core/consuming_buffers.cpp b/test/beast/core/consuming_buffers.cpp
index 9c54f081..a1b4156e 100644
--- a/test/beast/core/consuming_buffers.cpp
+++ b/test/beast/core/consuming_buffers.cpp
@@ -179,7 +179,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(consuming_buffers,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,consuming_buffers);
 
 } // beast
 } // boost
diff --git a/test/beast/core/detail/variant.cpp b/test/beast/core/detail/variant.cpp
index 053332f7..850c16e2 100644
--- a/test/beast/core/detail/variant.cpp
+++ b/test/beast/core/detail/variant.cpp
@@ -446,7 +446,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(variant,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,variant);
 
 } // detail
 } // beast
diff --git a/test/beast/core/detail/varint.cpp b/test/beast/core/detail/varint.cpp
index 237a9338..6466c998 100644
--- a/test/beast/core/detail/varint.cpp
+++ b/test/beast/core/detail/varint.cpp
@@ -46,7 +46,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(varint,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,varint);
 
 } // detail
 } // beast
diff --git a/test/beast/core/drain_buffer.cpp b/test/beast/core/drain_buffer.cpp
index 082ed7f2..bf0889b5 100644
--- a/test/beast/core/drain_buffer.cpp
+++ b/test/beast/core/drain_buffer.cpp
@@ -49,7 +49,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(drain_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,drain_buffer);
 
 } // beast
 } // boost
diff --git a/test/beast/core/empty_base_optimization.cpp b/test/beast/core/empty_base_optimization.cpp
index efb68eda..c6ef699e 100644
--- a/test/beast/core/empty_base_optimization.cpp
+++ b/test/beast/core/empty_base_optimization.cpp
@@ -91,7 +91,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(empty_base_optimization,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,empty_base_optimization);
 
 } // detail
 } // beast
diff --git a/test/beast/core/file_posix.cpp b/test/beast/core/file_posix.cpp
index 888770bf..e8320cb4 100644
--- a/test/beast/core/file_posix.cpp
+++ b/test/beast/core/file_posix.cpp
@@ -33,7 +33,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(file_posix,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,file_posix);
 
 } // beast
 } // boost
diff --git a/test/beast/core/file_stdio.cpp b/test/beast/core/file_stdio.cpp
index 447f6e95..d44a1946 100644
--- a/test/beast/core/file_stdio.cpp
+++ b/test/beast/core/file_stdio.cpp
@@ -31,7 +31,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(file_stdio,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,file_stdio);
 
 } // beast
 } // boost
diff --git a/test/beast/core/file_win32.cpp b/test/beast/core/file_win32.cpp
index 05763efa..8fa68b41 100644
--- a/test/beast/core/file_win32.cpp
+++ b/test/beast/core/file_win32.cpp
@@ -33,7 +33,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(file_win32,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,file_win32);
 
 } // beast
 } // boost
diff --git a/test/beast/core/flat_buffer.cpp b/test/beast/core/flat_buffer.cpp
index 5c399290..23a9b820 100644
--- a/test/beast/core/flat_buffer.cpp
+++ b/test/beast/core/flat_buffer.cpp
@@ -349,7 +349,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(flat_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,flat_buffer);
 
 } // beast
 } // boost
diff --git a/test/beast/core/flat_static_buffer.cpp b/test/beast/core/flat_static_buffer.cpp
index b8364983..60745bdd 100644
--- a/test/beast/core/flat_static_buffer.cpp
+++ b/test/beast/core/flat_static_buffer.cpp
@@ -232,7 +232,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(flat_static_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,flat_static_buffer);
 
 } // beast
 } // boost
diff --git a/test/beast/core/handler_alloc.cpp b/test/beast/core/handler_alloc.cpp
index 905d715c..32defc73 100644
--- a/test/beast/core/handler_alloc.cpp
+++ b/test/beast/core/handler_alloc.cpp
@@ -61,7 +61,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(handler_alloc,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,handler_alloc);
 
 } // beast
 } // boost
diff --git a/test/beast/core/handler_ptr.cpp b/test/beast/core/handler_ptr.cpp
index 71df39de..953bdb1f 100644
--- a/test/beast/core/handler_ptr.cpp
+++ b/test/beast/core/handler_ptr.cpp
@@ -77,7 +77,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(handler_ptr,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,handler_ptr);
 
 } // beast
 } // boost
diff --git a/test/beast/core/multi_buffer.cpp b/test/beast/core/multi_buffer.cpp
index 4b01a25b..80ab4af7 100644
--- a/test/beast/core/multi_buffer.cpp
+++ b/test/beast/core/multi_buffer.cpp
@@ -590,7 +590,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(multi_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,multi_buffer);
 
 } // beast
 } // boost
diff --git a/test/beast/core/ostream.cpp b/test/beast/core/ostream.cpp
index 051777ba..65c639c6 100644
--- a/test/beast/core/ostream.cpp
+++ b/test/beast/core/ostream.cpp
@@ -63,7 +63,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(ostream,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,ostream);
 
 } // beast
 } // boost
diff --git a/test/beast/core/read_size.cpp b/test/beast/core/read_size.cpp
index 9f31f80e..5025e0ae 100644
--- a/test/beast/core/read_size.cpp
+++ b/test/beast/core/read_size.cpp
@@ -42,7 +42,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(read_size,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,read_size);
 
 } // beast
 } // boost
diff --git a/test/beast/core/sha1.cpp b/test/beast/core/sha1.cpp
index b60c3cfc..aebe7d2f 100644
--- a/test/beast/core/sha1.cpp
+++ b/test/beast/core/sha1.cpp
@@ -76,7 +76,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(sha1,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,sha1);
 
 } // test
 } // beast
diff --git a/test/beast/core/span.cpp b/test/beast/core/span.cpp
index d215505f..1ee75085 100644
--- a/test/beast/core/span.cpp
+++ b/test/beast/core/span.cpp
@@ -54,7 +54,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(span,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,span);
 
 } // beast
 } // boost
diff --git a/test/beast/core/static_buffer.cpp b/test/beast/core/static_buffer.cpp
index dfb1ce03..b3ce143a 100644
--- a/test/beast/core/static_buffer.cpp
+++ b/test/beast/core/static_buffer.cpp
@@ -232,7 +232,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(static_buffer,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,static_buffer);
 
 } // beast
 } // boost
diff --git a/test/beast/core/static_string.cpp b/test/beast/core/static_string.cpp
index f5d4e309..8fb474a6 100644
--- a/test/beast/core/static_string.cpp
+++ b/test/beast/core/static_string.cpp
@@ -1474,7 +1474,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(static_string,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,static_string);
 
 } // beast
 } // boost
diff --git a/test/beast/core/string_param.cpp b/test/beast/core/string_param.cpp
index 76bbff12..f6703fac 100644
--- a/test/beast/core/string_param.cpp
+++ b/test/beast/core/string_param.cpp
@@ -77,7 +77,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(string_param,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,string_param);
 
 } // beast
 } // boost
diff --git a/test/beast/http/basic_parser.cpp b/test/beast/http/basic_parser.cpp
index 50696d9b..055b1a01 100644
--- a/test/beast/http/basic_parser.cpp
+++ b/test/beast/http/basic_parser.cpp
@@ -1240,7 +1240,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(basic_parser,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,basic_parser);
 
 } // http
 } // beast
diff --git a/test/beast/http/chunk_encode.cpp b/test/beast/http/chunk_encode.cpp
index e73ef784..3e64d77d 100644
--- a/test/beast/http/chunk_encode.cpp
+++ b/test/beast/http/chunk_encode.cpp
@@ -304,7 +304,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(chunk_encode,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,chunk_encode);
 
 } // http
 } // beast
diff --git a/test/beast/http/dynamic_body.cpp b/test/beast/http/dynamic_body.cpp
index f43258e3..a1866948 100644
--- a/test/beast/http/dynamic_body.cpp
+++ b/test/beast/http/dynamic_body.cpp
@@ -71,7 +71,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(dynamic_body,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,dynamic_body);
 
 } // http
 } // beast
diff --git a/test/beast/http/error.cpp b/test/beast/http/error.cpp
index 8bf94155..86db1451 100644
--- a/test/beast/http/error.cpp
+++ b/test/beast/http/error.cpp
@@ -65,7 +65,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(error,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,error);
 
 } // http
 } // beast
diff --git a/test/beast/http/field.cpp b/test/beast/http/field.cpp
index 7eee1267..71046c7a 100644
--- a/test/beast/http/field.cpp
+++ b/test/beast/http/field.cpp
@@ -402,7 +402,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(field,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,field);
 
 } // http
 } // beast
diff --git a/test/beast/http/fields.cpp b/test/beast/http/fields.cpp
index 00e96626..5ed766a6 100644
--- a/test/beast/http/fields.cpp
+++ b/test/beast/http/fields.cpp
@@ -935,7 +935,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(fields,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,fields);
 
 } // http
 } // beast
diff --git a/test/beast/http/file_body.cpp b/test/beast/http/file_body.cpp
index ed668a12..838d38e9 100644
--- a/test/beast/http/file_body.cpp
+++ b/test/beast/http/file_body.cpp
@@ -109,7 +109,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(file_body,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,file_body);
 
 } // http
 } // beast
diff --git a/test/beast/http/message.cpp b/test/beast/http/message.cpp
index 062dbe66..d5c5157f 100644
--- a/test/beast/http/message.cpp
+++ b/test/beast/http/message.cpp
@@ -373,7 +373,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(message,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,message);
 
 } // http
 } // beast
diff --git a/test/beast/http/parser.cpp b/test/beast/http/parser.cpp
index 406d9eaa..69fabdd1 100644
--- a/test/beast/http/parser.cpp
+++ b/test/beast/http/parser.cpp
@@ -341,7 +341,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(parser,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,parser);
 
 } // http
 } // beast
diff --git a/test/beast/http/read.cpp b/test/beast/http/read.cpp
index adac1bfe..fcaee3fa 100644
--- a/test/beast/http/read.cpp
+++ b/test/beast/http/read.cpp
@@ -465,7 +465,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(read,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,read);
 
 } // http
 } // beast
diff --git a/test/beast/http/rfc7230.cpp b/test/beast/http/rfc7230.cpp
index 758a504d..05f3f200 100644
--- a/test/beast/http/rfc7230.cpp
+++ b/test/beast/http/rfc7230.cpp
@@ -354,7 +354,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(rfc7230,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,rfc7230);
 
 } // http
 } // beast
diff --git a/test/beast/http/serializer.cpp b/test/beast/http/serializer.cpp
index 1970da6d..171333d4 100644
--- a/test/beast/http/serializer.cpp
+++ b/test/beast/http/serializer.cpp
@@ -122,7 +122,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(serializer,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,serializer);
 
 } // http
 } // beast
diff --git a/test/beast/http/span_body.cpp b/test/beast/http/span_body.cpp
index 6634900d..e6e9aa13 100644
--- a/test/beast/http/span_body.cpp
+++ b/test/beast/http/span_body.cpp
@@ -73,7 +73,7 @@ struct span_body_test
     }
 };
 
-BEAST_DEFINE_TESTSUITE(span_body,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,span_body);
 
 } // http
 } // beast
diff --git a/test/beast/http/status.cpp b/test/beast/http/status.cpp
index c31ed759..3c26efc5 100644
--- a/test/beast/http/status.cpp
+++ b/test/beast/http/status.cpp
@@ -172,7 +172,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(status,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,status);
 
 } // http
 } // beast
diff --git a/test/beast/http/verb.cpp b/test/beast/http/verb.cpp
index 20f98a1d..90c609c8 100644
--- a/test/beast/http/verb.cpp
+++ b/test/beast/http/verb.cpp
@@ -124,7 +124,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(verb,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,verb);
 
 } // http
 } // beast
diff --git a/test/beast/http/write.cpp b/test/beast/http/write.cpp
index 830cb0ec..e265371c 100644
--- a/test/beast/http/write.cpp
+++ b/test/beast/http/write.cpp
@@ -860,7 +860,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(write,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,write);
 
 } // http
 } // beast
diff --git a/test/beast/websocket/error.cpp b/test/beast/websocket/error.cpp
index d7bdbeb5..2f9dc57a 100644
--- a/test/beast/websocket/error.cpp
+++ b/test/beast/websocket/error.cpp
@@ -44,7 +44,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(error,websocket,beast);
+BEAST_DEFINE_TESTSUITE(beast,websocket,error);
 
 } // websocket
 } // beast
diff --git a/test/beast/websocket/frame.cpp b/test/beast/websocket/frame.cpp
index 48d08863..81ecfcdd 100644
--- a/test/beast/websocket/frame.cpp
+++ b/test/beast/websocket/frame.cpp
@@ -249,7 +249,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(frame,websocket,beast);
+BEAST_DEFINE_TESTSUITE(beast,websocket,frame);
 
 } // detail
 } // websocket
diff --git a/test/beast/websocket/mask.cpp b/test/beast/websocket/mask.cpp
index 77a14c59..a4993964 100644
--- a/test/beast/websocket/mask.cpp
+++ b/test/beast/websocket/mask.cpp
@@ -50,7 +50,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(mask,websocket,beast);
+BEAST_DEFINE_TESTSUITE(beast,websocket,mask);
 
 } // detail
 } // websocket
diff --git a/test/beast/websocket/rfc6455.cpp b/test/beast/websocket/rfc6455.cpp
index 15d5a429..5efd8ceb 100644
--- a/test/beast/websocket/rfc6455.cpp
+++ b/test/beast/websocket/rfc6455.cpp
@@ -46,7 +46,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(rfc6455,websocket,beast);
+BEAST_DEFINE_TESTSUITE(beast,websocket,rfc6455);
 
 } // websocket
 } // beast
diff --git a/test/beast/websocket/stream.cpp b/test/beast/websocket/stream.cpp
index 9e01e21a..173bd885 100644
--- a/test/beast/websocket/stream.cpp
+++ b/test/beast/websocket/stream.cpp
@@ -1997,7 +1997,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(stream,websocket,beast);
+BEAST_DEFINE_TESTSUITE(beast,websocket,stream);
 
 } // websocket
 } // beast
diff --git a/test/beast/websocket/utf8_checker.cpp b/test/beast/websocket/utf8_checker.cpp
index 2ab0f83d..7d669d3a 100644
--- a/test/beast/websocket/utf8_checker.cpp
+++ b/test/beast/websocket/utf8_checker.cpp
@@ -389,9 +389,7 @@ public:
     }
 };
 
-#if defined(NDEBUG) && ! BOOST_BEAST_NO_SLOW_TESTS
-BEAST_DEFINE_TESTSUITE(utf8_checker,websocket,beast);
-#endif
+BEAST_DEFINE_TESTSUITE(beast,websocket,utf8_checker);
 
 } // detail
 } // websocket
diff --git a/test/beast/zlib/deflate_stream.cpp b/test/beast/zlib/deflate_stream.cpp
index 1e861b24..c3ef1bf3 100644
--- a/test/beast/zlib/deflate_stream.cpp
+++ b/test/beast/zlib/deflate_stream.cpp
@@ -313,7 +313,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(deflate_stream,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,zlib,deflate_stream);
 
 } // zlib
 } // beast
diff --git a/test/beast/zlib/error.cpp b/test/beast/zlib/error.cpp
index 279b84db..522027d6 100644
--- a/test/beast/zlib/error.cpp
+++ b/test/beast/zlib/error.cpp
@@ -58,7 +58,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(error,zlib,beast);
+BEAST_DEFINE_TESTSUITE(beast,zlib,error);
 
 } // zlib
 } // beast
diff --git a/test/beast/zlib/inflate_stream.cpp b/test/beast/zlib/inflate_stream.cpp
index bf337558..c76df144 100644
--- a/test/beast/zlib/inflate_stream.cpp
+++ b/test/beast/zlib/inflate_stream.cpp
@@ -372,7 +372,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(inflate_stream,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,zlib,inflate_stream);
 
 } // zlib
 } // beast
diff --git a/test/bench/buffers/bench_buffers.cpp b/test/bench/buffers/bench_buffers.cpp
index b2851272..d656f1ce 100644
--- a/test/bench/buffers/bench_buffers.cpp
+++ b/test/bench/buffers/bench_buffers.cpp
@@ -236,7 +236,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(buffers,benchmarks,beast);
+BEAST_DEFINE_TESTSUITE(beast,benchmarks,buffers);
 
 } // beast
 } // boost
diff --git a/test/bench/parser/bench_parser.cpp b/test/bench/parser/bench_parser.cpp
index a887b39d..46de225e 100644
--- a/test/bench/parser/bench_parser.cpp
+++ b/test/bench/parser/bench_parser.cpp
@@ -300,7 +300,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(parser,benchmarks,beast);
+BEAST_DEFINE_TESTSUITE(beast,benchmarks,parser);
 
 } // http
 } // beast
diff --git a/test/bench/utf8_checker/bench_utf8_checker.cpp b/test/bench/utf8_checker/bench_utf8_checker.cpp
index 5d27aa17..85e64695 100644
--- a/test/bench/utf8_checker/bench_utf8_checker.cpp
+++ b/test/bench/utf8_checker/bench_utf8_checker.cpp
@@ -150,7 +150,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(utf8_checker,benchmarks,beast);
+BEAST_DEFINE_TESTSUITE(beast,benchmarks,utf8_checker);
 
 } // beast
 } // boost
diff --git a/test/bench/zlib/deflate_stream.cpp b/test/bench/zlib/deflate_stream.cpp
index 4ba214d8..6db1efea 100644
--- a/test/bench/zlib/deflate_stream.cpp
+++ b/test/bench/zlib/deflate_stream.cpp
@@ -193,7 +193,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(deflate_stream,zlib,beast);
+BEAST_DEFINE_TESTSUITE(beast,zlib,deflate_stream);
 
 } // zlib
 } // beast
diff --git a/test/bench/zlib/inflate_stream.cpp b/test/bench/zlib/inflate_stream.cpp
index eb401c14..a081ede3 100644
--- a/test/bench/zlib/inflate_stream.cpp
+++ b/test/bench/zlib/inflate_stream.cpp
@@ -238,7 +238,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(inflate_stream,zlib,beast);
+BEAST_DEFINE_TESTSUITE(beast,zlib,inflate_stream);
 
 } // zlib
 } // beast
diff --git a/test/doc/core_examples.cpp b/test/doc/core_examples.cpp
index 83e02aaa..b56b6be4 100644
--- a/test/doc/core_examples.cpp
+++ b/test/doc/core_examples.cpp
@@ -81,7 +81,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(examples,core,beast);
+BEAST_DEFINE_TESTSUITE(beast,core,examples);
 
 } // beast
 } // boost
diff --git a/test/doc/http_examples.cpp b/test/doc/http_examples.cpp
index 984c3d0a..bc2a247d 100644
--- a/test/doc/http_examples.cpp
+++ b/test/doc/http_examples.cpp
@@ -451,7 +451,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(examples,http,beast);
+BEAST_DEFINE_TESTSUITE(beast,http,examples);
 
 } // http
 } // beast
diff --git a/test/example/server/tests.cpp b/test/example/server/tests.cpp
index 9a9eda36..d4d56a1d 100644
--- a/test/example/server/tests.cpp
+++ b/test/example/server/tests.cpp
@@ -324,7 +324,7 @@ public:
     }
 };
 
-BEAST_DEFINE_TESTSUITE(server,websocket,beast);
+BEAST_DEFINE_TESTSUITE(beast,websocket,server);
 
 } // 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 937745ae..2c98a48b 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 BEAST_DEFINE_TESTSUITE_INSERT(Class,Module,Library,manual) \
+#define BEAST_DEFINE_TESTSUITE_INSERT(Library,Module,Class,manual) \
     static beast::unit_test::detail::insert_suite <Class##_test>   \
         Library ## Module ## Class ## _test_instance(             \
             #Class, #Module, #Library, manual)
@@ -651,9 +651,9 @@ run(runner& r)
 
 /** Define a unit test suite.
 
-    Class     The type representing the class being tested.
-    Module    Identifies the module.
     Library   Identifies the library.
+    Module    Identifies the module.
+    Class     The type representing the class being tested.
 
     The declaration for the class implementing the test should be the same
     as Class ## _test. For example, if Class is aged_ordered_container, the
@@ -676,10 +676,10 @@ run(runner& r)
 
 #else
 #include <boost/beast/unit_test/global_suites.hpp>
-#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)
+#define BEAST_DEFINE_TESTSUITE(Library,Module,Class) \
+        BEAST_DEFINE_TESTSUITE_INSERT(Library,Module,Class,false)
+#define BEAST_DEFINE_TESTSUITE_MANUAL(Library,Module,Class) \
+        BEAST_DEFINE_TESTSUITE_INSERT(Library,Module,Class,true)
 
 #endif