diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7141a566a49..fafa54390b9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -234,7 +234,7 @@ endif()
 set(GINKGO_HAVE_GPU_AWARE_MPI OFF)
 set(GINKGO_FORCE_SPMV_BLOCKING_COMM OFF)
 if(GINKGO_BUILD_MPI)
-    find_package(MPI REQUIRED)
+    find_package(MPI 3.1 COMPONENTS CXX REQUIRED)
     if(GINKGO_FORCE_GPU_AWARE_MPI)
         set(GINKGO_HAVE_GPU_AWARE_MPI ON)
     else()
diff --git a/cmake/GinkgoConfig.cmake.in b/cmake/GinkgoConfig.cmake.in
index bc1828c80d0..1d0bc291ce0 100644
--- a/cmake/GinkgoConfig.cmake.in
+++ b/cmake/GinkgoConfig.cmake.in
@@ -161,7 +161,7 @@ endif()
 
 # Check for MPI if it is enabled
 if(GINKGO_BUILD_MPI)
-    find_package(MPI REQUIRED)
+    find_package(MPI 3.1 COMPONENTS CXX REQUIRED)
 endif()
 
 # HIP and OpenMP depend on Threads::Threads in some circumstances, but don't find it
diff --git a/cmake/autodetect_executors.cmake b/cmake/autodetect_executors.cmake
index 3a5ba36b559..315e0eb3e38 100644
--- a/cmake/autodetect_executors.cmake
+++ b/cmake/autodetect_executors.cmake
@@ -15,7 +15,7 @@ if (NOT DEFINED GINKGO_BUILD_OMP)
 endif()
 
 if (NOT DEFINED GINKGO_BUILD_MPI)
-    find_package(MPI 3.1)
+    find_package(MPI 3.1 COMPONENTS CXX)
     if(MPI_FOUND)
         message(STATUS "Enabling MPI support")
         set(GINKGO_HAS_MPI ON)
diff --git a/cmake/create_test.cmake b/cmake/create_test.cmake
index d38c2781b74..458ecbf07c0 100644
--- a/cmake/create_test.cmake
+++ b/cmake/create_test.cmake
@@ -14,7 +14,7 @@ function(ginkgo_create_gtest_mpi_main)
     target_sources(gtest_mpi_main
       PRIVATE
       ${PROJECT_SOURCE_DIR}/core/test/mpi/gtest/mpi_listener.cpp)
-    find_package(MPI REQUIRED)
+    find_package(MPI 3.1 COMPONENTS CXX REQUIRED)
     target_link_libraries(gtest_mpi_main PRIVATE GTest::GTest MPI::MPI_CXX)
 endfunction(ginkgo_create_gtest_mpi_main)