diff --git a/hash/test/hash_built_in_array_test.cpp b/hash/test/hash_built_in_array_test.cpp
index a63216e..a06f7c4 100644
--- a/hash/test/hash_built_in_array_test.cpp
+++ b/hash/test/hash_built_in_array_test.cpp
@@ -14,12 +14,12 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
-BOOST_AUTO_UNIT_TEST(array_int_test)
+BOOST_AUTO_TEST_CASE(array_int_test)
 {
     const int length1 = 25;
     int array1[25] = {
@@ -47,7 +47,7 @@ BOOST_AUTO_UNIT_TEST(array_int_test)
             == HASH_NAMESPACE::hash_range(array3, array3 + length3));
 }
 
-BOOST_AUTO_UNIT_TEST(two_dimensional_array_test)
+BOOST_AUTO_TEST_CASE(two_dimensional_array_test)
 {
     int array[3][2] = {{-5, 6}, {7, -3}, {26, 1}};
     HASH_NAMESPACE::hash<int[3][2]> hasher;
diff --git a/hash/test/hash_custom_test.cpp b/hash/test/hash_custom_test.cpp
index 3cbe6e9..37447eb 100644
--- a/hash/test/hash_custom_test.cpp
+++ b/hash/test/hash_custom_test.cpp
@@ -49,7 +49,7 @@ namespace boost
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS
@@ -58,7 +58,7 @@ namespace boost
 #include <string>
 #include <cctype>
 
-BOOST_AUTO_UNIT_TEST(custom_tests)
+BOOST_AUTO_TEST_CASE(custom_tests)
 {
     HASH_NAMESPACE::hash<test::custom> custom_hasher;
     BOOST_CHECK(custom_hasher(10) == 100u);
diff --git a/hash/test/hash_deque_test.cpp b/hash/test/hash_deque_test.cpp
index 1cd7fe8..581c422 100644
--- a/hash/test/hash_deque_test.cpp
+++ b/hash/test/hash_deque_test.cpp
@@ -14,7 +14,7 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS
diff --git a/hash/test/hash_float_test.cpp b/hash/test/hash_float_test.cpp
index bfb9f8a..ff039b7 100644
--- a/hash/test/hash_float_test.cpp
+++ b/hash/test/hash_float_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash/hash.hpp>
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include <cmath>
@@ -193,7 +193,7 @@ void float_tests(char const* name, T* = 0)
 #endif
 }
 
-BOOST_AUTO_UNIT_TEST(hash_float_tests)
+BOOST_AUTO_TEST_CASE(hash_float_tests)
 {
     std::cout<<"Compiler: "<<BOOST_COMPILER<<"\n";
     std::cout<<"Platform: "<<BOOST_PLATFORM<<"\n";
@@ -202,12 +202,12 @@ BOOST_AUTO_UNIT_TEST(hash_float_tests)
     float_tests("float", (float*) 0);
 }
 
-BOOST_AUTO_UNIT_TEST(hash_double_tests)
+BOOST_AUTO_TEST_CASE(hash_double_tests)
 {
     float_tests("double", (double*) 0);
 }
 
-BOOST_AUTO_UNIT_TEST(hash_long_double_tests)
+BOOST_AUTO_TEST_CASE(hash_long_double_tests)
 {
     float_tests("long double", (long double*) 0);
 }
diff --git a/hash/test/hash_function_pointer_test.cpp b/hash/test/hash_function_pointer_test.cpp
index a9d22a5..b4f3fc1 100644
--- a/hash/test/hash_function_pointer_test.cpp
+++ b/hash/test/hash_function_pointer_test.cpp
@@ -12,7 +12,7 @@
 #  include <boost/functional/hash/hash.hpp>
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include <boost/limits.hpp>
@@ -26,7 +26,7 @@ void void_func2() { static int x = 2; --x; }
 int int_func1(int) { return 0; }
 int int_func2(int) { return 1; }
 
-BOOST_AUTO_UNIT_TEST(function_pointer_tests)
+BOOST_AUTO_TEST_CASE(function_pointer_tests)
 {
     compile_time_tests((void(**)()) 0);
     compile_time_tests((int(**)(int)) 0);
diff --git a/hash/test/hash_list_test.cpp b/hash/test/hash_list_test.cpp
index bfa962b..5d13a41 100644
--- a/hash/test/hash_list_test.cpp
+++ b/hash/test/hash_list_test.cpp
@@ -14,7 +14,7 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS
diff --git a/hash/test/hash_map_test.cpp b/hash/test/hash_map_test.cpp
index ffce08f..b2fa323 100644
--- a/hash/test/hash_map_test.cpp
+++ b/hash/test/hash_map_test.cpp
@@ -14,7 +14,7 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include <map>
diff --git a/hash/test/hash_map_test.hpp b/hash/test/hash_map_test.hpp
index f4d6164..59fc221 100644
--- a/hash/test/hash_map_test.hpp
+++ b/hash/test/hash_map_test.hpp
@@ -52,7 +52,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         }
     }
 
-    BOOST_AUTO_UNIT_TEST(BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests))
+    BOOST_AUTO_TEST_CASE(BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests))
     {
         integer_tests((CONTAINER_TYPE<char, unsigned char>*) 0);
         integer_tests((CONTAINER_TYPE<int, float>*) 0);
diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp
index 00f5f52..f74fa45 100644
--- a/hash/test/hash_number_test.cpp
+++ b/hash/test/hash_number_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash/hash.hpp>
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include <boost/preprocessor/cat.hpp>
@@ -106,7 +106,7 @@ void poor_quality_tests(T*)
 }
 
 #define NUMERIC_TEST(type, name) \
