diff --git a/CMakeLists.txt b/CMakeLists.txt
index 647af0e..defcaba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,7 +27,7 @@ include( CheckIncludeFile )
 include( CheckFunctionExists )
 include( CheckLibraryExists )
 include( CheckSymbolExists )
-
+enable_testing( )
 
 #### include our cmake modules ##################
 
@@ -73,6 +73,8 @@ set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined"
 add_subdirectory( lib )
 add_subdirectory( kpilot )
 add_subdirectory( conduits )
+add_subdirectory( tests )
+
 tde_conditional_add_subdirectory( BUILD_DOC doc )
 tde_conditional_add_subdirectory( BUILD_TRANSLATIONS po )
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index f147b5c..f27f41a 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,51 +1,79 @@
-link_directories(${CMAKE_BINARY_DIR}/lib ${CMAKE_CURRENT_BINARY_DIR})
-include_directories(${CMAKE_SOURCE_DIR}/lib ${CMAKE_BINARY_DIR}/lib)
+#################################################
+#
+#  (C) 2019 Michele Calgaro
+#  michele (DOT) calgaro (AT) yahoo (DOT) it
+#
+#  Improvements and feedbacks are welcome
+#
+#  This file is released under GPL >= 3
+#
+#################################################
+
+include_directories(
+  ${TQT_INCLUDE_DIRS}
+  ${TDE_INCLUDE_DIR}
+  ${CMAKE_SOURCE_DIR}
+  ${CMAKE_BINARY_DIR}
+  ${CMAKE_SOURCE_DIR}/lib
+  ${CMAKE_BINARY_DIR}/lib
+  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${CMAKE_CURRENT_BINARY_DIR}
+)
+
+link_directories(
+  ${CMAKE_CURRENT_BINARY_DIR}
+  ${CMAKE_BINARY_DIR}/lib
+)
 
 # Tests don't need to go into toplevel/bin, they are fine in the current dir.
 set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} )
 
-set(testconstants_SRCS testconstants.cc)
-trinity_add_executable(testconstants ${testconstants_SRCS})
-target_link_libraries(testconstants kpilot ${TQT_LIBRARIES})
-add_test(testconstants ${EXECUTABLE_OUTPUT_PATH}/testconstants)
+tde_add_check_executable( testconstants
+  SOURCES testconstants.cc
+  LINK kpilot-shared ${TQT_LIBRARIES}
+  TEST
+)
 
-set(testcategories_SRCS testcategories.cc)
-trinity_add_executable(testcategories ${testcategories_SRCS})
-target_link_libraries(testcategories kpilot ${TQT_LIBRARIES})
-add_test(testcategories ${EXECUTABLE_OUTPUT_PATH}/testcategories)
+tde_add_check_executable( testcategories
+  SOURCES testcategories.cc
+  LINK kpilot-shared ${TQT_LIBRARIES}
+  TEST
+)
 
-set(testaddresses_SRCS testaddress.cc)
-trinity_add_executable(testaddresses ${testaddresses_SRCS})
-target_link_libraries(testaddresses kpilot ${TQT_LIBRARIES})
-add_test(testaddresses ${EXECUTABLE_OUTPUT_PATH}/testaddresses)
+tde_add_check_executable( testaddresses
+  SOURCES testaddress.cc
+  LINK kpilot-shared ${TQT_LIBRARIES}
+  TEST
+)
 
-set(testdatebook_SRCS testdatebook.cc)
-trinity_add_executable(testdatebook ${testdatebook_SRCS})
-target_link_libraries(testdatebook kpilot ${TQT_LIBRARIES})
-add_test(testdatebook ${EXECUTABLE_OUTPUT_PATH}/testdatebook)
+tde_add_check_executable( testdatebook
+  SOURCES testdatebook.cc
+  LINK kpilot-shared ${TQT_LIBRARIES}
+  TEST
+)
 
-set(testidmapper_SRCS testidmapper.cc)
-trinity_add_executable(testidmapper ${testidmapper_SRCS})
-target_link_libraries(testidmapper kpilot ${TQT_LIBRARIES})
-add_test(testidmapper ${EXECUTABLE_OUTPUT_PATH}/testidmapper)
+tde_add_check_executable( importaddresses
+  SOURCES importaddresses.cc
+  LINK kpilot-shared tdeabc-shared tdeabc_file-shared ${TQT_LIBRARIES}
+)
+add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses --data-dir "${CMAKE_CURRENT_BINARY_DIR}" --address-file "${CMAKE_CURRENT_SOURCE_DIR}/data/AddressDB.pdb")
 
 if (HAVE_CALENDARLOCAL_H)
-	set(importdatebook_SRCS importdatebook.cc)
-	set(exportdatebook_SRCS exportdatebook.cc)
-	set(mergecalendars_SRCS mergecalendars.cc)
-	trinity_add_executable(importdatebook ${importdatebook_SRCS})
-	trinity_add_executable(exportdatebook ${exportdatebook_SRCS})
-	trinity_add_executable(mergecalendars ${mergecalendars_SRCS})
-	target_link_libraries(importdatebook kpilot ${TQT_LIBRARIES} kcal)
-	target_link_libraries(exportdatebook kpilot ${TQT_LIBRARIES} kcal)
-	target_link_libraries(mergecalendars ${TQT_LIBRARIES} kcal)
-	add_test(importdatebook ${EXECUTABLE_OUTPUT_PATH}/importdatebook)
-	add_test(exportdatebook ${EXECUTABLE_OUTPUT_PATH}/exportdatebook)
-	add_test(mergecalendars ${EXECUTABLE_OUTPUT_PATH}/mergecalendars)
-endif (HAVE_CALENDARLOCAL_H)
+	tde_add_check_executable( importdatebook
+		SOURCES importdatebook.cc
+		LINK kpilot-shared kcal-shared ${TQT_LIBRARIES}
+	  TEST
+	)
 
-set(importaddresses_SRCS importaddresses.cc)
-trinity_add_executable(importaddresses ${importaddresses_SRCS})
-target_link_libraries(importaddresses kpilot ${TQT_LIBRARIES} tdeabc tdeabc_file)
-add_test(importaddresses ${EXECUTABLE_OUTPUT_PATH}/importaddresses)
+	tde_add_check_executable( exportdatebook
+		SOURCES exportdatebook.cc
+		LINK kpilot-shared kcal-shared ${TQT_LIBRARIES}
+	  TEST
+	)
 
+	tde_add_check_executable( mergecalendars
+		SOURCES mergecalendars.cc
+		LINK kpilot-shared kcal-shared ${TQT_LIBRARIES}
+	  TEST
+	)
+endif (HAVE_CALENDARLOCAL_H)
diff --git a/tests/importaddresses.cc b/tests/importaddresses.cc
index 7900423..032a14f 100644
--- a/tests/importaddresses.cc
+++ b/tests/importaddresses.cc
@@ -59,8 +59,7 @@ int main(int argc, char **argv)
 	TDECmdLineArgs::init(argc,argv,&aboutData);
 	TDECmdLineArgs::addCmdLineOptions( options );
 
-	//  TDEApplication app( false, false );
-	TDEApplication app;
+	TDEApplication app( false, false );
 
 	TDECmdLineArgs *args = TDECmdLineArgs::parsedArgs();