From 9b14fff12e5b48ae8276d1df79547162ee1eb74d Mon Sep 17 00:00:00 2001
From: Nick Thompson <nathompson7@protonmail.com>
Date: Sat, 10 Aug 2019 08:50:12 -0400
Subject: [PATCH] Remove header deprecation warnings.

---
 doc/background/special_tut.qbk                  | 2 +-
 example/test_cpp_float_close_fraction.cpp       | 2 +-
 test/adaptive_gauss_kronrod_quadrature_test.cpp | 2 +-
 test/catmull_rom_test.cpp                       | 2 +-
 test/chebyshev_test.cpp                         | 2 +-
 test/chebyshev_transform_test.cpp               | 2 +-
 test/complex_test.cpp                           | 2 +-
 test/exp_sinh_quadrature_test.cpp               | 2 +-
 test/float128/powm1_sqrtp1m1_test.cpp           | 2 +-
 test/float128/setup.hpp                         | 2 +-
 test/float128/test_factorials.cpp               | 2 +-
 test/float128/test_std_lib.cpp                  | 2 +-
 test/gauss_kronrod_quadrature_test.cpp          | 2 +-
 test/gauss_quadrature_test.cpp                  | 2 +-
 test/hypot_test.cpp                             | 2 +-
 test/lanczos_smoothing_test.cpp                 | 2 +-
 test/log1p_expm1_test.cpp                       | 2 +-
 test/naive_monte_carlo_test.cpp                 | 2 +-
 test/pow_test.cpp                               | 2 +-
 test/powm1_sqrtp1m1_test.cpp                    | 2 +-
 test/sinh_sinh_quadrature_test.cpp              | 2 +-
 test/tanh_sinh_quadrature_test.cpp              | 2 +-
 test/test_0F1.hpp                               | 2 +-
 test/test_1F0.hpp                               | 2 +-
 test/test_1F1.hpp                               | 2 +-
 test/test_1F1_log.hpp                           | 2 +-
 test/test_1F1_regularized.hpp                   | 2 +-
 test/test_2F0.hpp                               | 2 +-
 test/test_airy.cpp                              | 2 +-
 test/test_arcsine.cpp                           | 2 +-
 test/test_barycentric_rational.cpp              | 2 +-
 test/test_bernoulli.cpp                         | 2 +-
 test/test_bessel_airy_zeros.cpp                 | 2 +-
 test/test_bessel_i.hpp                          | 2 +-
 test/test_bessel_i_prime.hpp                    | 2 +-
 test/test_bessel_j.hpp                          | 2 +-
 test/test_bessel_j_prime.hpp                    | 2 +-
 test/test_bessel_k.hpp                          | 2 +-
 test/test_bessel_k_prime.hpp                    | 2 +-
 test/test_bessel_y.hpp                          | 2 +-
 test/test_bessel_y_prime.hpp                    | 2 +-
 test/test_beta.hpp                              | 2 +-
 test/test_beta_dist.cpp                         | 2 +-
 test/test_binomial.cpp                          | 2 +-
 test/test_binomial_coeff.hpp                    | 2 +-
 test/test_carlson.hpp                           | 2 +-
 test/test_cauchy.cpp                            | 2 +-
 test/test_cbrt.hpp                              | 2 +-
 test/test_chi_squared.cpp                       | 2 +-
 test/test_constants.cpp                         | 2 +-
 test/test_cstdfloat.cpp                         | 2 +-
 test/test_cubic_b_spline.cpp                    | 2 +-
 test/test_difference.cpp                        | 2 +-
 test/test_digamma.hpp                           | 2 +-
 test/test_dist_overloads.cpp                    | 2 +-
 test/test_ellint_1.hpp                          | 2 +-
 test/test_ellint_2.hpp                          | 2 +-
 test/test_ellint_3.hpp                          | 2 +-
 test/test_ellint_d.hpp                          | 2 +-
 test/test_erf.hpp                               | 2 +-
 test/test_expint.hpp                            | 2 +-
 test/test_exponential_dist.cpp                  | 2 +-
 test/test_extreme_value.cpp                     | 2 +-
 test/test_factorials.cpp                        | 2 +-
 test/test_find_location.cpp                     | 2 +-
 test/test_find_scale.cpp                        | 2 +-
 test/test_fisher_f.cpp                          | 2 +-
 test/test_gamma.hpp                             | 2 +-
 test/test_gamma_dist.cpp                        | 2 +-
 test/test_geometric.cpp                         | 2 +-
 test/test_hankel.cpp                            | 2 +-
 test/test_hermite.hpp                           | 2 +-
 test/test_heuman_lambda.hpp                     | 2 +-
 test/test_hyperexponential_dist.cpp             | 2 +-
 test/test_hypergeometric_dist.cpp               | 2 +-
 test/test_ibeta.hpp                             | 2 +-
 test/test_ibeta_derivative.hpp                  | 2 +-
 test/test_ibeta_inv.hpp                         | 2 +-
 test/test_ibeta_inv_ab.hpp                      | 2 +-
 test/test_igamma.hpp                            | 2 +-
 test/test_igamma_inv.hpp                        | 2 +-
 test/test_igamma_inva.hpp                       | 2 +-
 test/test_inv_hyp.cpp                           | 2 +-
 test/test_inverse_chi_squared_distribution.cpp  | 2 +-
 test/test_inverse_gamma_distribution.cpp        | 2 +-
 test/test_inverse_gaussian.cpp                  | 2 +-
 test/test_jacobi.hpp                            | 2 +-
 test/test_jacobi_zeta.hpp                       | 2 +-
 test/test_laguerre.hpp                          | 2 +-
 test/test_lambert_w.cpp                         | 2 +-
 test/test_lambert_w_derivative.cpp              | 2 +-
 test/test_lambert_w_integrals_double.cpp        | 2 +-
 test/test_lambert_w_integrals_float.cpp         | 2 +-
 test/test_lambert_w_integrals_float128.cpp      | 2 +-
 test/test_lambert_w_integrals_long_double.cpp   | 2 +-
 test/test_lambert_w_integrals_quad.cpp          | 2 +-
 test/test_legendre.hpp                          | 2 +-
 test/test_logistic_dist.cpp                     | 2 +-
 test/test_lognormal.cpp                         | 2 +-
 test/test_long_double_support.cpp               | 2 +-
 test/test_minima.cpp                            | 2 +-
 test/test_nc_beta.cpp                           | 2 +-
 test/test_nc_beta.hpp                           | 2 +-
 test/test_nc_chi_squared.cpp                    | 2 +-
 test/test_nc_chi_squared.hpp                    | 2 +-
 test/test_nc_f.cpp                              | 2 +-
 test/test_nc_t.cpp                              | 2 +-
 test/test_nc_t.hpp                              | 2 +-
 test/test_negative_binomial.cpp                 | 2 +-
 test/test_next.cpp                              | 2 +-
 test/test_next_decimal.cpp                      | 2 +-
 test/test_normal.cpp                            | 2 +-
 test/test_numerical_differentiation.cpp         | 2 +-
 test/test_owens_t.cpp                           | 2 +-
 test/test_owens_t.hpp                           | 2 +-
 test/test_pFq.hpp                               | 2 +-
 test/test_pFq_precision.cpp                     | 2 +-
 test/test_pareto.cpp                            | 2 +-
 test/test_poisson.cpp                           | 2 +-
 test/test_policy_sf.cpp                         | 2 +-
 test/test_polygamma.hpp                         | 2 +-
 test/test_rational_instances/test_rational.hpp  | 2 +-
 test/test_rationals.cpp                         | 2 +-
 test/test_rayleigh.cpp                          | 2 +-
 test/test_real_concept.cpp                      | 2 +-
 test/test_recurrence.cpp                        | 2 +-
 test/test_remez.cpp                             | 2 +-
 test/test_root_finding_concepts.cpp             | 2 +-
 test/test_root_iterations.cpp                   | 2 +-
 test/test_roots.cpp                             | 2 +-
 test/test_round.cpp                             | 2 +-
 test/test_sign.cpp                              | 2 +-
 test/test_sinc.hpp                              | 2 +-
 test/test_skew_normal.cpp                       | 2 +-
 test/test_spherical_harmonic.cpp                | 2 +-
 test/test_spherical_harmonic.hpp                | 2 +-
 test/test_students_t.cpp                        | 2 +-
 test/test_tgamma_ratio.hpp                      | 2 +-
 test/test_toms748_solve.cpp                     | 2 +-
 test/test_tr1.cpp                               | 2 +-
 test/test_trapezoidal.cpp                       | 2 +-
 test/test_triangular.cpp                        | 2 +-
 test/test_trig.hpp                              | 2 +-
 test/test_trigamma.hpp                          | 2 +-
 test/test_uniform.cpp                           | 2 +-
 test/test_vector_barycentric_rational.cpp       | 2 +-
 test/test_weibull.cpp                           | 2 +-
 test/test_zeta.hpp                              | 2 +-
 148 files changed, 148 insertions(+), 148 deletions(-)

