-ADD_TEST(MEDCouplingBasicsTest1 python MEDCouplingBasicsTest1.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest1 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest2 python MEDCouplingBasicsTest2.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest2 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest3 python MEDCouplingBasicsTest3.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest3 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest4 python MEDCouplingBasicsTest4.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest4 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest5 python MEDCouplingBasicsTest5.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest5 PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingBasicsTest python MEDCouplingBasicsTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingBasicsTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingExamplesTest python MEDCouplingExamplesTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingExamplesTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingRemapperTest python MEDCouplingRemapperTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingRemapperTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-# if numpy is used
-ADD_TEST(MEDCouplingNumPyTest python MEDCouplingNumPyTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingNumPyTest PROPERTIES LABELS "${COMPONENT_NAME}")
-
-ADD_TEST(MEDCouplingPickleTest python MEDCouplingPickleTest.py)
-SET_TESTS_PROPERTIES(MEDCouplingPickleTest PROPERTIES LABELS "${COMPONENT_NAME}")
+INCLUDE(tests.set)
+
+FOREACH(tfile ${ALL_TESTS})
+ GET_FILENAME_COMPONENT(BASE_NAME ${tfile} NAME_WE)
+ SET(TEST_NAME ${COMPONENT_NAME}_${BASE_NAME})
+ ADD_TEST(${TEST_NAME} python ${tfile})
+ SET_TESTS_PROPERTIES(${TEST_NAME} PROPERTIES
+ LABELS "${COMPONENT_NAME}"
+ TIMEOUT ${TIMEOUT}
+ )
+ENDFOREACH()