diff --git a/c/parallel/test/test_main.cpp b/c/parallel/test/test_main.cpp
index 3e3b4900a5d..d1fb01d96bd 100644
--- a/c/parallel/test/test_main.cpp
+++ b/c/parallel/test/test_main.cpp
@@ -12,8 +12,7 @@
 
 #include <iostream>
 
-#define CATCH_CONFIG_RUNNER
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
 
 int device_guard(int device_id)
 {
@@ -40,7 +39,7 @@ int main(int argc, char* argv[])
   int device_id{};
 
   // Build a new parser on top of Catch's
-  using namespace Catch::clara;
+  using namespace Catch::Clara;
   auto cli = session.cli() | Opt(device_id, "device")["-d"]["--device"]("device id to use");
   session.cli(cli);
 
diff --git a/c/parallel/test/test_util.h b/c/parallel/test/test_util.h
index 3f7010a3e36..456a717c4d8 100644
--- a/c/parallel/test/test_util.h
+++ b/c/parallel/test/test_util.h
@@ -22,7 +22,9 @@
 #include <type_traits>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators_all.hpp>
 #include <cccl/c/reduce.h>
 #include <nvrtc.h>
 
diff --git a/c2h/include/c2h/catch2_main.h b/c2h/include/c2h/catch2_main.h
index dc1fa2eba16..8005d33a649 100644
--- a/c2h/include/c2h/catch2_main.h
+++ b/c2h/include/c2h/catch2_main.h
@@ -36,13 +36,9 @@
 //! executable, this header is included into each test. On the other hand, when all the tests are compiled into a single
 //! executable, this header is excluded from the tests and included into catch2_runner.cpp
 
-#ifdef CUB_CONFIG_MAIN
-#  define CATCH_CONFIG_RUNNER
-#endif
-
-#include <catch2/catch.hpp>
+#include <catch2/catch_session.hpp>
 
-#if defined(CUB_CONFIG_MAIN)
+#ifdef CUB_CONFIG_MAIN
 #  if THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
 #    include <c2h/catch2_runner_helper.h>
 
@@ -59,7 +55,7 @@ int main(int argc, char* argv[])
   int device_id{};
 
   // Build a new parser on top of Catch's
-  using namespace Catch::clara;
+  using namespace Catch::Clara;
   auto cli = session.cli() | Opt(device_id, "device")["-d"]["--device"]("device id to use");
   session.cli(cli);
 
@@ -73,4 +69,4 @@ int main(int argc, char* argv[])
 #  endif // THRUST_DEVICE_SYSTEM == THRUST_DEVICE_SYSTEM_CUDA
   return session.run(argc, argv);
 }
-#endif
+#endif // CUB_CONFIG_MAIN
diff --git a/c2h/include/c2h/catch2_test_helper.h b/c2h/include/c2h/catch2_test_helper.h
index 729c1f43ebd..585b24a70b6 100644
--- a/c2h/include/c2h/catch2_test_helper.h
+++ b/c2h/include/c2h/catch2_test_helper.h
@@ -39,15 +39,37 @@
 #include <tuple>
 #include <type_traits>
 
-#if __CUDACC_VER_MAJOR__ == 11
-_CCCL_NV_DIAG_SUPPRESS(177) // catch2 may contain unused variables
-#endif // nvcc-11
-
 #include <c2h/catch2_main.h>
 #include <c2h/device_policy.h>
 #include <c2h/test_util_vec.h>
 #include <c2h/utility.h>
 #include <c2h/vector.h>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators_all.hpp>
+#include <catch2/matchers/catch_matchers.hpp>
+#include <catch2/matchers/catch_matchers_vector.hpp>
+
+// workaround for error #3185-D: no '#pragma diagnostic push' was found to match this 'diagnostic pop'
+#if _CCCL_COMPILER(NVHPC)
+#  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma("diag push")
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma("diag pop")
+#endif
+// workaround for error
+// * MSVC14.39: #3185-D: no '#pragma diagnostic push' was found to match this 'diagnostic pop'
+// * MSVC14.29: internal error: assertion failed: alloc_copy_of_pending_pragma: copied pragma has source sequence entry
+//              (pragma.c, line 526 in alloc_copy_of_pending_pragma)
+// see also upstream Catch2 issue: https://github.com/catchorg/Catch2/issues/2636
+#if _CCCL_COMPILER(MSVC)
+#  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#endif
 
 #ifndef VAR_IDX
 #  define VAR_IDX 0
