diff --git a/CHANGELOG.md b/CHANGELOG.md
index f37fe12a..41cf3288 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+Version 96:
+
+* Move bench/ to test/
+
+--------------------------------------------------------------------------------
+
 Version 95:
 
 * Tidy up Travis build scripts
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 34d4b7db..60a655eb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,6 @@ cmake_minimum_required (VERSION 3.5.2)
 project (Beast VERSION 95)
 
 set_property (GLOBAL PROPERTY USE_FOLDERS ON)
-option (Beast_BUILD_BENCH "Build bench" ON)
 option (Beast_BUILD_EXAMPLES "Build examples" ON)
 option (Beast_BUILD_TESTS "Build tests" ON)
 
@@ -192,10 +191,6 @@ file (GLOB_RECURSE EXTRAS_INCLUDES
 
 set (TEST_MAIN ${PROJECT_SOURCE_DIR}/extras/boost/beast/unit_test/main.cpp)
 
-if (Beast_BUILD_BENCH)
-    add_subdirectory (bench)
-endif()
-
 if (Beast_BUILD_EXAMPLES AND
     (NOT "${VARIANT}" STREQUAL "coverage") AND
     (NOT "${VARIANT}" STREQUAL "ubasan"))
diff --git a/README.md b/README.md
index 7f276ef3..28e03e90 100644
--- a/README.md
+++ b/README.md
@@ -110,7 +110,6 @@ The files in the repository are laid out thusly:
 
 ```
 ./
-    bench/          Benchmarking programs
     bin/            Create this to hold executables and project files
     bin64/          Create this to hold 64-bit Windows executables and project files
     doc/            Source code and scripts for the documentation
diff --git a/bench/Jamfile b/bench/Jamfile
deleted file mode 100644
index 89c2563c..00000000
--- a/bench/Jamfile
+++ /dev/null
@@ -1,8 +0,0 @@
-#
-# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
-#
-# Distributed under the Boost Software License, Version 1.0. (See accompanying
-# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-#
-# Official repository: https://github.com/boostorg/beast
-#
diff --git a/build/build-and-test.sh b/build/build-and-test.sh
index de97ecae..c24317bb 100755
--- a/build/build-and-test.sh
+++ b/build/build-and-test.sh
@@ -109,7 +109,6 @@ function build_bjam ()
   else
     bjam \
       libs/beast/test//fat-tests \
-      libs/beast/bench \
       libs/beast/example \
       toolset=$TOOLSET \
       variant=$VARIANT \
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index a1f87c88..2d17750e 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -12,5 +12,6 @@ if (OPENSSL_FOUND)
 endif()
 
 add_subdirectory (beast)
+add_subdirectory (bench)
 add_subdirectory (doc)
 add_subdirectory (example)
diff --git a/test/Jamfile b/test/Jamfile
index 047f4f50..2519abd5 100644
--- a/test/Jamfile
+++ b/test/Jamfile
@@ -9,6 +9,7 @@
 
 alias run-tests :
     beast//run-tests
+    bench//run-tests
     doc//run-tests
     example//run-tests
     ;
diff --git a/bench/CMakeLists.txt b/test/bench/CMakeLists.txt
similarity index 100%
rename from bench/CMakeLists.txt
rename to test/bench/CMakeLists.txt
diff --git a/test/bench/Jamfile b/test/bench/Jamfile
new file mode 100644
index 00000000..45f95178
--- /dev/null
+++ b/test/bench/Jamfile
@@ -0,0 +1,15 @@
+#
+# Copyright (c) 2016-2017 Vinnie Falco (vinnie dot falco at gmail dot com)
+#
+# Distributed under the Boost Software License, Version 1.0. (See accompanying
+# file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+#
+# Official repository: https://github.com/boostorg/beast
+#
+
+alias run-tests :
+    buffers//run-tests
+    parser//run-tests
+    wsload//run-tests
+    utf8_checker//run-tests
+    ;
diff --git a/bench/buffers/CMakeLists.txt b/test/bench/buffers/CMakeLists.txt
similarity index 93%
rename from bench/buffers/CMakeLists.txt
rename to test/bench/buffers/CMakeLists.txt
index e947317b..9eec8337 100644
--- a/bench/buffers/CMakeLists.txt
+++ b/test/bench/buffers/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
-GroupSources(bench/buffers "/")
+GroupSources(test/bench/buffers "/")
 
 add_executable (bench-buffers
     ${BOOST_BEAST_INCLUDES}
diff --git a/bench/buffers/Jamfile b/test/bench/buffers/Jamfile
similarity index 80%
rename from bench/buffers/Jamfile
rename to test/bench/buffers/Jamfile
index fd1e6082..4f278c0c 100644
--- a/bench/buffers/Jamfile
+++ b/test/bench/buffers/Jamfile
@@ -11,3 +11,9 @@ exe bench-buffers :
     $(TEST_MAIN)
     bench_buffers.cpp
     ;
+
+explicit bench-buffers ;
+
+alias run-tests :
+    [ compile bench_buffers.cpp ]
+    ;
diff --git a/bench/buffers/bench_buffers.cpp b/test/bench/buffers/bench_buffers.cpp
similarity index 100%
rename from bench/buffers/bench_buffers.cpp
rename to test/bench/buffers/bench_buffers.cpp
diff --git a/bench/parser/CMakeLists.txt b/test/bench/parser/CMakeLists.txt
similarity index 94%
rename from bench/parser/CMakeLists.txt
rename to test/bench/parser/CMakeLists.txt
index efac63ad..6f293569 100644
--- a/bench/parser/CMakeLists.txt
+++ b/test/bench/parser/CMakeLists.txt
@@ -10,7 +10,7 @@
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
 GroupSources(test/beast/http "/")
-GroupSources(bench/parser "/")
+GroupSources(test/bench/parser "/")
 
 add_executable (bench-parser
     ${BOOST_BEAST_INCLUDES}
diff --git a/bench/parser/Jamfile b/test/bench/parser/Jamfile
similarity index 76%
rename from bench/parser/Jamfile
rename to test/bench/parser/Jamfile
index 1a66fb18..eea768a5 100644
--- a/bench/parser/Jamfile
+++ b/test/bench/parser/Jamfile
@@ -12,3 +12,10 @@ exe bench-parser :
     nodejs_parser.cpp
     bench_parser.cpp
     ;
+
+explicit bench-parser ;
+
+alias run-tests :
+    [ compile nodejs_parser.cpp ]
+    [ compile bench_parser.cpp ]
+    ;
diff --git a/bench/parser/bench_parser.cpp b/test/bench/parser/bench_parser.cpp
similarity index 100%
rename from bench/parser/bench_parser.cpp
rename to test/bench/parser/bench_parser.cpp
diff --git a/bench/parser/nodejs-parser/AUTHORS b/test/bench/parser/nodejs-parser/AUTHORS
similarity index 100%
rename from bench/parser/nodejs-parser/AUTHORS
rename to test/bench/parser/nodejs-parser/AUTHORS
diff --git a/bench/parser/nodejs-parser/LICENSE-MIT b/test/bench/parser/nodejs-parser/LICENSE-MIT
similarity index 100%
rename from bench/parser/nodejs-parser/LICENSE-MIT
rename to test/bench/parser/nodejs-parser/LICENSE-MIT
diff --git a/bench/parser/nodejs-parser/README.md b/test/bench/parser/nodejs-parser/README.md
similarity index 100%
rename from bench/parser/nodejs-parser/README.md
rename to test/bench/parser/nodejs-parser/README.md
diff --git a/bench/parser/nodejs-parser/http_parser.c b/test/bench/parser/nodejs-parser/http_parser.c
similarity index 100%
rename from bench/parser/nodejs-parser/http_parser.c
rename to test/bench/parser/nodejs-parser/http_parser.c
diff --git a/bench/parser/nodejs-parser/http_parser.h b/test/bench/parser/nodejs-parser/http_parser.h
similarity index 100%
rename from bench/parser/nodejs-parser/http_parser.h
rename to test/bench/parser/nodejs-parser/http_parser.h
diff --git a/bench/parser/nodejs_parser.cpp b/test/bench/parser/nodejs_parser.cpp
similarity index 100%
rename from bench/parser/nodejs_parser.cpp
rename to test/bench/parser/nodejs_parser.cpp
diff --git a/bench/parser/nodejs_parser.hpp b/test/bench/parser/nodejs_parser.hpp
similarity index 100%
rename from bench/parser/nodejs_parser.hpp
rename to test/bench/parser/nodejs_parser.hpp
diff --git a/bench/utf8_checker/CMakeLists.txt b/test/bench/utf8_checker/CMakeLists.txt
similarity index 92%
rename from bench/utf8_checker/CMakeLists.txt
rename to test/bench/utf8_checker/CMakeLists.txt
index acae959c..fc982f1b 100644
--- a/bench/utf8_checker/CMakeLists.txt
+++ b/test/bench/utf8_checker/CMakeLists.txt
@@ -9,7 +9,7 @@
 
 GroupSources(extras/boost/beast extras)
 GroupSources(include/boost/beast beast)
-GroupSources(bench/utf8_checker "/")
+GroupSources(test/bench/utf8_checker "/")
 
 add_executable (bench-utf8-checker
     ${BOOST_BEAST_INCLUDES}
diff --git a/bench/utf8_checker/Jamfile b/test/bench/utf8_checker/Jamfile
similarity index 79%
rename from bench/utf8_checker/Jamfile
rename to test/bench/utf8_checker/Jamfile
index 522ee9ee..1856df27 100644
--- a/bench/utf8_checker/Jamfile
+++ b/test/bench/utf8_checker/Jamfile
@@ -11,3 +11,9 @@ exe bench-utf8-checker :
     $(TEST_MAIN)
     bench_utf8_checker.cpp
     ;
+
+explicit bench-utf8-checker ;
+
+alias run-tests :
+    [ compile bench_utf8_checker.cpp ]
+    ;
diff --git a/bench/utf8_checker/bench_utf8_checker.cpp b/test/bench/utf8_checker/bench_utf8_checker.cpp
similarity index 100%
rename from bench/utf8_checker/bench_utf8_checker.cpp
rename to test/bench/utf8_checker/bench_utf8_checker.cpp
diff --git a/bench/wsload/CMakeLists.txt b/test/bench/wsload/CMakeLists.txt
similarity index 90%
rename from bench/wsload/CMakeLists.txt
rename to test/bench/wsload/CMakeLists.txt
index e564d885..329a023c 100644
--- a/bench/wsload/CMakeLists.txt
+++ b/test/bench/wsload/CMakeLists.txt
@@ -10,12 +10,12 @@
 GroupSources(include/boost/beast beast)
 GroupSources(example/common common)
 GroupSources(extras/boost/beast extras)
-GroupSources(bench/wsload "/")
+GroupSources(test/bench/wsload "/")
 
 add_executable (bench-wsload
     ${BOOST_BEAST_INCLUDES}
     ${COMMON_INCLUDES}
     ${EXTRAS_INCLUDES}
     Jamfile
-    wsload.cpp
+    wsload_main.cpp
     )
diff --git a/bench/wsload/Jamfile b/test/bench/wsload/Jamfile
similarity index 73%
rename from bench/wsload/Jamfile
rename to test/bench/wsload/Jamfile
index 26b30b7c..807e64ab 100644
--- a/bench/wsload/Jamfile
+++ b/test/bench/wsload/Jamfile
@@ -8,5 +8,12 @@
 #
 
 exe wsload :
-    wsload.cpp
+    $(TEST_MAIN)
+    wsload_main.cpp
+    ;
+
+explicit wsload ;
+
+alias run-tests :
+    [ compile wsload_main.cpp ]
     ;
diff --git a/bench/wsload/wsload.cpp b/test/bench/wsload/wsload_main.cpp
similarity index 100%
rename from bench/wsload/wsload.cpp
rename to test/bench/wsload/wsload_main.cpp