diff --git a/thrust/testing/unittest/testframework.h b/thrust/testing/unittest/testframework.h
index cd5799e0ca..9739d602e9 100644
--- a/thrust/testing/unittest/testframework.h
+++ b/thrust/testing/unittest/testframework.h
@@ -9,8 +9,11 @@
 #include <thrust/mr/host_memory_resource.h>
 #include <thrust/mr/universal_memory_resource.h>
 
+#include <cuda/std/limits>
+
 #include <cstdio>
 #include <iostream>
+#include <limits>
 #include <map>
 #include <set>
 #include <string>
@@ -199,22 +202,28 @@ class custom_numeric
   }
 };
 
-THRUST_NAMESPACE_BEGIN
+namespace std
+{
+template <>
+struct numeric_limits<custom_numeric> : numeric_limits<int>
+{};
+} // namespace std
 
+_LIBCUDACXX_BEGIN_NAMESPACE_STD
 template <>
 struct numeric_limits<custom_numeric> : numeric_limits<int>
 {};
+_LIBCUDACXX_END_NAMESPACE_STD
 
+THRUST_NAMESPACE_BEGIN
 namespace detail
 {
-
 // For random number generation
 template <>
 class integer_traits<custom_numeric> : public integer_traits_base<int, INT_MIN, INT_MAX>
 {};
 
 } // namespace detail
-
 THRUST_NAMESPACE_END
 
 using NumericTypes = unittest::type_list<
diff --git a/thrust/testing/unittest/util.h b/thrust/testing/unittest/util.h
index 39c4ea962e..7618d02643 100644
--- a/thrust/testing/unittest/util.h
+++ b/thrust/testing/unittest/util.h
@@ -26,7 +26,7 @@ typename THRUST_NS_QUALIFIER::detail::disable_if<::cuda::std::is_floating_point<
 truncate_to_max_representable(std::size_t n)
 {
   return static_cast<T>(
-    THRUST_NS_QUALIFIER::min<std::size_t>(n, static_cast<std::size_t>(THRUST_NS_QUALIFIER::numeric_limits<T>::max())));
+    THRUST_NS_QUALIFIER::min<std::size_t>(n, static_cast<std::size_t>(::cuda::std::numeric_limits<T>::max())));
 }
 
 // TODO: This probably won't work for `half`.
@@ -34,7 +34,7 @@ template <typename T>
 typename ::cuda::std::enable_if_t<::cuda::std::is_floating_point<T>::value, T>
 truncate_to_max_representable(std::size_t n)
 {
-  return THRUST_NS_QUALIFIER::min<T>(static_cast<T>(n), THRUST_NS_QUALIFIER::numeric_limits<T>::max());
+  return THRUST_NS_QUALIFIER::min<T>(static_cast<T>(n), ::cuda::std::numeric_limits<T>::max());
 }
 
 } // namespace unittest
diff --git a/thrust/thrust/limits.h b/thrust/thrust/limits.h
index b6ea9c0bdf..54cad7fd1c 100644
--- a/thrust/thrust/limits.h
+++ b/thrust/thrust/limits.h
@@ -24,7 +24,7 @@
 THRUST_NAMESPACE_BEGIN
 
 template <typename T>
-struct numeric_limits : std::numeric_limits<T>
+struct CCCL_DEPRECATED_BECAUSE("Use cuda::std::numeric_limits") numeric_limits : std::numeric_limits<T>
 {};
 
 THRUST_NAMESPACE_END