diff --git a/cub/test/catch2_segmented_sort_helper.cuh b/cub/test/catch2_segmented_sort_helper.cuh
index c45c8419b6..bf688553d2 100644
--- a/cub/test/catch2_segmented_sort_helper.cuh
+++ b/cub/test/catch2_segmented_sort_helper.cuh
@@ -89,7 +89,7 @@ struct segment_index_to_offset_op
     }
     else if (i < num_segments)
     {
-      return segment_size * (i - num_empty_segments);
+      return segment_size * static_cast<OffsetT>(i - num_empty_segments);
     }
     else
     {
@@ -176,7 +176,7 @@ private:
     std::size_t end_cycle = segment_end / sequence_length;
 
     // Number of full cycles repeating the sequence
-    std::size_t full_cycles = (end_cycle > start_cycle) ? end_cycle - start_cycle : 0;
+    int full_cycles = (end_cycle > start_cycle) ? static_cast<int>(end_cycle - start_cycle) : 0;
 
     // Add contributions from full cycles
     c2h::host_vector<int> histogram(sequence_length, full_cycles);
diff --git a/cub/test/catch2_test_device_segmented_sort_pairs.cu b/cub/test/catch2_test_device_segmented_sort_pairs.cu
index 9f8250f7d3..b89c9df92f 100644
--- a/cub/test/catch2_test_device_segmented_sort_pairs.cu
+++ b/cub/test/catch2_test_device_segmented_sort_pairs.cu
@@ -236,9 +236,6 @@ try
     segment_iterator_t{num_empty_segments, num_segments, segment_size, num_items});
   auto offsets_plus_1 = offsets + 1;
 
-  auto out_keys_ptr   = thrust::raw_pointer_cast(out_keys.data());
-  auto out_values_ptr = thrust::raw_pointer_cast(out_values.data());
-
   stable_sort_pairs(
     thrust::raw_pointer_cast(in_keys.data()),
     thrust::raw_pointer_cast(out_keys.data()),