@@ -110,11 +132,11 @@ std::vector<T> to_vec(std::vector<T> const& vec)
 }
 } // namespace detail
 
-#define REQUIRE_APPROX_EQ(ref, out)                \
-  {                                                \
-    auto vec_ref = detail::to_vec(ref);            \
-    auto vec_out = detail::to_vec(out);            \
-    REQUIRE_THAT(vec_ref, Catch::Approx(vec_out)); \
+#define REQUIRE_APPROX_EQ(ref, out)                          \
+  {                                                          \
+    auto vec_ref = detail::to_vec(ref);                      \
+    auto vec_out = detail::to_vec(out);                      \
+    REQUIRE_THAT(vec_ref, Catch::Matchers::Approx(vec_out)); \
   }
 
 namespace detail
@@ -140,7 +162,7 @@ struct bitwise_equal
 
 // Catch2 Matcher that calls `std::equal` with a default-constructable custom predicate
 template <typename Range, typename Pred>
-struct CustomEqualsRangeMatcher : Catch::MatcherBase<Range>
+struct CustomEqualsRangeMatcher : Catch::Matchers::MatcherBase<Range>
 {
   CustomEqualsRangeMatcher(Range const& range)
       : range{range}
diff --git a/cmake/CCCLGetDependencies.cmake b/cmake/CCCLGetDependencies.cmake
index cd7f3c9fc41..1a97d98820b 100644
--- a/cmake/CCCLGetDependencies.cmake
+++ b/cmake/CCCLGetDependencies.cmake
@@ -14,7 +14,7 @@ endmacro()
 
 macro(cccl_get_catch2)
   include("${_cccl_cpm_file}")
-  CPMAddPackage("gh:catchorg/Catch2@2.13.9")
+  CPMAddPackage("gh:catchorg/Catch2@3.8.0")
 endmacro()
 
 macro(cccl_get_fmt)
diff --git a/cub/benchmarks/nvbench_helper/CMakeLists.txt b/cub/benchmarks/nvbench_helper/CMakeLists.txt
index 24b12c12154..bf8581fbf79 100644
--- a/cub/benchmarks/nvbench_helper/CMakeLists.txt
+++ b/cub/benchmarks/nvbench_helper/CMakeLists.txt
@@ -26,10 +26,9 @@ if (CUB_ENABLE_NVBENCH_HELPER_TESTS)
                                                  test/gen_range.cu
                                                  test/gen_entropy.cu
                                                  test/gen_uniform_distribution.cu
-                                                 test/gen_power_law_distribution.cu
-                                                 test/main.cpp)
+                                                 test/gen_power_law_distribution.cu)
     cccl_configure_target(${nvbench_helper_test_target} DIALECT 17)
-    target_link_libraries(${nvbench_helper_test_target} PRIVATE nvbench_helper Catch2::Catch2 Boost::math)
+    target_link_libraries(${nvbench_helper_test_target} PRIVATE nvbench_helper Catch2::Catch2WithMain Boost::math)
     if ("${device_system}" STREQUAL "cpp")
       target_compile_definitions(${nvbench_helper_test_target} PRIVATE THRUST_DEVICE_SYSTEM=THRUST_DEVICE_SYSTEM_CPP)
     endif()
diff --git a/cub/benchmarks/nvbench_helper/nvbench_helper/nvbench_helper.cuh b/cub/benchmarks/nvbench_helper/nvbench_helper/nvbench_helper.cuh
index e1928ec8516..451d289f6c2 100644
--- a/cub/benchmarks/nvbench_helper/nvbench_helper/nvbench_helper.cuh
+++ b/cub/benchmarks/nvbench_helper/nvbench_helper/nvbench_helper.cuh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <cub/thread/thread_operators.cuh>
+
 #include <thrust/device_vector.h>
 #include <thrust/execution_policy.h>
 
