diff --git a/c2h/include/c2h/operator.cuh b/c2h/include/c2h/operator.cuh
index ced195899b3..33e6c428ebb 100644
--- a/c2h/include/c2h/operator.cuh
+++ b/c2h/include/c2h/operator.cuh
@@ -5,6 +5,7 @@
 #include <cuda/functional>
 #include <cuda/std/functional>
 #include <cuda/std/limits>
+#include <cuda/std/type_traits>
 #include <cuda/type_traits>
 
 #include <c2h/custom_type.h>
@@ -100,5 +101,25 @@ template <template <typename> class... Policies>
 inline const c2h::custom_type_t<Policies...> identity_v<cuda::minimum<>, c2h::custom_type_t<Policies...>> =
   cuda::std::numeric_limits<c2h::custom_type_t<Policies...>>::max();
 
+/***********************************************************************************************************************
+ * Test operators
+ **********************************************************************************************************************/
+
+template <class ExpectedOffsetT = void>
+struct incrementer_t
+{
+  int* d_counts;
+
+  template <class OffsetT, class... Args>
+  __device__ void operator()(OffsetT i, Args...)
+  {
+    static_assert(cuda::std::is_void_v<ExpectedOffsetT> || cuda::std::is_same_v<ExpectedOffsetT, OffsetT>,
+                  "ExpectedOffsetT and OffsetT must be the same type");
+    atomicAdd(d_counts + i, 1); // Check if `i` was served more than once
+  }
+};
+
+incrementer_t(int*) -> incrementer_t<>;
+
 struct custom_plus : cuda::std::plus<>
 {};
diff --git a/cub/test/catch2_test_device_bulk.cu b/cub/test/catch2_test_device_bulk.cu
index 809f85443de..05c27c730a0 100644
--- a/cub/test/catch2_test_device_bulk.cu
+++ b/cub/test/catch2_test_device_bulk.cu
@@ -8,10 +8,9 @@
 #include <thrust/count.h>
 #include <thrust/detail/raw_pointer_cast.h>
 
-#include <cuda/std/type_traits>
-
 #include "catch2_test_launch_helper.h"
 #include <c2h/catch2_test_helper.h>
+#include <c2h/operator.cuh>
 
 // %PARAM% TEST_LAUNCH lid 0:1:2
 
@@ -19,19 +18,6 @@ DECLARE_LAUNCH_WRAPPER(cub::DeviceFor::Bulk, device_bulk);
 
 using offset_type = c2h::type_list<std::int32_t, std::uint32_t, std::uint64_t, std::int64_t>;
 
