diff --git a/CMakeLists.txt b/CMakeLists.txt
index 50864fccb06527f527726dec31544d798550c120..352b13ed8196235ceedd133f7457ce832a92a179 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -211,8 +211,6 @@ include_directories(${PUGS_BINARY_DIR}/src/utils)
 # Pugs tests
 
 set(CATCH_MODULE_PATH "${PUGS_SOURCE_DIR}/packages/Catch2")
-set(CATCH_INCLUDE_PATH "${CATCH_MODULE_PATH}/single_include/catch2")
-
 include("${CATCH_MODULE_PATH}/contrib/ParseAndAddCatchTests.cmake")
 add_subdirectory("${CATCH_MODULE_PATH}")
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4eef6c18771aa6768877e9b24a3afe8e91296911..dad75a12071765ed09cba7816a4a8f71469c18fc 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,4 +1,3 @@
-include_directories("${CATCH_INCLUDE_PATH}")
 include_directories("${PUGS_BINARY_DIR}/src/utils")
 set(EXECUTABLE_OUTPUT_PATH ${PUGS_BINARY_DIR})
 
@@ -18,8 +17,6 @@ add_executable (mpi_unit_tests
   mpi_test_Messenger.cpp
   )
 
-target_include_directories(Catch2 INTERFACE ${CATCH_INCLUDE_DIR})
-
 target_link_libraries (unit_tests
   PugsUtils
   kokkos
diff --git a/tests/mpi_test_Messenger.cpp b/tests/mpi_test_Messenger.cpp
index 64dd892751d57041eac1a4cf59c6828ceb7e0214..4d446ba65c51b27f16fe4a63cec52f956cc150b8 100644
--- a/tests/mpi_test_Messenger.cpp
+++ b/tests/mpi_test_Messenger.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Array.hpp>
 #include <Messenger.hpp>
diff --git a/tests/mpi_test_main.cpp b/tests/mpi_test_main.cpp
index 43512cc5e034c6597127a9ccb33fff05510b15d5..541d48a37c352a0cd12ce6c15ddd32de3ddae941 100644
--- a/tests/mpi_test_main.cpp
+++ b/tests/mpi_test_main.cpp
@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <Messenger.hpp>
diff --git a/tests/test_Array.cpp b/tests/test_Array.cpp
index 54610b6e93a3174b018fb14edee8eba68f253c34..e9f7238ef256bbc4f53901153902c9060722cc72 100644
--- a/tests/test_Array.cpp
+++ b/tests/test_Array.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Array.hpp>
 #include <PugsAssert.hpp>
diff --git a/tests/test_ArrayUtils.cpp b/tests/test_ArrayUtils.cpp
index 8528d724ec32aa965fdd06242771b27fcc7e48b0..0f54e23a0d5a1de69f22cab9d252cfc915389067 100644
--- a/tests/test_ArrayUtils.cpp
+++ b/tests/test_ArrayUtils.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Array.hpp>
 #include <ArrayUtils.hpp>
diff --git a/tests/test_ItemType.cpp b/tests/test_ItemType.cpp
index 9b2813dff60ec34bf2bf33a6d52baf0893289f23..8560f8790c3c380503f18189a609ca219a545438 100644
--- a/tests/test_ItemType.cpp
+++ b/tests/test_ItemType.cpp
@@ -1,5 +1,5 @@
 #include <PugsMacros.hpp>
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <ItemType.hpp>
 
diff --git a/tests/test_PugsAssert.cpp b/tests/test_PugsAssert.cpp
index afa6e6d4bef5fee716430e960823a183f735eae4..ccbc472034ebab1f511235efe3a967b44b18a39a 100644
--- a/tests/test_PugsAssert.cpp
+++ b/tests/test_PugsAssert.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <PugsAssert.hpp>
 #include <string>
diff --git a/tests/test_RevisionInfo.cpp b/tests/test_RevisionInfo.cpp
index fafde85b4c1e36f7f38b4645a84159bfe588daba..8bf2cf49ff218e6ebd91cd7a39f34522f2fd0108 100644
--- a/tests/test_RevisionInfo.cpp
+++ b/tests/test_RevisionInfo.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <RevisionInfo.hpp>
 
diff --git a/tests/test_TinyMatrix.cpp b/tests/test_TinyMatrix.cpp
index 9ae46f62d19bbe6210cf7fc0eb22f9b339d40af7..fe45b86e0da57e884c5c0e70d4c6417aecb66edd 100644
--- a/tests/test_TinyMatrix.cpp
+++ b/tests/test_TinyMatrix.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Kokkos_Core.hpp>
 #include <PugsAssert.hpp>
diff --git a/tests/test_TinyVector.cpp b/tests/test_TinyVector.cpp
index 1988bb6bbec9c2f84a33e0310b56ea8a336e888c..79ffb373e550921c69a08eef02178018be573a63 100644
--- a/tests/test_TinyVector.cpp
+++ b/tests/test_TinyVector.cpp
@@ -1,4 +1,4 @@
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <PugsAssert.hpp>
 #include <TinyVector.hpp>
diff --git a/tests/test_main.cpp b/tests/test_main.cpp
index 0509951338bc3f9f52de36ca435ce33839071ac6..e0ed7b5fe279e1b1b4b21d10a4145701ab619fc8 100644
--- a/tests/test_main.cpp
+++ b/tests/test_main.cpp
@@ -1,5 +1,5 @@
 #define CATCH_CONFIG_RUNNER
-#include <catch.hpp>
+#include <catch2/catch.hpp>
 
 #include <Kokkos_Core.hpp>