diff --git a/trunk/paradiseo-moeo/test/CMakeLists.txt b/trunk/paradiseo-moeo/test/CMakeLists.txt
index 74c2a9cb8..f0081db68 100644
--- a/trunk/paradiseo-moeo/test/CMakeLists.txt
+++ b/trunk/paradiseo-moeo/test/CMakeLists.txt
@@ -56,9 +56,18 @@ FOREACH (test ${TEST_LIST})
 ENDFOREACH (test)
 
 
-IF(ENABLE_CMAKE_TESTING)
+
+IF(ENABLE_MINIMAL_CMAKE_TESTING)
+    SET (MIN_TEST_LIST t-moeoEasyEA)				
+    FOREACH (mintest ${MIN_TEST_LIST})
+    	  SET ("T_${mintest}_SOURCES" "${mintest}.cpp")
+    	  ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) 
+		  ADD_TEST(${mintest} ${mintest}) 
+          TARGET_LINK_LIBRARIES(${mintest} moeo ga es eoutils eo)
+    ENDFOREACH (mintest)
+   
+ELSEIF(ENABLE_CMAKE_TESTING)
 	
-	# Add the tests
 	FOREACH (test ${TEST_LIST})
 		  ADD_EXECUTABLE(${test} ${T_${test}_SOURCES}) 
 		  ADD_TEST(${test} ${test}) 
@@ -69,7 +78,7 @@ IF(ENABLE_CMAKE_TESTING)
 	 TARGET_LINK_LIBRARIES(${test} moeo ga es eoutils eo)
 	ENDFOREACH (test)
 	
-ENDIF(ENABLE_CMAKE_TESTING)
+ENDIF(ENABLE_MINIMAL_CMAKE_TESTING)
 
 ######################################################################################
 
diff --git a/trunk/paradiseo-peo/test/CMakeLists.txt b/trunk/paradiseo-peo/test/CMakeLists.txt
index 9ae9963d5..0c5c6c878 100644
--- a/trunk/paradiseo-peo/test/CMakeLists.txt
+++ b/trunk/paradiseo-peo/test/CMakeLists.txt
@@ -71,9 +71,24 @@ FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
 ENDFOREACH (test)
 
 
-IF(ENABLE_CMAKE_TESTING)
-	
-	# Add the tests
+IF(ENABLE_MINIMAL_CMAKE_TESTING)
+
+    SET (MIN_TEST_LIST t-MultiStart)
+    FOREACH (test ${TEST_RUN})
+		  ADD_TEST(${test} ${test})
+	ENDFOREACH (test)				
+    FOREACH (mintest ${MIN_TEST_LIST})
+    	  SET ("T_${mintest}_SOURCES" "${mintest}.cpp")
+    	  ADD_EXECUTABLE(${mintest} ${T_${mintest}_SOURCES}) 
+		  ADD_TEST(${mintest} ${mintest}) 
+		  TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
+    ENDFOREACH (mintest)
+    FOREACH (test ${TEST_STOP})
+		  ADD_TEST(${test} ${test})
+	ENDFOREACH (test)
+   
+ELSEIF(ENABLE_CMAKE_TESTING)
+
 	FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
 		  ADD_EXECUTABLE(${test} ${T_${test}_SOURCES})  
 	ENDFOREACH (test)
@@ -93,9 +108,10 @@ IF(ENABLE_CMAKE_TESTING)
 	# Link the librairies
 	FOREACH (test ${TEST_RUN} ${TEST_LIST} ${TEST_STOP})
 	 TARGET_LINK_LIBRARIES(${test} peo ${XML2_LIBS} rmc_mpi ga es eoutils eo peo)
-	ENDFOREACH (test)
+	ENDFOREACH (test)	
 	
-ENDIF(ENABLE_CMAKE_TESTING)
+ENDIF(ENABLE_MINIMAL_CMAKE_TESTING)
+
 
 ######################################################################################