diff --git a/test/exec/asio/test_asio_thread_pool.cpp b/test/exec/asio/test_asio_thread_pool.cpp
index 1eb69e39a..9e56cfee2 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <numeric>
 #include <span>
diff --git a/test/exec/asio/test_completion_token.cpp b/test/exec/asio/test_completion_token.cpp
index ae2458d39..4cbcf63e6 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <barrier>
 #include <concepts>
diff --git a/test/exec/asio/test_use_sender.cpp b/test/exec/asio/test_use_sender.cpp
index 373b51309..4ecaed0b6 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <chrono>
 #include <exception>
diff --git a/test/exec/async_scope/test_dtor.cpp b/test/exec/async_scope/test_dtor.cpp
index a79d26e35..c7be333e2 100644
--- a/test/exec/async_scope/test_dtor.cpp
+++ b/test/exec/async_scope/test_dtor.cpp
@@ -1,6 +1,6 @@
 #include "exec/static_thread_pool.hpp"
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;
diff --git a/test/exec/async_scope/test_empty.cpp b/test/exec/async_scope/test_empty.cpp
index 0b0454a4a..9e415341d 100644
--- a/test/exec/async_scope/test_empty.cpp
+++ b/test/exec/async_scope/test_empty.cpp
@@ -1,7 +1,7 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;
diff --git a/test/exec/async_scope/test_spawn.cpp b/test/exec/async_scope/test_spawn.cpp
index a32cb235b..ebe7f3111 100644
--- a/test/exec/async_scope/test_spawn.cpp
+++ b/test/exec/async_scope/test_spawn.cpp
@@ -1,8 +1,8 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
 #include "test_common/type_helpers.hpp"
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;
diff --git a/test/exec/async_scope/test_spawn_future.cpp b/test/exec/async_scope/test_spawn_future.cpp
index 3574c1332..3b70cd1ec 100644
--- a/test/exec/async_scope/test_spawn_future.cpp
+++ b/test/exec/async_scope/test_spawn_future.cpp
@@ -1,9 +1,9 @@
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/just_from.hpp>
 #include <exec/static_thread_pool.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;
diff --git a/test/exec/async_scope/test_start_now.cpp b/test/exec/async_scope/test_start_now.cpp
index f177c17c7..47f1c80c3 100644
--- a/test/exec/async_scope/test_start_now.cpp
+++ b/test/exec/async_scope/test_start_now.cpp
@@ -1,7 +1,7 @@
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/start_now.hpp>
 #include <exec/static_thread_pool.hpp>
+#include <test_common/catch2.hpp>
 
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
diff --git a/test/exec/async_scope/test_stop.cpp b/test/exec/async_scope/test_stop.cpp
index 38e60dc7b..291655f7d 100644
--- a/test/exec/async_scope/test_stop.cpp
+++ b/test/exec/async_scope/test_stop.cpp
@@ -2,8 +2,8 @@
 #include "exec/start_detached.hpp"
 #include "test_common/receivers.hpp"
 #include "test_common/schedulers.hpp"
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;
diff --git a/test/exec/sequence/test_any_sequence_of.cpp b/test/exec/sequence/test_any_sequence_of.cpp
index 5a7badce5..dd06f3130 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_all.hpp>
+#include <test_common/catch2.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 06d142f77..1f6e3300b 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_all.hpp>
+#include <test_common/catch2.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 3cd700533..935774f30 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/exec/sequence/test_iterate.cpp b/test/exec/sequence/test_iterate.cpp
index fa5a06d25..408630a9a 100644
--- a/test/exec/sequence/test_iterate.cpp
+++ b/test/exec/sequence/test_iterate.cpp
@@ -19,8 +19,8 @@
 #include "stdexec/execution.hpp"
 
 #include <array>
-#include <catch2/catch_all.hpp>
 #include <numeric>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/exec/sequence/test_merge.cpp b/test/exec/sequence/test_merge.cpp
index cc93c384f..8ea66e8ec 100644
--- a/test/exec/sequence/test_merge.cpp
+++ b/test/exec/sequence/test_merge.cpp
@@ -29,7 +29,7 @@
 #include "stdexec/__detail/__continues_on.hpp"
 #include "stdexec/__detail/__just.hpp"
 #include "stdexec/__detail/__upon_error.hpp"
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/exec/sequence/test_transform_each.cpp b/test/exec/sequence/test_transform_each.cpp
index 6a80b2671..919aba25a 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/exec/taskflow/test_taskflow_thread_pool.cpp b/test/exec/taskflow/test_taskflow_thread_pool.cpp
index 4270f2bd4..6f3922e51 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <stdexec/execution.hpp>
 
diff --git a/test/exec/tbb/test_tbb_thread_pool.cpp b/test/exec/tbb/test_tbb_thread_pool.cpp
index 46b44219c..2af9889bb 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <span>
 
diff --git a/test/exec/test_any_sender.cpp b/test/exec/test_any_sender.cpp
index 76df3752a..74b82e058 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/exec/test_at_coroutine_exit.cpp b/test/exec/test_at_coroutine_exit.cpp
index 65ef942d5..ca6184cf3 100644
--- a/test/exec/test_at_coroutine_exit.cpp
+++ b/test/exec/test_at_coroutine_exit.cpp
@@ -18,9 +18,9 @@
 #include <stdexec/coroutine.hpp>
 
 #if !STDEXEC_NO_STDCPP_COROUTINES() && !STDEXEC_NO_STDCPP_EXCEPTIONS() && !STDEXEC_APPLE_CLANG()
