diff --git a/libcudacxx/include/cuda/std/__functional/operations.h b/libcudacxx/include/cuda/std/__functional/operations.h
index 978a53f993d..ec3917f7d88 100644
--- a/libcudacxx/include/cuda/std/__functional/operations.h
+++ b/libcudacxx/include/cuda/std/__functional/operations.h
@@ -4,7 +4,7 @@
 // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
 // See https://llvm.org/LICENSE.txt for license information.
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-// SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES.
+// SPDX-FileCopyrightText: Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
 //
 //===----------------------------------------------------------------------===//
 
@@ -55,11 +55,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS plus<void>
   typedef void is_transparent;
 };
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS minus : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -71,7 +67,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS minus : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(minus);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS minus<void>
 {
@@ -85,7 +80,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS minus<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 template <class _Tp = void>
 struct _LIBCUDACXX_TEMPLATE_VIS multiplies : __binary_function<_Tp, _Tp, _Tp>
@@ -113,11 +107,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS multiplies<void>
   typedef void is_transparent;
 };
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS divides : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -129,7 +119,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS divides : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(divides);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS divides<void>
 {
@@ -143,13 +132,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS divides<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS modulus : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -161,7 +145,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS modulus : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(modulus);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS modulus<void>
 {
@@ -175,7 +158,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS modulus<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 template <class _Tp = void>
 struct _LIBCUDACXX_TEMPLATE_VIS negate : __unary_function<_Tp, _Tp>
@@ -204,11 +186,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS negate<void>
 
 // Bitwise operations
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS bit_and : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -220,7 +198,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_and : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_and);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_and<void>
 {
@@ -234,9 +211,7 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_and<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_not : __unary_function<_Tp, _Tp>
 {
@@ -260,13 +235,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_not<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS bit_or : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -278,7 +248,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_or : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_or);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_or<void>
 {
@@ -292,13 +261,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_or<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS bit_xor : __binary_function<_Tp, _Tp, _Tp>
 {
   typedef _Tp __result_type; // used by valarray
@@ -310,7 +274,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_xor : __binary_function<_Tp, _Tp, _Tp>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(bit_xor);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS bit_xor<void>
 {
@@ -324,15 +287,10 @@ struct _LIBCUDACXX_TEMPLATE_VIS bit_xor<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 // Comparison operations
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS equal_to : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -344,7 +302,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS equal_to : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(equal_to);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS equal_to<void>
 {
@@ -358,13 +315,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS equal_to<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -376,7 +328,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(not_equal_to);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to<void>
 {
@@ -390,13 +341,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS not_equal_to<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS less : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -408,7 +354,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS less : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(less);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS less<void>
 {
@@ -422,13 +367,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS less<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS less_equal : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -440,7 +380,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS less_equal : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(less_equal);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS less_equal<void>
 {
@@ -454,13 +393,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS less_equal<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS greater_equal : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -472,7 +406,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater_equal : __binary_function<_Tp, _Tp, bool
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(greater_equal);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS greater_equal<void>
 {
@@ -486,13 +419,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater_equal<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS greater : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -504,7 +432,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(greater);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS greater<void>
 {
@@ -518,15 +445,10 @@ struct _LIBCUDACXX_TEMPLATE_VIS greater<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 // Logical operations
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS logical_and : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -538,7 +460,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_and : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_and);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS logical_and<void>
 {
@@ -552,13 +473,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_and<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS logical_not : __unary_function<_Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -570,7 +486,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_not : __unary_function<_Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_not);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS logical_not<void>
 {
@@ -583,13 +498,8 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_not<void>
   }
   typedef void is_transparent;
 };
-#endif
 
-#if _CCCL_STD_VER > 2011
 template <class _Tp = void>
-#else
-template <class _Tp>
-#endif
 struct _LIBCUDACXX_TEMPLATE_VIS logical_or : __binary_function<_Tp, _Tp, bool>
 {
   typedef bool __result_type; // used by valarray
@@ -601,7 +511,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_or : __binary_function<_Tp, _Tp, bool>
 };
 _LIBCUDACXX_CTAD_SUPPORTED_FOR_TYPE(logical_or);
 
-#if _CCCL_STD_VER > 2011
 template <>
 struct _LIBCUDACXX_TEMPLATE_VIS logical_or<void>
 {
@@ -615,7 +524,6 @@ struct _LIBCUDACXX_TEMPLATE_VIS logical_or<void>
   }
   typedef void is_transparent;
 };
-#endif
 
 _LIBCUDACXX_END_NAMESPACE_STD
 
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp
index cb48c6e9927..174e55eb5d0 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/divides.pass.cpp
@@ -47,7 +47,6 @@ int main(int, char**)
   static_assert((cuda::std::is_same<int, F::result_type>::value), "");
 #endif
   assert(f(36, 4) == 9);
-#if TEST_STD_VER > 2011
   typedef cuda::std::divides<> F2;
   const F2 f2 = F2();
   assert(f2(36, 4) == 9);
@@ -59,7 +58,6 @@ int main(int, char**)
 
   constexpr double bar = cuda::std::divides<>()(3.0, 2);
   static_assert(bar == 1.5, ""); // exact in binary
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp
index 17fd3d90333..13198441607 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/minus.pass.cpp
@@ -47,7 +47,6 @@ int main(int, char**)
   static_assert((cuda::std::is_same<int, F::result_type>::value), "");
 #endif
   assert(f(3, 2) == 1);
-#if TEST_STD_VER > 2011
   typedef cuda::std::minus<> F2;
   const F2 f2 = F2();
   assert(f2(3, 2) == 1);
@@ -59,7 +58,6 @@ int main(int, char**)
 
   constexpr double bar = cuda::std::minus<>()(3.0, 2);
   static_assert(bar == 1.0, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp
index 3997dc1c5ce..ee457d1534f 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/modulus.pass.cpp
@@ -47,7 +47,6 @@ int main(int, char**)
   static_assert((cuda::std::is_same<int, F::result_type>::value), "");
 #endif
   assert(f(36, 8) == 4);
-#if TEST_STD_VER > 2011
   typedef cuda::std::modulus<> F2;
   const F2 f2 = F2();
   assert(f2(36, 8) == 4);
@@ -59,7 +58,6 @@ int main(int, char**)
 
   constexpr int bar = cuda::std::modulus<>()(3L, 2);
   static_assert(bar == 1, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp
index de38f3f2922..41d787d7948 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/multiplies.pass.cpp
@@ -47,7 +47,6 @@ int main(int, char**)
   static_assert((cuda::std::is_same<int, F::result_type>::value), "");
 #endif
   assert(f(3, 2) == 6);
-#if TEST_STD_VER > 2011
   typedef cuda::std::multiplies<> F2;
   const F2 f2 = F2();
   assert(f2(3, 2) == 6);
@@ -59,7 +58,6 @@ int main(int, char**)
 
   constexpr double bar = cuda::std::multiplies<>()(3.0, 2);
   static_assert(bar == 6.0, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp
index d3c0c12b8f7..31d417be599 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/negate.pass.cpp
@@ -46,7 +46,6 @@ int main(int, char**)
   static_assert((cuda::std::is_same<F::result_type, int>::value), "");
 #endif
   assert(f(36) == -36);
-#if TEST_STD_VER > 2011
   typedef cuda::std::negate<> F2;
   const F2 f2 = F2();
   assert(f2(36) == -36);
@@ -58,7 +57,6 @@ int main(int, char**)
 
   constexpr double bar = cuda::std::negate<>()(3.0);
   static_assert(bar == -3.0, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp
index a0d6ae30be0..f5c8268f2d5 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/plus.pass.cpp
@@ -47,7 +47,6 @@ int main(int, char**)
   static_assert((cuda::std::is_same<int, F::result_type>::value), "");
 #endif
   assert(f(3, 2) == 5);
-#if TEST_STD_VER > 2011
   typedef cuda::std::plus<> F2;
   const F2 f2 = F2();
   assert(f2(3, 2) == 5);
@@ -59,7 +58,6 @@ int main(int, char**)
 
   constexpr double bar = cuda::std::plus<>()(3.0, 2);
   static_assert(bar == 5.0, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp
index 73360fb3dd5..7c87d654659 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/arithmetic.operations/transparent.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11
+// UNSUPPORTED: c++98, c++03
 #include <cuda/std/functional>
 // #include <cuda/std/string>
 
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp
index b6669d782b4..a547d872bb8 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_and.pass.cpp
@@ -51,7 +51,6 @@ int main(int, char**)
   assert(f(0x58D3, 0xEA95) == 0x4891);
   assert(f(0x58D3, 0) == 0);
   assert(f(0xFFFF, 0x58D3) == 0x58D3);
-#if TEST_STD_VER > 2011
   typedef cuda::std::bit_and<> F2;
   const F2 f2 = F2();
   assert(f2(0xEA95, 0xEA95) == 0xEA95);
@@ -79,7 +78,6 @@ int main(int, char**)
 
   constexpr int bar = cuda::std::bit_and<>()(0x58D3L, 0xEA95);
   static_assert(bar == 0x4891, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp
index 0a7d6debedd..56e82846fdc 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_or.pass.cpp
@@ -51,7 +51,6 @@ int main(int, char**)
   assert(f(0x58D3, 0xEA95) == 0xFAD7);
   assert(f(0x58D3, 0) == 0x58D3);
   assert(f(0xFFFF, 0x58D3) == 0xFFFF);
-#if TEST_STD_VER > 2011
   typedef cuda::std::bit_or<> F2;
   const F2 f2 = F2();
   assert(f2(0xEA95, 0xEA95) == 0xEA95);
@@ -79,7 +78,6 @@ int main(int, char**)
 
   constexpr int bar = cuda::std::bit_or<>()(0x58D3L, 0xEA95);
   static_assert(bar == 0xFAD7, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp
index 1db49b45a2b..7603f5a2413 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/bit_xor.pass.cpp
@@ -53,7 +53,6 @@ int main(int, char**)
     assert(f(0x58D3, 0) == 0x58D3);
     assert(f(0xFFFF, 0x58D3) == 0xA72C);
   }
-#if TEST_STD_VER > 2011
   {
     typedef cuda::std::bit_xor<> F2;
     const F2 f = F2();
@@ -83,7 +82,6 @@ int main(int, char**)
     constexpr int bar = cuda::std::bit_xor<>()(0x58D3L, 0xEA95);
     static_assert(bar == 0xB246, "");
   }
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp
index c5a75a32c5f..5631958d7f1 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/bitwise.operations/transparent.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11
+// UNSUPPORTED: c++98, c++03
 #include <cuda/std/functional>
 // #include <cuda/std/string>
 
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/equal_to.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/equal_to.pass.cpp
index 4cb29075c9e..2fb5ad833df 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/equal_to.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/equal_to.pass.cpp
@@ -44,7 +44,6 @@ int main(int, char**)
 #endif
   assert(f(36, 36));
   assert(!f(36, 6));
-#if TEST_STD_VER > 2011
   typedef cuda::std::equal_to<> F2;
   const F2 f2 = F2();
   assert(f2(36, 36));
@@ -57,7 +56,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::equal_to<>()(36.0, 36);
   static_assert(bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater.pass.cpp
index 77b9d3065b4..9ca0ebf3f9d 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater.pass.cpp
@@ -53,7 +53,6 @@ int main(int, char**)
                  // test total ordering of int* for greater<int*> and
                  // greater<void>.
                  do_pointer_comparison_test<int, cuda::std::greater>();))
-#if TEST_STD_VER > 2011
   typedef cuda::std::greater<> F2;
   const F2 f2 = F2();
   assert(!f2(36, 36));
@@ -69,7 +68,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::greater<>()(36.0, 36);
   static_assert(!bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater_equal.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
index af72d9b0db7..1766a1a8ac7 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/greater_equal.pass.cpp
@@ -53,7 +53,6 @@ int main(int, char**)
                  // test total ordering of int* for greater_equal<int*> and
                  // greater_equal<void>.
                  do_pointer_comparison_test<int, cuda::std::greater_equal>();))
-#if TEST_STD_VER > 2011
   typedef cuda::std::greater_equal<> F2;
   const F2 f2 = F2();
   assert(f2(36, 36));
@@ -69,7 +68,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::greater_equal<>()(36.0, 36);
   static_assert(bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less.pass.cpp
index 82cb115a4c9..b788364b5d3 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less.pass.cpp
@@ -52,7 +52,6 @@ int main(int, char**)
                (
                  // test total ordering of int* for less<int*> and less<void>.
                  do_pointer_comparison_test<int, cuda::std::less>();))
-#if TEST_STD_VER > 2011
   typedef cuda::std::less<> F2;
   const F2 f2 = F2();
   assert(!f2(36, 36));
@@ -68,7 +67,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::less<>()(36.0, 36);
   static_assert(!bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less_equal.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less_equal.pass.cpp
index 428369c204a..72377e5bede 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less_equal.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/less_equal.pass.cpp
@@ -53,7 +53,6 @@ int main(int, char**)
                  // test total ordering of int* for less_equal<int*> and
                  // less_equal<void>.
                  do_pointer_comparison_test<int, cuda::std::less_equal>();))
-#if TEST_STD_VER > 2011
   typedef cuda::std::less_equal<> F2;
   const F2 f2 = F2();
   assert(f2(36, 36));
@@ -69,7 +68,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::less_equal<>()(36.0, 36);
   static_assert(bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp
index 5908eb0cc6c..f8bf5c1f52c 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/not_equal_to.pass.cpp
@@ -44,7 +44,6 @@ int main(int, char**)
 #endif
   assert(!f(36, 36));
   assert(f(36, 6));
-#if TEST_STD_VER > 2011
   typedef cuda::std::not_equal_to<> F2;
   const F2 f2 = F2();
   assert(!f2(36, 36));
@@ -59,7 +58,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::not_equal_to<>()(36.0, 36);
   static_assert(!bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp
index 9e125266ca4..46233314f01 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/pointer_comparison_test_helper.hpp
@@ -14,11 +14,8 @@ void do_pointer_comparison_test()
 {
   typedef CompareTemplate<T*> Compare;
   typedef CompareTemplate<std::uintptr_t> UIntCompare;
-#if TEST_STD_VER > 2011
   typedef CompareTemplate<void> VoidCompare;
-#else
-  typedef Compare VoidCompare;
-#endif
+
   std::vector<std::shared_ptr<T>> pointers;
   const std::size_t test_size = 100;
   for (size_t i = 0; i < test_size; ++i)
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/transparent.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/transparent.pass.cpp
index df267e95423..004f4334524 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/transparent.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/comparisons/transparent.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11
+// UNSUPPORTED: c++98, c++03
 #include <cuda/std/functional>
 // #include <cuda/std/string>
 
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_and.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_and.pass.cpp
index 04cfc5e8e73..e6d6d237bd6 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_and.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_and.pass.cpp
@@ -50,7 +50,6 @@ int main(int, char**)
   assert(!f(36, 0));
   assert(!f(0, 36));
   assert(!f(0, 0));
-#if TEST_STD_VER > 2011
   typedef cuda::std::logical_and<> F2;
   const F2 f2 = F2();
   assert(f2(36, 36));
@@ -70,7 +69,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::logical_and<>()(36.0, 36);
   static_assert(bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_not.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_not.pass.cpp
index 5b7f5187a02..3b224e928aa 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_not.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_not.pass.cpp
@@ -47,7 +47,6 @@ int main(int, char**)
 #endif
   assert(!f(36));
   assert(f(0));
-#if TEST_STD_VER > 2011
   typedef cuda::std::logical_not<> F2;
   const F2 f2 = F2();
   assert(!f2(36));
@@ -60,7 +59,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::logical_not<>()(36);
   static_assert(!bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_or.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_or.pass.cpp
index 0c20b9d66ac..146511c975f 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_or.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/logical_or.pass.cpp
@@ -50,7 +50,6 @@ int main(int, char**)
   assert(f(36, 0));
   assert(f(0, 36));
   assert(!f(0, 0));
-#if TEST_STD_VER > 2011
   typedef cuda::std::logical_or<> F2;
   const F2 f2 = F2();
   assert(f2(36, 36));
@@ -69,7 +68,6 @@ int main(int, char**)
 
   constexpr bool bar = cuda::std::logical_or<>()(36.0, 36);
   static_assert(bar, "");
-#endif
 
   return 0;
 }
diff --git a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/transparent.pass.cpp b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/transparent.pass.cpp
index 82883bc1175..f7a43daf39b 100644
--- a/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/transparent.pass.cpp
+++ b/libcudacxx/test/libcudacxx/std/utilities/function.objects/logical.operations/transparent.pass.cpp
@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: c++98, c++03, c++11
+// UNSUPPORTED: c++98, c++03
 #include <cuda/std/functional>
 // #include <cuda/std/string>