diff --git a/.upstream-tests/test/std/utilities/meta/meta.help/bool_constant.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.help/bool_constant.pass.cpp
index 9beee630f7..3a704fc60c 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.help/bool_constant.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.help/bool_constant.pass.cpp
@@ -17,7 +17,7 @@
 
 int main(int, char**)
 {
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     typedef cuda::std::bool_constant<true> _t;
     static_assert(_t::value, "");
     static_assert((cuda::std::is_same<_t::value_type, bool>::value), "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp
index 0419e40388..a28da1e418 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of.pass.cpp
@@ -22,7 +22,7 @@ void test_is_base_of()
     static_assert((cuda::std::is_base_of<const T, U>::value), "");
     static_assert((cuda::std::is_base_of<T, const U>::value), "");
     static_assert((cuda::std::is_base_of<const T, const U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((cuda::std::is_base_of_v<T, U>), "");
     static_assert((cuda::std::is_base_of_v<const T, U>), "");
     static_assert((cuda::std::is_base_of_v<T, const U>), "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp
index 9ff18a0a1d..48f45cb315 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.rel/is_base_of_union.pass.cpp
@@ -31,7 +31,7 @@ void test_is_base_of()
     static_assert((cuda::std::is_base_of<const T, U>::value), "");
     static_assert((cuda::std::is_base_of<T, const U>::value), "");
     static_assert((cuda::std::is_base_of<const T, const U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((cuda::std::is_base_of_v<T, U>), "");
     static_assert((cuda::std::is_base_of_v<const T, U>), "");
     static_assert((cuda::std::is_base_of_v<T, const U>), "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
index ddd0d953ed..e90d52d96c 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.rel/is_convertible.pass.cpp
@@ -21,7 +21,7 @@ void test_is_convertible()
     static_assert((cuda::std::is_convertible<const T, U>::value), "");
     static_assert((cuda::std::is_convertible<T, const U>::value), "");
     static_assert((cuda::std::is_convertible<const T, const U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((cuda::std::is_convertible_v<T, U>), "");
     static_assert((cuda::std::is_convertible_v<const T, U>), "");
     static_assert((cuda::std::is_convertible_v<T, const U>), "");
@@ -37,7 +37,7 @@ void test_is_not_convertible()
     static_assert((!cuda::std::is_convertible<const T, U>::value), "");
     static_assert((!cuda::std::is_convertible<T, const U>::value), "");
     static_assert((!cuda::std::is_convertible<const T, const U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_convertible_v<T, U>), "");
     static_assert((!cuda::std::is_convertible_v<const T, U>), "");
     static_assert((!cuda::std::is_convertible_v<T, const U>), "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.rel/is_same.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.rel/is_same.pass.cpp
index 5c490fd383..728170c923 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.rel/is_same.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.rel/is_same.pass.cpp
@@ -22,7 +22,7 @@ void test_is_same()
     static_assert((!cuda::std::is_same<const T, U>::value), "");
     static_assert((!cuda::std::is_same<T, const U>::value), "");
     static_assert(( cuda::std::is_same<const T, const U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_same_v<T, U>), "");
     static_assert((!cuda::std::is_same_v<const T, U>), "");
     static_assert((!cuda::std::is_same_v<T, const U>), "");
@@ -38,7 +38,7 @@ void test_is_same_ref()
     static_assert((cuda::std::is_same<const T, U>::value), "");
     static_assert((cuda::std::is_same<T, const U>::value), "");
     static_assert((cuda::std::is_same<const T, const U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((cuda::std::is_same_v<T, U>), "");
     static_assert((cuda::std::is_same_v<const T, U>), "");
     static_assert((cuda::std::is_same_v<T, const U>), "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
index 10a0849103..11b6171524 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of.pass.cpp
@@ -46,7 +46,7 @@ struct HasType : cuda::std::false_type {};
 template <class T>
 struct HasType<T, typename Voider<typename T::type>::type> : cuda::std::true_type {};
 
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
 template <typename T, typename U>
 struct test_invoke_result;
 
@@ -68,12 +68,12 @@ __host__ __device__
 void test_result_of()
 {
     ASSERT_SAME_TYPE(U, typename cuda::std::result_of<T>::type);
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     test_invoke_result<T, U>::call();
 #endif
 }
 
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
 template <typename T>
 struct test_invoke_no_result;
 
@@ -96,7 +96,7 @@ void test_no_result()
 #if TEST_STD_VER >= 11
     static_assert((!HasType<cuda::std::result_of<T> >::value), "");
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     test_invoke_no_result<T>::call();
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of11.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of11.pass.cpp
index 1bf16d05b4..a971f8565d 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of11.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.trans/meta.trans.other/result_of11.pass.cpp
@@ -31,7 +31,7 @@ struct wat
 struct F {};
 struct FD : public F {};
 
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
 template <typename T, typename U>
 struct test_invoke_result;
 
@@ -57,7 +57,7 @@ void test_result_of_imp()
 #if TEST_STD_VER > 11
     ASSERT_SAME_TYPE(U,        cuda::std::result_of_t<T>);
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     test_invoke_result<T, U>::call();
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
index 231cbccc19..c27b9597e8 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/alignment_of.pass.cpp
@@ -26,7 +26,7 @@ void test_alignment_of()
     static_assert( cuda::std::alignment_of<const T>::value == A, "");
     static_assert( cuda::std::alignment_of<volatile T>::value == A, "");
     static_assert( cuda::std::alignment_of<const volatile T>::value == A, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::alignment_of_v<T> == A, "");
     static_assert( cuda::std::alignment_of_v<const T> == A, "");
     static_assert( cuda::std::alignment_of_v<volatile T> == A, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp
index dfcde2a267..fd69f9d651 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/extent.pass.cpp
@@ -22,7 +22,7 @@ void test_extent()
     static_assert((cuda::std::extent<const T>::value == A), "");
     static_assert((cuda::std::extent<volatile T>::value == A), "");
     static_assert((cuda::std::extent<const volatile T>::value == A), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((cuda::std::extent_v<T> == A), "");
     static_assert((cuda::std::extent_v<const T> == A), "");
     static_assert((cuda::std::extent_v<volatile T> == A), "");
@@ -38,7 +38,7 @@ void test_extent1()
     static_assert((cuda::std::extent<const T, 1>::value == A), "");
     static_assert((cuda::std::extent<volatile T, 1>::value == A), "");
     static_assert((cuda::std::extent<const volatile T, 1>::value == A), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((cuda::std::extent_v<T, 1> == A), "");
     static_assert((cuda::std::extent_v<const T, 1> == A), "");
     static_assert((cuda::std::extent_v<volatile T, 1> == A), "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp
index 995df9e4a1..0531d367ba 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary.prop.query/rank.pass.cpp
@@ -22,7 +22,7 @@ void test_rank()
     static_assert( cuda::std::rank<const T>::value == A, "");
     static_assert( cuda::std::rank<volatile T>::value == A, "");
     static_assert( cuda::std::rank<const volatile T>::value == A, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::rank_v<T> == A, "");
     static_assert( cuda::std::rank_v<const T> == A, "");
     static_assert( cuda::std::rank_v<volatile T> == A, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
index b252ac755f..3a1be0461e 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_array.pass.cpp
@@ -22,7 +22,7 @@ void test_is_array()
     static_assert( cuda::std::is_array<const T>::value, "");
     static_assert( cuda::std::is_array<volatile T>::value, "");
     static_assert( cuda::std::is_array<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_array_v<T>, "");
     static_assert( cuda::std::is_array_v<const T>, "");
     static_assert( cuda::std::is_array_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_array()
     static_assert(!cuda::std::is_array<const T>::value, "");
     static_assert(!cuda::std::is_array<volatile T>::value, "");
     static_assert(!cuda::std::is_array<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_array_v<T>, "");
     static_assert(!cuda::std::is_array_v<const T>, "");
     static_assert(!cuda::std::is_array_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_class.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_class.pass.cpp
index 79a00a9074..7d287631aa 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_class.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_class.pass.cpp
@@ -22,7 +22,7 @@ void test_is_class()
     static_assert( cuda::std::is_class<const T>::value, "");
     static_assert( cuda::std::is_class<volatile T>::value, "");
     static_assert( cuda::std::is_class<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_class_v<T>, "");
     static_assert( cuda::std::is_class_v<const T>, "");
     static_assert( cuda::std::is_class_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_class()
     static_assert(!cuda::std::is_class<const T>::value, "");
     static_assert(!cuda::std::is_class<volatile T>::value, "");
     static_assert(!cuda::std::is_class<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_class_v<T>, "");
     static_assert(!cuda::std::is_class_v<const T>, "");
     static_assert(!cuda::std::is_class_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_enum.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_enum.pass.cpp
index a6578e881b..406dbc89ae 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_enum.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_enum.pass.cpp
@@ -22,7 +22,7 @@ void test_is_enum()
     static_assert( cuda::std::is_enum<const T>::value, "");
     static_assert( cuda::std::is_enum<volatile T>::value, "");
     static_assert( cuda::std::is_enum<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_enum_v<T>, "");
     static_assert( cuda::std::is_enum_v<const T>, "");
     static_assert( cuda::std::is_enum_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_enum()
     static_assert(!cuda::std::is_enum<const T>::value, "");
     static_assert(!cuda::std::is_enum<volatile T>::value, "");
     static_assert(!cuda::std::is_enum<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_enum_v<T>, "");
     static_assert(!cuda::std::is_enum_v<const T>, "");
     static_assert(!cuda::std::is_enum_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_floating_point.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_floating_point.pass.cpp
index 4af892f16c..71e28265f1 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_floating_point.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_floating_point.pass.cpp
@@ -24,7 +24,7 @@ void test_is_floating_point()
     static_assert( cuda::std::is_floating_point<const T>::value, "");
     static_assert( cuda::std::is_floating_point<volatile T>::value, "");
     static_assert( cuda::std::is_floating_point<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_floating_point_v<T>, "");
     static_assert( cuda::std::is_floating_point_v<const T>, "");
     static_assert( cuda::std::is_floating_point_v<volatile T>, "");
@@ -40,7 +40,7 @@ void test_is_not_floating_point()
     static_assert(!cuda::std::is_floating_point<const T>::value, "");
     static_assert(!cuda::std::is_floating_point<volatile T>::value, "");
     static_assert(!cuda::std::is_floating_point<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_floating_point_v<T>, "");
     static_assert(!cuda::std::is_floating_point_v<const T>, "");
     static_assert(!cuda::std::is_floating_point_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_function.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_function.pass.cpp
index 16aabce0f0..372eca5e79 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_function.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_function.pass.cpp
@@ -26,7 +26,7 @@ struct test_is_function {
     static_assert( cuda::std::is_function<const T>::value, "");
     static_assert( cuda::std::is_function<volatile T>::value, "");
     static_assert( cuda::std::is_function<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_function_v<T>, "");
     static_assert( cuda::std::is_function_v<const T>, "");
     static_assert( cuda::std::is_function_v<volatile T>, "");
@@ -40,7 +40,7 @@ struct test_is_not_function {
     static_assert(!cuda::std::is_function<const T>::value, "");
     static_assert(!cuda::std::is_function<volatile T>::value, "");
     static_assert(!cuda::std::is_function<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_function_v<T>, "");
     static_assert(!cuda::std::is_function_v<const T>, "");
     static_assert(!cuda::std::is_function_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_integral.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_integral.pass.cpp
index ff0f5db45c..71623a6969 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_integral.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_integral.pass.cpp
@@ -22,7 +22,7 @@ void test_is_integral()
     static_assert( cuda::std::is_integral<const T>::value, "");
     static_assert( cuda::std::is_integral<volatile T>::value, "");
     static_assert( cuda::std::is_integral<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_integral_v<T>, "");
     static_assert( cuda::std::is_integral_v<const T>, "");
     static_assert( cuda::std::is_integral_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_integral()
     static_assert(!cuda::std::is_integral<const T>::value, "");
     static_assert(!cuda::std::is_integral<volatile T>::value, "");
     static_assert(!cuda::std::is_integral<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_integral_v<T>, "");
     static_assert(!cuda::std::is_integral_v<const T>, "");
     static_assert(!cuda::std::is_integral_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_lvalue_reference.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_lvalue_reference.pass.cpp
index d6bdbdfe35..6b39c262cc 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_lvalue_reference.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_lvalue_reference.pass.cpp
@@ -22,7 +22,7 @@ void test_is_lvalue_reference()
     static_assert( cuda::std::is_lvalue_reference<const T>::value, "");
     static_assert( cuda::std::is_lvalue_reference<volatile T>::value, "");
     static_assert( cuda::std::is_lvalue_reference<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_lvalue_reference_v<T>, "");
     static_assert( cuda::std::is_lvalue_reference_v<const T>, "");
     static_assert( cuda::std::is_lvalue_reference_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_lvalue_reference()
     static_assert(!cuda::std::is_lvalue_reference<const T>::value, "");
     static_assert(!cuda::std::is_lvalue_reference<volatile T>::value, "");
     static_assert(!cuda::std::is_lvalue_reference<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_lvalue_reference_v<T>, "");
     static_assert(!cuda::std::is_lvalue_reference_v<const T>, "");
     static_assert(!cuda::std::is_lvalue_reference_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_object_pointer.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_object_pointer.pass.cpp
index 60521a0cc5..ec774fa167 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_object_pointer.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_object_pointer.pass.cpp
@@ -22,7 +22,7 @@ void test_is_member_object_pointer()
     static_assert( cuda::std::is_member_object_pointer<const T>::value, "");
     static_assert( cuda::std::is_member_object_pointer<volatile T>::value, "");
     static_assert( cuda::std::is_member_object_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_member_object_pointer_v<T>, "");
     static_assert( cuda::std::is_member_object_pointer_v<const T>, "");
     static_assert( cuda::std::is_member_object_pointer_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_member_object_pointer()
     static_assert(!cuda::std::is_member_object_pointer<const T>::value, "");
     static_assert(!cuda::std::is_member_object_pointer<volatile T>::value, "");
     static_assert(!cuda::std::is_member_object_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_member_object_pointer_v<T>, "");
     static_assert(!cuda::std::is_member_object_pointer_v<const T>, "");
     static_assert(!cuda::std::is_member_object_pointer_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_pointer.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_pointer.pass.cpp
index 122b0837c8..7e0f471486 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_pointer.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_member_pointer.pass.cpp
@@ -22,7 +22,7 @@ void test_is_member_pointer()
     static_assert( cuda::std::is_member_pointer<const T>::value, "");
     static_assert( cuda::std::is_member_pointer<volatile T>::value, "");
     static_assert( cuda::std::is_member_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_member_pointer_v<T>, "");
     static_assert( cuda::std::is_member_pointer_v<const T>, "");
     static_assert( cuda::std::is_member_pointer_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_member_pointer()
     static_assert(!cuda::std::is_member_pointer<const T>::value, "");
     static_assert(!cuda::std::is_member_pointer<volatile T>::value, "");
     static_assert(!cuda::std::is_member_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_member_pointer_v<T>, "");
     static_assert(!cuda::std::is_member_pointer_v<const T>, "");
     static_assert(!cuda::std::is_member_pointer_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_null_pointer.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_null_pointer.pass.cpp
index 8e4f281fa7..3decb3556b 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_null_pointer.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_null_pointer.pass.cpp
@@ -24,7 +24,7 @@ void test_is_null_pointer()
     static_assert( cuda::std::is_null_pointer<const T>::value, "");
     static_assert( cuda::std::is_null_pointer<volatile T>::value, "");
     static_assert( cuda::std::is_null_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_null_pointer_v<T>, "");
     static_assert( cuda::std::is_null_pointer_v<const T>, "");
     static_assert( cuda::std::is_null_pointer_v<volatile T>, "");
@@ -40,7 +40,7 @@ void test_is_not_null_pointer()
     static_assert(!cuda::std::is_null_pointer<const T>::value, "");
     static_assert(!cuda::std::is_null_pointer<volatile T>::value, "");
     static_assert(!cuda::std::is_null_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_null_pointer_v<T>, "");
     static_assert(!cuda::std::is_null_pointer_v<const T>, "");
     static_assert(!cuda::std::is_null_pointer_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_pointer.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_pointer.pass.cpp
index e993e77d12..a83762f202 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_pointer.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_pointer.pass.cpp
@@ -22,7 +22,7 @@ void test_is_pointer()
     static_assert( cuda::std::is_pointer<const T>::value, "");
     static_assert( cuda::std::is_pointer<volatile T>::value, "");
     static_assert( cuda::std::is_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_pointer_v<T>, "");
     static_assert( cuda::std::is_pointer_v<const T>, "");
     static_assert( cuda::std::is_pointer_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_pointer()
     static_assert(!cuda::std::is_pointer<const T>::value, "");
     static_assert(!cuda::std::is_pointer<volatile T>::value, "");
     static_assert(!cuda::std::is_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_pointer_v<T>, "");
     static_assert(!cuda::std::is_pointer_v<const T>, "");
     static_assert(!cuda::std::is_pointer_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_rvalue_reference.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_rvalue_reference.pass.cpp
index 53085006c7..ff3e36edb3 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_rvalue_reference.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_rvalue_reference.pass.cpp
@@ -22,7 +22,7 @@ void test_is_rvalue_reference()
     static_assert( cuda::std::is_rvalue_reference<const T>::value, "");
     static_assert( cuda::std::is_rvalue_reference<volatile T>::value, "");
     static_assert( cuda::std::is_rvalue_reference<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_rvalue_reference_v<T>, "");
     static_assert( cuda::std::is_rvalue_reference_v<const T>, "");
     static_assert( cuda::std::is_rvalue_reference_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_rvalue_reference()
     static_assert(!cuda::std::is_rvalue_reference<const T>::value, "");
     static_assert(!cuda::std::is_rvalue_reference<volatile T>::value, "");
     static_assert(!cuda::std::is_rvalue_reference<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_rvalue_reference_v<T>, "");
     static_assert(!cuda::std::is_rvalue_reference_v<const T>, "");
     static_assert(!cuda::std::is_rvalue_reference_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_union.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_union.pass.cpp
index 4f6170fcf7..2699bfadde 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_union.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_union.pass.cpp
@@ -22,7 +22,7 @@ void test_is_union()
     static_assert( cuda::std::is_union<const T>::value, "");
     static_assert( cuda::std::is_union<volatile T>::value, "");
     static_assert( cuda::std::is_union<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_union_v<T>, "");
     static_assert( cuda::std::is_union_v<const T>, "");
     static_assert( cuda::std::is_union_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_union()
     static_assert(!cuda::std::is_union<const T>::value, "");
     static_assert(!cuda::std::is_union<volatile T>::value, "");
     static_assert(!cuda::std::is_union<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_union_v<T>, "");
     static_assert(!cuda::std::is_union_v<const T>, "");
     static_assert(!cuda::std::is_union_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_void.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_void.pass.cpp
index 6098615b1a..7af3667609 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_void.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.cat/is_void.pass.cpp
@@ -22,7 +22,7 @@ void test_is_void()
     static_assert( cuda::std::is_void<const T>::value, "");
     static_assert( cuda::std::is_void<volatile T>::value, "");
     static_assert( cuda::std::is_void<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_void_v<T>, "");
     static_assert( cuda::std::is_void_v<const T>, "");
     static_assert( cuda::std::is_void_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_void()
     static_assert(!cuda::std::is_void<const T>::value, "");
     static_assert(!cuda::std::is_void<volatile T>::value, "");
     static_assert(!cuda::std::is_void<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_void_v<T>, "");
     static_assert(!cuda::std::is_void_v<const T>, "");
     static_assert(!cuda::std::is_void_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp
index 9a16950a07..e1a1b41149 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_arithmetic.pass.cpp
@@ -22,7 +22,7 @@ void test_is_arithmetic()
     static_assert( cuda::std::is_arithmetic<const T>::value, "");
     static_assert( cuda::std::is_arithmetic<volatile T>::value, "");
     static_assert( cuda::std::is_arithmetic<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_arithmetic_v<T>, "");
     static_assert( cuda::std::is_arithmetic_v<const T>, "");
     static_assert( cuda::std::is_arithmetic_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_arithmetic()
     static_assert(!cuda::std::is_arithmetic<const T>::value, "");
     static_assert(!cuda::std::is_arithmetic<volatile T>::value, "");
     static_assert(!cuda::std::is_arithmetic<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_arithmetic_v<T>, "");
     static_assert(!cuda::std::is_arithmetic_v<const T>, "");
     static_assert(!cuda::std::is_arithmetic_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp
index 831932f97b..7a97d4eff1 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_compound.pass.cpp
@@ -22,7 +22,7 @@ void test_is_compound()
     static_assert( cuda::std::is_compound<const T>::value, "");
     static_assert( cuda::std::is_compound<volatile T>::value, "");
     static_assert( cuda::std::is_compound<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_compound_v<T>, "");
     static_assert( cuda::std::is_compound_v<const T>, "");
     static_assert( cuda::std::is_compound_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_compound()
     static_assert(!cuda::std::is_compound<const T>::value, "");
     static_assert(!cuda::std::is_compound<volatile T>::value, "");
     static_assert(!cuda::std::is_compound<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_compound_v<T>, "");
     static_assert(!cuda::std::is_compound_v<const T>, "");
     static_assert(!cuda::std::is_compound_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp
index 313336a610..2e547bb7e2 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_fundamental.pass.cpp
@@ -24,7 +24,7 @@ void test_is_fundamental()
     static_assert( cuda::std::is_fundamental<const T>::value, "");
     static_assert( cuda::std::is_fundamental<volatile T>::value, "");
     static_assert( cuda::std::is_fundamental<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_fundamental_v<T>, "");
     static_assert( cuda::std::is_fundamental_v<const T>, "");
     static_assert( cuda::std::is_fundamental_v<volatile T>, "");
@@ -40,7 +40,7 @@ void test_is_not_fundamental()
     static_assert(!cuda::std::is_fundamental<const T>::value, "");
     static_assert(!cuda::std::is_fundamental<volatile T>::value, "");
     static_assert(!cuda::std::is_fundamental<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_fundamental_v<T>, "");
     static_assert(!cuda::std::is_fundamental_v<const T>, "");
     static_assert(!cuda::std::is_fundamental_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp
index 41da89101c..c73e29f78e 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_member_pointer.pass.cpp
@@ -22,7 +22,7 @@ void test_is_member_pointer()
     static_assert( cuda::std::is_member_pointer<const T>::value, "");
     static_assert( cuda::std::is_member_pointer<volatile T>::value, "");
     static_assert( cuda::std::is_member_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_member_pointer_v<T>, "");
     static_assert( cuda::std::is_member_pointer_v<const T>, "");
     static_assert( cuda::std::is_member_pointer_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_member_pointer()
     static_assert(!cuda::std::is_member_pointer<const T>::value, "");
     static_assert(!cuda::std::is_member_pointer<volatile T>::value, "");
     static_assert(!cuda::std::is_member_pointer<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_member_pointer_v<T>, "");
     static_assert(!cuda::std::is_member_pointer_v<const T>, "");
     static_assert(!cuda::std::is_member_pointer_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp
index eb168af7b1..aaa2754083 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_object.pass.cpp
@@ -22,7 +22,7 @@ void test_is_object()
     static_assert( cuda::std::is_object<const T>::value, "");
     static_assert( cuda::std::is_object<volatile T>::value, "");
     static_assert( cuda::std::is_object<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_object_v<T>, "");
     static_assert( cuda::std::is_object_v<const T>, "");
     static_assert( cuda::std::is_object_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_object()
     static_assert(!cuda::std::is_object<const T>::value, "");
     static_assert(!cuda::std::is_object<volatile T>::value, "");
     static_assert(!cuda::std::is_object<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_object_v<T>, "");
     static_assert(!cuda::std::is_object_v<const T>, "");
     static_assert(!cuda::std::is_object_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp
index 5ebccc59d0..4cb1c4269e 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_reference.pass.cpp
@@ -22,7 +22,7 @@ void test_is_reference()
     static_assert( cuda::std::is_reference<const T>::value, "");
     static_assert( cuda::std::is_reference<volatile T>::value, "");
     static_assert( cuda::std::is_reference<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_reference_v<T>, "");
     static_assert( cuda::std::is_reference_v<const T>, "");
     static_assert( cuda::std::is_reference_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_reference()
     static_assert(!cuda::std::is_reference<const T>::value, "");
     static_assert(!cuda::std::is_reference<volatile T>::value, "");
     static_assert(!cuda::std::is_reference<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_reference_v<T>, "");
     static_assert(!cuda::std::is_reference_v<const T>, "");
     static_assert(!cuda::std::is_reference_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp
index 3f27a28c2c..103ae1c61c 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.comp/is_scalar.pass.cpp
@@ -22,7 +22,7 @@ void test_is_scalar()
     static_assert( cuda::std::is_scalar<const T>::value, "");
     static_assert( cuda::std::is_scalar<volatile T>::value, "");
     static_assert( cuda::std::is_scalar<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_scalar_v<T>, "");
     static_assert( cuda::std::is_scalar_v<const T>, "");
     static_assert( cuda::std::is_scalar_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_scalar()
     static_assert(!cuda::std::is_scalar<const T>::value, "");
     static_assert(!cuda::std::is_scalar<volatile T>::value, "");
     static_assert(!cuda::std::is_scalar<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_scalar_v<T>, "");
     static_assert(!cuda::std::is_scalar_v<const T>, "");
     static_assert(!cuda::std::is_scalar_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
index 5ba5982f29..32ece07e46 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/has_virtual_destructor.pass.cpp
@@ -22,7 +22,7 @@ void test_has_virtual_destructor()
     static_assert( cuda::std::has_virtual_destructor<const T>::value, "");
     static_assert( cuda::std::has_virtual_destructor<volatile T>::value, "");
     static_assert( cuda::std::has_virtual_destructor<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::has_virtual_destructor_v<T>, "");
     static_assert( cuda::std::has_virtual_destructor_v<const T>, "");
     static_assert( cuda::std::has_virtual_destructor_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_has_not_virtual_destructor()
     static_assert(!cuda::std::has_virtual_destructor<const T>::value, "");
     static_assert(!cuda::std::has_virtual_destructor<volatile T>::value, "");
     static_assert(!cuda::std::has_virtual_destructor<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::has_virtual_destructor_v<T>, "");
     static_assert(!cuda::std::has_virtual_destructor_v<const T>, "");
     static_assert(!cuda::std::has_virtual_destructor_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
index cc813de768..737c991a5e 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_abstract.pass.cpp
@@ -21,7 +21,7 @@ void test_is_abstract()
     static_assert( cuda::std::is_abstract<const T>::value, "");
     static_assert( cuda::std::is_abstract<volatile T>::value, "");
     static_assert( cuda::std::is_abstract<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_abstract_v<T>, "");
     static_assert( cuda::std::is_abstract_v<const T>, "");
     static_assert( cuda::std::is_abstract_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_abstract()
     static_assert(!cuda::std::is_abstract<const T>::value, "");
     static_assert(!cuda::std::is_abstract<volatile T>::value, "");
     static_assert(!cuda::std::is_abstract<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_abstract_v<T>, "");
     static_assert(!cuda::std::is_abstract_v<const T>, "");
     static_assert(!cuda::std::is_abstract_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
index a543a57865..6209eb310e 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_assignable.pass.cpp
@@ -28,7 +28,7 @@ __host__ __device__
 void test_is_assignable()
 {
     static_assert(( cuda::std::is_assignable<T, U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(  cuda::std::is_assignable_v<T, U>, "");
 #endif
 }
@@ -38,7 +38,7 @@ __host__ __device__
 void test_is_not_assignable()
 {
     static_assert((!cuda::std::is_assignable<T, U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( !cuda::std::is_assignable_v<T, U>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp
index 22dd5a32e9..dc9fe53a39 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_const.pass.cpp
@@ -21,7 +21,7 @@ void test_is_const()
     static_assert( cuda::std::is_const<const T>::value, "");
     static_assert(!cuda::std::is_const<volatile T>::value, "");
     static_assert( cuda::std::is_const<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_const_v<T>, "");
     static_assert( cuda::std::is_const_v<const T>, "");
     static_assert(!cuda::std::is_const_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
index 676c65cf57..3e171a0ab7 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_constructible.pass.cpp
@@ -98,7 +98,7 @@ void test_is_constructible()
     // use it, so waive it.
     LIBCPP11_STATIC_ASSERT((cuda::std::__libcpp_is_constructible<T>::type::value), "");
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_constructible_v<T>, "");
 #endif
 }
@@ -113,7 +113,7 @@ void test_is_constructible()
     // use it, so waive it.
     LIBCPP11_STATIC_ASSERT((cuda::std::__libcpp_is_constructible<T, A0>::type::value), "");
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_constructible_v<T, A0>), "");
 #endif
 }
@@ -128,7 +128,7 @@ void test_is_constructible()
     // use it, so waive it.
     LIBCPP11_STATIC_ASSERT((cuda::std::__libcpp_is_constructible<T, A0, A1>::type::value), "");
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_constructible_v<T, A0, A1>), "");
 #endif
 }
@@ -143,7 +143,7 @@ void test_is_constructible()
     // use it, so waive it.
     LIBCPP11_STATIC_ASSERT((cuda::std::__libcpp_is_constructible<T, A0, A1, A2>::type::value), "");
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_constructible_v<T, A0, A1, A2>), "");
 #endif
 }
@@ -158,7 +158,7 @@ void test_is_not_constructible()
     // use it, so waive it.
     LIBCPP11_STATIC_ASSERT((!cuda::std::__libcpp_is_constructible<T>::type::value), "");
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_constructible_v<T>), "");
 #endif
 }
@@ -173,7 +173,7 @@ void test_is_not_constructible()
     // use it, so waive it.
     LIBCPP11_STATIC_ASSERT((!cuda::std::__libcpp_is_constructible<T, A0>::type::value), "");
 #endif
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_constructible_v<T, A0>), "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
index 77ae7dd666..647cc07ee1 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_assignable.pass.cpp
@@ -18,7 +18,7 @@ __host__ __device__
 void test_is_copy_assignable()
 {
     static_assert(( cuda::std::is_copy_assignable<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_copy_assignable_v<T>), "");
 #endif
 }
@@ -28,7 +28,7 @@ __host__ __device__
 void test_is_not_copy_assignable()
 {
     static_assert((!cuda::std::is_copy_assignable<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_copy_assignable_v<T>), "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
index f6c038b57a..33b44830eb 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_copy_constructible.pass.cpp
@@ -18,7 +18,7 @@ __host__ __device__
 void test_is_copy_constructible()
 {
     static_assert( cuda::std::is_copy_constructible<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_copy_constructible_v<T>, "");
 #endif
 }
@@ -28,7 +28,7 @@ __host__ __device__
 void test_is_not_copy_constructible()
 {
     static_assert(!cuda::std::is_copy_constructible<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_copy_constructible_v<T>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
index 615e0d3cef..bd6afa7737 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_default_constructible.pass.cpp
@@ -21,7 +21,7 @@ void test_is_default_constructible()
     static_assert( cuda::std::is_default_constructible<const T>::value, "");
     static_assert( cuda::std::is_default_constructible<volatile T>::value, "");
     static_assert( cuda::std::is_default_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_default_constructible_v<T>, "");
     static_assert( cuda::std::is_default_constructible_v<const T>, "");
     static_assert( cuda::std::is_default_constructible_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_default_constructible()
     static_assert(!cuda::std::is_default_constructible<const T>::value, "");
     static_assert(!cuda::std::is_default_constructible<volatile T>::value, "");
     static_assert(!cuda::std::is_default_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_default_constructible_v<T>, "");
     static_assert(!cuda::std::is_default_constructible_v<const T>, "");
     static_assert(!cuda::std::is_default_constructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp
index 4933ffb8c0..bdf5a69cd7 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_destructible.pass.cpp
@@ -27,7 +27,7 @@ void test_is_destructible()
     static_assert( cuda::std::is_destructible<const T>::value, "");
     static_assert( cuda::std::is_destructible<volatile T>::value, "");
     static_assert( cuda::std::is_destructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_destructible_v<T>, "");
     static_assert( cuda::std::is_destructible_v<const T>, "");
     static_assert( cuda::std::is_destructible_v<volatile T>, "");
@@ -43,7 +43,7 @@ void test_is_not_destructible()
     static_assert(!cuda::std::is_destructible<const T>::value, "");
     static_assert(!cuda::std::is_destructible<volatile T>::value, "");
     static_assert(!cuda::std::is_destructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_destructible_v<T>, "");
     static_assert(!cuda::std::is_destructible_v<const T>, "");
     static_assert(!cuda::std::is_destructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp
index be1b4f97c1..ab966f0bde 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_empty.pass.cpp
@@ -29,7 +29,7 @@ void test_is_empty()
     static_assert( cuda::std::is_empty<const T>::value, "");
     static_assert( cuda::std::is_empty<volatile T>::value, "");
     static_assert( cuda::std::is_empty<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_empty_v<T>, "");
     static_assert( cuda::std::is_empty_v<const T>, "");
     static_assert( cuda::std::is_empty_v<volatile T>, "");
@@ -45,7 +45,7 @@ void test_is_not_empty()
     static_assert(!cuda::std::is_empty<const T>::value, "");
     static_assert(!cuda::std::is_empty<volatile T>::value, "");
     static_assert(!cuda::std::is_empty<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_empty_v<T>, "");
     static_assert(!cuda::std::is_empty_v<const T>, "");
     static_assert(!cuda::std::is_empty_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp
index 664fbd6fe9..566f4169cd 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_final.pass.cpp
@@ -26,7 +26,7 @@ void test_is_final()
     static_assert( cuda::std::is_final<const T>::value, "");
     static_assert( cuda::std::is_final<volatile T>::value, "");
     static_assert( cuda::std::is_final<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_final_v<T>, "");
     static_assert( cuda::std::is_final_v<const T>, "");
     static_assert( cuda::std::is_final_v<volatile T>, "");
@@ -42,7 +42,7 @@ void test_is_not_final()
     static_assert(!cuda::std::is_final<const T>::value, "");
     static_assert(!cuda::std::is_final<volatile T>::value, "");
     static_assert(!cuda::std::is_final<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_final_v<T>, "");
     static_assert(!cuda::std::is_final_v<const T>, "");
     static_assert(!cuda::std::is_final_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp
index 3d22e5b2e1..533b957907 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_literal_type.pass.cpp
@@ -22,7 +22,7 @@ void test_is_literal_type()
     static_assert( cuda::std::is_literal_type<const T>::value, "");
     static_assert( cuda::std::is_literal_type<volatile T>::value, "");
     static_assert( cuda::std::is_literal_type<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_literal_type_v<T>, "");
     static_assert( cuda::std::is_literal_type_v<const T>, "");
     static_assert( cuda::std::is_literal_type_v<volatile T>, "");
@@ -38,7 +38,7 @@ void test_is_not_literal_type()
     static_assert(!cuda::std::is_literal_type<const T>::value, "");
     static_assert(!cuda::std::is_literal_type<volatile T>::value, "");
     static_assert(!cuda::std::is_literal_type<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_literal_type_v<T>, "");
     static_assert(!cuda::std::is_literal_type_v<const T>, "");
     static_assert(!cuda::std::is_literal_type_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp
index 0244e6a35d..5c65113128 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_assignable.pass.cpp
@@ -18,7 +18,7 @@ __host__ __device__
 void test_is_move_assignable()
 {
     static_assert(( cuda::std::is_move_assignable<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_move_assignable_v<T>), "");
 #endif
 }
@@ -28,7 +28,7 @@ __host__ __device__
 void test_is_not_move_assignable()
 {
     static_assert((!cuda::std::is_move_assignable<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_move_assignable_v<T>), "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp
index 6d75c7f454..4b5451bae9 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_move_constructible.pass.cpp
@@ -18,7 +18,7 @@ __host__ __device__
 void test_is_move_constructible()
 {
     static_assert( cuda::std::is_move_constructible<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_move_constructible_v<T>, "");
 #endif
 }
@@ -28,7 +28,7 @@ __host__ __device__
 void test_is_not_move_constructible()
 {
     static_assert(!cuda::std::is_move_constructible<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_move_constructible_v<T>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp
index 3328ed4c98..94372aef3c 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_assignable.pass.cpp
@@ -18,7 +18,7 @@ __host__ __device__
 void test_is_nothrow_assignable()
 {
     static_assert(( cuda::std::is_nothrow_assignable<T, U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_nothrow_assignable_v<T, U>), "");
 #endif
 }
@@ -28,7 +28,7 @@ __host__ __device__
 void test_is_not_nothrow_assignable()
 {
     static_assert((!cuda::std::is_nothrow_assignable<T, U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_nothrow_assignable_v<T, U>), "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp
index 8ffbfea737..cbae238b7c 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_constructible.pass.cpp
@@ -19,7 +19,7 @@ __host__ __device__
 void test_is_nothrow_constructible()
 {
     static_assert(( cuda::std::is_nothrow_constructible<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_nothrow_constructible_v<T>), "");
 #endif
 }
@@ -29,7 +29,7 @@ __host__ __device__
 void test_is_nothrow_constructible()
 {
     static_assert(( cuda::std::is_nothrow_constructible<T, A0>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_nothrow_constructible_v<T, A0>), "");
 #endif
 }
@@ -39,7 +39,7 @@ __host__ __device__
 void test_is_not_nothrow_constructible()
 {
     static_assert((!cuda::std::is_nothrow_constructible<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_nothrow_constructible_v<T>), "");
 #endif
 }
@@ -49,7 +49,7 @@ __host__ __device__
 void test_is_not_nothrow_constructible()
 {
     static_assert((!cuda::std::is_nothrow_constructible<T, A0>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_nothrow_constructible_v<T, A0>), "");
 #endif
 }
@@ -59,7 +59,7 @@ __host__ __device__
 void test_is_not_nothrow_constructible()
 {
     static_assert((!cuda::std::is_nothrow_constructible<T, A0, A1>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_nothrow_constructible_v<T, A0, A1>), "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp
index 4c7cc60678..34e03b9370 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_assignable.pass.cpp
@@ -18,7 +18,7 @@ __host__ __device__
 void test_has_nothrow_assign()
 {
     static_assert( cuda::std::is_nothrow_copy_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_nothrow_copy_assignable_v<T>, "");
 #endif
 }
@@ -28,7 +28,7 @@ __host__ __device__
 void test_has_not_nothrow_assign()
 {
     static_assert(!cuda::std::is_nothrow_copy_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_nothrow_copy_assignable_v<T>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp
index 95df4f4b24..6c6756be76 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_copy_constructible.pass.cpp
@@ -19,7 +19,7 @@ void test_is_nothrow_copy_constructible()
 {
     static_assert( cuda::std::is_nothrow_copy_constructible<T>::value, "");
     static_assert( cuda::std::is_nothrow_copy_constructible<const T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_nothrow_copy_constructible_v<T>, "");
     static_assert( cuda::std::is_nothrow_copy_constructible_v<const T>, "");
 #endif
@@ -33,7 +33,7 @@ void test_has_not_nothrow_copy_constructor()
     static_assert(!cuda::std::is_nothrow_copy_constructible<const T>::value, "");
     static_assert(!cuda::std::is_nothrow_copy_constructible<volatile T>::value, "");
     static_assert(!cuda::std::is_nothrow_copy_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_nothrow_copy_constructible_v<T>, "");
     static_assert(!cuda::std::is_nothrow_copy_constructible_v<const T>, "");
     static_assert(!cuda::std::is_nothrow_copy_constructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp
index 0f238460ed..383cb51997 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_default_constructible.pass.cpp
@@ -21,7 +21,7 @@ void test_is_nothrow_default_constructible()
     static_assert( cuda::std::is_nothrow_default_constructible<const T>::value, "");
     static_assert( cuda::std::is_nothrow_default_constructible<volatile T>::value, "");
     static_assert( cuda::std::is_nothrow_default_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_nothrow_default_constructible_v<T>, "");
     static_assert( cuda::std::is_nothrow_default_constructible_v<const T>, "");
     static_assert( cuda::std::is_nothrow_default_constructible_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_has_not_nothrow_default_constructor()
     static_assert(!cuda::std::is_nothrow_default_constructible<const T>::value, "");
     static_assert(!cuda::std::is_nothrow_default_constructible<volatile T>::value, "");
     static_assert(!cuda::std::is_nothrow_default_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_nothrow_default_constructible_v<T>, "");
     static_assert(!cuda::std::is_nothrow_default_constructible_v<const T>, "");
     static_assert(!cuda::std::is_nothrow_default_constructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp
index cce4b76eae..0a093c3369 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_destructible.pass.cpp
@@ -26,7 +26,7 @@ void test_is_nothrow_destructible()
     static_assert( cuda::std::is_nothrow_destructible<const T>::value, "");
     static_assert( cuda::std::is_nothrow_destructible<volatile T>::value, "");
     static_assert( cuda::std::is_nothrow_destructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_nothrow_destructible_v<T>, "");
     static_assert( cuda::std::is_nothrow_destructible_v<const T>, "");
     static_assert( cuda::std::is_nothrow_destructible_v<volatile T>, "");
@@ -42,7 +42,7 @@ void test_is_not_nothrow_destructible()
     static_assert(!cuda::std::is_nothrow_destructible<const T>::value, "");
     static_assert(!cuda::std::is_nothrow_destructible<volatile T>::value, "");
     static_assert(!cuda::std::is_nothrow_destructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_nothrow_destructible_v<T>, "");
     static_assert(!cuda::std::is_nothrow_destructible_v<const T>, "");
     static_assert(!cuda::std::is_nothrow_destructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp
index 7eba32504b..0f64e59238 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_assignable.pass.cpp
@@ -18,7 +18,7 @@ __host__ __device__
 void test_has_nothrow_assign()
 {
     static_assert( cuda::std::is_nothrow_move_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_nothrow_move_assignable_v<T>, "");
 #endif
 }
@@ -28,7 +28,7 @@ __host__ __device__
 void test_has_not_nothrow_assign()
 {
     static_assert(!cuda::std::is_nothrow_move_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_nothrow_move_assignable_v<T>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp
index 691bc77aea..26fab3e7df 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_nothrow_move_constructible.pass.cpp
@@ -19,7 +19,7 @@ void test_is_nothrow_move_constructible()
 {
     static_assert( cuda::std::is_nothrow_move_constructible<T>::value, "");
     static_assert( cuda::std::is_nothrow_move_constructible<const T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_nothrow_move_constructible_v<T>, "");
     static_assert( cuda::std::is_nothrow_move_constructible_v<const T>, "");
 #endif
@@ -33,7 +33,7 @@ void test_has_not_nothrow_move_constructor()
     static_assert(!cuda::std::is_nothrow_move_constructible<const T>::value, "");
     static_assert(!cuda::std::is_nothrow_move_constructible<volatile T>::value, "");
     static_assert(!cuda::std::is_nothrow_move_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_nothrow_move_constructible_v<T>, "");
     static_assert(!cuda::std::is_nothrow_move_constructible_v<const T>, "");
     static_assert(!cuda::std::is_nothrow_move_constructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp
index 2e6a04dade..b947ce0cf4 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_pod.pass.cpp
@@ -21,7 +21,7 @@ void test_is_pod()
     static_assert( cuda::std::is_pod<const T>::value, "");
     static_assert( cuda::std::is_pod<volatile T>::value, "");
     static_assert( cuda::std::is_pod<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_pod_v<T>, "");
     static_assert( cuda::std::is_pod_v<const T>, "");
     static_assert( cuda::std::is_pod_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_pod()
     static_assert(!cuda::std::is_pod<const T>::value, "");
     static_assert(!cuda::std::is_pod<volatile T>::value, "");
     static_assert(!cuda::std::is_pod<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_pod_v<T>, "");
     static_assert(!cuda::std::is_pod_v<const T>, "");
     static_assert(!cuda::std::is_pod_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
index cb849a0ca5..713e1bc7a5 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_polymorphic.pass.cpp
@@ -21,7 +21,7 @@ void test_is_polymorphic()
     static_assert( cuda::std::is_polymorphic<const T>::value, "");
     static_assert( cuda::std::is_polymorphic<volatile T>::value, "");
     static_assert( cuda::std::is_polymorphic<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_polymorphic_v<T>, "");
     static_assert( cuda::std::is_polymorphic_v<const T>, "");
     static_assert( cuda::std::is_polymorphic_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_polymorphic()
     static_assert(!cuda::std::is_polymorphic<const T>::value, "");
     static_assert(!cuda::std::is_polymorphic<volatile T>::value, "");
     static_assert(!cuda::std::is_polymorphic<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_polymorphic_v<T>, "");
     static_assert(!cuda::std::is_polymorphic_v<const T>, "");
     static_assert(!cuda::std::is_polymorphic_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
index a49b383797..c3e1aef9fd 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_signed.pass.cpp
@@ -21,7 +21,7 @@ void test_is_signed()
     static_assert( cuda::std::is_signed<const T>::value, "");
     static_assert( cuda::std::is_signed<volatile T>::value, "");
     static_assert( cuda::std::is_signed<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_signed_v<T>, "");
     static_assert( cuda::std::is_signed_v<const T>, "");
     static_assert( cuda::std::is_signed_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_signed()
     static_assert(!cuda::std::is_signed<const T>::value, "");
     static_assert(!cuda::std::is_signed<volatile T>::value, "");
     static_assert(!cuda::std::is_signed<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_signed_v<T>, "");
     static_assert(!cuda::std::is_signed_v<const T>, "");
     static_assert(!cuda::std::is_signed_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp
index 4cfee4af9f..44380a799c 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_standard_layout.pass.cpp
@@ -21,7 +21,7 @@ void test_is_standard_layout()
     static_assert( cuda::std::is_standard_layout<const T>::value, "");
     static_assert( cuda::std::is_standard_layout<volatile T>::value, "");
     static_assert( cuda::std::is_standard_layout<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_standard_layout_v<T>, "");
     static_assert( cuda::std::is_standard_layout_v<const T>, "");
     static_assert( cuda::std::is_standard_layout_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_standard_layout()
     static_assert(!cuda::std::is_standard_layout<const T>::value, "");
     static_assert(!cuda::std::is_standard_layout<volatile T>::value, "");
     static_assert(!cuda::std::is_standard_layout<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_standard_layout_v<T>, "");
     static_assert(!cuda::std::is_standard_layout_v<const T>, "");
     static_assert(!cuda::std::is_standard_layout_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_swappable_include_order.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_swappable_include_order.pass.cpp
index aa6279e19c..408f8e7e6f 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_swappable_include_order.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_swappable_include_order.pass.cpp
@@ -34,7 +34,7 @@ int main(int, char**)
     typedef double T[17][29];
     {
         LIBCPP_STATIC_ASSERT(cuda::std::__is_swappable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
         static_assert(cuda::std::is_swappable_v<T>, "");
 #endif
     }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp
index 71823d06b3..0cffd1a1c9 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivial.pass.cpp
@@ -21,7 +21,7 @@ void test_is_trivial()
     static_assert( cuda::std::is_trivial<const T>::value, "");
     static_assert( cuda::std::is_trivial<volatile T>::value, "");
     static_assert( cuda::std::is_trivial<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivial_v<T>, "");
     static_assert( cuda::std::is_trivial_v<const T>, "");
     static_assert( cuda::std::is_trivial_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_trivial()
     static_assert(!cuda::std::is_trivial<const T>::value, "");
     static_assert(!cuda::std::is_trivial<volatile T>::value, "");
     static_assert(!cuda::std::is_trivial<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivial_v<T>, "");
     static_assert(!cuda::std::is_trivial_v<const T>, "");
     static_assert(!cuda::std::is_trivial_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp
index 05ca4867b0..461ec376bf 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_assignable.pass.cpp
@@ -20,7 +20,7 @@ __host__ __device__
 void test_is_trivially_assignable()
 {
     static_assert(( cuda::std::is_trivially_assignable<T, U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_trivially_assignable_v<T, U>), "");
 #endif
 }
@@ -30,7 +30,7 @@ __host__ __device__
 void test_is_not_trivially_assignable()
 {
     static_assert((!cuda::std::is_trivially_assignable<T, U>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_trivially_assignable_v<T, U>), "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp
index ab1cbbba57..203a035c4e 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_constructible.pass.cpp
@@ -19,7 +19,7 @@ __host__ __device__
 void test_is_trivially_constructible()
 {
     static_assert(( cuda::std::is_trivially_constructible<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_trivially_constructible_v<T>), "");
 #endif
 }
@@ -29,7 +29,7 @@ __host__ __device__
 void test_is_trivially_constructible()
 {
     static_assert(( cuda::std::is_trivially_constructible<T, A0>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(( cuda::std::is_trivially_constructible_v<T, A0>), "");
 #endif
 }
@@ -39,7 +39,7 @@ __host__ __device__
 void test_is_not_trivially_constructible()
 {
     static_assert((!cuda::std::is_trivially_constructible<T>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_trivially_constructible_v<T>), "");
 #endif
 }
@@ -49,7 +49,7 @@ __host__ __device__
 void test_is_not_trivially_constructible()
 {
     static_assert((!cuda::std::is_trivially_constructible<T, A0>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_trivially_constructible_v<T, A0>), "");
 #endif
 }
@@ -59,7 +59,7 @@ __host__ __device__
 void test_is_not_trivially_constructible()
 {
     static_assert((!cuda::std::is_trivially_constructible<T, A0, A1>::value), "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert((!cuda::std::is_trivially_constructible_v<T, A0, A1>), "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp
index c1c542f45b..cc5aee6d61 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_assignable.pass.cpp
@@ -20,7 +20,7 @@ __host__ __device__
 void test_has_trivially_copy_assignable()
 {
     static_assert( cuda::std::is_trivially_copy_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_copy_assignable_v<T>, "");
 #endif
 }
@@ -30,7 +30,7 @@ __host__ __device__
 void test_has_not_trivially_copy_assignable()
 {
     static_assert(!cuda::std::is_trivially_copy_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_copy_assignable_v<T>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp
index 73a99331fe..bb55583dd0 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copy_constructible.pass.cpp
@@ -21,7 +21,7 @@ void test_is_trivially_copy_constructible()
 {
     static_assert( cuda::std::is_trivially_copy_constructible<T>::value, "");
     static_assert( cuda::std::is_trivially_copy_constructible<const T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_copy_constructible_v<T>, "");
     static_assert( cuda::std::is_trivially_copy_constructible_v<const T>, "");
 #endif
@@ -33,7 +33,7 @@ void test_has_not_trivial_copy_constructor()
 {
     static_assert(!cuda::std::is_trivially_copy_constructible<T>::value, "");
     static_assert(!cuda::std::is_trivially_copy_constructible<const T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_copy_constructible_v<T>, "");
     static_assert(!cuda::std::is_trivially_copy_constructible_v<const T>, "");
 #endif
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable.pass.cpp
index 308f06d921..2a702da7e8 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable.pass.cpp
@@ -28,7 +28,7 @@ void test_is_trivially_copyable()
 {
     static_assert( cuda::std::is_trivially_copyable<T>::value, "");
     static_assert( cuda::std::is_trivially_copyable<const T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_copyable_v<T>, "");
     static_assert( cuda::std::is_trivially_copyable_v<const T>, "");
 #endif
@@ -40,7 +40,7 @@ void test_is_not_trivially_copyable()
 {
     static_assert(!cuda::std::is_trivially_copyable<T>::value, "");
     static_assert(!cuda::std::is_trivially_copyable<const T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_copyable_v<T>, "");
     static_assert(!cuda::std::is_trivially_copyable_v<const T>, "");
 #endif
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable_volatile.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable_volatile.pass.cpp
index 1e625f5be3..3be92c940d 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable_volatile.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_copyable_volatile.pass.cpp
@@ -41,7 +41,7 @@ void test_is_trivially_copyable_volatile()
 {
     static_assert( cuda::std::is_trivially_copyable<volatile T>::value, "");
     static_assert( cuda::std::is_trivially_copyable<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_copyable_v<volatile T>, "");
     static_assert( cuda::std::is_trivially_copyable_v<const volatile T>, "");
 #endif
@@ -53,7 +53,7 @@ void test_is_not_trivially_copyable_volatile()
 {
     static_assert(!cuda::std::is_trivially_copyable<volatile T>::value, "");
     static_assert(!cuda::std::is_trivially_copyable<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_copyable_v<volatile T>, "");
     static_assert(!cuda::std::is_trivially_copyable_v<const volatile T>, "");
 #endif
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp
index fe666adcfa..6ac1dfa1be 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_default_constructible.pass.cpp
@@ -21,7 +21,7 @@ void test_is_trivially_default_constructible()
     static_assert( cuda::std::is_trivially_default_constructible<const T>::value, "");
     static_assert( cuda::std::is_trivially_default_constructible<volatile T>::value, "");
     static_assert( cuda::std::is_trivially_default_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_default_constructible_v<T>, "");
     static_assert( cuda::std::is_trivially_default_constructible_v<const T>, "");
     static_assert( cuda::std::is_trivially_default_constructible_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_has_not_trivial_default_constructor()
     static_assert(!cuda::std::is_trivially_default_constructible<const T>::value, "");
     static_assert(!cuda::std::is_trivially_default_constructible<volatile T>::value, "");
     static_assert(!cuda::std::is_trivially_default_constructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_default_constructible_v<T>, "");
     static_assert(!cuda::std::is_trivially_default_constructible_v<const T>, "");
     static_assert(!cuda::std::is_trivially_default_constructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp
index 7178814026..153967aabe 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_destructible.pass.cpp
@@ -27,7 +27,7 @@ void test_is_trivially_destructible()
     static_assert( cuda::std::is_trivially_destructible<const T>::value, "");
     static_assert( cuda::std::is_trivially_destructible<volatile T>::value, "");
     static_assert( cuda::std::is_trivially_destructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_destructible_v<T>, "");
     static_assert( cuda::std::is_trivially_destructible_v<const T>, "");
     static_assert( cuda::std::is_trivially_destructible_v<volatile T>, "");
@@ -43,7 +43,7 @@ void test_is_not_trivially_destructible()
     static_assert(!cuda::std::is_trivially_destructible<const T>::value, "");
     static_assert(!cuda::std::is_trivially_destructible<volatile T>::value, "");
     static_assert(!cuda::std::is_trivially_destructible<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_destructible_v<T>, "");
     static_assert(!cuda::std::is_trivially_destructible_v<const T>, "");
     static_assert(!cuda::std::is_trivially_destructible_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp
index a8cbcdea5c..4391a8f6ed 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_assignable.pass.cpp
@@ -20,7 +20,7 @@ __host__ __device__
 void test_has_trivial_assign()
 {
     static_assert( cuda::std::is_trivially_move_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_move_assignable_v<T>, "");
 #endif
 }
@@ -30,7 +30,7 @@ __host__ __device__
 void test_has_not_trivial_assign()
 {
     static_assert(!cuda::std::is_trivially_move_assignable<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_move_assignable_v<T>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp
index 742f50d837..bc160f574a 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_trivially_move_constructible.pass.cpp
@@ -20,7 +20,7 @@ __host__ __device__
 void test_is_trivially_move_constructible()
 {
     static_assert( cuda::std::is_trivially_move_constructible<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_trivially_move_constructible_v<T>, "");
 #endif
 }
@@ -30,7 +30,7 @@ __host__ __device__
 void test_has_not_trivial_move_constructor()
 {
     static_assert(!cuda::std::is_trivially_move_constructible<T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_trivially_move_constructible_v<T>, "");
 #endif
 }
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
index c258d37c48..2bb41bdbf2 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_unsigned.pass.cpp
@@ -21,7 +21,7 @@ void test_is_unsigned()
     static_assert( cuda::std::is_unsigned<const T>::value, "");
     static_assert( cuda::std::is_unsigned<volatile T>::value, "");
     static_assert( cuda::std::is_unsigned<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert( cuda::std::is_unsigned_v<T>, "");
     static_assert( cuda::std::is_unsigned_v<const T>, "");
     static_assert( cuda::std::is_unsigned_v<volatile T>, "");
@@ -37,7 +37,7 @@ void test_is_not_unsigned()
     static_assert(!cuda::std::is_unsigned<const T>::value, "");
     static_assert(!cuda::std::is_unsigned<volatile T>::value, "");
     static_assert(!cuda::std::is_unsigned<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_unsigned_v<T>, "");
     static_assert(!cuda::std::is_unsigned_v<const T>, "");
     static_assert(!cuda::std::is_unsigned_v<volatile T>, "");
diff --git a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp
index 7e700ec98e..45e07df4c2 100644
--- a/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp
+++ b/.upstream-tests/test/std/utilities/meta/meta.unary/meta.unary.prop/is_volatile.pass.cpp
@@ -21,7 +21,7 @@ void test_is_volatile()
     static_assert(!cuda::std::is_volatile<const T>::value, "");
     static_assert( cuda::std::is_volatile<volatile T>::value, "");
     static_assert( cuda::std::is_volatile<const volatile T>::value, "");
-#if TEST_STD_VER > 14
+#if TEST_STD_VER > 11
     static_assert(!cuda::std::is_volatile_v<T>, "");
     static_assert(!cuda::std::is_volatile_v<const T>, "");
     static_assert( cuda::std::is_volatile_v<volatile T>, "");