-    BOOST_AUTO_UNIT_TEST(BOOST_PP_CAT(test_, name)) { \
+    BOOST_AUTO_TEST_CASE(BOOST_PP_CAT(test_, name)) { \
         numeric_test((type*) 0); \
         limits_test((type*) 0); \
         poor_quality_tests((type*) 0); \
diff --git a/hash/test/hash_pointer_test.cpp b/hash/test/hash_pointer_test.cpp
index e24551f..d0096b9 100644
--- a/hash/test/hash_pointer_test.cpp
+++ b/hash/test/hash_pointer_test.cpp
@@ -12,7 +12,7 @@
 #  include <boost/functional/hash/hash.hpp>
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include <boost/limits.hpp>
@@ -21,7 +21,7 @@
 
 #include "./compile_time.hpp"
 
-BOOST_AUTO_UNIT_TEST(pointer_tests)
+BOOST_AUTO_TEST_CASE(pointer_tests)
 {
     compile_time_tests((int**) 0);
     compile_time_tests((void**) 0);
diff --git a/hash/test/hash_range_test.cpp b/hash/test/hash_range_test.cpp
index e5a652c..a73fbf0 100644
--- a/hash/test/hash_range_test.cpp
+++ b/hash/test/hash_range_test.cpp
@@ -13,7 +13,7 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS
@@ -22,7 +22,7 @@
 #include <boost/mpl/assert.hpp>
 #include <boost/type_traits/is_base_and_derived.hpp>
 
-BOOST_AUTO_UNIT_TEST(hash_range_tests)
+BOOST_AUTO_TEST_CASE(hash_range_tests)
 {
     std::vector<int> empty, values1, values2, values3, values4, values5;
     values1.push_back(0);
diff --git a/hash/test/hash_sequence_test.hpp b/hash/test/hash_sequence_test.hpp
index 6a9e8db..d957091 100644
--- a/hash/test/hash_sequence_test.hpp
+++ b/hash/test/hash_sequence_test.hpp
@@ -55,7 +55,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         }
     }
 
-    BOOST_AUTO_UNIT_TEST(BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests))
+    BOOST_AUTO_TEST_CASE(BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests))
     {
         integer_tests((CONTAINER_TYPE<char>*) 0);
         integer_tests((CONTAINER_TYPE<int>*) 0);
diff --git a/hash/test/hash_set_test.cpp b/hash/test/hash_set_test.cpp
index df54894..11da0fc 100644
--- a/hash/test/hash_set_test.cpp
+++ b/hash/test/hash_set_test.cpp
@@ -14,7 +14,7 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS
diff --git a/hash/test/hash_set_test.hpp b/hash/test/hash_set_test.hpp
index 76fb820..b43f4aa 100644
--- a/hash/test/hash_set_test.hpp
+++ b/hash/test/hash_set_test.hpp
@@ -53,7 +53,7 @@ namespace BOOST_PP_CAT(CONTAINER_TYPE, _tests)
         }
     }
 
-    BOOST_AUTO_UNIT_TEST(BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests))
+    BOOST_AUTO_TEST_CASE(BOOST_PP_CAT(CONTAINER_TYPE, _hash_integer_tests))
     {
         integer_tests((CONTAINER_TYPE<char>*) 0);
         integer_tests((CONTAINER_TYPE<int>*) 0);
diff --git a/hash/test/hash_string_test.cpp b/hash/test/hash_string_test.cpp
index a36f345..df50cb0 100644
--- a/hash/test/hash_string_test.cpp
+++ b/hash/test/hash_string_test.cpp
@@ -11,7 +11,7 @@
 #  include <boost/functional/hash/hash.hpp>
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #include <boost/limits.hpp>
@@ -20,7 +20,7 @@
 
 #include "./compile_time.hpp"
 
-BOOST_AUTO_UNIT_TEST(string_tests)
+BOOST_AUTO_TEST_CASE(string_tests)
 {
     compile_time_tests((std::string*) 0);
 
@@ -44,7 +44,7 @@ BOOST_AUTO_UNIT_TEST(string_tests)
 }
 
 #if !defined(BOOST_NO_STD_WSTRING)
-BOOST_AUTO_UNIT_TEST(wstring_tests)
+BOOST_AUTO_TEST_CASE(wstring_tests)
 {
     compile_time_tests((std::wstring*) 0);
 
diff --git a/hash/test/hash_value_array_test.cpp b/hash/test/hash_value_array_test.cpp
index 1ebb24e..1e9a7d0 100644
--- a/hash/test/hash_value_array_test.cpp
+++ b/hash/test/hash_value_array_test.cpp
@@ -17,12 +17,12 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS
 
-BOOST_AUTO_UNIT_TEST(array_int_test)
+BOOST_AUTO_TEST_CASE(array_int_test)
 {
     const int array1[25] = {
         26, -43, 32, 65, 45,
@@ -44,7 +44,7 @@ BOOST_AUTO_UNIT_TEST(array_int_test)
     BOOST_CHECK(hasher3(array3) == HASH_NAMESPACE::hash_value(array3));
 }
 
-BOOST_AUTO_UNIT_TEST(two_dimensional_array_test)
+BOOST_AUTO_TEST_CASE(two_dimensional_array_test)
 {
     int array[3][2] = {{-5, 6}, {7, -3}, {26, 1}};
     HASH_NAMESPACE::hash<int[3][2]> hasher;
diff --git a/hash/test/hash_vector_test.cpp b/hash/test/hash_vector_test.cpp
index 9e275bc..210daf4 100644
--- a/hash/test/hash_vector_test.cpp
+++ b/hash/test/hash_vector_test.cpp
@@ -14,7 +14,7 @@
 #  endif
 #endif
 
-#define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 #ifdef TEST_EXTENSIONS