diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5393654..d061082 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,6 +84,9 @@ else()
 endif()
 target_include_directories(dtfft PRIVATE ${PROJECT_SOURCE_DIR}/src/include)
 target_include_directories(dtfft PRIVATE ${PROJECT_BINARY_DIR})
+target_include_directories(dtfft PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${MPI_Fortran_MODULE_DIR}>)
+target_include_directories(dtfft PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:${MPI_C_INCLUDE_DIRS}>)
+target_link_libraries(dtfft PRIVATE ${MPI_Fortran_LIBRARIES})
 
 set(DTFFT_MODULE_DIR ${PROJECT_BINARY_DIR}/mod)
 set_target_properties(dtfft PROPERTIES Fortran_MODULE_DIRECTORY ${DTFFT_MODULE_DIR})
@@ -91,10 +94,10 @@ set_target_properties(dtfft PROPERTIES VERSION ${CMAKE_PROJECT_VERSION})
 set(DTFFT_HEADER_DIR "${PROJECT_SOURCE_DIR}/include")
 SET(DTFFT_MODULE "${DTFFT_MODULE_DIR}/dtfft.mod")
 SET(DTFFT_HEADERS "${DTFFT_MODULE};${DTFFT_HEADER_DIR}/dtfft.f03")
-target_link_libraries(dtfft PRIVATE MPI::MPI_Fortran MPI::MPI_C)
+
 if(DTFFT_BUILD_C_CXX_API)
   set(DTFFT_HEADERS "${DTFFT_HEADERS};${DTFFT_HEADER_DIR}/dtfft.h;${DTFFT_HEADER_DIR}/dtfft.hpp;${DTFFT_CONF_HEADER}")
-  target_link_libraries(dtfft PRIVATE MPI::MPI_CXX)
+  target_link_libraries(dtfft PRIVATE ${MPI_CXX_LIBRARIES})
 endif()
 set_target_properties(dtfft PROPERTIES PUBLIC_HEADER "${DTFFT_HEADERS}")
 target_include_directories(dtfft INTERFACE $<INSTALL_INTERFACE:include>)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 6a6f433..86359b0 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -28,13 +28,15 @@ foreach(test ${TEST_SOURCES})
   get_filename_component(extension ${test} EXT)
   add_executable(${test_name} ${test})
   target_link_libraries(${test_name} PRIVATE dtfft)
-  target_link_libraries(${test_name} PRIVATE MPI::MPI_Fortran)
+  target_link_libraries(${test_name} PRIVATE ${MPI_Fortran_LIBRARIES})
   target_include_directories(${test_name} PRIVATE ${PROJECT_BINARY_DIR})
   target_include_directories(${test_name} PRIVATE ${PROJECT_SOURCE_DIR}/include)
   target_include_directories(${test_name} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${PROJECT_SOURCE_DIR}/src/include>)
   target_include_directories(${test_name} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${DTFFT_MODULE_DIR}>)
+  target_include_directories(${test_name} PRIVATE $<$<COMPILE_LANGUAGE:Fortran>:${MPI_Fortran_MODULE_DIR}>)
+  target_include_directories(${test_name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX>:${MPI_C_INCLUDE_DIRS}>)
   if( extension STREQUAL ".cpp" )
-    target_link_libraries(${test_name} PRIVATE MPI::MPI_CXX)
+    target_link_libraries(${test_name} PRIVATE ${MPI_CXX_LIBRARIES})
   endif()
 
   foreach(nproc RANGE 1 ${TESTS_MAX_PROC} 1)