diff --git a/libstdc++-v3/include/bits/c++config b/libstdc++-v3/include/bits/c++config
index 4b7fa659300..becd83af4d9 100644
--- a/libstdc++-v3/include/bits/c++config
+++ b/libstdc++-v3/include/bits/c++config
@@ -245,6 +245,7 @@
     namespace __debug { }
     namespace __parallel { }
     namespace __cxx1998 { }
+    namespace __normal { }
 
     namespace __detail {
       namespace __variant { }				// C++17
@@ -384,6 +385,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
 # endif
   }
 
+  namespace __normal = __cxx1998;
+
 _GLIBCXX_END_NAMESPACE_VERSION
 
   // Inline namespace for debug mode.
@@ -407,6 +410,11 @@ _GLIBCXX_END_NAMESPACE_VERSION
 #  warning currently using inlined namespace mode which may fail \
    without inlining due to lack of weak symbols
 # endif
+#else
+namespace std
+{
+  namespace __normal = ::std;
+}
 #endif
 
 // Macros for namespace scope. Either namespace std:: or the name
diff --git a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc
index dc2a2be3867..399064ea074 100644
--- a/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc
+++ b/libstdc++-v3/testsuite/23_containers/forward_list/capacity/1.cc
@@ -35,12 +35,7 @@ test01()
   fld.resize(0);
   VERIFY(fld.empty() == true);
 
-#ifdef _GLIBCXX_DEBUG
-  using std::_GLIBCXX_STD_C::_Fwd_list_node;
-#else
-  using std::_Fwd_list_node;
-#endif
-
+  using std::__normal::_Fwd_list_node;
   std::allocator<_Fwd_list_node<double> > a;
   VERIFY( fld.max_size() == __gnu_test::max_size(a) );
 }
diff --git a/libstdc++-v3/testsuite/util/testsuite_abi.h b/libstdc++-v3/testsuite/util/testsuite_abi.h
index 4a0cf64f6fb..d0902db9193 100644
--- a/libstdc++-v3/testsuite/util/testsuite_abi.h
+++ b/libstdc++-v3/testsuite/util/testsuite_abi.h
@@ -24,11 +24,7 @@
 #include <locale>
 #if __cplusplus >= 201103L
 # include <unordered_map>
-# ifdef _GLIBCXX_DEBUG
-namespace unord = std::_GLIBCXX_STD_C;
-# else
-namespace unord = std;
-# endif
+namespace unord = std::__normal;
 #else
 # include <tr1/unordered_map>
 namespace unord = std::tr1;