diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 4adb29d160..9fa02a6901 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -885,7 +885,9 @@ test-suite distribution_tests :
    [ run test_lexical_cast.cpp /boost/test//boost_unit_test_framework  ]
    [ run test_nonfinite_trap.cpp /boost/test//boost_unit_test_framework : : : <exception-handling>off:<build>no  ]
    [ run test_signed_zero.cpp /boost/test//boost_unit_test_framework  ]
-   [ run complex_test.cpp /boost/test//boost_unit_test_framework  ]
+   
+   # Deprecated for a few cycles, and now causes collisions with boost::math::complex
+   # [ run complex_test.cpp /boost/test//boost_unit_test_framework  ]
 
    [ compile test_dist_deduction_guides.cpp : [ requires cpp_deduction_guides cpp_variadic_templates ] ]
    [ run git_issue_800.cpp /boost/test//boost_unit_test_framework  ]
diff --git a/test/special_functions_test.cpp b/test/special_functions_test.cpp
index 8ea88c193c..d655adf631 100644
--- a/test/special_functions_test.cpp
+++ b/test/special_functions_test.cpp
@@ -53,11 +53,11 @@ typedef boost::mpl::list<float,double,long double>  near_eps_test_types;
 
 #include "sinc_test.hpp"
 #include "sinhc_test.hpp"
-#include "atanh_test.hpp"
-#include "asinh_test.hpp"
-#include "acosh_test.hpp"
-
 
+// Deprecated and cause collisions with cuda::std::complex
+//#include "atanh_test.hpp"
+//#include "asinh_test.hpp"
+//#include "acosh_test.hpp"
 
 boost::unit_test::test_suite *    init_unit_test_suite(int, char *[])
 {
@@ -83,9 +83,6 @@ boost::unit_test::test_suite *    init_unit_test_suite(int, char *[])
     
     
 #define BOOST_SPECIAL_FUNCTIONS_COMMON_TEST             \
-    BOOST_SPECIAL_FUNCTIONS_COMMON_GENERATOR(atanh)     \
-    BOOST_SPECIAL_FUNCTIONS_COMMON_GENERATOR(asinh)     \
-    BOOST_SPECIAL_FUNCTIONS_COMMON_GENERATOR(acosh)     \
     BOOST_SPECIAL_FUNCTIONS_COMMON_GENERATOR(sinc_pi)   \
     BOOST_SPECIAL_FUNCTIONS_COMMON_GENERATOR(sinhc_pi)
     
@@ -134,9 +131,9 @@ boost::unit_test::test_suite *    init_unit_test_suite(int, char *[])
     
     BOOST_TEST_MESSAGE(" ");
     
-    test->add(BOOST_TEST_CASE(atanh_manual_check));
-    test->add(BOOST_TEST_CASE(asinh_manual_check));
-    test->add(BOOST_TEST_CASE(acosh_manual_check));
+    // test->add(BOOST_TEST_CASE(atanh_manual_check));
+    // test->add(BOOST_TEST_CASE(asinh_manual_check));
+    // test->add(BOOST_TEST_CASE(acosh_manual_check));
     test->add(BOOST_TEST_CASE(sinc_pi_manual_check));
     test->add(BOOST_TEST_CASE(sinhc_pi_manual_check));