diff --git a/cub/benchmarks/nvbench_helper/test/gen_entropy.cu b/cub/benchmarks/nvbench_helper/test/gen_entropy.cu
index 967b8ff0e88..12c96154f94 100644
--- a/cub/benchmarks/nvbench_helper/test/gen_entropy.cu
+++ b/cub/benchmarks/nvbench_helper/test/gen_entropy.cu
@@ -36,7 +36,8 @@
 #include <algorithm>
 #include <array>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nvbench_helper.cuh>
 
 template <class T>
diff --git a/cub/benchmarks/nvbench_helper/test/gen_power_law_distribution.cu b/cub/benchmarks/nvbench_helper/test/gen_power_law_distribution.cu
index 0d06d308b0b..599bb9293cb 100644
--- a/cub/benchmarks/nvbench_helper/test/gen_power_law_distribution.cu
+++ b/cub/benchmarks/nvbench_helper/test/gen_power_law_distribution.cu
@@ -33,7 +33,8 @@
 
 #include <boost/math/statistics/anderson_darling.hpp>
 #include <boost/math/statistics/univariate_statistics.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nvbench_helper.cuh>
 
 bool is_normal(thrust::host_vector<double> data)
diff --git a/cub/benchmarks/nvbench_helper/test/gen_range.cu b/cub/benchmarks/nvbench_helper/test/gen_range.cu
index 064e0b2f1d2..f4eba3183b9 100644
--- a/cub/benchmarks/nvbench_helper/test/gen_range.cu
+++ b/cub/benchmarks/nvbench_helper/test/gen_range.cu
@@ -30,7 +30,8 @@
 
 #include <limits>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/generators/catch_generators_all.hpp>
 #include <nvbench_helper.cuh>
 
 using types =
diff --git a/cub/benchmarks/nvbench_helper/test/gen_seed.cu b/cub/benchmarks/nvbench_helper/test/gen_seed.cu
index 3f04b2c88d1..9f27d6931d5 100644
--- a/cub/benchmarks/nvbench_helper/test/gen_seed.cu
+++ b/cub/benchmarks/nvbench_helper/test/gen_seed.cu
@@ -28,7 +28,7 @@
 #include <thrust/device_vector.h>
 #include <thrust/equal.h>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
 #include <nvbench_helper.cuh>
 
 using types =
diff --git a/cub/benchmarks/nvbench_helper/test/gen_uniform_distribution.cu b/cub/benchmarks/nvbench_helper/test/gen_uniform_distribution.cu
index ed09ef7535e..d37ba2b8fb6 100644
--- a/cub/benchmarks/nvbench_helper/test/gen_uniform_distribution.cu
+++ b/cub/benchmarks/nvbench_helper/test/gen_uniform_distribution.cu
@@ -34,7 +34,9 @@
 #include <map>
 
 #include <boost/math/distributions/chi_squared.hpp>
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/generators/catch_generators_all.hpp>
 #include <nvbench_helper.cuh>
 
 template <typename T>
diff --git a/cub/benchmarks/nvbench_helper/test/main.cpp b/cub/benchmarks/nvbench_helper/test/main.cpp
deleted file mode 100644
index 5dc819f5caa..00000000000
--- a/cub/benchmarks/nvbench_helper/test/main.cpp
+++ /dev/null
@@ -1,29 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2011-2023, NVIDIA CORPORATION.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright
- *       notice, this list of conditions and the following disclaimer in the
- *       documentation and/or other materials provided with the distribution.
- *     * Neither the name of the NVIDIA CORPORATION nor the
- *       names of its contributors may be used to endorse or promote products
- *       derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL NVIDIA CORPORATION BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- ******************************************************************************/
-
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
diff --git a/cub/test/catch2_test_device_segmented_reduce_iterators_64bit.cu b/cub/test/catch2_test_device_segmented_reduce_iterators_64bit.cu
index 561290ce075..b58109cb657 100644
--- a/cub/test/catch2_test_device_segmented_reduce_iterators_64bit.cu
+++ b/cub/test/catch2_test_device_segmented_reduce_iterators_64bit.cu
@@ -34,7 +34,6 @@
 
 #include <cstdint>
 
-#include "catch2/catch.hpp"
 #include "catch2_test_launch_helper.h"
 #include <c2h/catch2_test_helper.h>
 
