diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c5748fb..acac1f0d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,7 @@
 Version 105:
 
 * Fix compile error in websocket snippet
+* Tidy up Jamfile and tests
 
 --------------------------------------------------------------------------------
 
diff --git a/Jamfile b/Jamfile
index c993e919..285f6f3a 100644
--- a/Jamfile
+++ b/Jamfile
@@ -13,8 +13,6 @@ import boost ;
 import modules ;
 import testing ;
 
-import ../config/checks/config : requires ;
-
 boost.use-project ;
 
 if [ os.name ] = SOLARIS
@@ -51,57 +49,47 @@ else
     lib crypto ;
 }
 
-variant coverage :
-    debug
-    :
-    <cxxflags>"-msse4.2 --coverage"
+variant coverage
+  : debug
+  : <cxxflags>"-msse4.2 --coverage"
     <linkflags>"--coverage"
-    ;
+  ;
 
-variant valgrind :
-    release
-    :
-    <valgrind>on # Boost.Context uses this property
-    ;
+variant valgrind
+  : release
+  : <valgrind>on # Boost.Context uses this property
+  ;
 
 variant ubasan
-    :
-    release
-    :
-    <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
+  : release
+  : <cxxflags>"-msse4.2 -funsigned-char -fno-omit-frame-pointer -fsanitize=address,undefined -fsanitize-blacklist=libs/beast/tools/blacklist.supp"
     <linkflags>"-fsanitize=address,undefined"
     <define>BOOST_USE_ASAN=1
-    ;
-
-#cxx11_hdr_type_traits
-local REQ = [ requires cxx11_variadic_templates cxx11_template_aliases cxx11_decltype cxx11_hdr_tuple ] ;
+  ;
 
 path-constant TEST_MAIN : test/extras/include/boost/beast/unit_test/main.cpp ;
 
 project /boost/beast
   : requirements
-    #$(REQ)
     <implicit-dependency>/boost//headers
     <include>.
     <include>./test/extras/include
-    #<use>/boost//headers
     <library>/boost/system//boost_system
     <library>/boost/coroutine//boost_coroutine
     <library>/boost/filesystem//boost_filesystem
-    <link>static
-    <define>BOOST_ALL_NO_LIB=1
-    <define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
     <threading>multi
     <runtime-link>shared
     <debug-symbols>on
+    <define>BOOST_ALL_NO_LIB=1
     <define>BOOST_ASIO_DISABLE_BOOST_ARRAY=1
     <define>BOOST_ASIO_DISABLE_BOOST_BIND=1
     <define>BOOST_ASIO_DISABLE_BOOST_DATE_TIME=1
     <define>BOOST_ASIO_DISABLE_BOOST_REGEX=1
     <define>BOOST_ASIO_NO_DEPRECATED=1
+    <define>BOOST_COROUTINES_NO_DEPRECATION_WARNING=1
+    <toolset>msvc:<cxxflags>"/bigobj"
     <toolset>msvc:<define>_SCL_SECURE_NO_WARNINGS=1
     <toolset>msvc:<define>_CRT_SECURE_NO_WARNINGS=1
-    <toolset>msvc:<cxxflags>"/bigobj"
     <toolset>msvc:<variant>release:<cxxflags>"/Ob2 /Oi /Ot"
     <os>SOLARIS:<library>socket
     <os>SOLARIS:<library>nsl
diff --git a/test/beast/http/chunk_encode.cpp b/test/beast/http/chunk_encode.cpp
index 174c7f92..638ff5a4 100644
--- a/test/beast/http/chunk_encode.cpp
+++ b/test/beast/http/chunk_encode.cpp
@@ -65,11 +65,11 @@ public:
     void
     check_fwd(string_view match, Args&&... args)
     {
-        T t{std::forward<Args>(args)...};
+        T t(std::forward<Args>(args)...);
         BEAST_EXPECT(to_string(t) == match);
-        T t2{t};
+        T t2(t);
         BEAST_EXPECT(to_string(t2) == match);
-        T t3{std::move(t2)};
+        T t3(std::move(t2));
         BEAST_EXPECT(to_string(t3) == match);
     }
 
diff --git a/test/example/common/root_certificates.cpp b/test/example/common/root_certificates.cpp
index 70ebacce..86d65c5b 100644
--- a/test/example/common/root_certificates.cpp
+++ b/test/example/common/root_certificates.cpp
@@ -7,6 +7,10 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+#if BOOST_BEAST_USE_OPENSSL
+
 // Test that header file is self-contained.
 #include "example/common/root_certificates.hpp"
 
+#endif
+
diff --git a/test/example/common/server_certificate.cpp b/test/example/common/server_certificate.cpp
index 40bd10fe..fc690776 100644
--- a/test/example/common/server_certificate.cpp
+++ b/test/example/common/server_certificate.cpp
@@ -7,6 +7,9 @@
 // Official repository: https://github.com/boostorg/beast
 //
 
+#if BOOST_BEAST_USE_OPENSSL
+
 // Test that header file is self-contained.
 #include "example/common/server_certificate.hpp"
 
+#endif