diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6075df8e..e20aaaaf 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -8,7 +8,7 @@ if (NOT Catch2_FOUND)
   FetchContent_Declare(
     Catch2
     GIT_REPOSITORY https://github.com/catchorg/Catch2.git
-    GIT_TAG        v2.13.9)
+    GIT_TAG        v3.5.3)
 
   FetchContent_MakeAvailable(Catch2)
 
@@ -35,7 +35,7 @@ add_executable(
 target_include_directories(unit_tests PUBLIC ${CATCH_MODULE_PATH})
 target_link_libraries(
     unit_tests
-    PRIVATE Catch2::Catch2
+    PRIVATE Catch2::Catch2WithMain
     PRIVATE cppzmq
     PRIVATE ${CMAKE_THREAD_LIBS_INIT}
 )
diff --git a/tests/buffer.cpp b/tests/buffer.cpp
index da8a5141..9db2e9ad 100644
--- a/tests/buffer.cpp
+++ b/tests/buffer.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq.hpp>
 
 #ifdef ZMQ_CPP17
diff --git a/tests/codec_multipart.cpp b/tests/codec_multipart.cpp
index a5cb1e86..f43edff3 100644
--- a/tests/codec_multipart.cpp
+++ b/tests/codec_multipart.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq_addon.hpp>
 
 #ifdef ZMQ_CPP11
diff --git a/tests/context.cpp b/tests/context.cpp
index ade5ade7..76964a6b 100644
--- a/tests/context.cpp
+++ b/tests/context.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq.hpp>
 
 #if (__cplusplus >= 201703L)
diff --git a/tests/message.cpp b/tests/message.cpp
index a841413d..23718bd0 100644
--- a/tests/message.cpp
+++ b/tests/message.cpp
@@ -1,5 +1,4 @@
-#define CATCH_CONFIG_MAIN
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq.hpp>
 
 #if defined(ZMQ_CPP11)
diff --git a/tests/multipart.cpp b/tests/multipart.cpp
index 7d92b979..c201592f 100644
--- a/tests/multipart.cpp
+++ b/tests/multipart.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq_addon.hpp>
 
 #ifdef ZMQ_HAS_RVALUE_REFS
diff --git a/tests/recv_multipart.cpp b/tests/recv_multipart.cpp
index cf998552..5a068d48 100644
--- a/tests/recv_multipart.cpp
+++ b/tests/recv_multipart.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq_addon.hpp>
 #ifdef ZMQ_CPP11
 
diff --git a/tests/send_multipart.cpp b/tests/send_multipart.cpp
index 1f238238..cc0b41da 100644
--- a/tests/send_multipart.cpp
+++ b/tests/send_multipart.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq_addon.hpp>
 #ifdef ZMQ_CPP11
 
diff --git a/tests/socket.cpp b/tests/socket.cpp
index cebee4b1..b6f227d0 100644
--- a/tests/socket.cpp
+++ b/tests/socket.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq.hpp>
 #ifdef ZMQ_CPP11
 #include <future>
diff --git a/tests/socket_ref.cpp b/tests/socket_ref.cpp
index 7658658f..6da39b08 100644
--- a/tests/socket_ref.cpp
+++ b/tests/socket_ref.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq.hpp>
 #ifdef ZMQ_CPP11
 
diff --git a/tests/testutil.hpp b/tests/testutil.hpp
index 6c371dec..f282083b 100644
--- a/tests/testutil.hpp
+++ b/tests/testutil.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq.hpp>
 
 #if defined(ZMQ_CPP11)
diff --git a/tests/utilities.cpp b/tests/utilities.cpp
index 30238a6e..694d0915 100644
--- a/tests/utilities.cpp
+++ b/tests/utilities.cpp
@@ -1,4 +1,4 @@
-#include <catch2/catch.hpp>
+#include <catch2/catch_all.hpp>
 #include <zmq.hpp>
 
 #if defined(ZMQ_CPP11) && !defined(ZMQ_CPP11_PARTIAL)