diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt
index 00a9be6dc..1e6b213ab 100644
--- a/trunk/paradiseo-peo/test/CMakeLists.txt
+++ b/trunk/paradiseo-peo/test/CMakeLists.txt
@@ -74,18 +74,23 @@ ENDFOREACH (test)
 IF(ENABLE_MINIMAL_CMAKE_TESTING)
 
     SET (MIN_TEST_LIST t-MultiStart)
-    FOREACH (test ${TEST_RUN})
-		  ADD_TEST(${test} ${test})
-	ENDFOREACH (test)				
+   
+    FOREACH (testrun ${TEST_RUN})
+          ADD_EXECUTABLE(${testrun} ${T_${testrun}_SOURCES}) 
+		  ADD_TEST(${testrun} ${testrun})
+	ENDFOREACH (testrun)				
+   
     FOREACH (mintest ${MIN_TEST_LIST})
     	  SET ("T_${mintest}_SOURCES" "${mintest}.cpp")
     	  ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) 
 		  ADD_TEST(${mintest} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${mintest}" "@param") 
 		  TARGET_LINK_LIBRARIES(${mintest} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
     ENDFOREACH (mintest)
-    FOREACH (test ${TEST_STOP})
-		  ADD_TEST(${test} ${test})
-	ENDFOREACH (test)
+    
+    FOREACH (teststop ${TEST_STOP})
+          ADD_EXECUTABLE(${teststop} ${T_${teststop}_SOURCES}) 
+		  ADD_TEST(${teststop} ${teststop})
+	ENDFOREACH (teststop)
    
 ELSEIF(ENABLE_CMAKE_TESTING)
 
@@ -93,20 +98,19 @@ ELSEIF(ENABLE_CMAKE_TESTING)
 		  ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})  
 	ENDFOREACH (test)
 	
-	FOREACH (test ${TEST_RUN})
-		  ADD_TEST(${test} ${test})
-	ENDFOREACH (test)
+	FOREACH (testrun ${TEST_RUN})
+		  ADD_TEST(${testrun} ${testrun})
+	ENDFOREACH (testrun)
 	
 	FOREACH (test ${TEST_LIST})
 		  ADD_TEST(${test} "mpiexec" "-n" "4" "${CMAKE_CURRENT_BINARY_DIR}/${test}" "@param")
 	ENDFOREACH (test)
 	
-	FOREACH (test ${TEST_STOP})
-		  ADD_TEST(${test} ${test})
-	ENDFOREACH (test)
+	FOREACH (teststop ${TEST_STOP})
+		  ADD_TEST(${teststop} ${teststop})
+	ENDFOREACH (teststop)
 	
-	# Link the librairies
-	FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
+	FOREACH (test ${TEST_LIST})
 	 TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
 	ENDFOREACH (test)	
 	
diff --git a/trunk/paradiseo-peo/test/t-Mpdallexit.cpp b/trunk/paradiseo-peo/test/t-Mpdallexit.cpp
index 53df81679..04c2839e3 100644
--- a/trunk/paradiseo-peo/test/t-Mpdallexit.cpp
+++ b/trunk/paradiseo-peo/test/t-Mpdallexit.cpp
@@ -34,7 +34,7 @@
 *
 */
 
-
+#include <iostream>
 #include <peo.h>
 
 int main (int __argc, char *__argv[])
diff --git a/trunk/paradiseo-peo/test/t-Mpdboot.cpp b/trunk/paradiseo-peo/test/t-Mpdboot.cpp
index 4773b482f..a394bc170 100644
--- a/trunk/paradiseo-peo/test/t-Mpdboot.cpp
+++ b/trunk/paradiseo-peo/test/t-Mpdboot.cpp
@@ -34,7 +34,7 @@
 *
 */
 
-
+#include <iostream>
 #include <peo.h>
 
 int main (int __argc, char *__argv[])