diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 8ac5370457..16f6f9e579 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -16,7 +16,6 @@ MACRO(UNIT_TEST)
     INCLUDE_DIRECTORIES(${TulipCoreBuildInclude} ${TulipCoreInclude} ${CppUnit_INCLUDE_DIRS} ${CMAKE_SOURCE_DIR}/tests/include)
     LINK_DIRECTORIES(${CppUnit_LIBRARY_DIRS})
     ADD_EXECUTABLE(${TEST_NAME} ${TEST_SRCS})
-    ADD_DEPENDENCIES(${TEST_NAME} ${TULIP_PLUGIN_TARGETS})
     ADD_DEPENDENCIES(runTests ${TEST_NAME})
     TARGET_LINK_LIBRARIES(${TEST_NAME} ${LibTulipCoreName} ${CppUnit_LIBRARIES})
     ADD_TEST(NAME ${TEST_NAME} COMMAND ${TEST_NAME} ${TEST_NAME})
diff --git a/tests/plugins/CMakeLists.txt b/tests/plugins/CMakeLists.txt
index 0e79a95f99..6195cc1882 100644
--- a/tests/plugins/CMakeLists.txt
+++ b/tests/plugins/CMakeLists.txt
@@ -1,3 +1,8 @@
+MACRO(UNIT_PLUGINS_TEST)
+  UNIT_TEST(${ARGV0} ${ARGN})
+  ADD_DEPENDENCIES(${ARGV0} ${TULIP_PLUGIN_TARGETS})
+ENDMACRO(UNIT_PLUGINS_TEST)
+
 SET(TULIP_PLUGINS_TESTS_SRCS
   BasicPluginsTest.cpp
   BasicMetricTest.cpp
@@ -9,9 +14,9 @@ SET_SOURCE_FILES_PROPERTIES(pluginstest.cpp pluginsloadingtest.cpp
 
 ADD_CUSTOM_TARGET(copy_data ALL ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/data ${CMAKE_CURRENT_BINARY_DIR}/data VERBATIM)
 
-UNIT_TEST(TulipPluginsTestSuite ${TULIP_PLUGINS_TESTS_SRCS})
+UNIT_PLUGINS_TEST(TulipPluginsTestSuite ${TULIP_PLUGINS_TESTS_SRCS})
 SET_TESTS_PROPERTIES(TulipPluginsTestSuite PROPERTIES DEPENDS copy_data)
 
 QTX_SET_INCLUDES_AND_DEFINITIONS()
-UNIT_TEST(TulipPluginsLoadingTest pluginsloadingtest.cpp)
+UNIT_PLUGINS_TEST(TulipPluginsLoadingTest pluginsloadingtest.cpp)
 TARGET_LINK_LIBRARIES(TulipPluginsLoadingTest ${QT_LIBRARIES})