From 8d7708a87bb2269876b71a500aae52f554d2b008 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@nvidia.com>
Date: Sat, 11 Apr 2026 17:42:07 -0700
Subject: [PATCH 1/5] upgrade Catch2 to v3.14.0

---
 CMakeLists.txt                                            | 4 ++--
 test/CMakeLists.txt                                       | 8 ++++----
 test/exec/CMakeLists.txt                                  | 2 +-
 test/exec/asio/CMakeLists.txt                             | 2 +-
 test/exec/asio/test_asio_thread_pool.cpp                  | 2 +-
 test/exec/asio/test_completion_token.cpp                  | 2 +-
 test/exec/asio/test_use_sender.cpp                        | 2 +-
 test/exec/async_scope/test_dtor.cpp                       | 2 +-
 test/exec/async_scope/test_empty.cpp                      | 2 +-
 test/exec/async_scope/test_spawn.cpp                      | 2 +-
 test/exec/async_scope/test_spawn_future.cpp               | 2 +-
 test/exec/async_scope/test_start_now.cpp                  | 2 +-
 test/exec/async_scope/test_stop.cpp                       | 2 +-
 test/exec/sequence/test_any_sequence_of.cpp               | 2 +-
 test/exec/sequence/test_empty_sequence.cpp                | 2 +-
 test/exec/sequence/test_ignore_all_values.cpp             | 2 +-
 test/exec/sequence/test_iterate.cpp                       | 2 +-
 test/exec/sequence/test_merge.cpp                         | 2 +-
 test/exec/sequence/test_transform_each.cpp                | 2 +-
 test/exec/taskflow/CMakeLists.txt                         | 2 +-
 test/exec/taskflow/test_taskflow_thread_pool.cpp          | 2 +-
 test/exec/tbb/CMakeLists.txt                              | 2 +-
 test/exec/tbb/test_tbb_thread_pool.cpp                    | 2 +-
 test/exec/test_any_sender.cpp                             | 2 +-
 test/exec/test_at_coroutine_exit.cpp                      | 2 +-
 test/exec/test_bwos_lifo_queue.cpp                        | 2 +-
 test/exec/test_completion_signatures.cpp                  | 2 +-
 test/exec/test_cpo_ensure_started.cpp                     | 2 +-
 test/exec/test_cpo_split.cpp                              | 2 +-
 test/exec/test_create.cpp                                 | 2 +-
 test/exec/test_ensure_started.cpp                         | 2 +-
 test/exec/test_env.cpp                                    | 2 +-
 test/exec/test_execute.cpp                                | 2 +-
 test/exec/test_fork_join.cpp                              | 2 +-
 test/exec/test_into_tuple.cpp                             | 2 +-
 test/exec/test_io_uring_context.cpp                       | 2 +-
 test/exec/test_just_from.cpp                              | 2 +-
 test/exec/test_libdispatch.cpp                            | 2 +-
 test/exec/test_materialize.cpp                            | 2 +-
 test/exec/test_repeat_n.cpp                               | 2 +-
 test/exec/test_repeat_until.cpp                           | 2 +-
 test/exec/test_sequence_senders.cpp                       | 2 +-
 test/exec/test_split.cpp                                  | 2 +-
 test/exec/test_start_detached.cpp                         | 2 +-
 test/exec/test_static_thread_pool.cpp                     | 2 +-
 test/exec/test_task.cpp                                   | 2 +-
 test/exec/test_timed_thread_scheduler.cpp                 | 2 +-
 test/exec/test_trampoline_scheduler.cpp                   | 2 +-
 test/exec/test_type_async_scope.cpp                       | 2 +-
 test/exec/test_unless_stop_requested.cpp                  | 2 +-
 test/exec/test_variant_sender.cpp                         | 2 +-
 test/exec/test_when_any.cpp                               | 2 +-
 test/exec/test_windows_thread_pool_context.cpp            | 2 +-
 test/nvexec/CMakeLists.txt                                | 2 +-
 test/nvexec/bulk.cpp                                      | 2 +-
 test/nvexec/ensure_started.cpp                            | 2 +-
 test/nvexec/launch.cpp                                    | 2 +-
 test/nvexec/let_error.cpp                                 | 2 +-
 test/nvexec/let_stopped.cpp                               | 2 +-
 test/nvexec/let_value.cpp                                 | 2 +-
 test/nvexec/monotonic_buffer.cpp                          | 2 +-
 test/nvexec/reduce.cpp                                    | 2 +-
 test/nvexec/split.cpp                                     | 2 +-
 test/nvexec/start_detached.cpp                            | 2 +-
 test/nvexec/synchronized_pool.cpp                         | 2 +-
 test/nvexec/test_main.cpp                                 | 2 +-
 test/nvexec/then.cpp                                      | 2 +-
 test/nvexec/tracer_resource.h                             | 2 +-
 test/nvexec/transfer.cpp                                  | 2 +-
 test/nvexec/transfer_when_all.cpp                         | 2 +-
 test/nvexec/upon_error.cpp                                | 2 +-
 test/nvexec/upon_stopped.cpp                              | 2 +-
 test/nvexec/variant.cpp                                   | 2 +-
 test/nvexec/when_all.cpp                                  | 2 +-
 test/stdexec/algos/adaptors/test_associate.cpp            | 2 +-
 test/stdexec/algos/adaptors/test_bulk.cpp                 | 2 +-
 test/stdexec/algos/adaptors/test_continues_on.cpp         | 2 +-
 test/stdexec/algos/adaptors/test_finally.cpp              | 2 +-
 test/stdexec/algos/adaptors/test_into_variant.cpp         | 2 +-
 test/stdexec/algos/adaptors/test_let_error.cpp            | 2 +-
 test/stdexec/algos/adaptors/test_let_stopped.cpp          | 2 +-
 test/stdexec/algos/adaptors/test_let_value.cpp            | 2 +-
 test/stdexec/algos/adaptors/test_on.cpp                   | 2 +-
 test/stdexec/algos/adaptors/test_on2.cpp                  | 2 +-
 test/stdexec/algos/adaptors/test_on3.cpp                  | 2 +-
 test/stdexec/algos/adaptors/test_sequence.cpp             | 2 +-
 test/stdexec/algos/adaptors/test_spawn_future.cpp         | 2 +-
 test/stdexec/algos/adaptors/test_starts_on.cpp            | 2 +-
 test/stdexec/algos/adaptors/test_stop_when.cpp            | 2 +-
 test/stdexec/algos/adaptors/test_stopped_as_error.cpp     | 2 +-
 test/stdexec/algos/adaptors/test_stopped_as_optional.cpp  | 2 +-
 test/stdexec/algos/adaptors/test_then.cpp                 | 2 +-
 test/stdexec/algos/adaptors/test_transfer_when_all.cpp    | 2 +-
 test/stdexec/algos/adaptors/test_upon_error.cpp           | 2 +-
 test/stdexec/algos/adaptors/test_upon_stopped.cpp         | 2 +-
 test/stdexec/algos/adaptors/test_when_all.cpp             | 6 +++---
 test/stdexec/algos/adaptors/test_write_env.cpp            | 2 +-
 test/stdexec/algos/consumers/test_spawn.cpp               | 2 +-
 test/stdexec/algos/consumers/test_sync_wait.cpp           | 2 +-
 test/stdexec/algos/factories/test_just.cpp                | 2 +-
 test/stdexec/algos/factories/test_just_error.cpp          | 2 +-
 test/stdexec/algos/factories/test_just_stopped.cpp        | 2 +-
 test/stdexec/algos/factories/test_read.cpp                | 2 +-
 test/stdexec/algos/factories/test_schedule.cpp            | 2 +-
 test/stdexec/algos/factories/test_transfer_just.cpp       | 2 +-
 test/stdexec/concepts/test_awaitables.cpp                 | 2 +-
 test/stdexec/concepts/test_concept_operation_state.cpp    | 2 +-
 test/stdexec/concepts/test_concept_scheduler.cpp          | 2 +-
 test/stdexec/concepts/test_concepts_receiver.cpp          | 2 +-
 test/stdexec/concepts/test_concepts_scope_association.cpp | 2 +-
 test/stdexec/concepts/test_concepts_scope_token.cpp       | 2 +-
 test/stdexec/concepts/test_concepts_sender.cpp            | 2 +-
 test/stdexec/cpos/test_cpo_bulk.cpp                       | 2 +-
 test/stdexec/cpos/test_cpo_connect.cpp                    | 2 +-
 test/stdexec/cpos/test_cpo_connect_awaitable.cpp          | 2 +-
 test/stdexec/cpos/test_cpo_receiver.cpp                   | 2 +-
 test/stdexec/cpos/test_cpo_schedule.cpp                   | 2 +-
 test/stdexec/cpos/test_cpo_start.cpp                      | 2 +-
 test/stdexec/cpos/test_cpo_upon_error.cpp                 | 2 +-
 test/stdexec/cpos/test_cpo_upon_stopped.cpp               | 2 +-
 test/stdexec/detail/test_any.cpp                          | 2 +-
 test/stdexec/detail/test_completion_signatures.cpp        | 2 +-
 test/stdexec/detail/test_demangle.cpp                     | 2 +-
 test/stdexec/detail/test_intrusive_mpsc_queue.cpp         | 2 +-
 test/stdexec/detail/test_utility.cpp                      | 2 +-
 test/stdexec/queries/test_env.cpp                         | 2 +-
 test/stdexec/queries/test_forwarding_queries.cpp          | 2 +-
 test/stdexec/queries/test_get_completion_behavior.cpp     | 2 +-
 .../queries/test_get_forward_progress_guarantee.cpp       | 2 +-
 test/stdexec/schedulers/test_parallel_scheduler.cpp       | 2 +-
 .../schedulers/test_parallel_scheduler_replacement.cpp    | 2 +-
 test/stdexec/schedulers/test_task_scheduler.cpp           | 2 +-
 test/stdexec/types/test_counting_scopes.cpp               | 2 +-
 test/stdexec/types/test_task.cpp                          | 2 +-
 test/test_common/allocators.hpp                           | 2 +-
 test/test_common/receivers.hpp                            | 2 +-
 test/test_common/require_terminate.hpp                    | 2 +-
 test/test_common/senders.hpp                              | 2 +-
 test/test_common/tuple.hpp                                | 2 +-
 test/test_main.cpp                                        | 2 +-
 test/test_scratch.cpp                                     | 2 +-
 141 files changed, 147 insertions(+), 147 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0be1c665a..f30e0f325 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,11 +121,11 @@ rapids_cpm_init(OVERRIDE ${CMAKE_CURRENT_SOURCE_DIR}/cmake/versions.json)
 
 if (STDEXEC_BUILD_TESTS)
     # Add Catch2
