diff --git a/example/basic_zposv/CMakeLists.txt b/example/basic_zposv/CMakeLists.txt
index e4eec5305b71f04677af76e2cb166d2998da64c5..fa03267e219114218ea65ed391b77d8d61d5fc7c 100644
--- a/example/basic_zposv/CMakeLists.txt
+++ b/example/basic_zposv/CMakeLists.txt
@@ -121,6 +121,9 @@ foreach(_example ${EXAMPLES})
             DESTINATION ${CMAKE_INSTALL_PREFIX}/example/basic_zposv)
 endforeach()
 
+#-------- Tests ---------
+include(CTestLists.cmake)
+
 ###
 ### END CMakeLists.txt
 ###
diff --git a/example/basic_zposv/CTestLists.cmake b/example/basic_zposv/CTestLists.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..e9a289d511d2ad786f7581b8099dd0b0d86e7551
--- /dev/null
+++ b/example/basic_zposv/CTestLists.cmake
@@ -0,0 +1,14 @@
+#
+# Check Example basic_zposv
+#
+
+set(TESTLIST 
+    posv_morse_functions
+    posv_users_functions
+    )
+
+foreach(prec ${RP_CHAMELEON_PRECISIONS})
+    foreach(test ${TESTLIST})
+        add_test(example_basic_${prec}${test} ./${prec}${test})
+    endforeach()
+endforeach()
\ No newline at end of file
diff --git a/example/lapack_to_morse/CMakeLists.txt b/example/lapack_to_morse/CMakeLists.txt
index 472b29fa94a996f2607f3536181a46466710e5e2..c4aef4faa8bea51e4319259cc65cce5175aa3ce5 100644
--- a/example/lapack_to_morse/CMakeLists.txt
+++ b/example/lapack_to_morse/CMakeLists.txt
@@ -168,6 +168,9 @@ target_link_libraries(step0 ${libs_for_step0})
 install(TARGETS step0
         DESTINATION ${CMAKE_INSTALL_PREFIX}/example/lapack_to_morse)
 
+#-------- Tests ---------
+include(CTestLists.cmake)
+
 ###
 ### END CMakeLists.txt
 ###
diff --git a/example/lapack_to_morse/CTestLists.cmake b/example/lapack_to_morse/CTestLists.cmake
new file mode 100644
index 0000000000000000000000000000000000000000..d6baba7251df5524635b22155d5ddb9f9d0f73c7
--- /dev/null
+++ b/example/lapack_to_morse/CTestLists.cmake
@@ -0,0 +1,17 @@
+#
+# Check Example basic_zposv
+#
+
+set(TESTLIST 
+    step0
+    step1
+    step2
+    step3
+    step4
+    step5
+    step6
+    )
+
+foreach(test ${TESTLIST})
+    add_test(example_ltm_${test} ./${prec}${test})
+endforeach()
diff --git a/testing/CMakeLists.txt b/testing/CMakeLists.txt
index b369d31a021ac6d0d27184bf3fbd6730bcb4cb4a..a7081726bc6317f52169459ca04aab33306e2e38 100644
--- a/testing/CMakeLists.txt
+++ b/testing/CMakeLists.txt
@@ -198,17 +198,13 @@ foreach(_precision ${CHAMELEON_PRECISION} )
 
 endforeach()
 
-# Add tests (C/CPP)
-# -----------------
+# Copy python scripts to use test drivers
+# ---------------------------------------
 if(CHAMELEON_SCHED_STARPU)
     # Copy launcher
     add_custom_target(testing_launcher_starpu ALL
                      COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/morse_testing_starpu.py
                                                       ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_starpu.py)
-    # add test
-#     add_test(NAME    morse_testing_starpu
-#              COMMAND ${PYTHON_EXECUTABLE}
-#                      ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_starpu.py)
     # install file
     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/morse_testing_starpu.py
             DESTINATION ${CMAKE_INSTALL_PREFIX}/testing)
@@ -224,6 +220,7 @@ if(CHAMELEON_SCHED_QUARK)
             DESTINATION ${CMAKE_INSTALL_PREFIX}/testing)
 endif()
 
+#-------- Tests ---------
 include(CTestLists.cmake)
 
 ###
diff --git a/timing/CMakeLists.txt b/timing/CMakeLists.txt
index a173c1fb6e742b53833e9a940db63c732e0f3dc2..ebb1236245a42dba4ba8dcacdc1a90de70b1193a 100644
--- a/timing/CMakeLists.txt
+++ b/timing/CMakeLists.txt
@@ -235,6 +235,7 @@ foreach(_timing ${TIMINGS})
             DESTINATION ${CMAKE_INSTALL_PREFIX}/timing)
 endforeach()
 
+#-------- Tests ---------
 include(CTestLists.cmake)
 
 ###