-#  include <catch2/catch_all.hpp>
 #  include <exec/at_coroutine_exit.hpp>
 #  include <exec/on_coro_disposition.hpp>
+#  include <test_common/catch2.hpp>
 
 #  include "../test_common/require_terminate.hpp"
 #  include "../test_common/schedulers.hpp"
diff --git a/test/exec/test_bwos_lifo_queue.cpp b/test/exec/test_bwos_lifo_queue.cpp
index c0f842c47..4553c96aa 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_all.hpp>
+#include <test_common/catch2.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 1ea84ad1c..8a6d636ab 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_all.hpp>
+#include <test_common/catch2.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 90e3ab89c..b925c2628 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/exec/test_cpo_split.cpp b/test/exec/test_cpo_split.cpp
index f3af5b6d8..703381372 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/exec/test_create.cpp b/test/exec/test_create.cpp
index 1bb7c9996..4cda6cea8 100644
--- a/test/exec/test_create.cpp
+++ b/test/exec/test_create.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/create.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include <optional>
 
diff --git a/test/exec/test_ensure_started.cpp b/test/exec/test_ensure_started.cpp
index bb01c414d..bc5139741 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 using exec::async_scope;
diff --git a/test/exec/test_env.cpp b/test/exec/test_env.cpp
index c13439066..943a28a63 100644
--- a/test/exec/test_env.cpp
+++ b/test/exec/test_env.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/exec/test_execute.cpp b/test/exec/test_execute.cpp
index 045c617de..fbd2dafd5 100644
--- a/test/exec/test_execute.cpp
+++ b/test/exec/test_execute.cpp
@@ -15,10 +15,10 @@
  */
 
 #include <atomic>
-#include <catch2/catch_all.hpp>
 #include <exec/execute.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/schedulers.hpp>
 
 #include <atomic>
diff --git a/test/exec/test_fork_join.cpp b/test/exec/test_fork_join.cpp
index 391e16ea9..5f1635242 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <atomic>
 
diff --git a/test/exec/test_function.cpp b/test/exec/test_function.cpp
index 331740429..dad3f443d 100644
--- a/test/exec/test_function.cpp
+++ b/test/exec/test_function.cpp
@@ -17,7 +17,7 @@
 
 #include <exec/function.hpp>
 
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <stdexec/execution.hpp>
 
diff --git a/test/exec/test_into_tuple.cpp b/test/exec/test_into_tuple.cpp
index 9ea180329..01bfd1046 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 using namespace STDEXEC;
 
diff --git a/test/exec/test_io_uring_context.cpp b/test/exec/test_io_uring_context.cpp
index 44545fc94..7f7ceafad 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_all.hpp"
+#  include "test_common/catch2.hpp"
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_just_from.cpp b/test/exec/test_just_from.cpp
index 3c8a35984..6291cb3fa 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/exec/test_libdispatch.cpp b/test/exec/test_libdispatch.cpp
index efed13d66..5b96e131a 100644
--- a/test/exec/test_libdispatch.cpp
+++ b/test/exec/test_libdispatch.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include "catch2/catch_all.hpp"
 #include "exec/libdispatch_queue.hpp"
 #include "stdexec/execution.hpp"
+#include "test_common/catch2.hpp"
 
 #include <numeric>
 #include <utility>
diff --git a/test/exec/test_materialize.cpp b/test/exec/test_materialize.cpp
index 684317d5b..f076b70e4 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_repeat_n.cpp b/test/exec/test_repeat_n.cpp
index 76862c971..06349cb51 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 using namespace STDEXEC;
 
diff --git a/test/exec/test_repeat_until.cpp b/test/exec/test_repeat_until.cpp
index 79297494f..5f30aad23 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <concepts>
 #include <cstddef>
