diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index ca120226b6..2974d96648 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_definitions(-DKWIN_UNIT_TEST)
 remove_definitions(-DQT_USE_QSTRINGBUILDER)
+add_subdirectory(libkwineffects)
 add_subdirectory(libxrenderutils)
 add_subdirectory(integration)
 if (HAVE_INPUT)
diff --git a/libkwineffects/autotests/CMakeLists.txt b/autotests/libkwineffects/CMakeLists.txt
similarity index 100%
rename from libkwineffects/autotests/CMakeLists.txt
rename to autotests/libkwineffects/CMakeLists.txt
diff --git a/libkwineffects/autotests/windowquadlisttest.cpp b/autotests/libkwineffects/windowquadlisttest.cpp
similarity index 100%
rename from libkwineffects/autotests/windowquadlisttest.cpp
rename to autotests/libkwineffects/windowquadlisttest.cpp
diff --git a/kcmkwin/kwincompositing/CMakeLists.txt b/kcmkwin/kwincompositing/CMakeLists.txt
index 4727f03c71..350ef85ded 100644
--- a/kcmkwin/kwincompositing/CMakeLists.txt
+++ b/kcmkwin/kwincompositing/CMakeLists.txt
@@ -9,6 +9,8 @@ remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FR
 
 include_directories(${KWIN_SOURCE_DIR}/effects)
 
+include(ECMMarkAsTest)
+
 ################# configure checks and create the configured files #################
 
 # now create config headers
diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index 0ba6a0d3fd..661d561615 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -125,5 +125,3 @@ install( FILES
     ${CMAKE_CURRENT_BINARY_DIR}/kwinglutils_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/kwinxrenderutils_export.h
     DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
-
-add_subdirectory(autotests)