diff --git a/doc/background/special_tut.qbk b/doc/background/special_tut.qbk
index a57fac071..2aaf48648 100644
--- a/doc/background/special_tut.qbk
+++ b/doc/background/special_tut.qbk
@@ -251,7 +251,7 @@ definition for the SC_ macro:
 
    // A couple of Boost.Test headers in case we need any BOOST_CHECK_* macros:
    #include <boost/test/unit_test.hpp>
-   #include <boost/test/floating_point_comparison.hpp>
+   #include <boost/test/tools/floating_point_comparison.hpp>
    // Our function to test:
    #include <boost/math/special_functions/my_special.hpp>
    // We need boost::array for our test data, plus a few headers from
diff --git a/example/test_cpp_float_close_fraction.cpp b/example/test_cpp_float_close_fraction.cpp
index 9b01ca629..b4699fad8 100644
--- a/example/test_cpp_float_close_fraction.cpp
+++ b/example/test_cpp_float_close_fraction.cpp
@@ -15,7 +15,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on"// Show library file details.
 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp> // Extra test tool for FP comparison.
+#include <boost/test/tools/floating_point_comparison.hpp> // Extra test tool for FP comparison.
 
 #include <iostream>
 #include <limits>
diff --git a/test/adaptive_gauss_kronrod_quadrature_test.cpp b/test/adaptive_gauss_kronrod_quadrature_test.cpp
index 919d03528..7b40829a2 100644
--- a/test/adaptive_gauss_kronrod_quadrature_test.cpp
+++ b/test/adaptive_gauss_kronrod_quadrature_test.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/quadrature/gauss_kronrod.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/catmull_rom_test.cpp b/test/catmull_rom_test.cpp
index d24cf772c..d2cfa4f29 100644
--- a/test/catmull_rom_test.cpp
+++ b/test/catmull_rom_test.cpp
@@ -11,7 +11,7 @@
 #include <boost/cstdfloat.hpp>
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/interpolators/catmull_rom.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/chebyshev_test.cpp b/test/chebyshev_test.cpp
index 6a99b1e29..b5dca51bc 100644
--- a/test/chebyshev_test.cpp
+++ b/test/chebyshev_test.cpp
@@ -9,7 +9,7 @@
 
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/chebyshev.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/chebyshev_transform_test.cpp b/test/chebyshev_transform_test.cpp
index 3aa27c613..fa6171be2 100644
--- a/test/chebyshev_transform_test.cpp
+++ b/test/chebyshev_transform_test.cpp
@@ -9,7 +9,7 @@
 #include <boost/cstdfloat.hpp>
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/chebyshev.hpp>
 #include <boost/math/special_functions/chebyshev_transform.hpp>
 #include <boost/math/special_functions/sinc.hpp>
diff --git a/test/complex_test.cpp b/test/complex_test.cpp
index 6d4cfe97e..aa6ae4325 100644
--- a/test/complex_test.cpp
+++ b/test/complex_test.cpp
@@ -5,7 +5,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/type_traits/is_same.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/mpl/if.hpp>
diff --git a/test/exp_sinh_quadrature_test.cpp b/test/exp_sinh_quadrature_test.cpp
index fc67d2bdb..f4a8883c9 100644
--- a/test/exp_sinh_quadrature_test.cpp
+++ b/test/exp_sinh_quadrature_test.cpp
@@ -10,7 +10,7 @@
 #include <boost/multiprecision/cpp_complex.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/quadrature/exp_sinh.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/math/special_functions/bessel.hpp>
diff --git a/test/float128/powm1_sqrtp1m1_test.cpp b/test/float128/powm1_sqrtp1m1_test.cpp
index 197a4b766..73972bb7a 100644
--- a/test/float128/powm1_sqrtp1m1_test.cpp
+++ b/test/float128/powm1_sqrtp1m1_test.cpp
@@ -10,7 +10,7 @@
 
 #include "setup.hpp"
 
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/powm1.hpp>
 #include <boost/math/special_functions/sqrt1pm1.hpp>
 
