Index: libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
===================================================================
--- libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
+++ libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_copy.pass.cpp
@@ -36,7 +36,7 @@
   Implicit(int x) : value(x) {}
 };
 
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
 constexpr bool alloc_copy_constructor_is_constexpr() {
   const std::tuple<int> t1 = 1;
   std::tuple<int> t2 = {std::allocator_arg, test_allocator<int>{}, t1};
@@ -106,7 +106,7 @@
         std::tuple<long long> t0(derived, A1<int>(), from);
     }
 
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
     static_assert(alloc_copy_constructor_is_constexpr());
 #endif
     return 0;
Index: libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
===================================================================
--- libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
+++ libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/alloc_convert_move.pass.cpp
@@ -51,7 +51,7 @@
   Implicit(int x) : value(x) {}
 };
 
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
 constexpr bool alloc_move_constructor_is_constexpr() {
   std::tuple<int> t1 = 1;
   std::tuple<int> t2 = {std::allocator_arg, test_allocator<int>{}, std::move(t1)};
@@ -119,7 +119,7 @@
         std::tuple<long long> t0(derived, A1<int>(), std::move(from));
     }
 
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
     static_assert(alloc_move_constructor_is_constexpr());
 #endif
 
Index: libcxx/test/support/test_iterators.h
===================================================================
--- libcxx/test/support/test_iterators.h
+++ libcxx/test/support/test_iterators.h
@@ -53,7 +53,7 @@
     template <class T>
     void operator,(T const &) = delete;
 };
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
    static_assert(std::output_iterator<cpp17_output_iterator<int*>, int>);
 #endif
 
@@ -94,7 +94,7 @@
     template <class T>
     void operator,(T const &) = delete;
 };
-#if _LIBCPP_STD_VER > 17
+#if TEST_STD_VER > 17
    static_assert(std::input_iterator<cpp17_input_iterator<int*>>);
 #endif
 
Index: libcxx/test/support/test_range.h
===================================================================
--- libcxx/test/support/test_range.h
+++ libcxx/test/support/test_range.h
@@ -13,7 +13,7 @@
 
 #include "test_iterators.h"
 
-#if _LIBCPP_STD_VER < 17
+#if TEST_STD_VER < 17
 #error "test/support/test_range.h" can only be included in builds supporting ranges
 #endif