diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt
index 4ad9443e1..dc96dc5a1 100644
--- a/trunk/paradiseo-peo/test/CMakeLists.txt
+++ b/trunk/paradiseo-peo/test/CMakeLists.txt
@@ -59,18 +59,22 @@ ENDIF(WIN32 AND NOT CYGWIN)
 ### 3) Define your targets and link the librairies
 ######################################################################################
 
-SET (TEST_LIST    t-Mpdboot
-				  t-ParallelEvalLib
-				  t-ParallelTransformLib
-				  t-MultiStartLib
+SET (TEST_RUN    t-Mpdboot)
+					  
+
+SET (TEST_LIST	  t-ParallelEval
+				  t-ParallelTransform
+				  t-MultiStart
 				  t-PSOSelect
-				  t-EAAsyncIslandLib
-				  t-EASyncIslandLib
-				  t-PSOGlobalBestLib
-				  t-PSOWorstPositionLib
+				  t-EAAsyncIsland
+				  t-EASyncIsland
+				  t-PSOGlobalBest
+				  t-PSOWorstPosition
 				  t-Mpdallexit)
+				  
+SET (TEST_STOP    t-Mpdallexit)
 	
-FOREACH (test ${TEST_LIST})
+FOREACH (test ${TEST_LIST} ${TEST_RUN} ${TEST_STOP})
 	  SET ("T_${test}_SOURCES" "${test}.cpp")
 ENDFOREACH (test)
 
@@ -78,14 +82,22 @@ ENDFOREACH (test)
 IF(ENABLE_CMAKE_TESTING)
 	
 	# Add the tests
-	FOREACH (test ${TEST_LIST})
+	FOREACH (test ${TEST_LIST} ${TEST_RUN} ${TEST_STOP})
 		  ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})  
 	ENDFOREACH (test)
 	
+	FOREACH (test ${TEST_RUN})
+		  ADD_TEST(${test} ${test})
+	ENDFOREACH (test)
+	
 	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)
+	
 	# Link the librairies
 	FOREACH (test ${TEST_LIST})
 	 TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo)
diff --git a/trunk/paradiseo-peo/test/t-EAAsyncIslandLib.cpp b/trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp
similarity index 100%
rename from trunk/paradiseo-peo/test/t-EAAsyncIslandLib.cpp
rename to trunk/paradiseo-peo/test/t-EAAsyncIsland.cpp
diff --git a/trunk/paradiseo-peo/test/t-EASyncIslandLib.cpp b/trunk/paradiseo-peo/test/t-EASyncIsland.cpp
similarity index 100%
rename from trunk/paradiseo-peo/test/t-EASyncIslandLib.cpp
rename to trunk/paradiseo-peo/test/t-EASyncIsland.cpp
diff --git a/trunk/paradiseo-peo/test/t-MultiStartLib.cpp b/trunk/paradiseo-peo/test/t-MultiStart.cpp
similarity index 100%
rename from trunk/paradiseo-peo/test/t-MultiStartLib.cpp
rename to trunk/paradiseo-peo/test/t-MultiStart.cpp
diff --git a/trunk/paradiseo-peo/test/t-PSOGlobalBestLib.cpp b/trunk/paradiseo-peo/test/t-PSOGlobalBest.cpp
similarity index 100%
rename from trunk/paradiseo-peo/test/t-PSOGlobalBestLib.cpp
rename to trunk/paradiseo-peo/test/t-PSOGlobalBest.cpp
diff --git a/trunk/paradiseo-peo/test/t-PSOWorstPositionLib.cpp b/trunk/paradiseo-peo/test/t-PSOWorstPosition.cpp
similarity index 100%
rename from trunk/paradiseo-peo/test/t-PSOWorstPositionLib.cpp
rename to trunk/paradiseo-peo/test/t-PSOWorstPosition.cpp
diff --git a/trunk/paradiseo-peo/test/t-ParallelEvalLib.cpp b/trunk/paradiseo-peo/test/t-ParallelEval.cpp
similarity index 100%
rename from trunk/paradiseo-peo/test/t-ParallelEvalLib.cpp
rename to trunk/paradiseo-peo/test/t-ParallelEval.cpp
diff --git a/trunk/paradiseo-peo/test/t-ParallelTransformLib.cpp b/trunk/paradiseo-peo/test/t-ParallelTransform.cpp
similarity index 100%
rename from trunk/paradiseo-peo/test/t-ParallelTransformLib.cpp
rename to trunk/paradiseo-peo/test/t-ParallelTransform.cpp