diff --git a/test/boost_has_hash.ipp b/test/boost_has_hash.ipp
index 5e0abd65..c9cfeff8 100644
--- a/test/boost_has_hash.ipp
+++ b/test/boost_has_hash.ipp
@@ -10,8 +10,14 @@
 //  DESCRIPTION:   The C++ implementation provides the (SGI) hash_set
 //                 or hash_map classes.
 
+#if defined(__GLIBCXX__) || (defined(__GLIBCPP__) && __GLIBCPP__>=20020514) // GCC >= 3.1.0
+#  define BOOST_STD_EXTENSION_NAMESPACE __gnu_cxx
+#include <ext/hash_set>
+#include <ext/hash_map>
+#else
 #include <hash_set>
 #include <hash_map>
+#endif
 
 #ifndef BOOST_STD_EXTENSION_NAMESPACE
 #define BOOST_STD_EXTENSION_NAMESPACE std
diff --git a/test/boost_has_slist.ipp b/test/boost_has_slist.ipp
index ac16d5af..f3c37d4c 100644
--- a/test/boost_has_slist.ipp
+++ b/test/boost_has_slist.ipp
@@ -9,7 +9,12 @@
 //  TITLE:         <slist>
 //  DESCRIPTION:   The C++ implementation provides the (SGI) slist class.
 
+#if defined(__GLIBCXX__) || (defined(__GLIBCPP__) && __GLIBCPP__>=20020514) // GCC >= 3.1.0
+#  define BOOST_STD_EXTENSION_NAMESPACE __gnu_cxx
+#include <ext/slist>
+#else
 #include <slist>
+#endif
 
 #ifndef BOOST_STD_EXTENSION_NAMESPACE
 #define BOOST_STD_EXTENSION_NAMESPACE std