diff --git a/akonadi/tests/testrunner/CMakeLists.txt b/akonadi/tests/testrunner/CMakeLists.txt
index f831fa93d..925701f93 100644
--- a/akonadi/tests/testrunner/CMakeLists.txt
+++ b/akonadi/tests/testrunner/CMakeLists.txt
@@ -1,11 +1,53 @@
 project (akonaditest)
 
-include_directories(${KDE4_INCLUDES})
-include_directories (${Boost_INCLUDE_DIR})
+include_directories(
+    ${CMAKE_SOURCE_DIR}/kabc
+    ${CMAKE_SOURCE_DIR}/kcal
+    ${CMAKE_SOURCE_DIR}/akonadi
+    ${CMAKE_BINARY_DIR}/kabc
+    ${CMAKE_BINARY_DIR}/kcal
+    ${CMAKE_BINARY_DIR}/akonadi
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${Boost_INCLUDE_DIR}
+    ${AKONADI_INCLUDE_DIR}
+    ${KDE4_INCLUDES}
+)
+
 set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${KDE4_ENABLE_EXCEPTIONS}" )
 
-set(akonaditest_SRCS main.cpp akonaditesting.cpp dao.cpp  item.cpp itemfactory.cpp  calitem.cpp vcarditem.cpp feeditem.cpp setup.cpp configreader.cpp config.cpp shellscript.cpp symbols.cpp)
+set(akonaditest_SRCS
+  main.cpp
+  akonaditesting.cpp
+  dao.cpp
+  item.cpp
+  itemfactory.cpp
+  calitem.cpp
+  vcarditem.cpp
+  feeditem.cpp
+  setup.cpp
+  configreader.cpp
+  config.cpp
+  shellscript.cpp
+  symbols.cpp
+)
 
 kde4_add_executable(akonaditest ${akonaditest_SRCS})
-target_link_libraries(akonaditest ${KDE4_KDEUI_LIB} ${Boost_LIBRARIES} ${KDE4_AKONADI_LIBS} ${KDE4_KABC_LIBS} ${KDE4_KCAL_LIBS} ${KDE4_SYNDICATION_LIBS} )
-install(TARGETS akonaditest ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+target_link_libraries(akonaditest
+  akonadi-kde
+  kabc
+  kcal
+  syndication
+  ${KDE4_KDEUI_LIB}
+  ${Boost_LIBRARIES}
+  ${KDE4_AKONADI_LIBS}
+  ${KDE4_KABC_LIBS}
+  ${KDE4_KCAL_LIBS}
+  ${KDE4_SYNDICATION_LIBS}
+  ${KDE4_KDECORE_LIBS}
+  ${QT_QTCORE_LIBRARY}
+  ${QT_QTXML_LIBRARY}
+  ${QT_QTDBUS_LIBRARY}
+)
+
+#install(TARGETS akonaditest ${INSTALL_TARGETS_DEFAULT_ARGS})