diff --git a/.gitignore b/.gitignore
index 0aacaa6..d750cc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@ tags
 compile_commands.json
 .clangd
 .cache
+subprojects/Catch2/
+subprojects/sprout/
diff --git a/subprojects/Catch2.wrap b/subprojects/Catch2.wrap
index 0e9ad77..e19cab1 100644
--- a/subprojects/Catch2.wrap
+++ b/subprojects/Catch2.wrap
@@ -3,4 +3,4 @@ revision = 05e10dfccc28c7f973727c54f850237d07d5e10f
 url = https://github.com/catchorg/Catch2.git
 
 [provide]
-catch2_dep = Catch2-3.5.2
+Catch2 = catch2_with_main_dep
diff --git a/test/unit/bitfield_pack_test.cpp b/test/unit/bitfield_pack_test.cpp
index 81e52d3..8c7477a 100644
--- a/test/unit/bitfield_pack_test.cpp
+++ b/test/unit/bitfield_pack_test.cpp
@@ -15,7 +15,7 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "duckhandy/bitfield_pack.hpp"
 #include <cstdint>
 
diff --git a/test/unit/endianness_test.cpp b/test/unit/endianness_test.cpp
index 7afdd98..7bffe5b 100644
--- a/test/unit/endianness_test.cpp
+++ b/test/unit/endianness_test.cpp
@@ -15,7 +15,7 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "duckhandy/endianness.hpp"
 #include <endian.h>
 
diff --git a/test/unit/int_conv_test.cpp b/test/unit/int_conv_test.cpp
index 8adaa82..2067c42 100644
--- a/test/unit/int_conv_test.cpp
+++ b/test/unit/int_conv_test.cpp
@@ -15,7 +15,7 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "duckhandy/int_conv.hpp"
 #include "duckhandy/string_bt.hpp"
 #include "sprout/cstring/strlen.hpp"
diff --git a/test/unit/main.cpp b/test/unit/main.cpp
index 7602a0e..3befcdc 100644
--- a/test/unit/main.cpp
+++ b/test/unit/main.cpp
@@ -15,5 +15,5 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#define CATCH_CONFIG_MAIN
-#include "catch2/catch.hpp"
+//#define CATCH_CONFIG_MAIN
+//#include "catch2/catch_test_macros.hpp"
diff --git a/test/unit/meson.build b/test/unit/meson.build
index 7b60b7a..bbf8914 100644
--- a/test/unit/meson.build
+++ b/test/unit/meson.build
@@ -1,4 +1,4 @@
-catch2_dep = dependency('Catch2', fallback: ['Catch2', 'catch2_dep'])
+catch2_dep = dependency('Catch2', version: '>=3.5.2')
 
 unit_test_prog = executable(meson.project_name(),
   'int_conv_test.cpp',
diff --git a/test/unit/resource_pool_test.cpp b/test/unit/resource_pool_test.cpp
index 84a3ad7..0d85a17 100644
--- a/test/unit/resource_pool_test.cpp
+++ b/test/unit/resource_pool_test.cpp
@@ -15,7 +15,7 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "duckhandy/resource_pool.hpp"
 #include <cstdint>
 
diff --git a/test/unit/reversed_sized_array_test.cpp b/test/unit/reversed_sized_array_test.cpp
index de30986..f3d6949 100644
--- a/test/unit/reversed_sized_array_test.cpp
+++ b/test/unit/reversed_sized_array_test.cpp
@@ -15,7 +15,7 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "duckhandy/implem/reversed_sized_array_bt.hpp"
 
 TEST_CASE ("Check conversion functions in ReversedSizedArray", "[ReversedSizedArray][containers]") {
diff --git a/test/unit/tiger_test.cpp b/test/unit/tiger_test.cpp
index e2d4cdd..9ad0dd9 100644
--- a/test/unit/tiger_test.cpp
+++ b/test/unit/tiger_test.cpp
@@ -15,7 +15,7 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "duckhandy/tiger_bt.hpp"
 
 TEST_CASE("Build-time Tiger hash tests", "[hash][bt][tiger]") {
diff --git a/test/unit/version_test.cpp b/test/unit/version_test.cpp
index b8e903a..e7c05ff 100644
--- a/test/unit/version_test.cpp
+++ b/test/unit/version_test.cpp
@@ -15,7 +15,7 @@
  * along with "duckhandy".  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "catch2/catch.hpp"
+#include "catch2/catch_test_macros.hpp"
 #include "duckhandy/version_bt.hpp"
 
 TEST_CASE ("Version class tests", "[version][bt]") {