diff --git a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
index 0520b637be5bf88385365b5d37f6508fa5ede6fe..7fbbcae2aa30def6368238ce2fe031de94c91d67 100644
--- a/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
+++ b/libstdc++-v3/testsuite/22_locale/locale/cons/unicode.cc
@@ -33,14 +33,12 @@ typedef std::codecvt<char, char, std::mbstate_t> 	      c_codecvt;
 typedef std::codecvt<wchar_t, char, std::mbstate_t>	      w_codecvt;
 #endif
 
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
 typedef std::codecvt<char16_t, char, std::mbstate_t>	      u16_codecvt;
 typedef std::codecvt<char32_t, char, std::mbstate_t>	      u32_codecvt;
 #ifdef _GLIBCXX_USE_CHAR8_T
 typedef std::codecvt<char16_t, char8_t, std::mbstate_t>	      u16u8_codecvt;
 typedef std::codecvt<char32_t, char8_t, std::mbstate_t>	      u32u8_codecvt;
 #endif
-#endif
 
 class gnu_facet: public std::locale::facet
 {
@@ -69,13 +67,11 @@ void test01()
 #ifdef _GLIBCXX_USE_WCHAR_T
       VERIFY( has_facet<w_codecvt>(loc13) );
 #endif
-#ifdef _GLIBCXX_USE_C99_STDINT_TR1
       VERIFY( has_facet<u16_codecvt>(loc13) );
       VERIFY( has_facet<u32_codecvt>(loc13) );
 #ifdef _GLIBCXX_USE_CHAR8_T
       VERIFY( has_facet<u16u8_codecvt>(loc13) );
       VERIFY( has_facet<u32u8_codecvt>(loc13) );
-#endif
 #endif
       VERIFY( has_facet<unicode_codecvt>(loc13) );
     }