diff --git a/eo/CMakeLists.txt b/eo/CMakeLists.txt
index 78cab0a5..df128f13 100644
--- a/eo/CMakeLists.txt
+++ b/eo/CMakeLists.txt
@@ -120,6 +120,11 @@ ENDIF (ENABLE_CMAKE_TESTING)
 ADD_SUBDIRECTORY(doc)
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(test)
+
+IF(WITH_MPI)
+    ADD_SUBDIRECTORY(test/mpi)
+ENDIF()
+
 ADD_SUBDIRECTORY(tutorial)
 
 ######################################################################################
diff --git a/eo/test/CMakeLists.txt b/eo/test/CMakeLists.txt
index 4e68b02a..8bf8b500 100644
--- a/eo/test/CMakeLists.txt
+++ b/eo/test/CMakeLists.txt
@@ -14,12 +14,23 @@ INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/contrib)
 INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/contrib/MGE)
 INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
 
+IF(WITH_MPI)
+    INCLUDE_DIRECTORIES(${BOOST_DIR}/include)
+    INCLUDE_DIRECTORIES(${MPI_DIR}/include)
+ENDIF()
+
 ######################################################################################
 ### 2) Specify where CMake can find the libraries
 ######################################################################################
 
 LINK_DIRECTORIES(${EO_BINARY_DIR}/lib)
 
+IF(WITH_MPI)
+    LINK_DIRECTORIES(${BOOST_DIR}/lib)
+    LINK_DIRECTORIES(${MPI_DIR}/lib)
+    SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
+ENDIF()
+
 ######################################################################################
 ### 3) Define your targets and link the librairies
 ######################################################################################
@@ -65,8 +76,8 @@ SET (TEST_LIST
   t-eoExtendedVelocity
   t-eoLogger
   t-eoIQRStat
-  t-eoParallel
-  t-openmp
+  #t-eoParallel
+  #t-openmp
   #t-eoDualFitness
   t-eoParser
   )
diff --git a/eo/test/mpi/CMakeLists.txt b/eo/test/mpi/CMakeLists.txt
new file mode 100644
index 00000000..37b1227f
--- /dev/null
+++ b/eo/test/mpi/CMakeLists.txt
@@ -0,0 +1,55 @@
+###############################################################################
+##
+## CMakeLists file for eo/test/mpi
+##
+###############################################################################
+
+######################################################################################
+### 1) Include the sources
+######################################################################################
+
+MESSAGE("EO SOURCE DIR: ${EO_SOURCE_DIR}")
+MESSAGE("OMPI: ${MPI_DIR}")
+MESSAGE("BOOST: ${BOOST_DIR}")
+
+INCLUDE_DIRECTORIES(${MPI_DIR}/include)
+INCLUDE_DIRECTORIES(${BOOST_DIR}/include)
+INCLUDE_DIRECTORIES(${EO_SOURCE_DIR}/src)
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+
+######################################################################################
+### 2) Specify where CMake can find the libraries
+######################################################################################
+
+LINK_DIRECTORIES(${EO_BINARY_DIR}/lib)
+LINK_DIRECTORIES(${MPI_DIR}/lib)
+LINK_DIRECTORIES(${BOOST_DIR}/lib)
+
+######################################################################################
+### 3) Define your targets and link the librairies
+######################################################################################
+
+SET (TEST_LIST
+    t-mpi-parallelApply
+    t-mpi-wrapper
+    t-mpi-multipleRoles
+    t-mpi-eval
+    )
+
+FOREACH (test ${TEST_LIST})
+  SET ("T_${test}_SOURCES" "${test}.cpp")
+ENDFOREACH (test)
+
+SET(CMAKE_CXX_COMPILER "${MPI_DIR}/bin/mpicxx")
+ADD_DEFINITIONS(-DWITH_MPI)
+
+IF(ENABLE_CMAKE_TESTING)
+    FOREACH (test ${TEST_LIST})
+    ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})
+    ADD_TEST(${test} ${test})
+    TARGET_LINK_LIBRARIES(${test} boost_mpi boost_serialization eoutils eompi eoserial eo)
+    INSTALL(TARGETS ${test} RUNTIME DESTINATION share/eo/test COMPONENT test)
+    ENDFOREACH (test)
+ENDIF()
+
+######################################################################################
diff --git a/eo/test/mpi/eval.cpp b/eo/test/mpi/t-mpi-eval.cpp
similarity index 100%
rename from eo/test/mpi/eval.cpp
rename to eo/test/mpi/t-mpi-eval.cpp
diff --git a/eo/test/mpi/multipleRoles.cpp b/eo/test/mpi/t-mpi-multipleRoles.cpp
similarity index 100%
rename from eo/test/mpi/multipleRoles.cpp
rename to eo/test/mpi/t-mpi-multipleRoles.cpp
diff --git a/eo/test/mpi/parallelApply.cpp b/eo/test/mpi/t-mpi-parallelApply.cpp
similarity index 100%
rename from eo/test/mpi/parallelApply.cpp
rename to eo/test/mpi/t-mpi-parallelApply.cpp
diff --git a/eo/test/mpi/wrapper.cpp b/eo/test/mpi/t-mpi-wrapper.cpp
similarity index 100%
rename from eo/test/mpi/wrapper.cpp
rename to eo/test/mpi/t-mpi-wrapper.cpp