diff --git a/tests/MPI_Dims_weighted_create_test.cpp b/tests/MPI_Dims_weighted_create_test.cpp
index 9cdc2eb..23d4250 100644
--- a/tests/MPI_Dims_weighted_create_test.cpp
+++ b/tests/MPI_Dims_weighted_create_test.cpp
@@ -28,7 +28,8 @@
 
 #define CATCH_CONFIG_RUNNER
 #define CATCH_CONFIG_CONSOLE_WIDTH 100
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_session.hpp>
 
 #include <array>
 #include <cstdint>
diff --git a/tests/MPI_Info_set_json_test.cpp b/tests/MPI_Info_set_json_test.cpp
index d9f1e92..b42304a 100644
--- a/tests/MPI_Info_set_json_test.cpp
+++ b/tests/MPI_Info_set_json_test.cpp
@@ -28,7 +28,9 @@
 
 #define CATCH_CONFIG_RUNNER
 #define CATCH_CONFIG_CONSOLE_WIDTH 100
-#include <catch2/catch.hpp>
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_session.hpp>
+#include <catch2/matchers/catch_matchers_string.hpp>
 
 #include <array>
 #include <cstdint>