diff --git a/test/exec/test_sequence_senders.cpp b/test/exec/test_sequence_senders.cpp
index f467866cf..0ab6ad859 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_split.cpp b/test/exec/test_split.cpp
index 9abbbd693..5e9353db9 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/exec/test_start_detached.cpp b/test/exec/test_start_detached.cpp
index 386521918..5ef6108d9 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_all.hpp>
+#include <test_common/catch2.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 dde1f85f3..b0cceede7 100644
--- a/test/exec/test_static_thread_pool.cpp
+++ b/test/exec/test_static_thread_pool.cpp
@@ -1,8 +1,24 @@
-#include "catch2/catch_all.hpp"
+/*
+ * Copyright (c) 2022 NVIDIA Corporation
+ *
+ * Licensed under the Apache License Version 2.0 with LLVM Exceptions
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *   https://llvm.org/LICENSE.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include <exec/sequence/ignore_all_values.hpp>
 #include <exec/sequence/transform_each.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>  // IWYU pragma: keep
 
 #include <atomic>
 #include <exception>
diff --git a/test/exec/test_task.cpp b/test/exec/test_task.cpp
index 9d2d6a137..dfc1e2d0e 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_all.hpp>
+#  include <test_common/catch2.hpp>
 
 #  include <string>
 
diff --git a/test/exec/test_timed_thread_scheduler.cpp b/test/exec/test_timed_thread_scheduler.cpp
index cd244f8fa..a3bb80821 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_all.hpp"
+#include "test_common/catch2.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 1acdc2e26..34774b010 100644
--- a/test/exec/test_trampoline_scheduler.cpp
+++ b/test/exec/test_trampoline_scheduler.cpp
@@ -19,8 +19,8 @@
 
 #include "../test_common/retry.hpp"
 
-#include <catch2/catch_all.hpp>
 #include <memory>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/exec/test_type_async_scope.cpp b/test/exec/test_type_async_scope.cpp
index 6eb306ee5..2f12e1046 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_all.hpp>
+#include <test_common/catch2.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 3d3164f01..75b7b87fc 100644
--- a/test/exec/test_unless_stop_requested.cpp
+++ b/test/exec/test_unless_stop_requested.cpp
@@ -20,8 +20,8 @@
 
 #include <exception>
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "../test_common/receivers.hpp"
 #include "../test_common/type_helpers.hpp"
diff --git a/test/exec/test_variant_sender.cpp b/test/exec/test_variant_sender.cpp
index 111ab009a..247ad28a7 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 using namespace STDEXEC;
 using namespace exec;
diff --git a/test/exec/test_when_any.cpp b/test/exec/test_when_any.cpp
index 427ac2071..58df5951c 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_all.hpp>
+#include <test_common/catch2.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 6e5b5f9cc..a7cae997c 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <stdexec/execution.hpp>
 
diff --git a/test/nvexec/bulk.cpp b/test/nvexec/bulk.cpp
index f11909259..1573cb94a 100644
--- a/test/nvexec/bulk.cpp
+++ b/test/nvexec/bulk.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/continues_on.cpp b/test/nvexec/continues_on.cpp
index e61a78e5d..0104af152 100644
--- a/test/nvexec/continues_on.cpp
+++ b/test/nvexec/continues_on.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "nvexec/stream_context.cuh"
 
diff --git a/test/nvexec/ensure_started.cpp b/test/nvexec/ensure_started.cpp
index 310eb7c7c..3b9d2c98e 100644
--- a/test/nvexec/ensure_started.cpp
+++ b/test/nvexec/ensure_started.cpp
@@ -1,6 +1,6 @@
 #include <atomic>
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/detail/cuda_atomic.cuh"
diff --git a/test/nvexec/launch.cpp b/test/nvexec/launch.cpp
index bfbae7998..9906711c1 100644
--- a/test/nvexec/launch.cpp
+++ b/test/nvexec/launch.cpp
@@ -15,8 +15,8 @@
  */
 
 #include <algorithm>
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/let_error.cpp b/test/nvexec/let_error.cpp
index 8d7c6a5a1..22a937685 100644
--- a/test/nvexec/let_error.cpp
+++ b/test/nvexec/let_error.cpp
@@ -1,6 +1,6 @@
-#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/let_stopped.cpp b/test/nvexec/let_stopped.cpp
index 23603d2eb..a1348eaab 100644
--- a/test/nvexec/let_stopped.cpp
+++ b/test/nvexec/let_stopped.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/let_value.cpp b/test/nvexec/let_value.cpp
index 9b7e890f3..a9345f636 100644
--- a/test/nvexec/let_value.cpp
+++ b/test/nvexec/let_value.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/monotonic_buffer.cpp b/test/nvexec/monotonic_buffer.cpp
index 4e48ae184..040fbf16a 100644
--- a/test/nvexec/monotonic_buffer.cpp
+++ b/test/nvexec/monotonic_buffer.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <iostream>
+#include <test_common/catch2.hpp>
 
 #include "nvexec/detail/memory.cuh"
 #include "tracer_resource.h"
diff --git a/test/nvexec/reduce.cpp b/test/nvexec/reduce.cpp
index e31f6b489..9a59fe122 100644
--- a/test/nvexec/reduce.cpp
+++ b/test/nvexec/reduce.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <stdexec/execution.hpp>
 
diff --git a/test/nvexec/split.cpp b/test/nvexec/split.cpp
index 6ffcf94df..d9ad79a86 100644
--- a/test/nvexec/split.cpp
+++ b/test/nvexec/split.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/start_detached.cpp b/test/nvexec/start_detached.cpp
index d30435419..54c8c7bd7 100644
--- a/test/nvexec/start_detached.cpp
+++ b/test/nvexec/start_detached.cpp
@@ -1,6 +1,6 @@
-#include <catch2/catch_all.hpp>
 #include <cstdlib>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "exec/start_detached.hpp"
diff --git a/test/nvexec/synchronized_pool.cpp b/test/nvexec/synchronized_pool.cpp
index 68434b601..297be8e5d 100644
--- a/test/nvexec/synchronized_pool.cpp
+++ b/test/nvexec/synchronized_pool.cpp
@@ -1,6 +1,6 @@
-#include <catch2/catch_all.hpp>
 #include <iostream>
 #include <numeric>
+#include <test_common/catch2.hpp>
 
 #include "nvexec/detail/memory.cuh"
 #include "tracer_resource.h"
