diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 7c15e9837b31e5bbca90465f4ace8af5b5fa594f..8cb3496de74d020cc6f882cf9d7c961890fc7e3b 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -61,6 +61,10 @@ IF (OGS_USE_PETSC)
 	TARGET_LINK_LIBRARIES( testrunner  ${PETSC_LIBRARIES})
 ENDIF (OGS_USE_PETSC)
 
+IF (OGS_USE_MPI)
+	TARGET_LINK_LIBRARIES( testrunner  ${MPI_CXX_LIBRARIES})
+ENDIF ()
+
 IF(OGS_BUILD_GUI)
 	TARGET_LINK_LIBRARIES(testrunner
 		QtDataView
diff --git a/scripts/cmake/Find.cmake b/scripts/cmake/Find.cmake
index c14977ba1ea649bd2f99c73ffcb6da35c3829bc2..9f7665a58e481a84fc16f56cd0698685e58f9be8 100644
--- a/scripts/cmake/Find.cmake
+++ b/scripts/cmake/Find.cmake
@@ -134,6 +134,10 @@ IF(OGS_USE_PETSC)
     include_directories(
               ${PETSC_INCLUDES}
      )
+ENDIF()
 
-    FIND_PACKAGE(MPI REQUIRED)
+IF(OGS_USE_MPI)
+	FIND_PACKAGE( MPI REQUIRED )
+	INCLUDE_DIRECTORIES(SYSTEM ${MPI_CXX_INCLUDE_PATH})
 ENDIF()
+