-template <class T>
-struct incrementer_t
-{
-  int* d_counts;
-
-  template <class OffsetT>
-  __device__ void operator()(OffsetT i)
-  {
-    static_assert(cuda::std::is_same_v<T, OffsetT>, "T and OffsetT must be the same type");
-    atomicAdd(d_counts + i, 1); // Check if `i` was served more than once
-  }
-};
-
 C2H_TEST("Device bulk works", "[bulk][device]", offset_type)
 {
   using offset_t = c2h::get<0, TestType>;
diff --git a/cub/test/catch2_test_device_for.cu b/cub/test/catch2_test_device_for.cu
index 440efab5265..fba05c3387a 100644
--- a/cub/test/catch2_test_device_for.cu
+++ b/cub/test/catch2_test_device_for.cu
@@ -14,23 +14,13 @@
 
 #include "catch2_test_launch_helper.h"
 #include <c2h/catch2_test_helper.h>
+#include <c2h/operator.cuh>
 
 // %PARAM% TEST_LAUNCH lid 0:1:2
 
 DECLARE_LAUNCH_WRAPPER(cub::DeviceFor::ForEach, device_for_each);
 DECLARE_LAUNCH_WRAPPER(cub::DeviceFor::ForEachN, device_for_each_n);
 
-struct incrementer_t
-{
-  int* d_counts;
-
-  template <class OffsetT>
-  __device__ void operator()(OffsetT i)
-  {
-    atomicAdd(d_counts + i, 1); // Check if `i` was served more than once
-  }
-};
-
 template <class OffsetT>
 class offset_proxy_t
 {
diff --git a/cub/test/catch2_test_device_for_copy.cu b/cub/test/catch2_test_device_for_copy.cu
index 0ba6a994302..6f140bf9183 100644
--- a/cub/test/catch2_test_device_for_copy.cu
+++ b/cub/test/catch2_test_device_for_copy.cu
@@ -13,6 +13,7 @@
 
 #include "catch2_test_launch_helper.h"
 #include <c2h/catch2_test_helper.h>
+#include <c2h/operator.cuh>
 
 // %PARAM% TEST_LAUNCH lid 0:1:2
 
@@ -21,17 +22,6 @@ DECLARE_LAUNCH_WRAPPER(cub::DeviceFor::ForEachCopyN, device_for_each_copy_n);
 
 using offset_type = c2h::type_list<std::int32_t, std::uint32_t, std::uint64_t, std::int64_t>;
 
-struct incrementer_t
-{
-  int* d_counts;
-
-  template <class OffsetT>
-  __device__ void operator()(OffsetT i)
-  {
-    atomicAdd(d_counts + i, 1); // Check if `i` was served more than once
-  }
-};
-
 template <class OffsetT>
 class offset_proxy_t
 {
diff --git a/cub/test/catch2_test_device_for_each_in_extents.cu b/cub/test/catch2_test_device_for_each_in_extents.cu
index 72a57f0b2fe..c25b8d5ab30 100644
--- a/cub/test/catch2_test_device_for_each_in_extents.cu
+++ b/cub/test/catch2_test_device_for_each_in_extents.cu
@@ -14,6 +14,7 @@
 #include <cuda/std/span>
 
 #include <c2h/catch2_test_helper.h>
+#include <c2h/operator.cuh>
 #include <c2h/utility.h>
 #include <catch2_test_launch_helper.h>
 
@@ -170,17 +171,6 @@ C2H_TEST("DeviceFor::ForEachInExtents 3D dynamic", "[ForEachInExtents][dynamic][
 //----------------------------------------------------------------------------------------------------------------------
 //
 
-struct incrementer_t
-{
-  int* d_counts;
-
-  template <class OffsetT>
-  __device__ void operator()(OffsetT i, OffsetT)
-  {
-    atomicAdd(d_counts + i, 1); // Check if `i` was served more than once
-  }
-};
-
 C2H_TEST("DeviceFor::ForEachInExtents works", "[ForEachInExtents]")
 {
   constexpr int max_items  = 5000000;
diff --git a/cub/test/catch2_test_device_for_each_in_layout.cu b/cub/test/catch2_test_device_for_each_in_layout.cu
index 0d008a98753..8f1217b6224 100644
--- a/cub/test/catch2_test_device_for_each_in_layout.cu
+++ b/cub/test/catch2_test_device_for_each_in_layout.cu
@@ -14,6 +14,7 @@
 #include <cuda/std/span>
 
 #include <c2h/catch2_test_helper.h>
+#include <c2h/operator.cuh>
 #include <c2h/utility.h>
 #include <catch2_test_launch_helper.h>
 
@@ -194,17 +195,6 @@ C2H_TEST("DeviceFor::ForEachInLayout 3D dynamic", "[ForEachInLayout][dynamic][de
 //----------------------------------------------------------------------------------------------------------------------
 // No duplicates
 
-struct incrementer_t
-{
-  int* d_counts;
-
-  template <typename IndexType, class OffsetT>
-  __device__ void operator()(IndexType i, OffsetT)
-  {
-    atomicAdd(d_counts + i, 1); // Check if `i` was served more than once
-  }
-};
-
 C2H_TEST("DeviceFor::ForEachInLayout no duplicates", "[ForEachInLayout][no_duplicates][device]", layouts)
 {
   constexpr int min_items = 1;