diff --git a/include/boost/container_hash/hash.hpp b/include/boost/container_hash/hash.hpp
index a1afe7c..306c279 100644
--- a/include/boost/container_hash/hash.hpp
+++ b/include/boost/container_hash/hash.hpp
@@ -643,7 +643,7 @@ namespace boost
 
         // boost::is_integral<char8_t> is false, but should be true (https://github.com/boostorg/type_traits/issues/175)
 #if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
-        template<> struct hash_is_avalanching< boost::hash< std::u8string > >: boost::true_type {};
+        template<> struct hash_is_avalanching< boost::hash< std::basic_string<char8_t> > >: boost::true_type {};
 #endif
 
 #if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
@@ -651,7 +651,7 @@ namespace boost
         template<class Ch> struct hash_is_avalanching< boost::hash< std::basic_string_view<Ch> > >: boost::is_integral<Ch> {};
 
 #if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
-        template<> struct hash_is_avalanching< boost::hash< std::u8string_view > >: boost::true_type {};
+        template<> struct hash_is_avalanching< boost::hash< std::basic_string_view<char8_t> > >: boost::true_type {};
 #endif
 
 #endif
diff --git a/test/hash_is_avalanching_test.cpp b/test/hash_is_avalanching_test.cpp
index fdac220..2591b47 100644
--- a/test/hash_is_avalanching_test.cpp
+++ b/test/hash_is_avalanching_test.cpp
@@ -45,7 +45,7 @@ int main()
 
 #if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
 
-    BOOST_TEST_TRAIT_TRUE(( hash_is_avalanching< boost::hash<std::u8string> > ));
+    BOOST_TEST_TRAIT_TRUE(( hash_is_avalanching< boost::hash< std::basic_string<char8_t> > > ));
 
 #endif
 
diff --git a/test/hash_is_avalanching_test2.cpp b/test/hash_is_avalanching_test2.cpp
index 33a4992..5224423 100644
--- a/test/hash_is_avalanching_test2.cpp
+++ b/test/hash_is_avalanching_test2.cpp
@@ -50,7 +50,7 @@ int main()
 
 #if defined(__cpp_char8_t) && __cpp_char8_t >= 201811L
 
-    BOOST_TEST_TRAIT_TRUE(( hash_is_avalanching< boost::hash<std::u8string_view> > ));
+    BOOST_TEST_TRAIT_TRUE(( hash_is_avalanching< boost::hash< std::basic_string_view<char8_t> > > ));
 
 #endif