diff --git a/hash/test/Jamfile b/hash/test/Jamfile
index d77ae3f..b40edfc 100644
--- a/hash/test/Jamfile
+++ b/hash/test/Jamfile
@@ -20,16 +20,12 @@ rule hash-test ( name )
 }
 
 {
-    test-suite "hash_std"
+    test-suite "functional/hash"
         :
             [ hash-test hash_number_test ]
             [ hash-test hash_pointer_test ]
             [ hash-test hash_float_test ]
             [ hash-test hash_string_test ]
-        ;
-
-    test-suite "hash_extensions"
-        :
             [ hash-test hash_range_test ]
             [ hash-test hash_custom_test ]
             [ hash-test hash_vector_test ]
diff --git a/hash/test/Jamfile.v2 b/hash/test/Jamfile.v2
index 4daa642..5f67006 100644
--- a/hash/test/Jamfile.v2
+++ b/hash/test/Jamfile.v2
@@ -8,16 +8,12 @@ import testing ;
 
 alias framework : /boost/test//boost_unit_test_framework ;
 
-test-suite /boost/hash_std
+test-suite functional/hash
     :
         [ run hash_number_test.cpp framework ]
         [ run hash_pointer_test.cpp framework ]
         [ run hash_float_test.cpp framework ]
         [ run hash_string_test.cpp framework ]
-    ;
-
-test-suite /boost/hash_extensions
-    :
         [ run hash_range_test.cpp framework ]
         [ run hash_custom_test.cpp framework ]
         [ run hash_vector_test.cpp framework ]