diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 937efce..40ae885 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -7,6 +7,6 @@ include(BoostTestJamfile OPTIONAL RESULT_VARIABLE HAVE_BOOST_TEST)
 if(HAVE_BOOST_TEST)
 
 boost_test_jamfile(FILE Jamfile.v2
-  LINK_LIBRARIES Boost::crc Boost::core Boost::timer Boost::random)
+  LINK_LIBRARIES Boost::crc Boost::core Boost::timer Boost::integer Boost::predef)
 
 endif()
diff --git a/test/crc_test.cpp b/test/crc_test.cpp
index 21b2af4..0ee85c8 100644
--- a/test/crc_test.cpp
+++ b/test/crc_test.cpp
@@ -18,7 +18,7 @@
 #include <boost/config.hpp>                      // for BOOST_MSVC, etc.
 #include <boost/cstdint.hpp>                     // for boost::uint16_t, etc.
 #include <boost/integer.hpp>                     // for boost::uint_t
-#include <boost/random/linear_congruential.hpp>  // for boost::minstd_rand
+#include <boost/core/detail/minstd_rand.hpp>     // for boost::detail::minstd_rand
 #include <boost/core/lightweight_test.hpp>
 #include <boost/timer/timer.hpp>                 // for boost::timer
 
@@ -195,7 +195,7 @@ PRIVATE_TESTER_NAME::error_test
     uint32_t           ran_data[ 256 ];
     std::size_t const  ran_length = sizeof(ran_data) / sizeof(ran_data[0]);
 
-    std::generate_n( ran_data, ran_length, boost::minstd_rand() );
+    std::generate_n( ran_data, ran_length, boost::detail::minstd_rand() );
 
     // Create computers and compute the checksum of the data
     optimal_crc_type  fast_tester;
@@ -434,7 +434,7 @@ timing_test
     boost::int32_t     ran_data[ 256 ];
     std::size_t const  ran_length = sizeof(ran_data) / sizeof(ran_data[0]);
 
-    std::generate_n( ran_data, ran_length, boost::minstd_rand() );
+    std::generate_n( ran_data, ran_length, boost::detail::minstd_rand() );
 
     // Use the first runs as a check.  This gives a chance for first-
     // time static initialization to not interfere in the timings.
@@ -521,7 +521,7 @@ augmented_tests
     size_t const  ran_length = sizeof(ran_data) / sizeof(ran_data[0]);
     size_t const  data_length = ran_length - 1;
 
-    std::generate_n( ran_data, data_length, boost::minstd_rand() );
+    std::generate_n( ran_data, data_length, boost::detail::minstd_rand() );
 
     // When creating a CRC for an augmented message, use
     // zeros in the appended CRC spot for the first run.
diff --git a/test/crc_test2.cpp b/test/crc_test2.cpp
index 699cb05..1964246 100644
--- a/test/crc_test2.cpp
+++ b/test/crc_test2.cpp
@@ -7,14 +7,14 @@
 
 //  See <http://www.boost.org/libs/crc/> for the library's home page.
 
-#include <boost/core/lightweight_test.hpp>
 #include <boost/crc.hpp>   // for boost::crc_basic,crc_optimal,augmented_crc,crc
-
+#include <boost/core/lightweight_test.hpp>
 #include <boost/cstdint.hpp>         // for boost::uint16_t, uint32_t, uintmax_t
 #include <boost/predef/other/endian.h>
 #include <boost/integer.hpp>                                // for boost::uint_t
 #include <boost/typeof/typeof.hpp>                             // for BOOST_AUTO
-#include <boost/random/linear_congruential.hpp>        // for boost::minstd_rand
+#include <boost/core/detail/minstd_rand.hpp>     // for boost::detail::minstd_rand
+#include <boost/type_traits/integral_constant.hpp>
 
 #include <algorithm>  // for std::generate_n, for_each
 #include <climits>    // for CHAR_BIT
@@ -325,7 +325,7 @@ void operator()(CRCPolicy)
     boost::uint32_t    ran_data[ 256 ];
     std::size_t const  ran_length = sizeof(ran_data) / sizeof(ran_data[0]);
 
-    std::generate_n( ran_data, ran_length, boost::minstd_rand() );
+    std::generate_n( ran_data, ran_length, boost::detail::minstd_rand() );
 
     // Create computers and compute the checksum of the data
     BOOST_AUTO( optimal_tester, CRCPolicy::make_crc_optimal() );
@@ -386,7 +386,7 @@ void augmented_crc_test()
     uint32_t &    run_crc = run_data[ data_length ];
     size_t const  data_size = sizeof( run_data ) - sizeof( run_crc );
 
-    std::generate_n( run_data, data_length, boost::minstd_rand() );
+    std::generate_n( run_data, data_length, boost::detail::minstd_rand() );
     run_crc = 0u;
 
     // The augmented-CRC routine needs to push an appropriate number of zero