diff --git a/dcop/tests/CMakeLists.txt b/dcop/tests/CMakeLists.txt
index 4530db268..f321f06c9 100644
--- a/dcop/tests/CMakeLists.txt
+++ b/dcop/tests/CMakeLists.txt
@@ -25,13 +25,15 @@ link_directories(
 ##### checks ####################################
 
 tde_add_check_executable( dcop_test AUTOMOC
-  SOURCES test.cpp ${CMAKE_CURRENT_BINARY_DIR}/test.skel ${CMAKE_CURRENT_BINARY_DIR}/test.h
+  SOURCES test.cpp ${CMAKE_CURRENT_BINARY_DIR}/test.skel
   LINK kdecore-shared
+  DEPENDENCIES dcop_tests_generated
 )
 
 tde_add_check_executable( driver AUTOMOC
-  SOURCES driver.cpp ${CMAKE_CURRENT_BINARY_DIR}/test.stub ${CMAKE_CURRENT_BINARY_DIR}/test.h
+  SOURCES driver.cpp ${CMAKE_CURRENT_BINARY_DIR}/test.stub
   LINK kdecore-shared
+  DEPENDENCIES dcop_tests_generated
 )
 
 add_test( NAME "dcop/dcop-tests"
@@ -40,8 +42,11 @@ add_test( NAME "dcop/dcop-tests"
 
 set_tests_properties( dcop/dcop-tests PROPERTIES TIMEOUT 30)
 
+
 ##### test.h and files ##########################
 
+add_custom_target( dcop_tests_generated DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/test.h )
+
 add_custom_command(
   OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test.h ${CMAKE_CURRENT_BINARY_DIR}/shell.generated
   COMMAND perl "${CMAKE_CURRENT_SOURCE_DIR}/generate.pl"
@@ -49,16 +54,3 @@ add_custom_command(
   DEPENDS testcases generate.pl
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
 )
-
-# a hack because *.skel and *.stub files have to be located the same place with the *.h
-add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test.skel
-  COMMAND ${CMAKE_COMMAND} -E copy_file
-    ${CMAKE_CURRENT_SOURCE_DIR}/test.skel ${CMAKE_CURRENT_BINARY_DIR}/
-)
-
-add_custom_command(
-  OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/test.stub
-  COMMAND ${CMAKE_COMMAND} -E copy_file
-    ${CMAKE_CURRENT_SOURCE_DIR}/test.stub ${CMAKE_CURRENT_BINARY_DIR}/
-)