diff --git a/tdeabc/tests/CMakeLists.txt b/tdeabc/tests/CMakeLists.txt
index b7d808340..56d4a7124 100644
--- a/tdeabc/tests/CMakeLists.txt
+++ b/tdeabc/tests/CMakeLists.txt
@@ -37,7 +37,6 @@ link_directories(
 ##### test programs ##############################
 
 tde_add_check_executable( testlock            AUTOMOC LINK tdeabc-shared )
-tde_add_check_executable( testldapclient      AUTOMOC LINK tdeabc-shared )
 tde_add_check_executable( testkabc            AUTOMOC LINK tdeabc-shared )
 tde_add_check_executable( testkabcdlg         AUTOMOC LINK tdeabc-shared )
 tde_add_check_executable( testdistlist        AUTOMOC LINK tdeabc-shared )
@@ -52,4 +51,4 @@ tde_add_check_executable( bigwrite AUTOMOC LINK tdeabc_file-shared )
 # tde_add_check_executable( testdb   AUTOMOC LINK tdeabc_file-shared )
 tde_add_check_executable( kabcargl AUTOMOC LINK tdeabc_file-shared )
 
-add_test( tdeabc/testldapclient testldapclient )
+tde_add_check_executable( testldapclient      AUTOMOC LINK tdeabc-shared TEST)
diff --git a/tdecore/tests/CMakeLists.txt b/tdecore/tests/CMakeLists.txt
index f7c8ee47a..c0fe7d760 100644
--- a/tdecore/tests/CMakeLists.txt
+++ b/tdecore/tests/CMakeLists.txt
@@ -32,25 +32,23 @@ tde_add_library( tdeconfigtest SHARED AUTOMOC
 
 set( CHECKS
   tdeconfigtestgui klocaletest kprocesstest ksimpleconfigtest kstddirstest
-  kurltest kuniqueapptest ktempfiletest krandomsequencetest kdebugtest
+  kuniqueapptest ktempfiletest krandomsequencetest kdebugtest
   ksocktest kstringhandlertest kcmdlineargstest kapptest kmemtest
   dcopkonqtest kipctest cplusplustest kiconloadertest kresolvertest
   kmdcodectest knotifytest ksortablevaluelisttest krfcdatetest testqtargs
   kprociotest kcharsetstest kcalendartest kmacroexpandertest kshelltest
-  kxerrorhandlertest startserviceby tdestdacceltest kglobaltest ktimezonestest
+  kxerrorhandlertest startserviceby kglobaltest ktimezonestest
 )
 
-set( TESTS kurltest tdestdacceltest )
 
 foreach( _check ${CHECKS} )
   tde_add_check_executable( ${_check} AUTOMOC LINK tdeconfigtest-shared )
 endforeach( )
 
+tde_add_check_executable( kurltest        AUTOMOC LINK tdeconfigtest-shared TEST )
+tde_add_check_executable( tdestdacceltest AUTOMOC LINK tdeconfigtest-shared TEST )
+
 tde_add_check_executable( kidlservertest AUTOMOC SOURCES KIDLTest.cpp KIDLTest.skel
   LINK tdeconfigtest-shared )
 tde_add_check_executable( kidlclienttest AUTOMOC SOURCES KIDLTestClient.cpp
   KIDLTest.stub LINK tdeconfigtest-shared )
-
-foreach( _test ${TESTS})
-  add_test( tdecore/${_test} ${_test} )
-endforeach( )