diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7fd7d75..23bedd37 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Version XXX:
 
+* Remove test framework's dependency on RTTI.
 * Fix CVE-2016-9840 in zlib implementation.
 * Fix TLS SNI handling in websocket_client_async_ssl example.
 * Fix reuse of sliding window in WebSocket permessage_deflate.
diff --git a/include/boost/beast/_experimental/unit_test/suite_list.hpp b/include/boost/beast/_experimental/unit_test/suite_list.hpp
index 93ab16a4..bb1fc93a 100644
--- a/include/boost/beast/_experimental/unit_test/suite_list.hpp
+++ b/include/boost/beast/_experimental/unit_test/suite_list.hpp
@@ -13,6 +13,8 @@
 #include <boost/beast/_experimental/unit_test/suite_info.hpp>
 #include <boost/beast/_experimental/unit_test/detail/const_container.hpp>
 #include <boost/assert.hpp>
+#include <boost/type_index.hpp>
+#include <boost/functional/hash.hpp>
 #include <typeindex>
 #include <set>
 #include <unordered_set>
@@ -28,7 +30,9 @@ class suite_list
 private:
 #ifndef NDEBUG
     std::unordered_set<std::string> names_;
-    std::unordered_set<std::type_index> classes_;
+
+    using type_index = boost::typeindex::type_index;
+    std::unordered_set<type_index, boost::hash<type_index>> classes_;
 #endif
 
 public:
@@ -65,7 +69,7 @@ suite_list::insert(
 
     {
         auto const result(classes_.insert(
-            std::type_index(typeid(Suite))));
+            boost::typeindex::type_id<Suite>()));
         BOOST_ASSERT(result.second); // Duplicate type
     }
 #endif