diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c0fd9fc..8b26d32f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -258,6 +258,7 @@ if (NANA_CMAKE_BUILD_DEMOS)
 
 	if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
 	     add_definitions(-DNANA_AUTOMATIC_GUI_TESTING)
+         enable_testing ()
 	endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
 
 	if(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
@@ -270,10 +271,11 @@ if (NANA_CMAKE_BUILD_DEMOS)
         add_executable(${demo} "../nana-demo/${demo}.cpp")
         set_property( TARGET ${demo} PROPERTY CXX_STANDARD 14 )
         target_link_libraries(${demo} ${PROJECT_NAME})
-        if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+        #if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
             #add_custom_command( TARGET  ${demo} POST_BUILD COMMAND  ${demo} )
-            add_custom_target(do_always_${demo} ALL COMMAND ${demo})
-        endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
+            #add_custom_target(do_always_${demo} ALL COMMAND ${demo})
+            add_test(${demo} COMMAND ${demo})
+        #endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
         install(TARGETS ${demo} RUNTIME DESTINATION  "../nana-demo/")
         message("... to build: ../nana-demo/${demo}.cpp" )
     endforeach( demo ${demos})