diff --git a/cub/test/catch2_test_vsmem.cu b/cub/test/catch2_test_vsmem.cu
index cf86389d68c..6b16bde7fa9 100644
--- a/cub/test/catch2_test_vsmem.cu
+++ b/cub/test/catch2_test_vsmem.cu
@@ -33,7 +33,6 @@
 #include <cub/util_type.cuh>
 #include <cub/util_vsmem.cuh>
 
-#include "catch2/catch.hpp"
 #include "catch2_test_launch_helper.h"
 #include <c2h/catch2_test_helper.h>
 
diff --git a/cub/test/insert_nested_NVTX_range_guard.h b/cub/test/insert_nested_NVTX_range_guard.h
index 56d7aad6bc1..9da6cf042b1 100644
--- a/cub/test/insert_nested_NVTX_range_guard.h
+++ b/cub/test/insert_nested_NVTX_range_guard.h
@@ -5,7 +5,7 @@
 #include <cstdio>
 #include <cstdlib>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
 
 #if defined(__cpp_inline_variables)
 inline thread_local bool entered = false;
diff --git a/cub/test/thread_reduce/catch2_test_thread_reduce.cu b/cub/test/thread_reduce/catch2_test_thread_reduce.cu
index fe88ea003be..ba7342db9a5 100644
--- a/cub/test/thread_reduce/catch2_test_thread_reduce.cu
+++ b/cub/test/thread_reduce/catch2_test_thread_reduce.cu
@@ -48,6 +48,7 @@
 #include "c2h/custom_type.h"
 #include "c2h/extended_types.h"
 #include "c2h/generators.h"