diff --git a/test/nvexec/test_main.cpp b/test/nvexec/test_main.cpp
index 2c344d5b8..51a22506d 100644
--- a/test/nvexec/test_main.cpp
+++ b/test/nvexec/test_main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.hpp>
diff --git a/test/nvexec/then.cpp b/test/nvexec/then.cpp
index 783791207..f19e25a6f 100644
--- a/test/nvexec/then.cpp
+++ b/test/nvexec/then.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream/common.cuh"
diff --git a/test/nvexec/tracer_resource.h b/test/nvexec/tracer_resource.h
index 772406e92..f567066f3 100644
--- a/test/nvexec/tracer_resource.h
+++ b/test/nvexec/tracer_resource.h
@@ -4,7 +4,7 @@
 #include <new>
 #include <vector>
 
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace nvdetail = nvexec::_strm;
 
diff --git a/test/nvexec/transfer.cpp b/test/nvexec/transfer.cpp
index ddacf4183..ee747ab44 100644
--- a/test/nvexec/transfer.cpp
+++ b/test/nvexec/transfer.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "exec/single_thread_context.hpp"
diff --git a/test/nvexec/transfer_when_all.cpp b/test/nvexec/transfer_when_all.cpp
index 2cbb7af30..4a4919ce3 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/nvexec/upon_error.cpp b/test/nvexec/upon_error.cpp
index 3fd8faf32..df3f1c491 100644
--- a/test/nvexec/upon_error.cpp
+++ b/test/nvexec/upon_error.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/upon_stopped.cpp b/test/nvexec/upon_stopped.cpp
index 854e67358..09fca2890 100644
--- a/test/nvexec/upon_stopped.cpp
+++ b/test/nvexec/upon_stopped.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream_context.cuh"
diff --git a/test/nvexec/variant.cpp b/test/nvexec/variant.cpp
index 9db216b11..610d1cf9e 100644
--- a/test/nvexec/variant.cpp
+++ b/test/nvexec/variant.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include <cuda/std/tuple>
 #include <thrust/universal_vector.h>
diff --git a/test/nvexec/when_all.cpp b/test/nvexec/when_all.cpp
index b0fe1b0be..deb0faee7 100644
--- a/test/nvexec/when_all.cpp
+++ b/test/nvexec/when_all.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include "common.cuh"
 #include "nvexec/stream/common.cuh"
diff --git a/test/stdexec/algos/adaptors/test_associate.cpp b/test/stdexec/algos/adaptors/test_associate.cpp
index c18bba894..76f7a2f52 100644
--- a/test/stdexec/algos/adaptors/test_associate.cpp
+++ b/test/stdexec/algos/adaptors/test_associate.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 4ff0685a3..48c90e53b 100644
--- a/test/stdexec/algos/adaptors/test_bulk.cpp
+++ b/test/stdexec/algos/adaptors/test_bulk.cpp
@@ -15,10 +15,10 @@
  */
 #include <exception>
 
-#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/senders.hpp>
diff --git a/test/stdexec/algos/adaptors/test_continues_on.cpp b/test/stdexec/algos/adaptors/test_continues_on.cpp
index d4debc23f..c4a829af3 100644
--- a/test/stdexec/algos/adaptors/test_continues_on.cpp
+++ b/test/stdexec/algos/adaptors/test_continues_on.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/start_detached.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_finally.cpp b/test/stdexec/algos/adaptors/test_finally.cpp
index 5b700f97c..05b67bf45 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_all.hpp>
+#include <test_common/catch2.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 6fa1d5bd9..4357d68b3 100644
--- a/test/stdexec/algos/adaptors/test_into_variant.cpp
+++ b/test/stdexec/algos/adaptors/test_into_variant.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <numbers>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/senders.hpp>
diff --git a/test/stdexec/algos/adaptors/test_let_error.cpp b/test/stdexec/algos/adaptors/test_let_error.cpp
index 7f7a2e208..9f3b5ba70 100644
--- a/test/stdexec/algos/adaptors/test_let_error.cpp
+++ b/test/stdexec/algos/adaptors/test_let_error.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/split.hpp>
 #include <exec/start_detached.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/senders.hpp>
diff --git a/test/stdexec/algos/adaptors/test_let_stopped.cpp b/test/stdexec/algos/adaptors/test_let_stopped.cpp
index 5ef07ea31..c143604bb 100644
--- a/test/stdexec/algos/adaptors/test_let_stopped.cpp
+++ b/test/stdexec/algos/adaptors/test_let_stopped.cpp
@@ -15,10 +15,10 @@
  */
 
 #include "stdexec/__detail/__sender_introspection.hpp"
-#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_let_value.cpp b/test/stdexec/algos/adaptors/test_let_value.cpp
index 7fd8ec319..939e550d3 100644
--- a/test/stdexec/algos/adaptors/test_let_value.cpp
+++ b/test/stdexec/algos/adaptors/test_let_value.cpp
@@ -15,12 +15,12 @@
  */
 
 #include "stdexec/__detail/__let.hpp"
-#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/start_detached.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_on.cpp b/test/stdexec/algos/adaptors/test_on.cpp
index 7b4d24226..6300b09cd 100644
--- a/test/stdexec/algos/adaptors/test_on.cpp
+++ b/test/stdexec/algos/adaptors/test_on.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 
diff --git a/test/stdexec/algos/adaptors/test_on2.cpp b/test/stdexec/algos/adaptors/test_on2.cpp
index 443a6b2f0..9a9a721b8 100644
--- a/test/stdexec/algos/adaptors/test_on2.cpp
+++ b/test/stdexec/algos/adaptors/test_on2.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 9fa33d411..a4f417afe 100644
--- a/test/stdexec/algos/adaptors/test_on3.cpp
+++ b/test/stdexec/algos/adaptors/test_on3.cpp
@@ -15,12 +15,12 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/ensure_started.hpp>
 #include <exec/split.hpp>
 #include <exec/start_detached.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/schedulers.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/algos/adaptors/test_sequence.cpp b/test/stdexec/algos/adaptors/test_sequence.cpp
