diff --git a/eo/src/CMakeLists.txt b/eo/src/CMakeLists.txt
index 6509908a..317080f1 100644
--- a/eo/src/CMakeLists.txt
+++ b/eo/src/CMakeLists.txt
@@ -11,7 +11,8 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 IF(WITH_MPI)
     MESSAGE("[EO] Compilation with MPI.")
 
-    SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
+    #SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
+    SET(CMAKE_CXX_COMPILER mpicxx)
 
     # headers location
     INCLUDE_DIRECTORIES(${MPI_DIR}/include)
diff --git a/eo/test/CMakeLists.txt b/eo/test/CMakeLists.txt
index e3a5a624..9bfc296b 100644
--- a/eo/test/CMakeLists.txt
+++ b/eo/test/CMakeLists.txt
@@ -26,7 +26,7 @@ LINK_DIRECTORIES(${EO_BINARY_DIR}/lib)
 
 IF(WITH_MPI)
     LINK_DIRECTORIES(${MPI_DIR}/lib)
-    SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
+    SET(CMAKE_CXX_COMPILER "mpicxx")
 ENDIF()
 
 ######################################################################################
diff --git a/eo/test/mpi/CMakeLists.txt b/eo/test/mpi/CMakeLists.txt
index 22734d44..d89f3ab3 100644
--- a/eo/test/mpi/CMakeLists.txt
+++ b/eo/test/mpi/CMakeLists.txt
@@ -38,7 +38,7 @@ FOREACH (test ${TEST_LIST})
   SET ("T_${test}_SOURCES" "${test}.cpp")
 ENDFOREACH (test)
 
-SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
+SET(CMAKE_CXX_COMPILER "mpicxx")
 ADD_DEFINITIONS(-DWITH_MPI)
 
 IF(ENABLE_CMAKE_TESTING)