diff --git a/CMakeLists.txt b/CMakeLists.txt
index 99bd332e..cf01bf48 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -183,8 +183,15 @@ endif (NANA_CMAKE_BUILD_FreeMe)
 
 if(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
     add_definitions(-DNANA_AUTOMATIC_GUI_TESTING)
+
+    if(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
+        add_definitions(-DNANA_ADD_DEF_AUTOMATIC_GUI_TESTING)
+    endif(NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING)
+
 endif(NANA_CMAKE_AUTOMATIC_GUI_TESTING)
 
+
+
 if(NANA_CMAKE_VERBOSE_PREPROCESSOR)
     add_definitions(-DVERBOSE_PREPROCESSOR)
 endif(NANA_CMAKE_VERBOSE_PREPROCESSOR)
@@ -331,5 +338,7 @@ message ( "NANA_CMAKE_FIND_BOOST_FILESYSTEM         = "  ${NANA_CMAKE_FIND_BOOST
 message ( "NANA_CMAKE_BOOST_FILESYSTEM_FORCE        = "  ${NANA_CMAKE_BOOST_FILESYSTEM_FORCE})
 message ( "NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT = "  ${NANA_CMAKE_BOOST_FILESYSTEM_INCLUDE_ROOT})
 message ( "NANA_CMAKE_BOOST_FILESYSTEM_LIB          = "  ${NANA_CMAKE_BOOST_FILESYSTEM_LIB})
+message ( "NANA_CMAKE_AUTOMATIC_GUI_TESTING         = "  ${NANA_CMAKE_AUTOMATIC_GUI_TESTING})
+message ( "NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING = "  ${NANA_CMAKE_ADD_DEF_AUTOMATIC_GUI_TESTING})
 
 
diff --git a/include/nana/config.hpp b/include/nana/config.hpp
index 2c1d3c83..99d73d31 100644
--- a/include/nana/config.hpp
+++ b/include/nana/config.hpp
@@ -93,6 +93,21 @@
 	#endif
 #endif
 
+
+///////////////////
+//  Support for NANA_AUTOMATIC_GUI_TESTING
+//	  Will cause the program to self-test the GUI.
+//    If NANA_ADD_DEF_AUTOMATIC_GUI_TESTING is also defined a default automatic GUI test
+//    will be added to all programs which don't have yet one defined. This default test will simple
+//    wait 10 sec. (time to construct, show and execute the GUI) and then exit normally.
+//
+//#define NANA_AUTOMATIC_GUI_TESTING
+//#if defined(NANA_AUTOMATIC_GUI_TESTING)
+	//#define NANA_ADD_DEF_AUTOMATIC_GUI_TESTING
+//#endif
+
+
+
 #if !defined(VERBOSE_PREPROCESSOR)
 //#define VERBOSE_PREPROCESSOR
 #endif