index 59350d0a5..1373efb85 100644
--- a/test/stdexec/algos/adaptors/test_sequence.cpp
+++ b/test/stdexec/algos/adaptors/test_sequence.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/sequence.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/type_helpers.hpp>
 
diff --git a/test/stdexec/algos/adaptors/test_spawn_future.cpp b/test/stdexec/algos/adaptors/test_spawn_future.cpp
index 740ed055e..d44931853 100644
--- a/test/stdexec/algos/adaptors/test_spawn_future.cpp
+++ b/test/stdexec/algos/adaptors/test_spawn_future.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/scope_helpers.hpp>
 #include <test_common/scope_tokens.hpp>
 
diff --git a/test/stdexec/algos/adaptors/test_starts_on.cpp b/test/stdexec/algos/adaptors/test_starts_on.cpp
index f457c1a1b..1fc8714e8 100644
--- a/test/stdexec/algos/adaptors/test_starts_on.cpp
+++ b/test/stdexec/algos/adaptors/test_starts_on.cpp
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/start_detached.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_stop_when.cpp b/test/stdexec/algos/adaptors/test_stop_when.cpp
index 29d64b78d..f1e43f068 100644
--- a/test/stdexec/algos/adaptors/test_stop_when.cpp
+++ b/test/stdexec/algos/adaptors/test_stop_when.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/__detail/__stop_when.hpp>
 #include <stdexec/execution.hpp>
 #include <stdexec/stop_token.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/algos/adaptors/test_stopped_as_error.cpp b/test/stdexec/algos/adaptors/test_stopped_as_error.cpp
index 643b2b12d..6281f87a1 100644
--- a/test/stdexec/algos/adaptors/test_stopped_as_error.cpp
+++ b/test/stdexec/algos/adaptors/test_stopped_as_error.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <numbers>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp b/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp
index 1b46d17af..b90dc3167 100644
--- a/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp
+++ b/test/stdexec/algos/adaptors/test_stopped_as_optional.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <numbers>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/senders.hpp>
diff --git a/test/stdexec/algos/adaptors/test_then.cpp b/test/stdexec/algos/adaptors/test_then.cpp
index d543818ce..596f7a6ad 100644
--- a/test/stdexec/algos/adaptors/test_then.cpp
+++ b/test/stdexec/algos/adaptors/test_then.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/senders.hpp>
diff --git a/test/stdexec/algos/adaptors/test_transfer_when_all.cpp b/test/stdexec/algos/adaptors/test_transfer_when_all.cpp
index 7c95291c5..3c07c1a5d 100644
--- a/test/stdexec/algos/adaptors/test_transfer_when_all.cpp
+++ b/test/stdexec/algos/adaptors/test_transfer_when_all.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_upon_error.cpp b/test/stdexec/algos/adaptors/test_upon_error.cpp
index e4502d0e3..7fa5287e3 100644
--- a/test/stdexec/algos/adaptors/test_upon_error.cpp
+++ b/test/stdexec/algos/adaptors/test_upon_error.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_upon_stopped.cpp b/test/stdexec/algos/adaptors/test_upon_stopped.cpp
index 8ad44725a..4adc4f971 100644
--- a/test/stdexec/algos/adaptors/test_upon_stopped.cpp
+++ b/test/stdexec/algos/adaptors/test_upon_stopped.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/adaptors/test_when_all.cpp b/test/stdexec/algos/adaptors/test_when_all.cpp
index bd64442d3..202d0a702 100644
--- a/test/stdexec/algos/adaptors/test_when_all.cpp
+++ b/test/stdexec/algos/adaptors/test_when_all.cpp
@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/any_sender_of.hpp>
 #include <exec/async_scope.hpp>
 #include <exec/env.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/split.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/senders.hpp>
diff --git a/test/stdexec/algos/adaptors/test_write_env.cpp b/test/stdexec/algos/adaptors/test_write_env.cpp
index 718c4f12f..81a22e9fd 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_all.hpp>
+#include <test_common/catch2.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 95ad8ca00..c919a73c1 100644
--- a/test/stdexec/algos/consumers/test_spawn.cpp
+++ b/test/stdexec/algos/consumers/test_spawn.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 8d054bd8a..eddfa7713 100644
--- a/test/stdexec/algos/consumers/test_sync_wait.cpp
+++ b/test/stdexec/algos/consumers/test_sync_wait.cpp
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/env.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/senders.hpp>
diff --git a/test/stdexec/algos/factories/test_just.cpp b/test/stdexec/algos/factories/test_just.cpp
index 843015905..8eb1ad5b1 100644
--- a/test/stdexec/algos/factories/test_just.cpp
+++ b/test/stdexec/algos/factories/test_just.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/completion_behavior.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
@@ -227,7 +227,7 @@ namespace
     ::STDEXEC::start(op);
     CHECK(invoked == 1);
   }
