diff --git a/test/unordered/bucket_tests.cpp b/test/unordered/bucket_tests.cpp
index 32dd93c5..181ff67c 100644
--- a/test/unordered/bucket_tests.cpp
+++ b/test/unordered/bucket_tests.cpp
@@ -16,7 +16,7 @@ namespace bucket_tests {
 test::seed_t seed(54635);
 
 template <class X>
-void bucket_tests(X* = 0)
+void tests(X* = 0)
 {
     typedef BOOST_DEDUCED_TYPENAME X::size_type size_type;
     typedef BOOST_DEDUCED_TYPENAME X::const_local_iterator const_local_iterator;
@@ -55,7 +55,7 @@ boost::unordered_multiset<test::object, test::hash, test::equal_to, test::alloca
 boost::unordered_map<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_map;
 boost::unordered_multimap<test::object, test::object, test::hash, test::equal_to, test::allocator<test::object> >* test_multimap;
 
-UNORDERED_TEST(bucket_tests, ((test_set)(test_multiset)(test_map)(test_multimap)))
+UNORDERED_TEST(tests, ((test_set)(test_multiset)(test_map)(test_multimap)))
 
 }
 
diff --git a/test/unordered/load_factor_tests.cpp b/test/unordered/load_factor_tests.cpp
index 86649421..0ace667b 100644
--- a/test/unordered/load_factor_tests.cpp
+++ b/test/unordered/load_factor_tests.cpp
@@ -20,7 +20,7 @@ namespace load_factor_tests
 test::seed_t seed(783656);
 
 template <class X>
-void load_factor_tests(X* = 0)
+void set_load_factor_tests(X* = 0)
 {
     X x;
 
@@ -71,7 +71,7 @@ boost::unordered_multiset<int>* int_multiset_ptr;
 boost::unordered_map<int, int>* int_map_ptr;
 boost::unordered_multimap<int, int>* int_multimap_ptr;
 
-UNORDERED_TEST(load_factor_tests,
+UNORDERED_TEST(set_load_factor_tests,
     ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
 )
 
diff --git a/test/unordered/rehash_tests.cpp b/test/unordered/rehash_tests.cpp
index c7b99748..f4c59822 100644
--- a/test/unordered/rehash_tests.cpp
+++ b/test/unordered/rehash_tests.cpp
@@ -55,19 +55,15 @@ void rehash_test1(X* = 0)
     tracker.compare(x);
 }
 
-template <class X>
-void rehash_tests(X* ptr = 0)
-{
-    rehash_empty_test1(ptr);
-    rehash_test1(ptr);
-}
-
 boost::unordered_set<int>* int_set_ptr;
 boost::unordered_multiset<int>* int_multiset_ptr;
 boost::unordered_map<int, int>* int_map_ptr;
 boost::unordered_multimap<int, int>* int_multimap_ptr;
 
-UNORDERED_TEST(rehash_tests,
+UNORDERED_TEST(rehash_empty_test1,
+    ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
+)
+UNORDERED_TEST(rehash_test1,
     ((int_set_ptr)(int_multiset_ptr)(int_map_ptr)(int_multimap_ptr))
 )