+#include <catch2/matchers/catch_matchers_floating_point.hpp>
 
 /***********************************************************************************************************************
  * Thread Reduce Wrapper Kernels
@@ -285,7 +286,7 @@ _CCCL_TEMPLATE(typename T)
 _CCCL_REQUIRES((::cuda::std::is_floating_point<T>::value))
 void verify_results(const T& expected_data, const T& test_results)
 {
-  REQUIRE(expected_data == Approx(test_results).epsilon(0.05));
+  REQUIRE_THAT(expected_data, Catch::Matchers::WithinRel(test_results, T{0.05}));
 }
 
 _CCCL_TEMPLATE(typename T)
diff --git a/cudax/include/cuda/experimental/__stf/utility/memory.cuh b/cudax/include/cuda/experimental/__stf/utility/memory.cuh
index bd3c895ee16..b0f987ca63b 100644
--- a/cudax/include/cuda/experimental/__stf/utility/memory.cuh
+++ b/cudax/include/cuda/experimental/__stf/utility/memory.cuh
@@ -29,6 +29,7 @@
 
 #include <cuda/experimental/__stf/utility/cuda_safe_call.cuh>
 
+#include <algorithm>
 #include <cstdint>
 
 namespace cuda::experimental::stf
diff --git a/cudax/test/CMakeLists.txt b/cudax/test/CMakeLists.txt
index 3c4abf38c91..c6fb198f35b 100644
--- a/cudax/test/CMakeLists.txt
+++ b/cudax/test/CMakeLists.txt
@@ -8,9 +8,6 @@ find_package(Thrust ${cudax_VERSION} EXACT CONFIG
 )
 thrust_create_target(cudax.test.thrust)
 
-add_library(catch2_main STATIC catch2_helpers/catch2_main.cpp)
-target_link_libraries(catch2_main PUBLIC Catch2::Catch2)
-
 ## cudax_add_test
 #
 # Add a catch2 test executable and register it with ctest.
@@ -34,8 +31,7 @@ function(cudax_add_catch2_test target_name_var test_name cn_target) # ARGN=test
   target_link_libraries(${test_target} PRIVATE
     ${cn_target}
     cudax.test.thrust
-    Catch2::Catch2
-    catch2_main
+    Catch2::Catch2WithMain
   )
   target_compile_options(${test_target} PRIVATE
     "-DLIBCUDACXX_ENABLE_EXPERIMENTAL_MEMORY_RESOURCE"
diff --git a/cudax/test/algorithm/common.cuh b/cudax/test/algorithm/common.cuh
index 661d087f3bc..c3c0f40869e 100644
--- a/cudax/test/algorithm/common.cuh
+++ b/cudax/test/algorithm/common.cuh
@@ -17,7 +17,7 @@
 #include <cuda/experimental/buffer.cuh>
 #include <cuda/experimental/memory_resource.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 inline constexpr uint8_t fill_byte    = 1;
diff --git a/cudax/test/catch2_helpers/catch2_main.cpp b/cudax/test/catch2_helpers/catch2_main.cpp
deleted file mode 100644
index 23afde17338..00000000000
--- a/cudax/test/catch2_helpers/catch2_main.cpp
+++ /dev/null
@@ -1,2 +0,0 @@
-#define CATCH_CONFIG_MAIN // This tells Catch to provide a main() - only do this in one cpp file
-#include <catch2/catch.hpp>
diff --git a/cudax/test/common/testing.cuh b/cudax/test/common/testing.cuh
index 965ae398e7b..65dc438c307 100644
--- a/cudax/test/common/testing.cuh
+++ b/cudax/test/common/testing.cuh
@@ -11,15 +11,39 @@
 #ifndef __COMMON_TESTING_H__
 #define __COMMON_TESTING_H__
 
+#include <cuda/__cccl_config>
+
 #include <cuda/experimental/launch.cuh>
 
 #include <exception> // IWYU pragma: keep
 #include <iostream>
 #include <sstream>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_template_test_macros.hpp>
+#include <catch2/catch_test_macros.hpp>
 #include <nv/target>
 
+// workaround for error #3185-D: no '#pragma diagnostic push' was found to match this 'diagnostic pop'
+#if _CCCL_COMPILER(NVHPC)
+#  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION _Pragma("diag push")
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION  _Pragma("diag pop")
+#endif
+// workaround for error
+// * MSVC14.39: #3185-D: no '#pragma diagnostic push' was found to match this 'diagnostic pop'
+// * MSVC14.29: internal error: assertion failed: alloc_copy_of_pending_pragma: copied pragma has source sequence entry
+//              (pragma.c, line 526 in alloc_copy_of_pending_pragma)
+// see also upstream Catch2 issue: https://github.com/catchorg/Catch2/issues/2636
+#if _CCCL_COMPILER(MSVC)
+#  undef CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  undef CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#  define CATCH_INTERNAL_START_WARNINGS_SUPPRESSION
+#  define CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION
+#  define CATCH_INTERNAL_SUPPRESS_UNUSED_VARIABLE_WARNINGS
+#endif
+
 namespace cuda::experimental::__async
 {
 }
diff --git a/cudax/test/containers/uninitialized_async_buffer.cu b/cudax/test/containers/uninitialized_async_buffer.cu
index 4cd09badfa6..392f5fb2944 100644
--- a/cudax/test/containers/uninitialized_async_buffer.cu
+++ b/cudax/test/containers/uninitialized_async_buffer.cu
@@ -23,7 +23,6 @@
 #include <cuda/experimental/memory_resource.cuh>
 
 #include "testing.cuh"
-#include <catch2/catch.hpp>
 
 struct do_not_construct
 {
diff --git a/cudax/test/event/event_smoke.cu b/cudax/test/event/event_smoke.cu
index 58cbb638daa..45d791652a0 100644
--- a/cudax/test/event/event_smoke.cu
+++ b/cudax/test/event/event_smoke.cu
@@ -11,7 +11,7 @@
 #include <cuda/experimental/event.cuh>
 #include <cuda/experimental/stream.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 namespace
diff --git a/cudax/test/execution/env.cu b/cudax/test/execution/env.cu
index 55663ad78be..ec0985d3759 100644
--- a/cudax/test/execution/env.cu
+++ b/cudax/test/execution/env.cu
@@ -14,7 +14,7 @@
 #include <cuda/experimental/execution.cuh>
 #include <cuda/experimental/memory_resource.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 
 namespace cudax = cuda::experimental;
 using env_t     = cudax::env_t<cuda::mr::device_accessible>;
diff --git a/cudax/test/execution/policies/get_execution_policy.cu b/cudax/test/execution/policies/get_execution_policy.cu
index 11c4937f410..1315a58a2a0 100644
--- a/cudax/test/execution/policies/get_execution_policy.cu
+++ b/cudax/test/execution/policies/get_execution_policy.cu
@@ -12,7 +12,7 @@
 
 #include <cuda/experimental/execution.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 
 using cuda::experimental::execution::execution_policy;
 
diff --git a/cudax/test/execution/policies/policies.cu b/cudax/test/execution/policies/policies.cu
index 781397e2ee9..c8073cdb45f 100644
--- a/cudax/test/execution/policies/policies.cu
+++ b/cudax/test/execution/policies/policies.cu
@@ -12,7 +12,7 @@
 
 #include <cuda/experimental/execution.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 
 namespace cudax = cuda::experimental;
 
diff --git a/cudax/test/green_context/green_ctx_smoke.cu b/cudax/test/green_context/green_ctx_smoke.cu
index 01b2571e55f..e9f2952a1e1 100644
--- a/cudax/test/green_context/green_ctx_smoke.cu
+++ b/cudax/test/green_context/green_ctx_smoke.cu
@@ -11,7 +11,7 @@
 #include <cuda/experimental/green_context.cuh>
 #include <cuda/experimental/stream.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 #if CUDART_VERSION >= 12050
@@ -23,7 +23,7 @@ TEST_CASE("Green context", "[green_context]")
   }
   else
   {
-    INFO("Can create a green context")
+    INFO("Can create a green context");
     {
       {
         [[maybe_unused]] cudax::green_context ctx(cudax::devices[0]);
@@ -35,7 +35,7 @@ TEST_CASE("Green context", "[green_context]")
       }
     }
 
-    INFO("Can create streams under green context")
+    INFO("Can create streams under green context");
     {
       cudax::green_context green_ctx_dev0(cudax::devices[0]);
       cudax::stream stream_under_green_ctx(green_ctx_dev0);
@@ -47,7 +47,7 @@ TEST_CASE("Green context", "[green_context]")
         CUDAX_REQUIRE(stream_dev1.device() == 1);
       }
 
-      INFO("Can create a side stream")
+      INFO("Can create a side stream");
       {
         auto ldev1 = stream_under_green_ctx.logical_device();
         CUDAX_REQUIRE(ldev1.get_kind() == cudax::logical_device::kinds::green_context);
diff --git a/cudax/test/hierarchy/hierarchy_smoke.cu b/cudax/test/hierarchy/hierarchy_smoke.cu
index 62be4f5aac6..1d2f506f1a9 100644
--- a/cudax/test/hierarchy/hierarchy_smoke.cu
+++ b/cudax/test/hierarchy/hierarchy_smoke.cu
@@ -10,6 +10,7 @@
 
 #include <iostream>
 
+#include "testing.cuh"
 #include <cooperative_groups.h>
 #include <host_device.cuh>
 
diff --git a/cudax/test/memory_resource/any_async_resource.cu b/cudax/test/memory_resource/any_async_resource.cu
index c491c9efa21..9dbb898fc08 100644
--- a/cudax/test/memory_resource/any_async_resource.cu
+++ b/cudax/test/memory_resource/any_async_resource.cu
@@ -11,7 +11,6 @@
 #include <cuda/experimental/memory_resource.cuh>
 
 #include "test_resource.cuh"
-#include <catch2/catch.hpp>
 #include <testing.cuh>
 
 #ifndef __CUDA_ARCH__
diff --git a/cudax/test/memory_resource/device_memory_pool.cu b/cudax/test/memory_resource/device_memory_pool.cu
index 351c3d8a0ed..bbfae3385d8 100644
--- a/cudax/test/memory_resource/device_memory_pool.cu
+++ b/cudax/test/memory_resource/device_memory_pool.cu
@@ -18,7 +18,6 @@
 
 #include <stdexcept>
 
-#include <catch2/catch.hpp>
 #include <testing.cuh>
 
 namespace cudax = cuda::experimental;
diff --git a/cudax/test/memory_resource/device_memory_resource.cu b/cudax/test/memory_resource/device_memory_resource.cu
index aefbb8b1bf7..44402c430e1 100644
--- a/cudax/test/memory_resource/device_memory_resource.cu
+++ b/cudax/test/memory_resource/device_memory_resource.cu
@@ -16,7 +16,7 @@
 
 #include <stdexcept>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 namespace cudax = cuda::experimental;
diff --git a/cudax/test/memory_resource/get_memory_resource.cu b/cudax/test/memory_resource/get_memory_resource.cu
index c61967fa7a5..389bb955624 100644
--- a/cudax/test/memory_resource/get_memory_resource.cu
+++ b/cudax/test/memory_resource/get_memory_resource.cu
@@ -13,7 +13,6 @@
 #include <cuda/experimental/memory_resource.cuh>
 
 #include "test_resource.cuh"
-#include <catch2/catch.hpp>
 #include <testing.cuh>
 
 using device_resource = cuda::experimental::device_memory_resource;
diff --git a/cudax/test/memory_resource/managed_memory_resource.cu b/cudax/test/memory_resource/managed_memory_resource.cu
index 1c5836192ba..c0a4f66dc62 100644
--- a/cudax/test/memory_resource/managed_memory_resource.cu
+++ b/cudax/test/memory_resource/managed_memory_resource.cu
@@ -17,7 +17,7 @@
 
 #include <stdexcept>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 namespace cudax = cuda::experimental;
diff --git a/cudax/test/memory_resource/pinned_memory_resource.cu b/cudax/test/memory_resource/pinned_memory_resource.cu
index 4240491c6a3..bcbe3a315ec 100644
--- a/cudax/test/memory_resource/pinned_memory_resource.cu
+++ b/cudax/test/memory_resource/pinned_memory_resource.cu
@@ -18,7 +18,7 @@
 #include <stdexcept>
 
 #include "cuda/__memory_resource/resource_ref.h"
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 namespace cudax = cuda::experimental;
diff --git a/cudax/test/memory_resource/shared_resource.cu b/cudax/test/memory_resource/shared_resource.cu
index cd279ab0b9e..29e6122774e 100644
--- a/cudax/test/memory_resource/shared_resource.cu
+++ b/cudax/test/memory_resource/shared_resource.cu
@@ -12,7 +12,6 @@
 #include <cuda/experimental/memory_resource.cuh>
 
 #include "test_resource.cuh"
-#include <catch2/catch.hpp>
 #include <testing.cuh>
 
 TEMPLATE_TEST_CASE_METHOD(test_fixture, "shared_resource", "[container][resource]", big_resource, small_resource)
diff --git a/cudax/test/memory_resource/test_resource.cuh b/cudax/test/memory_resource/test_resource.cuh
index 75cd9b665b2..644cace7abc 100644
--- a/cudax/test/memory_resource/test_resource.cuh
+++ b/cudax/test/memory_resource/test_resource.cuh
@@ -8,7 +8,6 @@
 #include <cstddef>
 #include <cstdint>
 
-#include <catch2/catch.hpp>
 #include <testing.cuh>
 
 using std::size_t;
diff --git a/cudax/test/stream/get_stream.cu b/cudax/test/stream/get_stream.cu
index 43cb9921990..5e0f6417ac9 100644
--- a/cudax/test/stream/get_stream.cu
+++ b/cudax/test/stream/get_stream.cu
@@ -10,7 +10,7 @@
 
 #include <cuda/experimental/stream.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 TEST_CASE("Can call get_stream on a cudaStream_t", "[stream]")
diff --git a/cudax/test/stream/stream_smoke.cu b/cudax/test/stream/stream_smoke.cu
index fd50ab7adf7..62cc8dcad45 100644
--- a/cudax/test/stream/stream_smoke.cu
+++ b/cudax/test/stream/stream_smoke.cu
@@ -11,7 +11,7 @@
 #include <cuda/experimental/launch.cuh>
 #include <cuda/experimental/stream.cuh>
 
-#include <catch2/catch.hpp>
+#include <testing.cuh>
 #include <utility.cuh>
 
 TEST_CASE("Can create a stream and launch work into it", "[stream]")
@@ -122,7 +122,7 @@ TEST_CASE("Stream get device", "[stream]")
   auto stream_ref_cudart = cudax::stream_ref(stream_handle);
   CUDAX_REQUIRE(stream_ref_cudart.device() == *std::prev(cudax::devices.end()));
 
-  INFO("Can create a side stream using logical device")
+  INFO("Can create a side stream using logical device");
   {
     if (test::cuda_driver_version() >= 12050)
     {