diff --git a/libcxx/test/std/localization/locale.stdcvt/depr.verify.cpp b/libcxx/test/std/localization/locale.stdcvt/depr.verify.cpp
--- a/libcxx/test/std/localization/locale.stdcvt/depr.verify.cpp
+++ b/libcxx/test/std/localization/locale.stdcvt/depr.verify.cpp
@@ -16,6 +16,6 @@
 #include <codecvt>
 
 std::codecvt_mode c1; // expected-warning {{'codecvt_mode' is deprecated}}
-std::codecvt_utf8<wchar_t> c2; // expected-warning {{'codecvt_utf8<wchar_t>' is deprecated}}
-std::codecvt_utf16<wchar_t> c3; // expected-warning {{'codecvt_utf16<wchar_t>' is deprecated}}
-std::codecvt_utf8_utf16<wchar_t> c4; // expected-warning {{'codecvt_utf8_utf16<wchar_t>' is deprecated}}
+std::codecvt_utf8<wchar_t> c2; // expected-warning-re {{'codecvt_utf8<wchar_t{{.*}}>' is deprecated}}
+std::codecvt_utf16<wchar_t> c3; // expected-warning-re {{'codecvt_utf16<wchar_t{{.*}}>' is deprecated}}
+std::codecvt_utf8_utf16<wchar_t> c4; // expected-warning-re {{'codecvt_utf8_utf16<wchar_t{{.*}}>' is deprecated}}
diff --git a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/depr.verify.cpp b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/depr.verify.cpp
--- a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/depr.verify.cpp
+++ b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.buffer/depr.verify.cpp
@@ -17,5 +17,5 @@
 #include <codecvt>
 #include <locale>
 
-std::wbuffer_convert<std::codecvt_utf8<wchar_t>> c1; // expected-warning {{'wbuffer_convert<std::codecvt_utf8<wchar_t>>' is deprecated}}
-// expected-warning@-1 {{'codecvt_utf8<wchar_t>' is deprecated}}
+std::wbuffer_convert<std::codecvt_utf8<wchar_t>> c1; // expected-warning-re {{'wbuffer_convert<std::codecvt_utf8<wchar_t{{.*}}>>' is deprecated}}
+// expected-warning-re@-1 {{'codecvt_utf8<wchar_t{{.*}}>' is deprecated}}
diff --git a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/depr.verify.cpp b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/depr.verify.cpp
--- a/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/depr.verify.cpp
+++ b/libcxx/test/std/localization/locales/locale.convenience/conversions/conversions.string/depr.verify.cpp
@@ -16,5 +16,5 @@
 #include <codecvt>
 #include <locale>
 
-std::wstring_convert<std::codecvt_utf8<wchar_t>> c1; // expected-warning {{'wstring_convert<std::codecvt_utf8<wchar_t>>' is deprecated}}
-// expected-warning@-1 {{'codecvt_utf8<wchar_t>' is deprecated}}
+std::wstring_convert<std::codecvt_utf8<wchar_t>> c1; // expected-warning-re {{'wstring_convert<std::codecvt_utf8<wchar_t{{.*}}>>' is deprecated}}
+// expected-warning-re@-1 {{'codecvt_utf8<wchar_t{{.*}}>' is deprecated}}