-    set(Catch2_VERSION 2.13.6)
+    set(Catch2_VERSION 3.14.0)
     # Always download it, don't attempt to do `find_package(Catch2)` first
     set(CPM_DOWNLOAD_Catch2 TRUE)
     rapids_cpm_find(Catch2 ${Catch2_VERSION}
-      GLOBAL_TARGETS Catch2::Catch2
+      GLOBAL_TARGETS Catch2::Catch2WithMain
       BUILD_EXPORT_SET stdexec-exports
       CPM_ARGS
         URL https://github.com/catchorg/Catch2/archive/refs/tags/v${Catch2_VERSION}.zip
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index c27c82700..ff9e84f7b 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -108,7 +108,7 @@ target_link_libraries(test.stdexec
     PUBLIC
     STDEXEC::stdexec
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
@@ -122,7 +122,7 @@ if(STDEXEC_BUILD_PARALLEL_SCHEDULER)
       STDEXEC::stdexec
       STDEXEC::parallel_scheduler
       stdexec_executable_flags
-      Catch2::Catch2
+      Catch2::Catch2WithMain
       PRIVATE
       common_test_settings)
 endif()
@@ -134,12 +134,12 @@ target_link_libraries(test.scratch
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::tbbexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
 # Discover the Catch2 test built by the application
-include(${Catch2_SOURCE_DIR}/contrib/Catch.cmake)
+include(${Catch2_SOURCE_DIR}/extras/Catch.cmake)
 
 # For testing that builds fail as expected
 include(${icm_SOURCE_DIR}/icm_build_failure_testing.cmake)
diff --git a/test/exec/CMakeLists.txt b/test/exec/CMakeLists.txt
index eefefde1f..93a30070a 100644
--- a/test/exec/CMakeLists.txt
+++ b/test/exec/CMakeLists.txt
@@ -73,7 +73,7 @@ target_link_libraries(test.exec
     PUBLIC
     STDEXEC::stdexec
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
diff --git a/test/exec/asio/CMakeLists.txt b/test/exec/asio/CMakeLists.txt
index cd6b4b620..75fe7c360 100644
--- a/test/exec/asio/CMakeLists.txt
+++ b/test/exec/asio/CMakeLists.txt
@@ -27,7 +27,7 @@ target_link_libraries(test.asioexec
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::asioexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
diff --git a/test/exec/asio/test_asio_thread_pool.cpp b/test/exec/asio/test_asio_thread_pool.cpp
index 19f7abb85..1cbcdd3d6 100644
--- a/test/exec/asio/test_asio_thread_pool.cpp
+++ b/test/exec/asio/test_asio_thread_pool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <numeric>
 #include <span>
diff --git a/test/exec/asio/test_completion_token.cpp b/test/exec/asio/test_completion_token.cpp
index 9d0b784fb..81ae54385 100644
--- a/test/exec/asio/test_completion_token.cpp
+++ b/test/exec/asio/test_completion_token.cpp
@@ -19,7 +19,7 @@
 #include <exec/asio/asio_config.hpp>
 #include <exec/asio/completion_token.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <barrier>
 #include <concepts>
diff --git a/test/exec/asio/test_use_sender.cpp b/test/exec/asio/test_use_sender.cpp
index 9fe7614b9..457042dbc 100644
--- a/test/exec/asio/test_use_sender.cpp
+++ b/test/exec/asio/test_use_sender.cpp
@@ -22,7 +22,7 @@
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <chrono>
 #include <exception>
diff --git a/test/exec/async_scope/test_dtor.cpp b/test/exec/async_scope/test_dtor.cpp
index 669048be8..a79d26e35 100644
--- a/test/exec/async_scope/test_dtor.cpp
+++ b/test/exec/async_scope/test_dtor.cpp
@@ -1,5 +1,5 @@
 #include "exec/static_thread_pool.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/exec/async_scope/test_empty.cpp b/test/exec/async_scope/test_empty.cpp
index b18dcf505..0b0454a4a 100644
--- a/test/exec/async_scope/test_empty.cpp
+++ b/test/exec/async_scope/test_empty.cpp
@@ -1,6 +1,6 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/exec/async_scope/test_spawn.cpp b/test/exec/async_scope/test_spawn.cpp
index 672e682a1..a32cb235b 100644
--- a/test/exec/async_scope/test_spawn.cpp
+++ b/test/exec/async_scope/test_spawn.cpp
@@ -1,7 +1,7 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
 #include "test_common/type_helpers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/exec/async_scope/test_spawn_future.cpp b/test/exec/async_scope/test_spawn_future.cpp
index 78fecef21..3574c1332 100644
--- a/test/exec/async_scope/test_spawn_future.cpp
+++ b/test/exec/async_scope/test_spawn_future.cpp
@@ -1,6 +1,6 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/just_from.hpp>
 #include <exec/static_thread_pool.hpp>
diff --git a/test/exec/async_scope/test_start_now.cpp b/test/exec/async_scope/test_start_now.cpp
index 99d545d6f..f177c17c7 100644
--- a/test/exec/async_scope/test_start_now.cpp
+++ b/test/exec/async_scope/test_start_now.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/start_now.hpp>
 #include <exec/static_thread_pool.hpp>
diff --git a/test/exec/async_scope/test_stop.cpp b/test/exec/async_scope/test_stop.cpp
index ba5159cb3..38e60dc7b 100644
--- a/test/exec/async_scope/test_stop.cpp
+++ b/test/exec/async_scope/test_stop.cpp
@@ -2,7 +2,7 @@
 #include "exec/start_detached.hpp"
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/exec/sequence/test_any_sequence_of.cpp b/test/exec/sequence/test_any_sequence_of.cpp
index 91275194c..5a7badce5 100644
--- a/test/exec/sequence/test_any_sequence_of.cpp
+++ b/test/exec/sequence/test_any_sequence_of.cpp
@@ -18,7 +18,7 @@
 #include "exec/sequence/any_sequence_of.hpp"
 #include "exec/sequence/empty_sequence.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 STDEXEC_PRAGMA_PUSH()
 STDEXEC_PRAGMA_IGNORE_GNU("-Wunused-function")
diff --git a/test/exec/sequence/test_empty_sequence.cpp b/test/exec/sequence/test_empty_sequence.cpp
index f3826519a..06d142f77 100644
--- a/test/exec/sequence/test_empty_sequence.cpp
+++ b/test/exec/sequence/test_empty_sequence.cpp
@@ -17,7 +17,7 @@
 
 #include "exec/sequence/empty_sequence.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/sequence/test_ignore_all_values.cpp b/test/exec/sequence/test_ignore_all_values.cpp
index 55c89a047..ee288e864 100644
--- a/test/exec/sequence/test_ignore_all_values.cpp
+++ b/test/exec/sequence/test_ignore_all_values.cpp
@@ -18,7 +18,7 @@
 #include "exec/sequence/empty_sequence.hpp"
 #include "exec/sequence/ignore_all_values.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {
diff --git a/test/exec/sequence/test_iterate.cpp b/test/exec/sequence/test_iterate.cpp
index 234e3946d..4dfb3e03e 100644
--- a/test/exec/sequence/test_iterate.cpp
+++ b/test/exec/sequence/test_iterate.cpp
@@ -21,7 +21,7 @@
 #if !STDEXEC_NO_STDCPP_RANGES()
 
 #  include <array>
-#  include <catch2/catch.hpp>
+#  include <catch2/catch_all.hpp>
 #  include <numeric>
 
 namespace
diff --git a/test/exec/sequence/test_merge.cpp b/test/exec/sequence/test_merge.cpp
index 667d1d899..767418d68 100644
--- a/test/exec/sequence/test_merge.cpp
+++ b/test/exec/sequence/test_merge.cpp
@@ -31,7 +31,7 @@
 #include "stdexec/__detail/__meta.hpp"
 #include "stdexec/__detail/__upon_error.hpp"
 #include <atomic>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <mutex>
 #include <test_common/receivers.hpp>
diff --git a/test/exec/sequence/test_transform_each.cpp b/test/exec/sequence/test_transform_each.cpp
index c6aea2f21..f5fd43eee 100644
--- a/test/exec/sequence/test_transform_each.cpp
+++ b/test/exec/sequence/test_transform_each.cpp
@@ -21,7 +21,7 @@
 #include "exec/sequence/empty_sequence.hpp"
 #include "exec/sequence/ignore_all_values.hpp"
 #include "exec/sequence/iterate.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/exec/taskflow/CMakeLists.txt b/test/exec/taskflow/CMakeLists.txt
index 565804e2f..fb0ad61ee 100644
--- a/test/exec/taskflow/CMakeLists.txt
+++ b/test/exec/taskflow/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(test.taskflowexec
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::taskflowexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
diff --git a/test/exec/taskflow/test_taskflow_thread_pool.cpp b/test/exec/taskflow/test_taskflow_thread_pool.cpp
index ac485629c..4270f2bd4 100644
--- a/test/exec/taskflow/test_taskflow_thread_pool.cpp
+++ b/test/exec/taskflow/test_taskflow_thread_pool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <stdexec/execution.hpp>
 
diff --git a/test/exec/tbb/CMakeLists.txt b/test/exec/tbb/CMakeLists.txt
index ac53a32f7..6f8f62961 100644
--- a/test/exec/tbb/CMakeLists.txt
+++ b/test/exec/tbb/CMakeLists.txt
@@ -25,7 +25,7 @@ target_link_libraries(test.tbbexec
     STDEXEC::stdexec
     $<TARGET_NAME_IF_EXISTS:STDEXEC::tbbexec>
     stdexec_executable_flags
-    Catch2::Catch2
+    Catch2::Catch2WithMain
     PRIVATE
     common_test_settings)
 
diff --git a/test/exec/tbb/test_tbb_thread_pool.cpp b/test/exec/tbb/test_tbb_thread_pool.cpp
index 3918d7d55..46b44219c 100644
--- a/test/exec/tbb/test_tbb_thread_pool.cpp
+++ b/test/exec/tbb/test_tbb_thread_pool.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <span>
 
diff --git a/test/exec/test_any_sender.cpp b/test/exec/test_any_sender.cpp
index 5f2eb5fce..4cd5b4fe9 100644
--- a/test/exec/test_any_sender.cpp
+++ b/test/exec/test_any_sender.cpp
@@ -25,7 +25,7 @@
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <iostream>
 
diff --git a/test/exec/test_at_coroutine_exit.cpp b/test/exec/test_at_coroutine_exit.cpp
index 991230bda..a566856bf 100644
--- a/test/exec/test_at_coroutine_exit.cpp
+++ b/test/exec/test_at_coroutine_exit.cpp
@@ -18,7 +18,7 @@
 #include <stdexec/coroutine.hpp>
 
 #if !STDEXEC_NO_STDCPP_COROUTINES() && !STDEXEC_NO_STDCPP_EXCEPTIONS()
-#  include <catch2/catch.hpp>
+#  include <catch2/catch_all.hpp>
 #  include <exec/at_coroutine_exit.hpp>
 #  include <exec/on_coro_disposition.hpp>
 
diff --git a/test/exec/test_bwos_lifo_queue.cpp b/test/exec/test_bwos_lifo_queue.cpp
index f2d294e67..c0f842c47 100644
--- a/test/exec/test_bwos_lifo_queue.cpp
+++ b/test/exec/test_bwos_lifo_queue.cpp
@@ -22,7 +22,7 @@
 #include <thread>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 TEST_CASE("exec::bwos::lifo_queue - ", "[bwos]")
 {
diff --git a/test/exec/test_completion_signatures.cpp b/test/exec/test_completion_signatures.cpp
index cce13641c..5931bce6f 100644
--- a/test/exec/test_completion_signatures.cpp
+++ b/test/exec/test_completion_signatures.cpp
@@ -24,7 +24,7 @@
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_cpo_ensure_started.cpp b/test/exec/test_cpo_ensure_started.cpp
index 6b37d7cce..90e3ab89c 100644
--- a/test/exec/test_cpo_ensure_started.cpp
+++ b/test/exec/test_cpo_ensure_started.cpp
@@ -19,7 +19,7 @@
 #include "../stdexec/cpos/cpo_helpers.cuh"
 #include "../test_common/receivers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {
diff --git a/test/exec/test_cpo_split.cpp b/test/exec/test_cpo_split.cpp
index e0debc570..f3af5b6d8 100644
--- a/test/exec/test_cpo_split.cpp
+++ b/test/exec/test_cpo_split.cpp
@@ -19,7 +19,7 @@
 #include "../stdexec/cpos/cpo_helpers.cuh"
 #include "../test_common/receivers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {
diff --git a/test/exec/test_create.cpp b/test/exec/test_create.cpp
index 142b38a09..1bb7c9996 100644
--- a/test/exec/test_create.cpp
+++ b/test/exec/test_create.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/create.hpp>
 #include <exec/static_thread_pool.hpp>
diff --git a/test/exec/test_ensure_started.cpp b/test/exec/test_ensure_started.cpp
index e5756362a..bb01c414d 100644
--- a/test/exec/test_ensure_started.cpp
+++ b/test/exec/test_ensure_started.cpp
@@ -23,7 +23,7 @@
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;
diff --git a/test/exec/test_env.cpp b/test/exec/test_env.cpp
index 373597718..c13439066 100644
--- a/test/exec/test_env.cpp
+++ b/test/exec/test_env.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <stdexec/execution.hpp>
 
diff --git a/test/exec/test_execute.cpp b/test/exec/test_execute.cpp
index ececa14e1..045c617de 100644
--- a/test/exec/test_execute.cpp
+++ b/test/exec/test_execute.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <atomic>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/execute.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
diff --git a/test/exec/test_fork_join.cpp b/test/exec/test_fork_join.cpp
index 762c98483..61e2323d9 100644
--- a/test/exec/test_fork_join.cpp
+++ b/test/exec/test_fork_join.cpp
@@ -20,7 +20,7 @@
 #include "test_common/schedulers.hpp"
 #include "test_common/type_helpers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <atomic>
 
diff --git a/test/exec/test_into_tuple.cpp b/test/exec/test_into_tuple.cpp
index 81b0558ef..9ea180329 100644
--- a/test/exec/test_into_tuple.cpp
+++ b/test/exec/test_into_tuple.cpp
@@ -18,7 +18,7 @@
 #include "test_common/senders.hpp"
 #include "test_common/type_helpers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 
diff --git a/test/exec/test_io_uring_context.cpp b/test/exec/test_io_uring_context.cpp
index d7986dcac..44545fc94 100644
--- a/test/exec/test_io_uring_context.cpp
+++ b/test/exec/test_io_uring_context.cpp
@@ -28,7 +28,7 @@
 #  include "exec/start_detached.hpp"
 #  include "exec/when_any.hpp"
 
-#  include "catch2/catch.hpp"
+#  include "catch2/catch_all.hpp"
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_just_from.cpp b/test/exec/test_just_from.cpp
index 7c64b3291..6da822e83 100644
--- a/test/exec/test_just_from.cpp
+++ b/test/exec/test_just_from.cpp
@@ -18,7 +18,7 @@
 #include "test_common/tuple.hpp"
 #include "test_common/type_helpers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 TEST_CASE("just_from is a sender", "[just_from]")
 {
diff --git a/test/exec/test_libdispatch.cpp b/test/exec/test_libdispatch.cpp
index f2c41f791..8ad837130 100644
--- a/test/exec/test_libdispatch.cpp
+++ b/test/exec/test_libdispatch.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include "exec/libdispatch_queue.hpp"
 #include "stdexec/execution.hpp"
 
diff --git a/test/exec/test_materialize.cpp b/test/exec/test_materialize.cpp
index 26095b792..684317d5b 100644
--- a/test/exec/test_materialize.cpp
+++ b/test/exec/test_materialize.cpp
@@ -3,7 +3,7 @@
 #include <test_common/senders.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_repeat_n.cpp b/test/exec/test_repeat_n.cpp
index 3c22ec618..03b8e4601 100644
--- a/test/exec/test_repeat_n.cpp
+++ b/test/exec/test_repeat_n.cpp
@@ -23,7 +23,7 @@
 #include <test_common/senders.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 
diff --git a/test/exec/test_repeat_until.cpp b/test/exec/test_repeat_until.cpp
index 2d02aab38..c8a384408 100644
--- a/test/exec/test_repeat_until.cpp
+++ b/test/exec/test_repeat_until.cpp
@@ -25,7 +25,7 @@
 #include <test_common/senders.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <concepts>
 #include <cstddef>
diff --git a/test/exec/test_sequence_senders.cpp b/test/exec/test_sequence_senders.cpp
index da549f08f..f467866cf 100644
--- a/test/exec/test_sequence_senders.cpp
+++ b/test/exec/test_sequence_senders.cpp
@@ -17,7 +17,7 @@
 
 #include "exec/sequence_senders.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_split.cpp b/test/exec/test_split.cpp
index f4f15b75f..9abbbd693 100644
--- a/test/exec/test_split.cpp
+++ b/test/exec/test_split.cpp
@@ -23,7 +23,7 @@
 #include <test_common/senders.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/exec/test_start_detached.cpp b/test/exec/test_start_detached.cpp
index c1db7ffe0..386521918 100644
--- a/test/exec/test_start_detached.cpp
+++ b/test/exec/test_start_detached.cpp
@@ -21,7 +21,7 @@
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <chrono>  // IWYU pragma: keep for std::chrono_literals
 
diff --git a/test/exec/test_static_thread_pool.cpp b/test/exec/test_static_thread_pool.cpp
index cca5f83a9..4d38f825e 100644
--- a/test/exec/test_static_thread_pool.cpp
+++ b/test/exec/test_static_thread_pool.cpp
@@ -1,4 +1,4 @@
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
 
diff --git a/test/exec/test_task.cpp b/test/exec/test_task.cpp
index 72a0f0c80..23288d268 100644
--- a/test/exec/test_task.cpp
+++ b/test/exec/test_task.cpp
@@ -25,7 +25,7 @@
 
 #  include <test_common/schedulers.hpp>
 
-#  include <catch2/catch.hpp>
+#  include <catch2/catch_all.hpp>
 
 #  include <string>
 
diff --git a/test/exec/test_timed_thread_scheduler.cpp b/test/exec/test_timed_thread_scheduler.cpp
index f20d6f8f4..cd244f8fa 100644
--- a/test/exec/test_timed_thread_scheduler.cpp
+++ b/test/exec/test_timed_thread_scheduler.cpp
@@ -17,7 +17,7 @@
 
 #include <exec/timed_thread_scheduler.hpp>
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_all.hpp"
 
 #include <exec/async_scope.hpp>
 #include <exec/when_any.hpp>
diff --git a/test/exec/test_trampoline_scheduler.cpp b/test/exec/test_trampoline_scheduler.cpp
index 40d3491f0..1acdc2e26 100644
--- a/test/exec/test_trampoline_scheduler.cpp
+++ b/test/exec/test_trampoline_scheduler.cpp
@@ -19,7 +19,7 @@
 
 #include "../test_common/retry.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <memory>
 
 namespace ex = STDEXEC;
diff --git a/test/exec/test_type_async_scope.cpp b/test/exec/test_type_async_scope.cpp
index 1adf206fb..e2a634ffe 100644
--- a/test/exec/test_type_async_scope.cpp
+++ b/test/exec/test_type_async_scope.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <exec/async_scope.hpp>
 #include <exec/static_thread_pool.hpp>
diff --git a/test/exec/test_unless_stop_requested.cpp b/test/exec/test_unless_stop_requested.cpp
index 4bd990785..3d3164f01 100644
--- a/test/exec/test_unless_stop_requested.cpp
+++ b/test/exec/test_unless_stop_requested.cpp
@@ -20,7 +20,7 @@
 
 #include <exception>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "../test_common/receivers.hpp"
diff --git a/test/exec/test_variant_sender.cpp b/test/exec/test_variant_sender.cpp
index 4be5ab36b..111ab009a 100644
--- a/test/exec/test_variant_sender.cpp
+++ b/test/exec/test_variant_sender.cpp
@@ -17,7 +17,7 @@
 
 #include <exec/variant_sender.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_when_any.cpp b/test/exec/test_when_any.cpp
index ac1618b08..00a601738 100644
--- a/test/exec/test_when_any.cpp
+++ b/test/exec/test_when_any.cpp
@@ -22,7 +22,7 @@
 #include <test_common/senders.hpp>
 #include <test_common/type_helpers.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/exec/test_windows_thread_pool_context.cpp b/test/exec/test_windows_thread_pool_context.cpp
index 06db76236..6e5b5f9cc 100644
--- a/test/exec/test_windows_thread_pool_context.cpp
+++ b/test/exec/test_windows_thread_pool_context.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <stdexec/execution.hpp>
 
diff --git a/test/nvexec/CMakeLists.txt b/test/nvexec/CMakeLists.txt
index 5f7777676..b304800f1 100644
--- a/test/nvexec/CMakeLists.txt
+++ b/test/nvexec/CMakeLists.txt
@@ -54,7 +54,7 @@ target_include_directories(test.nvexec PRIVATE ${CMAKE_CURRENT_LIST_DIR}/..)
 target_link_libraries(test.nvexec
                       STDEXEC::nvexec
                       stdexec_executable_flags
-                      Catch2::Catch2
+                      Catch2::Catch2WithMain
                       nvexec_executable_flags)
 
 # if(CMAKE_CXX_COMPILER_ID STREQUAL "NVHPC")
diff --git a/test/nvexec/bulk.cpp b/test/nvexec/bulk.cpp
index b617c63e6..f11909259 100644
--- a/test/nvexec/bulk.cpp
+++ b/test/nvexec/bulk.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/ensure_started.cpp b/test/nvexec/ensure_started.cpp
index 7b8dd8d82..310eb7c7c 100644
--- a/test/nvexec/ensure_started.cpp
+++ b/test/nvexec/ensure_started.cpp
@@ -1,5 +1,5 @@
 #include <atomic>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/launch.cpp b/test/nvexec/launch.cpp
index d33e9e693..bfbae7998 100644
--- a/test/nvexec/launch.cpp
+++ b/test/nvexec/launch.cpp
@@ -15,7 +15,7 @@
  */
 
 #include <algorithm>
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/let_error.cpp b/test/nvexec/let_error.cpp
index 9424e7b50..8d7c6a5a1 100644
--- a/test/nvexec/let_error.cpp
+++ b/test/nvexec/let_error.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <stdexec/execution.hpp>
 
diff --git a/test/nvexec/let_stopped.cpp b/test/nvexec/let_stopped.cpp
index 2b3eb786d..23603d2eb 100644
--- a/test/nvexec/let_stopped.cpp
+++ b/test/nvexec/let_stopped.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/let_value.cpp b/test/nvexec/let_value.cpp
index 9f45682c0..9b7e890f3 100644
--- a/test/nvexec/let_value.cpp
+++ b/test/nvexec/let_value.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/monotonic_buffer.cpp b/test/nvexec/monotonic_buffer.cpp
index ca28e2172..4e48ae184 100644
--- a/test/nvexec/monotonic_buffer.cpp
+++ b/test/nvexec/monotonic_buffer.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <iostream>
 
 #include "nvexec/detail/memory.cuh"
diff --git a/test/nvexec/reduce.cpp b/test/nvexec/reduce.cpp
index f1c2989e4..e31f6b489 100644
--- a/test/nvexec/reduce.cpp
+++ b/test/nvexec/reduce.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <stdexec/execution.hpp>
 
diff --git a/test/nvexec/split.cpp b/test/nvexec/split.cpp
index 9f64a6192..6ffcf94df 100644
--- a/test/nvexec/split.cpp
+++ b/test/nvexec/split.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/start_detached.cpp b/test/nvexec/start_detached.cpp
index 70139cdc5..d30435419 100644
--- a/test/nvexec/start_detached.cpp
+++ b/test/nvexec/start_detached.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <cstdlib>
 #include <stdexec/execution.hpp>
 
diff --git a/test/nvexec/synchronized_pool.cpp b/test/nvexec/synchronized_pool.cpp
index a8e586773..f5a810827 100644
--- a/test/nvexec/synchronized_pool.cpp
+++ b/test/nvexec/synchronized_pool.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <iostream>
 
 #include "nvexec/detail/memory.cuh"
diff --git a/test/nvexec/test_main.cpp b/test/nvexec/test_main.cpp
index 4ed06df1f..2c344d5b8 100644
--- a/test/nvexec/test_main.cpp
+++ b/test/nvexec/test_main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
diff --git a/test/nvexec/then.cpp b/test/nvexec/then.cpp
index e6aeaf55f..783791207 100644
--- a/test/nvexec/then.cpp
+++ b/test/nvexec/then.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/tracer_resource.h b/test/nvexec/tracer_resource.h
index 1e72f3ae5..772406e92 100644
--- a/test/nvexec/tracer_resource.h
+++ b/test/nvexec/tracer_resource.h
@@ -4,7 +4,7 @@
 #include <new>
 #include <vector>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace nvdetail = nvexec::_strm;
 
diff --git a/test/nvexec/transfer.cpp b/test/nvexec/transfer.cpp
index 4f64b5c8d..ddacf4183 100644
--- a/test/nvexec/transfer.cpp
+++ b/test/nvexec/transfer.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/transfer_when_all.cpp b/test/nvexec/transfer_when_all.cpp
index c883fe6b4..2cbb7af30 100644
--- a/test/nvexec/transfer_when_all.cpp
+++ b/test/nvexec/transfer_when_all.cpp
@@ -21,7 +21,7 @@
 #include <nvexec/stream_context.cuh>
 #include <stdexec/execution.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/nvexec/upon_error.cpp b/test/nvexec/upon_error.cpp
index 0ac323bbd..3fd8faf32 100644
--- a/test/nvexec/upon_error.cpp
+++ b/test/nvexec/upon_error.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/upon_stopped.cpp b/test/nvexec/upon_stopped.cpp
index 778434183..854e67358 100644
--- a/test/nvexec/upon_stopped.cpp
+++ b/test/nvexec/upon_stopped.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/nvexec/variant.cpp b/test/nvexec/variant.cpp
index 425d5dd9c..9db216b11 100644
--- a/test/nvexec/variant.cpp
+++ b/test/nvexec/variant.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include <cuda/std/tuple>
diff --git a/test/nvexec/when_all.cpp b/test/nvexec/when_all.cpp
index 8149e6f95..b0fe1b0be 100644
--- a/test/nvexec/when_all.cpp
+++ b/test/nvexec/when_all.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include "common.cuh"
diff --git a/test/stdexec/algos/adaptors/test_associate.cpp b/test/stdexec/algos/adaptors/test_associate.cpp
index 2839accdd..c18bba894 100644
--- a/test/stdexec/algos/adaptors/test_associate.cpp
+++ b/test/stdexec/algos/adaptors/test_associate.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/scope_tokens.hpp>
diff --git a/test/stdexec/algos/adaptors/test_bulk.cpp b/test/stdexec/algos/adaptors/test_bulk.cpp
index b3055205d..4ff0685a3 100644
--- a/test/stdexec/algos/adaptors/test_bulk.cpp
+++ b/test/stdexec/algos/adaptors/test_bulk.cpp
@@ -15,7 +15,7 @@
  */
 #include <exception>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
diff --git a/test/stdexec/algos/adaptors/test_continues_on.cpp b/test/stdexec/algos/adaptors/test_continues_on.cpp
index 6708de664..88428655c 100644
--- a/test/stdexec/algos/adaptors/test_continues_on.cpp
+++ b/test/stdexec/algos/adaptors/test_continues_on.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/start_detached.hpp>
 #include <exec/static_thread_pool.hpp>
diff --git a/test/stdexec/algos/adaptors/test_finally.cpp b/test/stdexec/algos/adaptors/test_finally.cpp
index 6530b1020..5b700f97c 100644
--- a/test/stdexec/algos/adaptors/test_finally.cpp
+++ b/test/stdexec/algos/adaptors/test_finally.cpp
@@ -17,7 +17,7 @@
 #include "exec/finally.hpp"
 #include "test_common/type_helpers.hpp"
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 using namespace STDEXEC;
 
diff --git a/test/stdexec/algos/adaptors/test_into_variant.cpp b/test/stdexec/algos/adaptors/test_into_variant.cpp
index 57960f0cf..6b20df485 100644
--- a/test/stdexec/algos/adaptors/test_into_variant.cpp
+++ b/test/stdexec/algos/adaptors/test_into_variant.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <numbers>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_let_error.cpp b/test/stdexec/algos/adaptors/test_let_error.cpp
index d5e8011e5..7f7a2e208 100644
--- a/test/stdexec/algos/adaptors/test_let_error.cpp
+++ b/test/stdexec/algos/adaptors/test_let_error.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/split.hpp>
diff --git a/test/stdexec/algos/adaptors/test_let_stopped.cpp b/test/stdexec/algos/adaptors/test_let_stopped.cpp
index 2e5ac09a0..5ef07ea31 100644
--- a/test/stdexec/algos/adaptors/test_let_stopped.cpp
+++ b/test/stdexec/algos/adaptors/test_let_stopped.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "stdexec/__detail/__sender_introspection.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
diff --git a/test/stdexec/algos/adaptors/test_let_value.cpp b/test/stdexec/algos/adaptors/test_let_value.cpp
index b56880030..dec4733ef 100644
--- a/test/stdexec/algos/adaptors/test_let_value.cpp
+++ b/test/stdexec/algos/adaptors/test_let_value.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "stdexec/__detail/__let.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/start_detached.hpp>
diff --git a/test/stdexec/algos/adaptors/test_on.cpp b/test/stdexec/algos/adaptors/test_on.cpp
index 547183f41..7b4d24226 100644
--- a/test/stdexec/algos/adaptors/test_on.cpp
+++ b/test/stdexec/algos/adaptors/test_on.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_on2.cpp b/test/stdexec/algos/adaptors/test_on2.cpp
index 1db5a8777..443a6b2f0 100644
--- a/test/stdexec/algos/adaptors/test_on2.cpp
+++ b/test/stdexec/algos/adaptors/test_on2.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_on3.cpp b/test/stdexec/algos/adaptors/test_on3.cpp
index 7d46f50eb..9fa33d411 100644
--- a/test/stdexec/algos/adaptors/test_on3.cpp
+++ b/test/stdexec/algos/adaptors/test_on3.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/ensure_started.hpp>
 #include <exec/split.hpp>
diff --git a/test/stdexec/algos/adaptors/test_sequence.cpp b/test/stdexec/algos/adaptors/test_sequence.cpp
index 0b8aaa25f..59350d0a5 100644
--- a/test/stdexec/algos/adaptors/test_sequence.cpp
+++ b/test/stdexec/algos/adaptors/test_sequence.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sequence.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_spawn_future.cpp b/test/stdexec/algos/adaptors/test_spawn_future.cpp
index 60543d004..163cd4856 100644
--- a/test/stdexec/algos/adaptors/test_spawn_future.cpp
+++ b/test/stdexec/algos/adaptors/test_spawn_future.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/scope_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_starts_on.cpp b/test/stdexec/algos/adaptors/test_starts_on.cpp
index 1c7617a2a..f457c1a1b 100644
--- a/test/stdexec/algos/adaptors/test_starts_on.cpp
+++ b/test/stdexec/algos/adaptors/test_starts_on.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/start_detached.hpp>
 #include <exec/static_thread_pool.hpp>
diff --git a/test/stdexec/algos/adaptors/test_stop_when.cpp b/test/stdexec/algos/adaptors/test_stop_when.cpp
index 31802a6cd..29d64b78d 100644
--- a/test/stdexec/algos/adaptors/test_stop_when.cpp
+++ b/test/stdexec/algos/adaptors/test_stop_when.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/__detail/__stop_when.hpp>
 #include <stdexec/execution.hpp>
 #include <stdexec/stop_token.hpp>
diff --git a/test/stdexec/algos/adaptors/test_stopped_as_error.cpp b/test/stdexec/algos/adaptors/test_stopped_as_error.cpp
index 4230c5d7b..643b2b12d 100644
--- a/test/stdexec/algos/adaptors/test_stopped_as_error.cpp
+++ b/test/stdexec/algos/adaptors/test_stopped_as_error.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <numbers>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp b/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp
index c905a96bc..1b46d17af 100644
--- a/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp
+++ b/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <numbers>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_then.cpp b/test/stdexec/algos/adaptors/test_then.cpp
index e8c87dc2d..d543818ce 100644
--- a/test/stdexec/algos/adaptors/test_then.cpp
+++ b/test/stdexec/algos/adaptors/test_then.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_transfer_when_all.cpp b/test/stdexec/algos/adaptors/test_transfer_when_all.cpp
index 3742bcf4e..7c95291c5 100644
--- a/test/stdexec/algos/adaptors/test_transfer_when_all.cpp
+++ b/test/stdexec/algos/adaptors/test_transfer_when_all.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_upon_error.cpp b/test/stdexec/algos/adaptors/test_upon_error.cpp
index da7dfcc4c..e4502d0e3 100644
--- a/test/stdexec/algos/adaptors/test_upon_error.cpp
+++ b/test/stdexec/algos/adaptors/test_upon_error.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_upon_stopped.cpp b/test/stdexec/algos/adaptors/test_upon_stopped.cpp
index febdbb12d..8ad44725a 100644
--- a/test/stdexec/algos/adaptors/test_upon_stopped.cpp
+++ b/test/stdexec/algos/adaptors/test_upon_stopped.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_when_all.cpp b/test/stdexec/algos/adaptors/test_when_all.cpp
index 631eb304e..a5f55df97 100644
--- a/test/stdexec/algos/adaptors/test_when_all.cpp
+++ b/test/stdexec/algos/adaptors/test_when_all.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/any_sender_of.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/env.hpp>
@@ -453,7 +453,7 @@ namespace
     ex::start(op);
   }
 
-  TEST_CASE("when_all handles stop requests from the environment correctly", "[adaptors][when_all")
+  TEST_CASE("when_all handles stop requests from the environment correctly", "[adaptors][when_all]")
   {
     auto snd = ex::when_all(completes_if(false), completes_if(false));
 
@@ -463,7 +463,7 @@ namespace
     ex::sync_wait(scope.on_empty());
   }
 
-  TEST_CASE("regression test for #1988", "[adaptors][when_all")
+  TEST_CASE("regression test for #1988", "[adaptors][when_all]")
   {
     // just test that this compiles:
     using any_sender = exec::any_sender<
diff --git a/test/stdexec/algos/adaptors/test_write_env.cpp b/test/stdexec/algos/adaptors/test_write_env.cpp
index c0dfcf4fd..71ca08798 100644
--- a/test/stdexec/algos/adaptors/test_write_env.cpp
+++ b/test/stdexec/algos/adaptors/test_write_env.cpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <type_traits>
 #include <utility>
diff --git a/test/stdexec/algos/consumers/test_spawn.cpp b/test/stdexec/algos/consumers/test_spawn.cpp
index 7cf0b9f7b..34652404c 100644
--- a/test/stdexec/algos/consumers/test_spawn.cpp
+++ b/test/stdexec/algos/consumers/test_spawn.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/scope_helpers.hpp>
 #include <test_common/scope_tokens.hpp>
diff --git a/test/stdexec/algos/consumers/test_sync_wait.cpp b/test/stdexec/algos/consumers/test_sync_wait.cpp
index c3a38f1c3..3ef5e1d2e 100644
--- a/test/stdexec/algos/consumers/test_sync_wait.cpp
+++ b/test/stdexec/algos/consumers/test_sync_wait.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
diff --git a/test/stdexec/algos/factories/test_just.cpp b/test/stdexec/algos/factories/test_just.cpp
index 8e1350355..e31d27c9e 100644
--- a/test/stdexec/algos/factories/test_just.cpp
+++ b/test/stdexec/algos/factories/test_just.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/factories/test_just_error.cpp b/test/stdexec/algos/factories/test_just_error.cpp
index 41da1dc72..c33349562 100644
--- a/test/stdexec/algos/factories/test_just_error.cpp
+++ b/test/stdexec/algos/factories/test_just_error.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/factories/test_just_stopped.cpp b/test/stdexec/algos/factories/test_just_stopped.cpp
index 56f0607ac..688965618 100644
--- a/test/stdexec/algos/factories/test_just_stopped.cpp
+++ b/test/stdexec/algos/factories/test_just_stopped.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/factories/test_read.cpp b/test/stdexec/algos/factories/test_read.cpp
index ef45530fa..0d847d051 100644
--- a/test/stdexec/algos/factories/test_read.cpp
+++ b/test/stdexec/algos/factories/test_read.cpp
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/type_helpers.hpp>
 
diff --git a/test/stdexec/algos/factories/test_schedule.cpp b/test/stdexec/algos/factories/test_schedule.cpp
index d33fbe98b..1331a0c77 100644
--- a/test/stdexec/algos/factories/test_schedule.cpp
+++ b/test/stdexec/algos/factories/test_schedule.cpp
@@ -14,7 +14,7 @@
 
 #include "exec/static_thread_pool.hpp"
 #include "stdexec/__detail/__meta.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/stdexec/algos/factories/test_transfer_just.cpp b/test/stdexec/algos/factories/test_transfer_just.cpp
index e02f573cb..70575caa2 100644
--- a/test/stdexec/algos/factories/test_transfer_just.cpp
+++ b/test/stdexec/algos/factories/test_transfer_just.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/concepts/test_awaitables.cpp b/test/stdexec/concepts/test_awaitables.cpp
index 019b4b420..fca741931 100644
--- a/test/stdexec/concepts/test_awaitables.cpp
+++ b/test/stdexec/concepts/test_awaitables.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include <exec/static_thread_pool.hpp>
diff --git a/test/stdexec/concepts/test_concept_operation_state.cpp b/test/stdexec/concepts/test_concept_operation_state.cpp
index 033f8bac1..b4c5d20f8 100644
--- a/test/stdexec/concepts/test_concept_operation_state.cpp
+++ b/test/stdexec/concepts/test_concept_operation_state.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/concepts/test_concept_scheduler.cpp b/test/stdexec/concepts/test_concept_scheduler.cpp
index 714d535db..89d3c6015 100644
--- a/test/stdexec/concepts/test_concept_scheduler.cpp
+++ b/test/stdexec/concepts/test_concept_scheduler.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/concepts/test_concepts_receiver.cpp b/test/stdexec/concepts/test_concepts_receiver.cpp
index 8512e8812..a35fbd9cf 100644
--- a/test/stdexec/concepts/test_concepts_receiver.cpp
+++ b/test/stdexec/concepts/test_concepts_receiver.cpp
@@ -14,7 +14,7 @@
 //  * limitations under the License.
 //  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 
diff --git a/test/stdexec/concepts/test_concepts_scope_association.cpp b/test/stdexec/concepts/test_concepts_scope_association.cpp
index b59268d8a..44579326b 100644
--- a/test/stdexec/concepts/test_concepts_scope_association.cpp
+++ b/test/stdexec/concepts/test_concepts_scope_association.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/concepts/test_concepts_scope_token.cpp b/test/stdexec/concepts/test_concepts_scope_token.cpp
index a200d187f..134d1e945 100644
--- a/test/stdexec/concepts/test_concepts_scope_token.cpp
+++ b/test/stdexec/concepts/test_concepts_scope_token.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/concepts/test_concepts_sender.cpp b/test/stdexec/concepts/test_concepts_sender.cpp
index 5b82f793d..a674d711f 100644
--- a/test/stdexec/concepts/test_concepts_sender.cpp
+++ b/test/stdexec/concepts/test_concepts_sender.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/cpos/test_cpo_bulk.cpp b/test/stdexec/cpos/test_cpo_bulk.cpp
index 2a5e0f2f8..3a01cfe7a 100644
--- a/test/stdexec/cpos/test_cpo_bulk.cpp
+++ b/test/stdexec/cpos/test_cpo_bulk.cpp
@@ -16,7 +16,7 @@
 
 #include "cpo_helpers.cuh"
 #include "test_common/receivers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {
diff --git a/test/stdexec/cpos/test_cpo_connect.cpp b/test/stdexec/cpos/test_cpo_connect.cpp
index 723935bde..d999c00cf 100644
--- a/test/stdexec/cpos/test_cpo_connect.cpp
+++ b/test/stdexec/cpos/test_cpo_connect.cpp
@@ -16,7 +16,7 @@
 
 #include "test_common/receivers.hpp"
 #include "test_common/type_helpers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/cpos/test_cpo_connect_awaitable.cpp b/test/stdexec/cpos/test_cpo_connect_awaitable.cpp
index ce9e838b4..3702bdde8 100644
--- a/test/stdexec/cpos/test_cpo_connect_awaitable.cpp
+++ b/test/stdexec/cpos/test_cpo_connect_awaitable.cpp
@@ -20,7 +20,7 @@
 
 #  include "test_common/receivers.hpp"
 #  include "test_common/type_helpers.hpp"
-#  include <catch2/catch.hpp>
+#  include <catch2/catch_all.hpp>
 #  include <stdexec/execution.hpp>
 
 #  include <stdexcept>
diff --git a/test/stdexec/cpos/test_cpo_receiver.cpp b/test/stdexec/cpos/test_cpo_receiver.cpp
index b6fdb3366..16d208a33 100644
--- a/test/stdexec/cpos/test_cpo_receiver.cpp
+++ b/test/stdexec/cpos/test_cpo_receiver.cpp
@@ -15,7 +15,7 @@
  */
 
 #include "test_common/receivers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include <climits>
diff --git a/test/stdexec/cpos/test_cpo_schedule.cpp b/test/stdexec/cpos/test_cpo_schedule.cpp
index 845b2d1f8..dd04e1cb4 100644
--- a/test/stdexec/cpos/test_cpo_schedule.cpp
+++ b/test/stdexec/cpos/test_cpo_schedule.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/type_helpers.hpp>
 
diff --git a/test/stdexec/cpos/test_cpo_start.cpp b/test/stdexec/cpos/test_cpo_start.cpp
index 76f9e0925..1e790b820 100644
--- a/test/stdexec/cpos/test_cpo_start.cpp
+++ b/test/stdexec/cpos/test_cpo_start.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/type_helpers.hpp>
 
diff --git a/test/stdexec/cpos/test_cpo_upon_error.cpp b/test/stdexec/cpos/test_cpo_upon_error.cpp
index 89e218c7f..02a43a84f 100644
--- a/test/stdexec/cpos/test_cpo_upon_error.cpp
+++ b/test/stdexec/cpos/test_cpo_upon_error.cpp
@@ -16,7 +16,7 @@
 
 #include "cpo_helpers.cuh"
 #include "test_common/receivers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {
diff --git a/test/stdexec/cpos/test_cpo_upon_stopped.cpp b/test/stdexec/cpos/test_cpo_upon_stopped.cpp
index 5efa9b299..c4f4e08f8 100644
--- a/test/stdexec/cpos/test_cpo_upon_stopped.cpp
+++ b/test/stdexec/cpos/test_cpo_upon_stopped.cpp
@@ -16,7 +16,7 @@
 
 #include "cpo_helpers.cuh"
 #include "test_common/receivers.hpp"
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 namespace
 {
diff --git a/test/stdexec/detail/test_any.cpp b/test/stdexec/detail/test_any.cpp
index ecf36d45d..1aba9115c 100644
--- a/test/stdexec/detail/test_any.cpp
+++ b/test/stdexec/detail/test_any.cpp
@@ -18,7 +18,7 @@
 
 #include <cstdio>
 
-#include <catch2/catch.hpp>  // IWYU pragma: keep
+#include <catch2/catch_all.hpp>  // IWYU pragma: keep
 
 // NOLINTBEGIN(modernize-use-override)
 
diff --git a/test/stdexec/detail/test_completion_signatures.cpp b/test/stdexec/detail/test_completion_signatures.cpp
index 13fe13d41..5ab5a2a8e 100644
--- a/test/stdexec/detail/test_completion_signatures.cpp
+++ b/test/stdexec/detail/test_completion_signatures.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/schedulers.hpp>
 namespace ex = STDEXEC;
diff --git a/test/stdexec/detail/test_demangle.cpp b/test/stdexec/detail/test_demangle.cpp
index 2166a4f83..eb082a528 100644
--- a/test/stdexec/detail/test_demangle.cpp
+++ b/test/stdexec/detail/test_demangle.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/detail/test_intrusive_mpsc_queue.cpp b/test/stdexec/detail/test_intrusive_mpsc_queue.cpp
index 2e578fd46..423d0f515 100644
--- a/test/stdexec/detail/test_intrusive_mpsc_queue.cpp
+++ b/test/stdexec/detail/test_intrusive_mpsc_queue.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/__detail/__intrusive_mpsc_queue.hpp>
 
 #include <algorithm>
diff --git a/test/stdexec/detail/test_utility.cpp b/test/stdexec/detail/test_utility.cpp
index da32785e0..66bd94eb0 100644
--- a/test/stdexec/detail/test_utility.cpp
+++ b/test/stdexec/detail/test_utility.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/__detail/__meta.hpp>
 
 #include <optional>
diff --git a/test/stdexec/queries/test_env.cpp b/test/stdexec/queries/test_env.cpp
index 8b476508a..08f2d64aa 100644
--- a/test/stdexec/queries/test_env.cpp
+++ b/test/stdexec/queries/test_env.cpp
@@ -16,7 +16,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/queries/test_forwarding_queries.cpp b/test/stdexec/queries/test_forwarding_queries.cpp
index 10eaf7538..ae503bb4a 100644
--- a/test/stdexec/queries/test_forwarding_queries.cpp
+++ b/test/stdexec/queries/test_forwarding_queries.cpp
@@ -12,7 +12,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 STDEXEC_PRAGMA_IGNORE_GNU("-Wdeprecated-declarations")
diff --git a/test/stdexec/queries/test_get_completion_behavior.cpp b/test/stdexec/queries/test_get_completion_behavior.cpp
index 787cd5efe..0bc0c87f7 100644
--- a/test/stdexec/queries/test_get_completion_behavior.cpp
+++ b/test/stdexec/queries/test_get_completion_behavior.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/queries/test_get_forward_progress_guarantee.cpp b/test/stdexec/queries/test_get_forward_progress_guarantee.cpp
index 3d2259db6..b3b4c23ef 100644
--- a/test/stdexec/queries/test_get_forward_progress_guarantee.cpp
+++ b/test/stdexec/queries/test_get_forward_progress_guarantee.cpp
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/schedulers.hpp>
 
diff --git a/test/stdexec/schedulers/test_parallel_scheduler.cpp b/test/stdexec/schedulers/test_parallel_scheduler.cpp
index 670113d73..5ca814f85 100644
--- a/test/stdexec/schedulers/test_parallel_scheduler.cpp
+++ b/test/stdexec/schedulers/test_parallel_scheduler.cpp
@@ -24,7 +24,7 @@
 #include <exec/inline_scheduler.hpp>
 #include <exec/static_thread_pool.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <test_common/receivers.hpp>
 
 namespace ex  = STDEXEC;
diff --git a/test/stdexec/schedulers/test_parallel_scheduler_replacement.cpp b/test/stdexec/schedulers/test_parallel_scheduler_replacement.cpp
index 29d99e173..1e71eeff9 100644
--- a/test/stdexec/schedulers/test_parallel_scheduler_replacement.cpp
+++ b/test/stdexec/schedulers/test_parallel_scheduler_replacement.cpp
@@ -18,7 +18,7 @@
 #include <stdexec/__detail/__parallel_scheduler_default_impl.hpp>
 #include <stdexec/execution.hpp>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #if defined(STDEXEC_PARALLEL_SCHEDULER_HEADER_ONLY)
 #  error This should be testing replacement of the system context with weak linking.
diff --git a/test/stdexec/schedulers/test_task_scheduler.cpp b/test/stdexec/schedulers/test_task_scheduler.cpp
index aebf899a6..17d3fbd2f 100644
--- a/test/stdexec/schedulers/test_task_scheduler.cpp
+++ b/test/stdexec/schedulers/test_task_scheduler.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/single_thread_context.hpp>
 #include <stdexec/execution.hpp>
diff --git a/test/stdexec/types/test_counting_scopes.cpp b/test/stdexec/types/test_counting_scopes.cpp
index d624f6227..7a946fb8e 100644
--- a/test/stdexec/types/test_counting_scopes.cpp
+++ b/test/stdexec/types/test_counting_scopes.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
diff --git a/test/stdexec/types/test_task.cpp b/test/stdexec/types/test_task.cpp
index 481d2f5e3..0c6fd3ff2 100644
--- a/test/stdexec/types/test_task.cpp
+++ b/test/stdexec/types/test_task.cpp
@@ -26,7 +26,7 @@
 
 #  include <atomic>
 
-#  include <catch2/catch.hpp>
+#  include <catch2/catch_all.hpp>
 
 #  include <test_common/allocators.hpp>
 #  include <test_common/senders.hpp>
diff --git a/test/test_common/allocators.hpp b/test/test_common/allocators.hpp
index 7b41bbda5..b12efb940 100644
--- a/test/test_common/allocators.hpp
+++ b/test/test_common/allocators.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 
 #include <new>
diff --git a/test/test_common/receivers.hpp b/test/test_common/receivers.hpp
index 55e4c4189..3bc5320bb 100644
--- a/test/test_common/receivers.hpp
+++ b/test/test_common/receivers.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/tuple.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/test_common/require_terminate.hpp b/test/test_common/require_terminate.hpp
index cd15ef467..544a7b10b 100644
--- a/test/test_common/require_terminate.hpp
+++ b/test/test_common/require_terminate.hpp
@@ -24,7 +24,7 @@
 #include <cstdlib>
 #include <exception>
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #ifdef REQUIRE_TERMINATE
 namespace
diff --git a/test/test_common/senders.hpp b/test/test_common/senders.hpp
index b5ca1cdf3..0b003c16b 100644
--- a/test/test_common/senders.hpp
+++ b/test/test_common/senders.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <exec/completion_behavior.hpp>
 #include <memory>
 #include <stdexec/execution.hpp>
diff --git a/test/test_common/tuple.hpp b/test/test_common/tuple.hpp
index db123838b..de1bf73b8 100644
--- a/test/test_common/tuple.hpp
+++ b/test/test_common/tuple.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 
 #include <tuple>
 
diff --git a/test/test_main.cpp b/test/test_main.cpp
index 4ed06df1f..2c344d5b8 100644
--- a/test/test_main.cpp
+++ b/test/test_main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
diff --git a/test/test_scratch.cpp b/test/test_scratch.cpp
index 6b933c0e6..ead4dc62b 100644
--- a/test/test_scratch.cpp
+++ b/test/test_scratch.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>

From 13169e66ee55b2a3f121601b908cd919c14dadf0 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@nvidia.com>
Date: Sat, 11 Apr 2026 18:06:29 -0700
Subject: [PATCH 2/5] missing headers, min/max macro snafu

---
 test/CMakeLists.txt            | 5 ++++-
 test/exec/test_libdispatch.cpp | 4 ++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index ff9e84f7b..3a072d151 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -92,7 +92,10 @@ set_target_properties(common_test_settings PROPERTIES
     MSVC_DEBUG_INFORMATION_FORMAT Embedded
     )
 target_include_directories(common_test_settings INTERFACE "${CMAKE_CURRENT_LIST_DIR}")
-target_compile_definitions(common_test_settings INTERFACE STDEXEC_NAMESPACE=std::execution)
+target_compile_definitions(common_test_settings INTERFACE
+    STDEXEC_NAMESPACE=std::execution
+    $<$<PLATFORM_ID:Windows>:NOMINMAX>
+    )
 target_compile_options(common_test_settings INTERFACE
     $<$<CXX_COMPILER_ID:MSVC>:/wd4714> # function marked as __forceinline not inlined
     $<$<CXX_COMPILER_ID:GNU>:-Wno-maybe-uninitialized> # warnings being emitted from stdlib headers, why?
diff --git a/test/exec/test_libdispatch.cpp b/test/exec/test_libdispatch.cpp
index 8ad837130..efed13d66 100644
--- a/test/exec/test_libdispatch.cpp
+++ b/test/exec/test_libdispatch.cpp
@@ -18,6 +18,10 @@
 #include "exec/libdispatch_queue.hpp"
 #include "stdexec/execution.hpp"
 
+#include <numeric>
+#include <utility>
+#include <vector>
+
 namespace
 {
   TEST_CASE("libdispatch queue should be able to process tasks")

From 0a9a5b87102c970a8689a1b98d250d36e51ff468 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@nvidia.com>
Date: Sat, 11 Apr 2026 21:44:20 -0700
Subject: [PATCH 3/5] try to solve linker error on Windows

---
 CMakeLists.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f30e0f325..f603401a6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -129,6 +129,7 @@ if (STDEXEC_BUILD_TESTS)
       BUILD_EXPORT_SET stdexec-exports
       CPM_ARGS
         URL https://github.com/catchorg/Catch2/archive/refs/tags/v${Catch2_VERSION}.zip
+        OPTIONS "CMAKE_CXX_STANDARD 20"
     )
 endif()
 

From d8d195f08873be33ed1781dd7428d20f2b8cc4ae Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@nvidia.com>
Date: Sun, 12 Apr 2026 09:46:00 -0700
Subject: [PATCH 4/5] add missing include

---
 test/nvexec/synchronized_pool.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/nvexec/synchronized_pool.cpp b/test/nvexec/synchronized_pool.cpp
index f5a810827..68434b601 100644
--- a/test/nvexec/synchronized_pool.cpp
+++ b/test/nvexec/synchronized_pool.cpp
@@ -1,5 +1,6 @@
 #include <catch2/catch_all.hpp>
 #include <iostream>
+#include <numeric>
 
 #include "nvexec/detail/memory.cuh"
 #include "tracer_resource.h"

From ca8f5fde8b2a6c63d2b4d0dd6e0edc97e3b85e21 Mon Sep 17 00:00:00 2001
From: Eric Niebler <eniebler@nvidia.com>
Date: Sun, 12 Apr 2026 12:58:30 -0700
Subject: [PATCH 5/5] label flaky Catch2 test as `[!mayfail]`

---
 test/exec/asio/test_completion_token.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/exec/asio/test_completion_token.cpp b/test/exec/asio/test_completion_token.cpp
index 81ae54385..8943653e3 100644
--- a/test/exec/asio/test_completion_token.cpp
+++ b/test/exec/asio/test_completion_token.cpp
@@ -391,7 +391,7 @@ namespace
             "completion handler's lifetime (this is necessary in situations where "
             "asynchronous control flow bifurcates and one of the child operations ends "
             "via exception)",
-            "[asioexec][completion_token]")
+            "[asioexec][completion_token][!mayfail]")
   {
     std::exception_ptr    ex;
     std::shared_ptr<void> ptr;