diff --git a/cub/test/catch2_test_iterator.cu b/cub/test/catch2_test_iterator.cu
index c94ea59773b..cb9cb729963 100644
--- a/cub/test/catch2_test_iterator.cu
+++ b/cub/test/catch2_test_iterator.cu
@@ -28,11 +28,8 @@
 
 #include <cuda/__cccl_config>
 
-// with NVHPC we get deprecation warnings originating from instantiations from cudafe1.stub.c, so we have to bulk
-// suppress all deprecation warnings in this file (without a matching pop)
-#if _CCCL_COMPILER(NVHPC)
+// we get deprecation warnings from all kinds of places (including  cudafe1.stub.c)), so just bulk suppress them
 _CCCL_SUPPRESS_DEPRECATED_PUSH
-#endif
 
 #include <cub/iterator/arg_index_input_iterator.cuh>
 #include <cub/iterator/cache_modified_input_iterator.cuh>
@@ -99,10 +96,8 @@ __global__ void test_iterator_kernel(InputIteratorT d_in, T* d_out, InputIterato
   d_itrs[1] = d_in; // Iterator at offset 0
 }
 
-_CCCL_SUPPRESS_DEPRECATED_PUSH
 template <typename InputIteratorT, typename T>
-void test_iterator(InputIteratorT d_in, const c2h::host_vector<T>& h_reference) //
-  _CCCL_SUPPRESS_DEPRECATED_POP
+void test_iterator(InputIteratorT d_in, const c2h::host_vector<T>& h_reference)
 {
   c2h::device_vector<T> d_out(h_reference.size());
   c2h::device_vector<InputIteratorT> d_itrs(2, d_in); // TODO(bgruber): using a raw allocation halves the compile time
@@ -123,9 +118,7 @@ C2H_TEST("Test constant iterator", "[iterator]", scalar_types)
   using T                = c2h::get<0, TestType>;
   const T base           = static_cast<T>(GENERATE(0, 99));
   const auto h_reference = c2h::host_vector<T>{base, base, base, base, base, base, base, base};
-  _CCCL_SUPPRESS_DEPRECATED_PUSH
   test_iterator(cub::ConstantInputIterator<T>(base), h_reference);
-  _CCCL_SUPPRESS_DEPRECATED_POP
 }
 
 C2H_TEST("Test counting iterator", "[iterator]", scalar_types)
@@ -141,9 +134,7 @@ C2H_TEST("Test counting iterator", "[iterator]", scalar_types)
     static_cast<T>(base + 21),
     static_cast<T>(base + 11),
     static_cast<T>(base + 0)};
-  _CCCL_SUPPRESS_DEPRECATED_PUSH
   test_iterator(cub::CountingInputIterator<T>(base), h_reference);
-  _CCCL_SUPPRESS_DEPRECATED_POP
 }
 
 using cache_modifiers =
@@ -201,11 +192,9 @@ C2H_TEST("Test transform iterator", "[iterator]", types)
     op(h_data[21]),
     op(h_data[11]),
     op(h_data[0])};
-  _CCCL_SUPPRESS_DEPRECATED_PUSH
   test_iterator(cub::TransformInputIterator<T, transform_op_t<T>, const T*>(
                   const_cast<const T*>(const_cast<const T*>(thrust::raw_pointer_cast(d_data.data()))), op),
                 h_reference);
-  _CCCL_SUPPRESS_DEPRECATED_POP
 }
 
 C2H_TEST("Test tex-obj texture iterator", "[iterator]", types)
@@ -249,9 +238,7 @@ C2H_TEST("Test texture transform iterator", "[iterator]", types)
   TextureIterator d_tex_itr;
   CubDebugExit(
     d_tex_itr.BindTexture(const_cast<const T*>(thrust::raw_pointer_cast(d_data.data())), sizeof(T) * TEST_VALUES));
-  _CCCL_SUPPRESS_DEPRECATED_PUSH
   cub::TransformInputIterator<T, transform_op_t<T>, TextureIterator> xform_itr(d_tex_itr, op);
-  _CCCL_SUPPRESS_DEPRECATED_POP
   test_iterator(xform_itr, h_reference);
   CubDebugExit(d_tex_itr.UnbindTexture());
 }