4 files changed, 4 insertions, 20 deletions

diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index a97c7f9..ce237c5 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -46,5 +46,3 @@ SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES LINKER_LANGUAGE CXX)
 qt5_use_modules(${PROJECT_NAME} Widgets Network)
 target_link_libraries(${PROJECT_NAME} ${storage_LIBS} akonadi2async)
 install(TARGETS ${PROJECT_NAME} ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
-
-add_subdirectory(test)
diff --git a/common/test/CMakeLists.txt b/common/test/CMakeLists.txt
deleted file mode 100644
index 98d4ecc..0000000
--- a/common/test/CMakeLists.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-set(CMAKE_AUTOMOC ON)
-include_directories(${CMAKE_CURRENT_BINARY_DIR})
-
-macro(auto_tests)
-    foreach(_testname ${ARGN})
-        add_executable(${_testname} ${_testname}.cpp ${store_SRCS})
-        qt5_use_modules(${_testname} Core Test)
-        target_link_libraries(${_testname} akonadi2common)
-        add_test(NAME ${_testname} COMMAND ${_testname})
-    endforeach(_testname)
-endmacro(auto_tests)
-
-auto_tests (
-    clientapitest
-)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index d3e6870..24912f5 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,6 +29,7 @@ manual_tests (
 )
 
 auto_tests (
+    clientapitest
     storagetest
     dummyresourcetest
     domainadaptortest
diff --git a/common/test/clientapitest.cpp b/tests/clientapitest.cpp
index 789c656..7bcd7b0 100644
--- a/common/test/clientapitest.cpp
+++ b/tests/clientapitest.cpp
@@ -2,9 +2,9 @@
 #include <QDebug>
 #include <functional>
 
-#include "../clientapi.h"
-#include "../facade.h"
-#include "../synclistresult.h"
+#include "clientapi.h"
+#include "facade.h"
+#include "synclistresult.h"
 
 class RevisionNotifier : public QObject
 {