diff --git a/test/depr/depr.c.headers/locale_h.pass.cpp b/test/depr/depr.c.headers/locale_h.pass.cpp
index eff9b2b6d..6ecf5a82e 100644
--- a/test/depr/depr.c.headers/locale_h.pass.cpp
+++ b/test/depr/depr.c.headers/locale_h.pass.cpp
@@ -43,6 +43,6 @@
 int main()
 {
     lconv lc;
-    static_assert((std::is_same<__typeof__(setlocale(0, "")), char*>::value), "");
-    static_assert((std::is_same<__typeof__(localeconv()), lconv*>::value), "");
+    static_assert((std::is_same<decltype(setlocale(0, "")), char*>::value), "");
+    static_assert((std::is_same<decltype(localeconv()), lconv*>::value), "");
 }
diff --git a/test/depr/depr.c.headers/setjmp_h.pass.cpp b/test/depr/depr.c.headers/setjmp_h.pass.cpp
index 2a8abe399..36f425390 100644
--- a/test/depr/depr.c.headers/setjmp_h.pass.cpp
+++ b/test/depr/depr.c.headers/setjmp_h.pass.cpp
@@ -15,6 +15,6 @@
 int main()
 {
     jmp_buf jb;
-    static_assert((std::is_same<__typeof__(longjmp(jb, 0)), void>::value),
-                  "std::is_same<__typeof__(longjmp(jb, 0)), void>::value");
+    static_assert((std::is_same<decltype(longjmp(jb, 0)), void>::value),
+                  "std::is_same<decltype(longjmp(jb, 0)), void>::value");
 }
diff --git a/test/language.support/support.runtime/csetjmp.pass.cpp b/test/language.support/support.runtime/csetjmp.pass.cpp
index a54f67b8f..dc034ce09 100644
--- a/test/language.support/support.runtime/csetjmp.pass.cpp
+++ b/test/language.support/support.runtime/csetjmp.pass.cpp
@@ -19,6 +19,6 @@
 int main()
 {
     std::jmp_buf jb;
-    static_assert((std::is_same<__typeof__(std::longjmp(jb, 0)), void>::value),
-                  "std::is_same<__typeof__(std::longjmp(jb, 0)), void>::value");
+    static_assert((std::is_same<decltype(std::longjmp(jb, 0)), void>::value),
+                  "std::is_same<decltype(std::longjmp(jb, 0)), void>::value");
 }
diff --git a/test/localization/c.locales/clocale.pass.cpp b/test/localization/c.locales/clocale.pass.cpp
index 87748655d..3b3e933c5 100644
--- a/test/localization/c.locales/clocale.pass.cpp
+++ b/test/localization/c.locales/clocale.pass.cpp
@@ -43,6 +43,6 @@
 int main()
 {
     std::lconv lc;
-    static_assert((std::is_same<__typeof__(std::setlocale(0, "")), char*>::value), "");
-    static_assert((std::is_same<__typeof__(std::localeconv()), std::lconv*>::value), "");
+    static_assert((std::is_same<decltype(std::setlocale(0, "")), char*>::value), "");
+    static_assert((std::is_same<decltype(std::localeconv()), std::lconv*>::value), "");
 }