diff --git a/test/float128/setup.hpp b/test/float128/setup.hpp
index 0bf004544..f71f5c98e 100644
--- a/test/float128/setup.hpp
+++ b/test/float128/setup.hpp
@@ -22,7 +22,7 @@ BOOST_STATIC_ASSERT_MSG(std::numeric_limits<boost::floatmax_t>::digits == 113, "
 #ifndef BOOST_MATH_TEST_TYPE
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #endif
 
 #endif
diff --git a/test/float128/test_factorials.cpp b/test/float128/test_factorials.cpp
index 61bde0f18..36349fced 100644
--- a/test/float128/test_factorials.cpp
+++ b/test/float128/test_factorials.cpp
@@ -14,7 +14,7 @@
 #include <boost/cstdfloat.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/factorials.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/tools/stats.hpp>
diff --git a/test/float128/test_std_lib.cpp b/test/float128/test_std_lib.cpp
index b0f2dfbf6..de42c105c 100644
--- a/test/float128/test_std_lib.cpp
+++ b/test/float128/test_std_lib.cpp
@@ -6,7 +6,7 @@
 #include <boost/cstdfloat.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <iostream>
 
 BOOST_AUTO_TEST_CASE( test_main )
diff --git a/test/gauss_kronrod_quadrature_test.cpp b/test/gauss_kronrod_quadrature_test.cpp
index 5bd736fb4..3518ffcaa 100644
--- a/test/gauss_kronrod_quadrature_test.cpp
+++ b/test/gauss_kronrod_quadrature_test.cpp
@@ -14,7 +14,7 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/quadrature/gauss_kronrod.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/gauss_quadrature_test.cpp b/test/gauss_quadrature_test.cpp
index 993c7f1f9..61145db16 100644
--- a/test/gauss_quadrature_test.cpp
+++ b/test/gauss_quadrature_test.cpp
@@ -15,7 +15,7 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/quadrature/gauss.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/hypot_test.cpp b/test/hypot_test.cpp
index 5575cdd6e..7a8c5ddb6 100644
--- a/test/hypot_test.cpp
+++ b/test/hypot_test.cpp
@@ -8,7 +8,7 @@
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #define BOOST_TEST_MAIN 
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 
 #include <cmath>
diff --git a/test/lanczos_smoothing_test.cpp b/test/lanczos_smoothing_test.cpp
index f754f1217..e7dbeac07 100644
--- a/test/lanczos_smoothing_test.cpp
+++ b/test/lanczos_smoothing_test.cpp
@@ -12,7 +12,7 @@
 #include <boost/numeric/ublas/vector.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/differentiation/lanczos_smoothing.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
 #include <boost/math/special_functions/next.hpp> // for float_distance
diff --git a/test/log1p_expm1_test.cpp b/test/log1p_expm1_test.cpp
index e7c577f33..04d45e2c5 100644
--- a/test/log1p_expm1_test.cpp
+++ b/test/log1p_expm1_test.cpp
@@ -14,7 +14,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include "log1p_expm1_test.hpp"
 
diff --git a/test/naive_monte_carlo_test.cpp b/test/naive_monte_carlo_test.cpp
index 7096afb51..4e5cce76a 100644
--- a/test/naive_monte_carlo_test.cpp
+++ b/test/naive_monte_carlo_test.cpp
@@ -12,7 +12,7 @@
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
 
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/quadrature/naive_monte_carlo.hpp>
 
diff --git a/test/pow_test.cpp b/test/pow_test.cpp
index dad5f74d3..d004f0d9b 100644
--- a/test/pow_test.cpp
+++ b/test/pow_test.cpp
@@ -14,7 +14,7 @@
 #include <boost/math/tools/test.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/typeof/typeof.hpp>
 #include <boost/type_traits/is_same.hpp>
diff --git a/test/powm1_sqrtp1m1_test.cpp b/test/powm1_sqrtp1m1_test.cpp
index c1ba30810..c3a60b4c7 100644
--- a/test/powm1_sqrtp1m1_test.cpp
+++ b/test/powm1_sqrtp1m1_test.cpp
@@ -8,7 +8,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/test.hpp>
 #include "powm1_sqrtp1m1_test.hpp"
diff --git a/test/sinh_sinh_quadrature_test.cpp b/test/sinh_sinh_quadrature_test.cpp
index b9fe44795..8958d24b2 100644
--- a/test/sinh_sinh_quadrature_test.cpp
+++ b/test/sinh_sinh_quadrature_test.cpp
@@ -9,7 +9,7 @@
 #include <boost/multiprecision/cpp_complex.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/quadrature/sinh_sinh.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/tanh_sinh_quadrature_test.cpp b/test/tanh_sinh_quadrature_test.cpp
index e15ef9e5e..cec247e17 100644
--- a/test/tanh_sinh_quadrature_test.cpp
+++ b/test/tanh_sinh_quadrature_test.cpp
@@ -13,7 +13,7 @@
 
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/quadrature/tanh_sinh.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/test_0F1.hpp b/test/test_0F1.hpp
index ac0df4117..24774e030 100644
--- a/test/test_0F1.hpp
+++ b/test/test_0F1.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/big_constant.hpp>
diff --git a/test/test_1F0.hpp b/test/test_1F0.hpp
index 0677f0d7f..9c2e99692 100644
--- a/test/test_1F0.hpp
+++ b/test/test_1F0.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_1F1.hpp b/test/test_1F1.hpp
index ca66af097..c9aa61e04 100644
--- a/test/test_1F1.hpp
+++ b/test/test_1F1.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/big_constant.hpp>
diff --git a/test/test_1F1_log.hpp b/test/test_1F1_log.hpp
index 420c92bc1..52103fc28 100644
--- a/test/test_1F1_log.hpp
+++ b/test/test_1F1_log.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/big_constant.hpp>
diff --git a/test/test_1F1_regularized.hpp b/test/test_1F1_regularized.hpp
index 6f9d567ba..7655d4270 100644
--- a/test/test_1F1_regularized.hpp
+++ b/test/test_1F1_regularized.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/big_constant.hpp>
diff --git a/test/test_2F0.hpp b/test/test_2F0.hpp
index dd84c35b5..d0cacf9e3 100644
--- a/test/test_2F0.hpp
+++ b/test/test_2F0.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/big_constant.hpp>
diff --git a/test/test_airy.cpp b/test/test_airy.cpp
index 72e148e60..aba34665f 100644
--- a/test/test_airy.cpp
+++ b/test/test_airy.cpp
@@ -8,7 +8,7 @@
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_arcsine.cpp b/test/test_arcsine.cpp
index 187f6462c..ed7bb709b 100644
--- a/test/test_arcsine.cpp
+++ b/test/test_arcsine.cpp
@@ -30,7 +30,7 @@ using boost::math::constants::one_div_root_two;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 
 #include <cmath>
 
diff --git a/test/test_barycentric_rational.cpp b/test/test_barycentric_rational.cpp
index 87edb0c71..21d3b99dd 100644
--- a/test/test_barycentric_rational.cpp
+++ b/test/test_barycentric_rational.cpp
@@ -11,7 +11,7 @@
 #include <boost/random/uniform_real_distribution.hpp>
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/interpolators/barycentric_rational.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
 
diff --git a/test/test_bernoulli.cpp b/test/test_bernoulli.cpp
index 28b001d6a..dfef8cd32 100644
--- a/test/test_bernoulli.cpp
+++ b/test/test_bernoulli.cpp
@@ -29,7 +29,7 @@ using boost::math::bernoulli_distribution;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
 
 #include <iostream>
 using std::cout;
diff --git a/test/test_bessel_airy_zeros.cpp b/test/test_bessel_airy_zeros.cpp
index ce05ad190..e6d9b2ee2 100644
--- a/test/test_bessel_airy_zeros.cpp
+++ b/test/test_bessel_airy_zeros.cpp
@@ -24,7 +24,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <typeinfo>
 #include <iostream>
diff --git a/test/test_bessel_i.hpp b/test/test_bessel_i.hpp
index d29a21a25..338c8b07f 100644
--- a/test/test_bessel_i.hpp
+++ b/test/test_bessel_i.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_bessel_i_prime.hpp b/test/test_bessel_i_prime.hpp
index af56c6261..91d93128f 100644
--- a/test/test_bessel_i_prime.hpp
+++ b/test/test_bessel_i_prime.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_bessel_j.hpp b/test/test_bessel_j.hpp
index c23e6478e..5884ac9f1 100644
--- a/test/test_bessel_j.hpp
+++ b/test/test_bessel_j.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_bessel_j_prime.hpp b/test/test_bessel_j_prime.hpp
index 2f96adbeb..e9510c610 100644
--- a/test/test_bessel_j_prime.hpp
+++ b/test/test_bessel_j_prime.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_bessel_k.hpp b/test/test_bessel_k.hpp
index 50fd3d8d0..402df0bc4 100644
--- a/test/test_bessel_k.hpp
+++ b/test/test_bessel_k.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_bessel_k_prime.hpp b/test/test_bessel_k_prime.hpp
index 8a53897dc..caeb03e72 100644
--- a/test/test_bessel_k_prime.hpp
+++ b/test/test_bessel_k_prime.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_bessel_y.hpp b/test/test_bessel_y.hpp
index d940b0805..2e2c42435 100644
--- a/test/test_bessel_y.hpp
+++ b/test/test_bessel_y.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_bessel_y_prime.hpp b/test/test_bessel_y_prime.hpp
index 81866abba..b2a898828 100644
--- a/test/test_bessel_y_prime.hpp
+++ b/test/test_bessel_y_prime.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_beta.hpp b/test/test_beta.hpp
index 7fe055ab0..f620baea1 100644
--- a/test/test_beta.hpp
+++ b/test/test_beta.hpp
@@ -13,7 +13,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_beta_dist.cpp b/test/test_beta_dist.cpp
index b767d4189..249c646ef 100644
--- a/test/test_beta_dist.cpp
+++ b/test/test_beta_dist.cpp
@@ -42,7 +42,7 @@ using boost::math::beta;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 
 #include "test_out_of_range.hpp"
 
diff --git a/test/test_binomial.cpp b/test/test_binomial.cpp
index d20765d79..b4a72ae5c 100644
--- a/test/test_binomial.cpp
+++ b/test/test_binomial.cpp
@@ -36,7 +36,7 @@ using boost::math::binomial_distribution;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "table_type.hpp"
 
 #include "test_out_of_range.hpp"
diff --git a/test/test_binomial_coeff.hpp b/test/test_binomial_coeff.hpp
index 0b0a3ebc7..cfb8104eb 100644
--- a/test/test_binomial_coeff.hpp
+++ b/test/test_binomial_coeff.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/binomial.hpp>
 #include <boost/math/special_functions/trunc.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_carlson.hpp b/test/test_carlson.hpp
index 90109eb79..48b689091 100644
--- a/test/test_carlson.hpp
+++ b/test/test_carlson.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_cauchy.cpp b/test/test_cauchy.cpp
index 61bc34b23..17d604ff5 100644
--- a/test/test_cauchy.cpp
+++ b/test/test_cauchy.cpp
@@ -27,7 +27,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <iostream>
    using std::cout;
diff --git a/test/test_cbrt.hpp b/test/test_cbrt.hpp
index 8a03bfd43..49886a37b 100644
--- a/test/test_cbrt.hpp
+++ b/test/test_cbrt.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_chi_squared.cpp b/test/test_chi_squared.cpp
index a76745376..8f79b93a2 100644
--- a/test/test_chi_squared.cpp
+++ b/test/test_chi_squared.cpp
@@ -27,7 +27,7 @@ using boost::math::chi_squared;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 
 #include "test_out_of_range.hpp"
 
diff --git a/test/test_constants.cpp b/test/test_constants.cpp
index 10e28f333..2eeee86b2 100644
--- a/test/test_constants.cpp
+++ b/test/test_constants.cpp
@@ -22,7 +22,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/constants/constants.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_cstdfloat.cpp b/test/test_cstdfloat.cpp
index 28d64416a..5fcf5a4c1 100644
--- a/test/test_cstdfloat.cpp
+++ b/test/test_cstdfloat.cpp
@@ -23,7 +23,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/scoped_array.hpp>
 
 //
diff --git a/test/test_cubic_b_spline.cpp b/test/test_cubic_b_spline.cpp
index 8f4e66c65..812662862 100644
--- a/test/test_cubic_b_spline.cpp
+++ b/test/test_cubic_b_spline.cpp
@@ -11,7 +11,7 @@
 #include <boost/random/uniform_real_distribution.hpp>
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/interpolators/cubic_b_spline.hpp>
 #include <boost/math/interpolators/detail/cubic_b_spline_detail.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/test_difference.cpp b/test/test_difference.cpp
index 5c91ac813..b64f2835c 100644
--- a/test/test_difference.cpp
+++ b/test/test_difference.cpp
@@ -6,7 +6,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/next.hpp>
 #include <boost/math/special_functions/ulp.hpp>
 #include <boost/math/special_functions/relative_difference.hpp>
diff --git a/test/test_digamma.hpp b/test/test_digamma.hpp
index d63da432f..6b35a7aea 100644
--- a/test/test_digamma.hpp
+++ b/test/test_digamma.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
 #include "functor.hpp"
diff --git a/test/test_dist_overloads.cpp b/test/test_dist_overloads.cpp
index d9f54a2ad..5fd60fbb2 100644
--- a/test/test_dist_overloads.cpp
+++ b/test/test_dist_overloads.cpp
@@ -14,7 +14,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <iostream>
    using std::cout;
diff --git a/test/test_ellint_1.hpp b/test/test_ellint_1.hpp
index 0e94b324b..f3e1bf668 100644
--- a/test/test_ellint_1.hpp
+++ b/test/test_ellint_1.hpp
@@ -12,7 +12,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
 #include "functor.hpp"
diff --git a/test/test_ellint_2.hpp b/test/test_ellint_2.hpp
index a48e4cecb..4101dead5 100644
--- a/test/test_ellint_2.hpp
+++ b/test/test_ellint_2.hpp
@@ -12,7 +12,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
 #include "functor.hpp"
diff --git a/test/test_ellint_3.hpp b/test/test_ellint_3.hpp
index 770b08cdc..3e7cdef07 100644
--- a/test/test_ellint_3.hpp
+++ b/test/test_ellint_3.hpp
@@ -12,7 +12,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_ellint_d.hpp b/test/test_ellint_d.hpp
index 55d26cb78..46ec86b87 100644
--- a/test/test_ellint_d.hpp
+++ b/test/test_ellint_d.hpp
@@ -11,7 +11,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
 #include "functor.hpp"
diff --git a/test/test_erf.hpp b/test/test_erf.hpp
index 62d77a1f2..be4d64f62 100644
--- a/test/test_erf.hpp
+++ b/test/test_erf.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_expint.hpp b/test/test_expint.hpp
index 9dee309cc..491db2fcd 100644
--- a/test/test_expint.hpp
+++ b/test/test_expint.hpp
@@ -8,7 +8,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_exponential_dist.cpp b/test/test_exponential_dist.cpp
index c8d3fcd94..7dc5f6c24 100644
--- a/test/test_exponential_dist.cpp
+++ b/test/test_exponential_dist.cpp
@@ -15,7 +15,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
 #include <iostream>
diff --git a/test/test_extreme_value.cpp b/test/test_extreme_value.cpp
index d35e8ba7d..2729e3bb7 100644
--- a/test/test_extreme_value.cpp
+++ b/test/test_extreme_value.cpp
@@ -14,7 +14,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
 #include <iostream>
diff --git a/test/test_factorials.cpp b/test/test_factorials.cpp
index e63a61962..851f6462d 100644
--- a/test/test_factorials.cpp
+++ b/test/test_factorials.cpp
@@ -16,7 +16,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/factorials.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <boost/math/tools/stats.hpp>
diff --git a/test/test_find_location.cpp b/test/test_find_location.cpp
index 2f9676a96..e689351d8 100644
--- a/test/test_find_location.cpp
+++ b/test/test_find_location.cpp
@@ -32,7 +32,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
 
 #include <iostream>
 #include <iomanip>
diff --git a/test/test_find_scale.cpp b/test/test_find_scale.cpp
index 6d1076875..05e423e29 100644
--- a/test/test_find_scale.cpp
+++ b/test/test_find_scale.cpp
@@ -32,7 +32,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION, BOOST_CHECK_EQUAL...
 
 #include <iostream>
 #include <iomanip>
diff --git a/test/test_fisher_f.cpp b/test/test_fisher_f.cpp
index a7662b212..19db28056 100644
--- a/test/test_fisher_f.cpp
+++ b/test/test_fisher_f.cpp
@@ -17,7 +17,7 @@ using boost::math::fisher_f_distribution;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "test_out_of_range.hpp"
 
 #include <iostream>
diff --git a/test/test_gamma.hpp b/test/test_gamma.hpp
index 9b10da896..f259e963a 100644
--- a/test/test_gamma.hpp
+++ b/test/test_gamma.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_gamma_dist.cpp b/test/test_gamma_dist.cpp
index a8a7f79d9..7ee1ee5df 100644
--- a/test/test_gamma_dist.cpp
+++ b/test/test_gamma_dist.cpp
@@ -20,7 +20,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/gamma.hpp>
     using boost::math::gamma_distribution;
diff --git a/test/test_geometric.cpp b/test/test_geometric.cpp
index 5e00ab6fc..33fbb8d46 100644
--- a/test/test_geometric.cpp
+++ b/test/test_geometric.cpp
@@ -38,7 +38,7 @@ using boost::math::geometric; // using typedef for geometric_distribution<double
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 #include "test_out_of_range.hpp"
 
 #include <iostream>
diff --git a/test/test_hankel.cpp b/test/test_hankel.cpp
index 976775a4a..f961234d3 100644
--- a/test/test_hankel.cpp
+++ b/test/test_hankel.cpp
@@ -8,7 +8,7 @@
 #define BOOST_MATH_OVERFLOW_ERROR_POLICY ignore_error
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_hermite.hpp b/test/test_hermite.hpp
index a724b7e63..0b00677ee 100644
--- a/test/test_hermite.hpp
+++ b/test/test_hermite.hpp
@@ -14,7 +14,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_heuman_lambda.hpp b/test/test_heuman_lambda.hpp
index a76d8e247..023b2e712 100644
--- a/test/test_heuman_lambda.hpp
+++ b/test/test_heuman_lambda.hpp
@@ -11,7 +11,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_hyperexponential_dist.cpp b/test/test_hyperexponential_dist.cpp
index 5068a19c9..f739c0990 100644
--- a/test/test_hyperexponential_dist.cpp
+++ b/test/test_hyperexponential_dist.cpp
@@ -15,7 +15,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <cstddef>
 #include <iostream>
diff --git a/test/test_hypergeometric_dist.cpp b/test/test_hypergeometric_dist.cpp
index bc0541e67..e49ec301a 100644
--- a/test/test_hypergeometric_dist.cpp
+++ b/test/test_hypergeometric_dist.cpp
@@ -15,7 +15,7 @@
 #include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <iostream>
    using std::cout;
diff --git a/test/test_ibeta.hpp b/test/test_ibeta.hpp
index 829732446..2baa6c88a 100644
--- a/test/test_ibeta.hpp
+++ b/test/test_ibeta.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_ibeta_derivative.hpp b/test/test_ibeta_derivative.hpp
index 262548362..5bc7be584 100644
--- a/test/test_ibeta_derivative.hpp
+++ b/test/test_ibeta_derivative.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_ibeta_inv.hpp b/test/test_ibeta_inv.hpp
index 2f41f3437..6787fdb93 100644
--- a/test/test_ibeta_inv.hpp
+++ b/test/test_ibeta_inv.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_ibeta_inv_ab.hpp b/test/test_ibeta_inv_ab.hpp
index 995343af2..e270010e1 100644
--- a/test/test_ibeta_inv_ab.hpp
+++ b/test/test_ibeta_inv_ab.hpp
@@ -9,7 +9,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_igamma.hpp b/test/test_igamma.hpp
index 3268955b1..cdfa0b4c7 100644
--- a/test/test_igamma.hpp
+++ b/test/test_igamma.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_igamma_inv.hpp b/test/test_igamma_inv.hpp
index ce8273ea6..7330e918a 100644
--- a/test/test_igamma_inv.hpp
+++ b/test/test_igamma_inv.hpp
@@ -10,7 +10,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_igamma_inva.hpp b/test/test_igamma_inva.hpp
index 665a0c39c..402ea2f8b 100644
--- a/test/test_igamma_inva.hpp
+++ b/test/test_igamma_inva.hpp
@@ -12,7 +12,7 @@
 #include <boost/test/unit_test.hpp>
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_inv_hyp.cpp b/test/test_inv_hyp.cpp
index 4c2e0435e..18bfceb48 100644
--- a/test/test_inv_hyp.cpp
+++ b/test/test_inv_hyp.cpp
@@ -11,7 +11,7 @@
 #include <boost/math/special_functions/atanh.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_inverse_chi_squared_distribution.cpp b/test/test_inverse_chi_squared_distribution.cpp
index 8b18c2d5a..21b1a578f 100644
--- a/test/test_inverse_chi_squared_distribution.cpp
+++ b/test/test_inverse_chi_squared_distribution.cpp
@@ -21,7 +21,7 @@ using ::boost::math::concepts::real_concept;
 //#include <boost/math/tools/test.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 #include "test_out_of_range.hpp"
 
 #include <boost/math/distributions/inverse_chi_squared.hpp> // for inverse_chisquared_distribution
diff --git a/test/test_inverse_gamma_distribution.cpp b/test/test_inverse_gamma_distribution.cpp
index 60c3f6be3..bad1bb158 100644
--- a/test/test_inverse_gamma_distribution.cpp
+++ b/test/test_inverse_gamma_distribution.cpp
@@ -21,7 +21,7 @@ using ::boost::math::concepts::real_concept;
 //#include <boost/math/tools/test.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE_FRACTION
 #include "test_out_of_range.hpp"
 
 #include <boost/math/distributions/inverse_gamma.hpp> // for inverse_gamma_distribution
diff --git a/test/test_inverse_gaussian.cpp b/test/test_inverse_gaussian.cpp
index eb2bc84fa..2bb530312 100644
--- a/test/test_inverse_gaussian.cpp
+++ b/test/test_inverse_gaussian.cpp
@@ -20,7 +20,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/inverse_gaussian.hpp>
 using boost::math::inverse_gaussian_distribution;
diff --git a/test/test_jacobi.hpp b/test/test_jacobi.hpp
index 0c1f1b8b1..b6023ae69 100644
--- a/test/test_jacobi.hpp
+++ b/test/test_jacobi.hpp
@@ -12,7 +12,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/array.hpp>
 #include "functor.hpp"
diff --git a/test/test_jacobi_zeta.hpp b/test/test_jacobi_zeta.hpp
index 056d60efc..a8cc26f71 100644
--- a/test/test_jacobi_zeta.hpp
+++ b/test/test_jacobi_zeta.hpp
@@ -11,7 +11,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 //#include <boost/math/special_functions/next.hpp>
diff --git a/test/test_laguerre.hpp b/test/test_laguerre.hpp
index fd00d1a7e..a0542d121 100644
--- a/test/test_laguerre.hpp
+++ b/test/test_laguerre.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_lambert_w.cpp b/test/test_lambert_w.cpp
index b8a0502e6..15834b2cb 100644
--- a/test/test_lambert_w.cpp
+++ b/test/test_lambert_w.cpp
@@ -26,7 +26,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on" // Report library file details.
 #include <boost/test/included/unit_test.hpp> // Boost.Test
 // #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/array.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/test/test_lambert_w_derivative.cpp b/test/test_lambert_w_derivative.cpp
index aa8946efb..25f720924 100644
--- a/test/test_lambert_w_derivative.cpp
+++ b/test/test_lambert_w_derivative.cpp
@@ -21,7 +21,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on" // Report library file details.
 #include <boost/test/included/unit_test.hpp> // Boost.Test
 // #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/array.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/test/test_lambert_w_integrals_double.cpp b/test/test_lambert_w_integrals_double.cpp
index 4d27d5d10..35d514a7f 100644
--- a/test/test_lambert_w_integrals_double.cpp
+++ b/test/test_lambert_w_integrals_double.cpp
@@ -17,7 +17,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on" // Report library file details.
 #include <boost/test/included/unit_test.hpp> // Boost.Test
 // #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/array.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/test/test_lambert_w_integrals_float.cpp b/test/test_lambert_w_integrals_float.cpp
index 58ceb8efa..220d18148 100644
--- a/test/test_lambert_w_integrals_float.cpp
+++ b/test/test_lambert_w_integrals_float.cpp
@@ -17,7 +17,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on" // Report library file details.
 #include <boost/test/included/unit_test.hpp> // Boost.Test
 // #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/array.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/test/test_lambert_w_integrals_float128.cpp b/test/test_lambert_w_integrals_float128.cpp
index 1010b138d..1bc774318 100644
--- a/test/test_lambert_w_integrals_float128.cpp
+++ b/test/test_lambert_w_integrals_float128.cpp
@@ -19,7 +19,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on" // Report library file details.
 #include <boost/test/included/unit_test.hpp> // Boost.Test
 // #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/array.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/test/test_lambert_w_integrals_long_double.cpp b/test/test_lambert_w_integrals_long_double.cpp
index 2442bc47c..62f69cc06 100644
--- a/test/test_lambert_w_integrals_long_double.cpp
+++ b/test/test_lambert_w_integrals_long_double.cpp
@@ -17,7 +17,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on" // Report library file details.
 #include <boost/test/included/unit_test.hpp> // Boost.Test
 // #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/array.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/test/test_lambert_w_integrals_quad.cpp b/test/test_lambert_w_integrals_quad.cpp
index 7e7fe08d2..e8d48348b 100644
--- a/test/test_lambert_w_integrals_quad.cpp
+++ b/test/test_lambert_w_integrals_quad.cpp
@@ -17,7 +17,7 @@
 #define BOOST_LIB_DIAGNOSTIC "on" // Report library file details.
 #include <boost/test/included/unit_test.hpp> // Boost.Test
 // #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/array.hpp>
 #include <boost/lexical_cast.hpp>
diff --git a/test/test_legendre.hpp b/test/test_legendre.hpp
index 2f5b04fd2..b260050b1 100644
--- a/test/test_legendre.hpp
+++ b/test/test_legendre.hpp
@@ -11,7 +11,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/special_functions/legendre.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_logistic_dist.cpp b/test/test_logistic_dist.cpp
index 34b2b32c0..eeb23ced6 100644
--- a/test/test_logistic_dist.cpp
+++ b/test/test_logistic_dist.cpp
@@ -23,7 +23,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
 #include <iostream>
diff --git a/test/test_lognormal.cpp b/test/test_lognormal.cpp
index 081e51780..d124c06ce 100644
--- a/test/test_lognormal.cpp
+++ b/test/test_lognormal.cpp
@@ -11,7 +11,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/lognormal.hpp>
     using boost::math::lognormal_distribution;
diff --git a/test/test_long_double_support.cpp b/test/test_long_double_support.cpp
index 2830142b6..2175b8e3b 100644
--- a/test/test_long_double_support.cpp
+++ b/test/test_long_double_support.cpp
@@ -13,7 +13,7 @@
 #include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <iostream>
 #include <iomanip>
diff --git a/test/test_minima.cpp b/test/test_minima.cpp
index e2f8560be..80314b9cb 100644
--- a/test/test_minima.cpp
+++ b/test/test_minima.cpp
@@ -10,7 +10,7 @@
 #include <boost/math/tools/minima.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/gamma.hpp>
 #include <iostream>
 #include <iomanip>
diff --git a/test/test_nc_beta.cpp b/test/test_nc_beta.cpp
index d0bec54f1..81b80fa1f 100644
--- a/test/test_nc_beta.cpp
+++ b/test/test_nc_beta.cpp
@@ -30,7 +30,7 @@
 #include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 
 #include "functor.hpp"
 #include "handle_test_result.hpp"
diff --git a/test/test_nc_beta.hpp b/test/test_nc_beta.hpp
index 5db1ebf46..3ba983adc 100644
--- a/test/test_nc_beta.hpp
+++ b/test/test_nc_beta.hpp
@@ -9,7 +9,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/distributions/non_central_beta.hpp> 
 #include <boost/math/distributions/poisson.hpp> 
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_nc_chi_squared.cpp b/test/test_nc_chi_squared.cpp
index f1f0b6456..cfebb2363 100644
--- a/test/test_nc_chi_squared.cpp
+++ b/test/test_nc_chi_squared.cpp
@@ -28,7 +28,7 @@
 #include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "test_out_of_range.hpp"
 
 #include "functor.hpp"
diff --git a/test/test_nc_chi_squared.hpp b/test/test_nc_chi_squared.hpp
index e5a8ffd9a..ad6e58afa 100644
--- a/test/test_nc_chi_squared.hpp
+++ b/test/test_nc_chi_squared.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/distributions/non_central_chi_squared.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_nc_f.cpp b/test/test_nc_f.cpp
index b1a3d354f..22a587be1 100644
--- a/test/test_nc_f.cpp
+++ b/test/test_nc_f.cpp
@@ -27,7 +27,7 @@
 #include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "test_out_of_range.hpp"
 
 #include "functor.hpp"
diff --git a/test/test_nc_t.cpp b/test/test_nc_t.cpp
index e6e781a9a..d9a8d4ed7 100644
--- a/test/test_nc_t.cpp
+++ b/test/test_nc_t.cpp
@@ -30,7 +30,7 @@
 #include <boost/test/unit_test.hpp> // for test_main
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 
 #include "functor.hpp"
 #include "handle_test_result.hpp"
diff --git a/test/test_nc_t.hpp b/test/test_nc_t.hpp
index 7a29dc9ae..9cb8cb9dc 100644
--- a/test/test_nc_t.hpp
+++ b/test/test_nc_t.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/distributions/non_central_t.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_negative_binomial.cpp b/test/test_negative_binomial.cpp
index f2e909ded..069ebf879 100644
--- a/test/test_negative_binomial.cpp
+++ b/test/test_negative_binomial.cpp
@@ -38,7 +38,7 @@ using boost::math::negative_binomial_distribution;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // for test_main
-#include <boost/test/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
+#include <boost/test/tools/floating_point_comparison.hpp> // for BOOST_CHECK_CLOSE
 #include "table_type.hpp"
 #include "test_out_of_range.hpp"
 
diff --git a/test/test_next.cpp b/test/test_next.cpp
index 11e7a870a..adc890e6e 100644
--- a/test/test_next.cpp
+++ b/test/test_next.cpp
@@ -9,7 +9,7 @@
 #include <boost/math/tools/test.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/next.hpp>
 #include <boost/math/special_functions/ulp.hpp>
 #include <boost/multiprecision/cpp_bin_float.hpp>
diff --git a/test/test_next_decimal.cpp b/test/test_next_decimal.cpp
index 4245e3a49..56e5d3eb0 100644
--- a/test/test_next_decimal.cpp
+++ b/test/test_next_decimal.cpp
@@ -9,7 +9,7 @@
 #include <boost/math/tools/test.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/next.hpp>
 #include <boost/math/special_functions/ulp.hpp>
 #include <boost/multiprecision/cpp_dec_float.hpp>
diff --git a/test/test_normal.cpp b/test/test_normal.cpp
index 275af0f80..757e942c6 100644
--- a/test/test_normal.cpp
+++ b/test/test_normal.cpp
@@ -27,7 +27,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/normal.hpp>
     using boost::math::normal_distribution;
diff --git a/test/test_numerical_differentiation.cpp b/test/test_numerical_differentiation.cpp
index c6fb46d81..1b2f53962 100644
--- a/test/test_numerical_differentiation.cpp
+++ b/test/test_numerical_differentiation.cpp
@@ -10,7 +10,7 @@
 #include <iostream>
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/bessel.hpp>
 #include <boost/math/special_functions/bessel_prime.hpp>
 #include <boost/math/special_functions/next.hpp>
diff --git a/test/test_owens_t.cpp b/test/test_owens_t.cpp
index 2c234d292..cee111db5 100644
--- a/test/test_owens_t.cpp
+++ b/test/test_owens_t.cpp
@@ -35,7 +35,7 @@ using boost::math::owens_t;
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/array.hpp>
 
 #include "libs/math/test/handle_test_result.hpp"
diff --git a/test/test_owens_t.hpp b/test/test_owens_t.hpp
index 12bae1dfb..d16ebd386 100644
--- a/test/test_owens_t.hpp
+++ b/test/test_owens_t.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/distributions/normal.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_pFq.hpp b/test/test_pFq.hpp
index dafdbb11d..50897ab9c 100644
--- a/test/test_pFq.hpp
+++ b/test/test_pFq.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/big_constant.hpp>
diff --git a/test/test_pFq_precision.cpp b/test/test_pFq_precision.cpp
index 069aacb1c..6e030c01e 100644
--- a/test/test_pFq_precision.cpp
+++ b/test/test_pFq_precision.cpp
@@ -5,7 +5,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/tools/big_constant.hpp>
diff --git a/test/test_pareto.cpp b/test/test_pareto.cpp
index 7ba74e911..7ea38740b 100644
--- a/test/test_pareto.cpp
+++ b/test/test_pareto.cpp
@@ -27,7 +27,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/pareto.hpp>
     using boost::math::pareto_distribution;
diff --git a/test/test_poisson.cpp b/test/test_poisson.cpp
index 3a65337f9..3d54e5a92 100644
--- a/test/test_poisson.cpp
+++ b/test/test_poisson.cpp
@@ -25,7 +25,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/distributions/poisson.hpp>
diff --git a/test/test_policy_sf.cpp b/test/test_policy_sf.cpp
index fdd922cbe..93701c3e7 100644
--- a/test/test_policy_sf.cpp
+++ b/test/test_policy_sf.cpp
@@ -5,7 +5,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions.hpp>
 
 //
diff --git a/test/test_polygamma.hpp b/test/test_polygamma.hpp
index 94532fd0a..53b316564 100644
--- a/test/test_polygamma.hpp
+++ b/test/test_polygamma.hpp
@@ -10,7 +10,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_rational_instances/test_rational.hpp b/test/test_rational_instances/test_rational.hpp
index 722c26bbc..e5e5ff1b7 100644
--- a/test/test_rational_instances/test_rational.hpp
+++ b/test/test_rational_instances/test_rational.hpp
@@ -7,7 +7,7 @@
 #ifndef BOOST_MATH_TEST_RATIONAL_HPP
 #define BOOST_MATH_TEST_RATIONAL_HPP
 
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/test/unit_test.hpp>
 #include <boost/array.hpp>
 #include <boost/math/tools/rational.hpp>
diff --git a/test/test_rationals.cpp b/test/test_rationals.cpp
index b6f3c3a51..bdb77f7fe 100644
--- a/test/test_rationals.cpp
+++ b/test/test_rationals.cpp
@@ -6,7 +6,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/array.hpp>
 #include <boost/math/tools/rational.hpp>
 #include <iostream>
diff --git a/test/test_rayleigh.cpp b/test/test_rayleigh.cpp
index df8abf5a8..242ec32f4 100644
--- a/test/test_rayleigh.cpp
+++ b/test/test_rayleigh.cpp
@@ -19,7 +19,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include "test_out_of_range.hpp"
 
 #include <iostream>
diff --git a/test/test_real_concept.cpp b/test/test_real_concept.cpp
index 661027de8..187e36fb8 100644
--- a/test/test_real_concept.cpp
+++ b/test/test_real_concept.cpp
@@ -11,7 +11,7 @@
 #include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <iostream>
 #include <iomanip>
 
diff --git a/test/test_recurrence.cpp b/test/test_recurrence.cpp
index 378fcc1ac..cb2de886c 100644
--- a/test/test_recurrence.cpp
+++ b/test/test_recurrence.cpp
@@ -12,7 +12,7 @@
 #include <boost/math/tools/recurrence.hpp>
 #include <boost/math/special_functions/bessel.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 
 #ifdef BOOST_MSVC
diff --git a/test/test_remez.cpp b/test/test_remez.cpp
index 02112cc0e..8009d34bd 100644
--- a/test/test_remez.cpp
+++ b/test/test_remez.cpp
@@ -16,7 +16,7 @@
 #include <boost/math/tools/remez.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/expm1.hpp>
 #include <iostream>
 #include <iomanip>
diff --git a/test/test_root_finding_concepts.cpp b/test/test_root_finding_concepts.cpp
index 4552a6119..60543f92a 100644
--- a/test/test_root_finding_concepts.cpp
+++ b/test/test_root_finding_concepts.cpp
@@ -9,7 +9,7 @@
 #include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/tuple/tuple.hpp>
 #include <boost/fusion/include/tuple.hpp>
 #include <boost/fusion/include/std_pair.hpp>
diff --git a/test/test_root_iterations.cpp b/test/test_root_iterations.cpp
index db45e69e1..973f8550f 100644
--- a/test/test_root_iterations.cpp
+++ b/test/test_root_iterations.cpp
@@ -9,7 +9,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/roots.hpp>
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/test/test_roots.cpp b/test/test_roots.cpp
index 73a81ccba..5a2eeece8 100644
--- a/test/test_roots.cpp
+++ b/test/test_roots.cpp
@@ -7,7 +7,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/test/results_collector.hpp>
 #include <boost/math/special_functions/beta.hpp>
 #include <boost/math/distributions/skew_normal.hpp>
diff --git a/test/test_round.cpp b/test/test_round.cpp
index 350eb41f3..6475ac295 100644
--- a/test/test_round.cpp
+++ b/test/test_round.cpp
@@ -9,7 +9,7 @@
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
 #include <boost/math/tools/test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/round.hpp>
 #include <boost/math/special_functions/next.hpp>
 #include <boost/math/special_functions/trunc.hpp>
diff --git a/test/test_sign.cpp b/test/test_sign.cpp
index 80be14bbb..27ba7b792 100644
--- a/test/test_sign.cpp
+++ b/test/test_sign.cpp
@@ -12,7 +12,7 @@
 #include <boost/test/unit_test.hpp> // Boost.Test
 #include <boost/test/results_collector.hpp>
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <iostream>
    using std::cout;
diff --git a/test/test_sinc.hpp b/test/test_sinc.hpp
index a35cc47d8..6f169ffdf 100644
--- a/test/test_sinc.hpp
+++ b/test/test_sinc.hpp
@@ -6,7 +6,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/sinc.hpp>
 #include <boost/array.hpp>
 #include "functor.hpp"
diff --git a/test/test_skew_normal.cpp b/test/test_skew_normal.cpp
index 41aea4711..24a70694b 100644
--- a/test/test_skew_normal.cpp
+++ b/test/test_skew_normal.cpp
@@ -19,7 +19,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/skew_normal.hpp>
 using boost::math::skew_normal_distribution;
diff --git a/test/test_spherical_harmonic.cpp b/test/test_spherical_harmonic.cpp
index 91a616c86..fb33acdd6 100644
--- a/test/test_spherical_harmonic.cpp
+++ b/test/test_spherical_harmonic.cpp
@@ -8,7 +8,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_spherical_harmonic.hpp b/test/test_spherical_harmonic.hpp
index ebe37dd75..0fe578eee 100644
--- a/test/test_spherical_harmonic.hpp
+++ b/test/test_spherical_harmonic.hpp
@@ -7,7 +7,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
 #include <boost/array.hpp>
diff --git a/test/test_students_t.cpp b/test/test_students_t.cpp
index 87423a380..1f12b998b 100644
--- a/test/test_students_t.cpp
+++ b/test/test_students_t.cpp
@@ -20,7 +20,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #include <boost/math/tools/test.hpp> // for real_concept
diff --git a/test/test_tgamma_ratio.hpp b/test/test_tgamma_ratio.hpp
index 80ce9de68..23f1946fc 100644
--- a/test/test_tgamma_ratio.hpp
+++ b/test/test_tgamma_ratio.hpp
@@ -9,7 +9,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
diff --git a/test/test_toms748_solve.cpp b/test/test_toms748_solve.cpp
index 8a632a9f2..5a40055cc 100644
--- a/test/test_toms748_solve.cpp
+++ b/test/test_toms748_solve.cpp
@@ -7,7 +7,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/tools/toms748_solve.hpp>
 #include <boost/math/special_functions/gamma.hpp>
diff --git a/test/test_tr1.cpp b/test/test_tr1.cpp
index 61bd57e70..ec7c883f0 100644
--- a/test/test_tr1.cpp
+++ b/test/test_tr1.cpp
@@ -5,7 +5,7 @@
 
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/precision.hpp>
 #include <math.h>  // ldexpf
 #include <iostream>
diff --git a/test/test_trapezoidal.cpp b/test/test_trapezoidal.cpp
index be40f61c6..6f78c8b83 100644
--- a/test/test_trapezoidal.cpp
+++ b/test/test_trapezoidal.cpp
@@ -10,7 +10,7 @@
 #include <boost/config.hpp>
 //#include <boost/multiprecision/mpc.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/concepts/real_concept.hpp>
 #include <boost/math/special_functions/bessel.hpp>
 #include <boost/math/quadrature/trapezoidal.hpp>
diff --git a/test/test_triangular.cpp b/test/test_triangular.cpp
index 23500913c..b0620a6a3 100644
--- a/test/test_triangular.cpp
+++ b/test/test_triangular.cpp
@@ -18,7 +18,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/triangular.hpp>
 using boost::math::triangular_distribution;
diff --git a/test/test_trig.hpp b/test/test_trig.hpp
index 1912d2e6a..1092815fb 100644
--- a/test/test_trig.hpp
+++ b/test/test_trig.hpp
@@ -6,7 +6,7 @@
 #include <boost/math/concepts/real_concept.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/special_functions/math_fwd.hpp>
 #include <boost/math/constants/constants.hpp>
 #include <boost/type_traits/is_floating_point.hpp>
diff --git a/test/test_trigamma.hpp b/test/test_trigamma.hpp
index df1fdde2b..9ebaa03bf 100644
--- a/test/test_trigamma.hpp
+++ b/test/test_trigamma.hpp
@@ -9,7 +9,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>
diff --git a/test/test_uniform.cpp b/test/test_uniform.cpp
index 010fc144d..daa89387d 100644
--- a/test/test_uniform.cpp
+++ b/test/test_uniform.cpp
@@ -18,7 +18,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/uniform.hpp>
     using boost::math::uniform_distribution;
diff --git a/test/test_vector_barycentric_rational.cpp b/test/test_vector_barycentric_rational.cpp
index 6250fa897..c296add3e 100644
--- a/test/test_vector_barycentric_rational.cpp
+++ b/test/test_vector_barycentric_rational.cpp
@@ -14,7 +14,7 @@
 #include <boost/random/uniform_real_distribution.hpp>
 #include <boost/type_index.hpp>
 #include <boost/test/included/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/interpolators/barycentric_rational.hpp>
 #include <boost/math/interpolators/vector_barycentric_rational.hpp>
 
diff --git a/test/test_weibull.cpp b/test/test_weibull.cpp
index 0d5b0407b..f56b08f23 100644
--- a/test/test_weibull.cpp
+++ b/test/test_weibull.cpp
@@ -16,7 +16,7 @@
 #include <boost/math/concepts/real_concept.hpp> // for real_concept
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp> // Boost.Test
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 
 #include <boost/math/distributions/weibull.hpp>
     using boost::math::weibull_distribution;
diff --git a/test/test_zeta.hpp b/test/test_zeta.hpp
index 7ac55cdad..52d92810c 100644
--- a/test/test_zeta.hpp
+++ b/test/test_zeta.hpp
@@ -8,7 +8,7 @@
 #include <boost/math/special_functions/math_fwd.hpp>
 #define BOOST_TEST_MAIN
 #include <boost/test/unit_test.hpp>
-#include <boost/test/floating_point_comparison.hpp>
+#include <boost/test/tools/floating_point_comparison.hpp>
 #include <boost/math/tools/stats.hpp>
 #include <boost/math/tools/test.hpp>
 #include <boost/math/constants/constants.hpp>