-#endif
+#endif  // !STDEXEC_NO_STDCPP_EXCEPTIONS()
 
   TEST_CASE("just completes inline and has no completion domain", "[factories][just]")
   {
diff --git a/test/stdexec/algos/factories/test_just_error.cpp b/test/stdexec/algos/factories/test_just_error.cpp
index c33349562..52c3db2b2 100644
--- a/test/stdexec/algos/factories/test_just_error.cpp
+++ b/test/stdexec/algos/factories/test_just_error.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 688965618..94c1d57f9 100644
--- a/test/stdexec/algos/factories/test_just_stopped.cpp
+++ b/test/stdexec/algos/factories/test_just_stopped.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 0d847d051..e5126e423 100644
--- a/test/stdexec/algos/factories/test_read.cpp
+++ b/test/stdexec/algos/factories/test_read.cpp
@@ -12,8 +12,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/type_helpers.hpp>
 
 #include <memory>
diff --git a/test/stdexec/algos/factories/test_schedule.cpp b/test/stdexec/algos/factories/test_schedule.cpp
index 1331a0c77..3e9f640a2 100644
--- a/test/stdexec/algos/factories/test_schedule.cpp
+++ b/test/stdexec/algos/factories/test_schedule.cpp
@@ -14,8 +14,8 @@
 
 #include "exec/static_thread_pool.hpp"
 #include "stdexec/__detail/__meta.hpp"
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/algos/factories/test_transfer_just.cpp b/test/stdexec/algos/factories/test_transfer_just.cpp
index 70575caa2..6eb84433f 100644
--- a/test/stdexec/algos/factories/test_transfer_just.cpp
+++ b/test/stdexec/algos/factories/test_transfer_just.cpp
@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
 #include <test_common/type_helpers.hpp>
diff --git a/test/stdexec/concepts/test_awaitables.cpp b/test/stdexec/concepts/test_awaitables.cpp
index fca741931..2d03a244d 100644
--- a/test/stdexec/concepts/test_awaitables.cpp
+++ b/test/stdexec/concepts/test_awaitables.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/coroutine.hpp>
diff --git a/test/stdexec/concepts/test_concept_operation_state.cpp b/test/stdexec/concepts/test_concept_operation_state.cpp
index b4c5d20f8..47b85b1fd 100644
--- a/test/stdexec/concepts/test_concept_operation_state.cpp
+++ b/test/stdexec/concepts/test_concept_operation_state.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/stdexec/concepts/test_concept_scheduler.cpp b/test/stdexec/concepts/test_concept_scheduler.cpp
index 89d3c6015..376284ff1 100644
--- a/test/stdexec/concepts/test_concept_scheduler.cpp
+++ b/test/stdexec/concepts/test_concept_scheduler.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/stdexec/concepts/test_concepts_receiver.cpp b/test/stdexec/concepts/test_concepts_receiver.cpp
index 7b0e8d59e..58e364fa3 100644
--- a/test/stdexec/concepts/test_concepts_receiver.cpp
+++ b/test/stdexec/concepts/test_concepts_receiver.cpp
@@ -14,8 +14,8 @@
 //  * limitations under the License.
 //  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 
 namespace ex = STDEXEC;
@@ -73,7 +73,7 @@ struct recv_set_error_except
   void set_stopped() noexcept {}
   void set_error(std::exception_ptr)
   {
-    throw std::logic_error{"err"};
+    STDEXEC_THROW(std::logic_error{"err"});
   }
 
   [[nodiscard]]
@@ -90,7 +90,7 @@ struct recv_set_stopped_except
   void set_value() noexcept {}
   void set_stopped()
   {
-    throw std::logic_error{"err"};
+    STDEXEC_THROW(std::logic_error{"err"});
   }
   void set_error(std::exception_ptr) noexcept {}
 
diff --git a/test/stdexec/concepts/test_concepts_scope_association.cpp b/test/stdexec/concepts/test_concepts_scope_association.cpp
index 44579326b..295b1df11 100644
--- a/test/stdexec/concepts/test_concepts_scope_association.cpp
+++ b/test/stdexec/concepts/test_concepts_scope_association.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 134d1e945..562d16de2 100644
--- a/test/stdexec/concepts/test_concepts_scope_token.cpp
+++ b/test/stdexec/concepts/test_concepts_scope_token.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/stdexec/concepts/test_concepts_sender.cpp b/test/stdexec/concepts/test_concepts_sender.cpp
index a674d711f..85416efb9 100644
--- a/test/stdexec/concepts/test_concepts_sender.cpp
+++ b/test/stdexec/concepts/test_concepts_sender.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 3a01cfe7a..b834ee47f 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/stdexec/cpos/test_cpo_connect.cpp b/test/stdexec/cpos/test_cpo_connect.cpp
index d999c00cf..1fd17820c 100644
--- a/test/stdexec/cpos/test_cpo_connect.cpp
+++ b/test/stdexec/cpos/test_cpo_connect.cpp
@@ -16,8 +16,8 @@
 
 #include "test_common/receivers.hpp"
 #include "test_common/type_helpers.hpp"
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 7535b65f5..3fc7b5646 100644
--- a/test/stdexec/cpos/test_cpo_connect_awaitable.cpp
+++ b/test/stdexec/cpos/test_cpo_connect_awaitable.cpp
@@ -20,8 +20,8 @@
 
 #  include "test_common/receivers.hpp"
 #  include "test_common/type_helpers.hpp"
-#  include <catch2/catch_all.hpp>
 #  include <stdexec/execution.hpp>
+#  include <test_common/catch2.hpp>
 
 #  include <stdexcept>
 #  include <type_traits>
diff --git a/test/stdexec/cpos/test_cpo_receiver.cpp b/test/stdexec/cpos/test_cpo_receiver.cpp
index 9ab3711cb..952bea829 100644
--- a/test/stdexec/cpos/test_cpo_receiver.cpp
+++ b/test/stdexec/cpos/test_cpo_receiver.cpp
@@ -15,8 +15,8 @@
  */
 
 #include "test_common/receivers.hpp"
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include <climits>
 #include <string>
diff --git a/test/stdexec/cpos/test_cpo_schedule.cpp b/test/stdexec/cpos/test_cpo_schedule.cpp
index dd04e1cb4..85db2acbd 100644
--- a/test/stdexec/cpos/test_cpo_schedule.cpp
+++ b/test/stdexec/cpos/test_cpo_schedule.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/type_helpers.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/cpos/test_cpo_start.cpp b/test/stdexec/cpos/test_cpo_start.cpp
index 1e790b820..7b667a956 100644
--- a/test/stdexec/cpos/test_cpo_start.cpp
+++ b/test/stdexec/cpos/test_cpo_start.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/type_helpers.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/stdexec/cpos/test_cpo_upon_error.cpp b/test/stdexec/cpos/test_cpo_upon_error.cpp
index 02a43a84f..493dbd5b8 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/stdexec/cpos/test_cpo_upon_stopped.cpp b/test/stdexec/cpos/test_cpo_upon_stopped.cpp
index c4f4e08f8..1a8eb3a26 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 namespace
 {
diff --git a/test/stdexec/detail/test_any.cpp b/test/stdexec/detail/test_any.cpp
index 4e1f94f7c..4a7399486 100644
--- a/test/stdexec/detail/test_any.cpp
+++ b/test/stdexec/detail/test_any.cpp
@@ -18,7 +18,7 @@
 
 #include <cstdio>
 
-#include <catch2/catch_all.hpp>  // IWYU pragma: keep
+#include <test_common/catch2.hpp>  // IWYU pragma: keep
 
 // NOLINTBEGIN(modernize-use-override)
 STDEXEC_PRAGMA_PUSH()
@@ -226,7 +226,7 @@ namespace
 
     any::__any<any::__iequality_comparable> a = 42;
     if (a != a)
-      throw "error";
+      STDEXEC_THROW("error");
 
     any::__any_ptr<ibaz> pifoo = any::__addressof(m);
     [[maybe_unused]]
diff --git a/test/stdexec/detail/test_common_domain.cpp b/test/stdexec/detail/test_common_domain.cpp
index b40da2b88..c03cacf48 100644
--- a/test/stdexec/detail/test_common_domain.cpp
+++ b/test/stdexec/detail/test_common_domain.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include <test_common/receivers.hpp>
 
diff --git a/test/stdexec/detail/test_completion_signatures.cpp b/test/stdexec/detail/test_completion_signatures.cpp
index 5ab5a2a8e..f1bb9372d 100644
--- a/test/stdexec/detail/test_completion_signatures.cpp
+++ b/test/stdexec/detail/test_completion_signatures.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 eb082a528..743af46ae 100644
--- a/test/stdexec/detail/test_demangle.cpp
+++ b/test/stdexec/detail/test_demangle.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 423d0f515..df3bf0e44 100644
--- a/test/stdexec/detail/test_intrusive_mpsc_queue.cpp
+++ b/test/stdexec/detail/test_intrusive_mpsc_queue.cpp
@@ -1,5 +1,5 @@
-#include <catch2/catch_all.hpp>
 #include <stdexec/__detail/__intrusive_mpsc_queue.hpp>
+#include <test_common/catch2.hpp>
 
 #include <algorithm>
 #include <atomic>
diff --git a/test/stdexec/detail/test_utility.cpp b/test/stdexec/detail/test_utility.cpp
index 66bd94eb0..eed8126a5 100644
--- a/test/stdexec/detail/test_utility.cpp
+++ b/test/stdexec/detail/test_utility.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/__detail/__meta.hpp>
+#include <test_common/catch2.hpp>
 
 #include <optional>
 
diff --git a/test/stdexec/queries/test_env.cpp b/test/stdexec/queries/test_env.cpp
index 08f2d64aa..af37a8192 100644
--- a/test/stdexec/queries/test_env.cpp
+++ b/test/stdexec/queries/test_env.cpp
@@ -16,8 +16,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 
diff --git a/test/stdexec/queries/test_forwarding_queries.cpp b/test/stdexec/queries/test_forwarding_queries.cpp
index ae503bb4a..9fa9c2c48 100644
--- a/test/stdexec/queries/test_forwarding_queries.cpp
+++ b/test/stdexec/queries/test_forwarding_queries.cpp
@@ -12,8 +12,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 STDEXEC_PRAGMA_IGNORE_GNU("-Wdeprecated-declarations")
 STDEXEC_PRAGMA_IGNORE_EDG(deprecated_entity_with_custom_message)
diff --git a/test/stdexec/queries/test_get_completion_behavior.cpp b/test/stdexec/queries/test_get_completion_behavior.cpp
index 0bc0c87f7..0999f3fe5 100644
--- a/test/stdexec/queries/test_get_completion_behavior.cpp
+++ b/test/stdexec/queries/test_get_completion_behavior.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 namespace ex = STDEXEC;
 using cb     = ex::__completion_behavior;
diff --git a/test/stdexec/queries/test_get_forward_progress_guarantee.cpp b/test/stdexec/queries/test_get_forward_progress_guarantee.cpp
index b3b4c23ef..78cbdc461 100644
--- a/test/stdexec/queries/test_get_forward_progress_guarantee.cpp
+++ b/test/stdexec/queries/test_get_forward_progress_guarantee.cpp
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/schedulers.hpp>
 
 STDEXEC_PRAGMA_PUSH()
diff --git a/test/stdexec/schedulers/test_parallel_scheduler.cpp b/test/stdexec/schedulers/test_parallel_scheduler.cpp
index 91f194182..5106278c2 100644
--- a/test/stdexec/schedulers/test_parallel_scheduler.cpp
+++ b/test/stdexec/schedulers/test_parallel_scheduler.cpp
@@ -27,7 +27,7 @@
 #include <exec/inline_scheduler.hpp>
 #include <exec/static_thread_pool.hpp>
 
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.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 1e71eeff9..8b4aaaaa7 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_all.hpp>
+#include <test_common/catch2.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 8ccbe59b3..027738188 100644
--- a/test/stdexec/schedulers/test_task_scheduler.cpp
+++ b/test/stdexec/schedulers/test_task_scheduler.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/sender_for.hpp>
 #include <exec/single_thread_context.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>
diff --git a/test/stdexec/types/test_counting_scopes.cpp b/test/stdexec/types/test_counting_scopes.cpp
index 4465a36b6..07a07da49 100644
--- a/test/stdexec/types/test_counting_scopes.cpp
+++ b/test/stdexec/types/test_counting_scopes.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <exec/static_thread_pool.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 
 #include <atomic>
diff --git a/test/stdexec/types/test_task.cpp b/test/stdexec/types/test_task.cpp
index b3b69f29f..5fb0b4e3d 100644
--- a/test/stdexec/types/test_task.cpp
+++ b/test/stdexec/types/test_task.cpp
@@ -27,7 +27,7 @@
 
 #  include <atomic>
 
-#  include <catch2/catch_all.hpp>
+#  include <test_common/catch2.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 b12efb940..cb0cea31c 100644
--- a/test/test_common/allocators.hpp
+++ b/test/test_common/allocators.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 
 #include <new>
 
diff --git a/test/test_common/catch2.hpp b/test/test_common/catch2.hpp
new file mode 100644
index 000000000..a3403f3af
--- /dev/null
+++ b/test/test_common/catch2.hpp
@@ -0,0 +1,26 @@
+/*
+ * Copyright (c) 2022 Lucian Radu Teodorescu
+ *
+ * Licensed under the Apache License Version 2.0 with LLVM Exceptions
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ *   https://llvm.org/LICENSE.txt
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <stdexec/__detail/__config.hpp>
+
+STDEXEC_PRAGMA_PUSH()
+STDEXEC_PRAGMA_IGNORE_GNU("-Wunused-parameter")
+
+#include <catch2/catch_all.hpp>
+
+STDEXEC_PRAGMA_POP()
diff --git a/test/test_common/receivers.hpp b/test/test_common/receivers.hpp
index 3bc5320bb..b557551ab 100644
--- a/test/test_common/receivers.hpp
+++ b/test/test_common/receivers.hpp
@@ -16,8 +16,8 @@
 
 #pragma once
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.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 544a7b10b..4e0a3afa7 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_all.hpp>
+#include <test_common/catch2.hpp>
 
 #ifdef REQUIRE_TERMINATE
 namespace
diff --git a/test/test_common/senders.hpp b/test/test_common/senders.hpp
index 0b003c16b..83f068411 100644
--- a/test/test_common/senders.hpp
+++ b/test/test_common/senders.hpp
@@ -16,10 +16,10 @@
 
 #pragma once
 
-#include <catch2/catch_all.hpp>
 #include <exec/completion_behavior.hpp>
 #include <memory>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/type_helpers.hpp>
 
 namespace ex = STDEXEC;
diff --git a/test/test_common/tuple.hpp b/test/test_common/tuple.hpp
index de1bf73b8..0be1952e1 100644
--- a/test/test_common/tuple.hpp
+++ b/test/test_common/tuple.hpp
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.hpp>
 
 #include <tuple>
 
diff --git a/test/test_main.cpp b/test/test_main.cpp
index 2c344d5b8..51a22506d 100644
--- a/test/test_main.cpp
+++ b/test/test_main.cpp
@@ -1,2 +1,2 @@
 #define CATCH_CONFIG_MAIN
-#include <catch2/catch_all.hpp>
+#include <test_common/catch2.hpp>
diff --git a/test/test_scratch.cpp b/test/test_scratch.cpp
index ead4dc62b..c7071eefc 100644
--- a/test/test_scratch.cpp
+++ b/test/test_scratch.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-#include <catch2/catch_all.hpp>
 #include <stdexec/execution.hpp>
+#include <test_common/catch2.hpp>
 #include <test_common/receivers.hpp>
 #include <test_common/schedulers.hpp>