diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index ca120226b..2974d9664 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,311 +1,312 @@
 add_definitions(-DKWIN_UNIT_TEST)
 remove_definitions(-DQT_USE_QSTRINGBUILDER)
+add_subdirectory(libkwineffects)
 add_subdirectory(libxrenderutils)
 add_subdirectory(integration)
 if (HAVE_INPUT)
     add_subdirectory(libinput)
 endif()
 add_subdirectory(tabbox)
 
 ########################################################
 # Test ScreenPaintData
 ########################################################
 set( testScreenPaintData_SRCS test_screen_paint_data.cpp )
 add_executable(testScreenPaintData ${testScreenPaintData_SRCS})
 target_link_libraries( testScreenPaintData kwineffects Qt5::Test Qt5::Widgets KF5::WindowSystem)
 add_test(kwin-testScreenPaintData testScreenPaintData)
 ecm_mark_as_test(testScreenPaintData)
 
 ########################################################
 # Test WindowPaintData
 ########################################################
 set( testWindowPaintData_SRCS test_window_paint_data.cpp )
 add_executable(testWindowPaintData ${testWindowPaintData_SRCS})
 target_link_libraries( testWindowPaintData kwineffects Qt5::Widgets Qt5::Test )
 add_test(kwin-testWindowPaintData testWindowPaintData)
 ecm_mark_as_test(testWindowPaintData)
 
 ########################################################
 # Test VirtualDesktopManager
 ########################################################
 set( testVirtualDesktops_SRCS
      test_virtual_desktops.cpp
      ../virtualdesktops.cpp
 )
 add_executable(testVirtualDesktops ${testVirtualDesktops_SRCS})
 
 target_link_libraries( testVirtualDesktops
                        Qt5::Test
                        Qt5::Widgets
                        KF5::I18n
                        KF5::GlobalAccel
                        KF5::ConfigCore
                        KF5::WindowSystem
 )
 add_test(kwin-testVirtualDesktops testVirtualDesktops)
 ecm_mark_as_test(testVirtualDesktops)
 
 ########################################################
 # Test ClientMachine
 ########################################################
 set( testClientMachine_SRCS
      test_client_machine.cpp
      ../client_machine.cpp
 )
 add_executable( testClientMachine ${testClientMachine_SRCS} )
 
 target_link_libraries( testClientMachine
                        Qt5::Concurrent
                        Qt5::Test
                        Qt5::X11Extras
                        Qt5::Widgets
                        KF5::ConfigCore
                        KF5::WindowSystem
                        XCB::XCB
                        XCB::XFIXES
                        ${X11_X11_LIB} # to make jenkins happy
 )
 add_test(kwin-testClientMachine testClientMachine)
 ecm_mark_as_test(testClientMachine)
 
 ########################################################
 # Test XcbWrapper
 ########################################################
 set( testXcbWrapper_SRCS
      test_xcb_wrapper.cpp
 )
 add_executable( testXcbWrapper ${testXcbWrapper_SRCS} )
 
 target_link_libraries( testXcbWrapper
                        Qt5::Test
                        Qt5::X11Extras
                        Qt5::Widgets
                        KF5::ConfigCore
                        KF5::WindowSystem
                        XCB::XCB
 )
 add_test(kwin-testXcbWrapper testXcbWrapper)
 ecm_mark_as_test(testXcbWrapper)
 
 if (XCB_ICCCM_FOUND)
     add_executable( testXcbSizeHints test_xcb_size_hints.cpp )
     target_link_libraries( testXcbSizeHints
                            Qt5::Test
                            Qt5::X11Extras
                            KF5::ConfigCore
                            KF5::WindowSystem
                            XCB::XCB
                            XCB::ICCCM
     )
     add_test(kwin-testXcbSizeHints testXcbSizeHints)
     ecm_mark_as_test(testXcbSizeHints)
 endif()
 
 ########################################################
 # Test XcbWindow
 ########################################################
 set( testXcbWindow_SRCS
      test_xcb_window.cpp
 )
 add_executable( testXcbWindow ${testXcbWindow_SRCS} )
 
 target_link_libraries( testXcbWindow
                        Qt5::Test
                        Qt5::X11Extras
                        Qt5::Widgets
                        KF5::ConfigCore
                        KF5::WindowSystem
                        XCB::XCB
 )
 add_test(kwin-testXcbWindow testXcbWindow)
 ecm_mark_as_test(testXcbWindow)
 
 ########################################################
 # Test BuiltInEffectLoader
 ########################################################
 set( testBuiltInEffectLoader_SRCS
     test_builtin_effectloader.cpp
     mock_effectshandler.cpp
     ../effectloader.cpp
 )
 add_executable( testBuiltInEffectLoader ${testBuiltInEffectLoader_SRCS})
 
 target_link_libraries(testBuiltInEffectLoader
     Qt5::Concurrent
     Qt5::Test
     KF5::Package
     kwineffects
     kwin4_effect_builtins
 )
 
 add_test(kwin-testBuiltInEffectLoader testBuiltInEffectLoader)
 ecm_mark_as_test(testBuiltInEffectLoader)
 
 ########################################################
 # Test ScriptedEffectLoader
 ########################################################
 include_directories(${KWIN_SOURCE_DIR})
 set( testScriptedEffectLoader_SRCS
     test_scripted_effectloader.cpp
     mock_effectshandler.cpp
     ../effectloader.cpp
     ../scripting/scriptedeffect.cpp
     ../scripting/scriptingutils.cpp
     ../scripting/scripting_logging.cpp
 )
 add_executable( testScriptedEffectLoader ${testScriptedEffectLoader_SRCS})
 
 target_link_libraries(testScriptedEffectLoader
     Qt5::Concurrent
     Qt5::Script
     Qt5::Test
     KF5::ConfigGui
     KF5::GlobalAccel
     KF5::I18n
     KF5::Package
     kwineffects
     kwin4_effect_builtins
 )
 
 add_test(kwin-testScriptedEffectLoader testScriptedEffectLoader)
 ecm_mark_as_test(testScriptedEffectLoader)
 
 ########################################################
 # Test PluginEffectLoader
 ########################################################
 set( testPluginEffectLoader_SRCS
     test_plugin_effectloader.cpp
     mock_effectshandler.cpp
     ../effectloader.cpp
 )
 add_executable( testPluginEffectLoader ${testPluginEffectLoader_SRCS})
 
 target_link_libraries(testPluginEffectLoader
     Qt5::Concurrent
     Qt5::Test
     KF5::Package
     kwineffects
     kwin4_effect_builtins
 )
 
 add_test(kwin-testPluginEffectLoader testPluginEffectLoader)
 ecm_mark_as_test(testPluginEffectLoader)
 
 ########################################################
 # FakeEffectPlugin
 ########################################################
 add_library(fakeeffectplugin MODULE fakeeffectplugin.cpp)
 set_target_properties(fakeeffectplugin PROPERTIES PREFIX "")
 target_link_libraries(fakeeffectplugin kwineffects)
 
 ########################################################
 # FakeEffectPlugin-Version
 ########################################################
 add_library(effectversionplugin MODULE fakeeffectplugin_version.cpp)
 set_target_properties(effectversionplugin PROPERTIES PREFIX "")
 target_link_libraries(effectversionplugin kwineffects)
 
 ########################################################
 # Test Screens
 ########################################################
 set( testScreens_SRCS
     test_screens.cpp
     mock_abstract_client.cpp
     mock_client.cpp
     mock_screens.cpp
     mock_workspace.cpp
     ../screens.cpp
     ../x11eventfilter.cpp
 )
 kconfig_add_kcfg_files(testScreens_SRCS ../settings.kcfgc)
 
 add_executable( testScreens ${testScreens_SRCS})
 target_include_directories(testScreens BEFORE PRIVATE ./)
 target_link_libraries(testScreens
     Qt5::Test
     Qt5::X11Extras
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::WindowSystem
 )
 
 add_test(kwin_testScreens testScreens)
 ecm_mark_as_test(testScreens)
 
 ########################################################
 # Test XrandRScreens
 ########################################################
 set( testXRandRScreens_SRCS
      test_xrandr_screens.cpp
      mock_abstract_client.cpp
      mock_client.cpp
      mock_screens.cpp
      mock_workspace.cpp
      ../screens.cpp
      ../plugins/platforms/x11/standalone/screens_xrandr.cpp
      ../xcbutils.cpp # init of extensions
      ../x11eventfilter.cpp
 )
 kconfig_add_kcfg_files(testXRandRScreens_SRCS ../settings.kcfgc)
 add_executable( testXRandRScreens ${testXRandRScreens_SRCS} )
 target_link_libraries( testXRandRScreens
                        Qt5::Test
                        Qt5::Gui
                        KF5::ConfigCore
                        KF5::ConfigGui
                        KF5::WindowSystem
                        XCB::XCB
                        XCB::RANDR
                        XCB::XFIXES
                        XCB::SYNC
                        XCB::COMPOSITE
                        XCB::DAMAGE
                        XCB::GLX
                        XCB::SHM
 )
 
 add_test(kwin-testXRandRScreens testXRandRScreens)
 ecm_mark_as_test(testXRandRScreens)
 
 ########################################################
 # Test ScreenEdges
 ########################################################
 set( testScreenEdges_SRCS
     test_screen_edges.cpp
     mock_abstract_client.cpp
     mock_client.cpp
     mock_screens.cpp
     mock_workspace.cpp
     ../atoms.cpp
     ../screens.cpp
     ../screenedge.cpp
     ../virtualdesktops.cpp
     ../xcbutils.cpp # init of extensions
     ../plugins/platforms/x11/standalone/edge.cpp
 )
 kconfig_add_kcfg_files(testScreenEdges_SRCS ../settings.kcfgc)
 qt5_add_dbus_interface( testScreenEdges_SRCS ${CMAKE_CURRENT_SOURCE_DIR}/../org.freedesktop.ScreenSaver.xml screenlocker_interface)
 
 add_executable( testScreenEdges ${testScreenEdges_SRCS})
 target_include_directories(testScreenEdges BEFORE PRIVATE ./)
 target_link_libraries(testScreenEdges
     Qt5::DBus
     Qt5::Test
     Qt5::X11Extras
     KF5::ConfigCore
     KF5::ConfigGui
     KF5::I18n
     KF5::GlobalAccel
     KF5::WindowSystem
     XCB::XCB
     XCB::RANDR
     XCB::XFIXES
     XCB::SYNC
     XCB::COMPOSITE
     XCB::DAMAGE
     XCB::GLX
     XCB::SHM
 )
 
 add_test(kwin_testScreenEdges testScreenEdges)
 ecm_mark_as_test(testScreenEdges)
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 4727f03c7..350ef85de 100644
--- a/kcmkwin/kwincompositing/CMakeLists.txt
+++ b/kcmkwin/kwincompositing/CMakeLists.txt
@@ -1,83 +1,85 @@
 #########################################################################
 # KI18N Translation Domain for this library
 add_definitions(-DTRANSLATION_DOMAIN=\"kcmkwincompositing\")
 
 add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS)
 add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
 
 remove_definitions(-DQT_NO_CAST_FROM_ASCII -DQT_STRICT_ITERATORS -DQT_NO_CAST_FROM_BYTEARRAY)
 
 include_directories(${KWIN_SOURCE_DIR}/effects)
 
+include(ECMMarkAsTest)
+
 ################# configure checks and create the configured files #################
 
 # now create config headers
 configure_file(config-prefix.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-prefix.h )
 configure_file(config-compiler.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-compiler.h )
 
 set(kwincomposing_SRC
     model.cpp
     main.cpp
     compositing.cpp
     effectconfig.cpp)
 
 qt5_add_dbus_interface( kwincomposing_SRC
   ${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface)
 qt5_add_dbus_interface( kwincomposing_SRC
   ${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
 
 ki18n_wrap_ui(kwincomposing_SRC compositing.ui)
 
 add_library(kwincompositing MODULE ${kwincomposing_SRC})
 
 target_link_libraries(kwincompositing
     Qt5::Quick
     Qt5::DBus
     Qt5::Widgets
     KF5::CoreAddons
     KF5::ConfigCore
     KF5::Declarative
     KF5::I18n
     KF5::Service
     KF5::KCMUtils
     KF5::NewStuff
     kwin4_effect_builtins
 )
 
 
 set(modelTest_SRC
     model.cpp
     effectconfig.cpp
     compositing.cpp
     test/effectmodeltest.cpp
     test/modeltest.cpp)
 
 qt5_add_dbus_interface( modelTest_SRC
   ${KWIN_SOURCE_DIR}/org.kde.kwin.Compositing.xml kwin_compositing_interface)
 qt5_add_dbus_interface( modelTest_SRC
   ${KWIN_SOURCE_DIR}/org.kde.kwin.Effects.xml kwin_effects_interface)
 
 add_executable(effectModelTest ${modelTest_SRC})
 ecm_mark_as_test(effectModelTest)
 
 target_link_libraries(effectModelTest
     Qt5::Quick
     Qt5::DBus
     Qt5::Test
     Qt5::Widgets
     KF5::CoreAddons
     KF5::ConfigCore
     KF5::Declarative
     KF5::I18n
     KF5::Service
     KF5::KCMUtils
     KF5::NewStuff
     kwineffects
     kwin4_effect_builtins
 )
 
 INSTALL(DIRECTORY qml DESTINATION ${DATA_INSTALL_DIR}/kwincompositing)
 INSTALL(TARGETS kwincompositing DESTINATION ${PLUGIN_INSTALL_DIR})
 install(FILES kwincompositing.desktop kcmkwineffects.desktop  DESTINATION  ${SERVICES_INSTALL_DIR})
 install(FILES kwineffect.knsrc DESTINATION ${CONFIG_INSTALL_DIR})
 ################# list the subdirectories #################
diff --git a/libkwineffects/CMakeLists.txt b/libkwineffects/CMakeLists.txt
index 0ba6a0d3f..661d56161 100644
--- a/libkwineffects/CMakeLists.txt
+++ b/libkwineffects/CMakeLists.txt
@@ -1,129 +1,127 @@
 ########### next target ###############
 include(ECMSetupVersion)
 
 ecm_setup_version(${PROJECT_VERSION}
                   VARIABLE_PREFIX KWINEFFECTS
                   VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/kwineffects_version.h"
                   PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KWinEffectsConfigVersion.cmake"
                   SOVERSION 8
 )
 
 ### xrenderutils lib ###
 set(kwin_XRENDERUTILS_SRCS
     kwinxrenderutils.cpp
     logging.cpp
     )
 
 add_library(kwinxrenderutils SHARED ${kwin_XRENDERUTILS_SRCS})
 generate_export_header(kwinxrenderutils EXPORT_FILE_NAME kwinxrenderutils_export.h)
 target_link_libraries(kwinxrenderutils
     PUBLIC
         Qt5::Core
         Qt5::Gui
         XCB::XCB
         XCB::XFIXES
         XCB::RENDER
         KF5::WaylandServer
     )
 
 set_target_properties(kwinxrenderutils PROPERTIES
     VERSION ${KWINEFFECTS_VERSION_STRING}
     SOVERSION ${KWINEFFECTS_SOVERSION}
 )
 set_target_properties(kwinxrenderutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}xrenderutils)
 
 install(TARGETS kwinxrenderutils EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 ###  effects lib  ###
 set(kwin_EFFECTSLIB_SRCS
     kwineffects.cpp
     anidata.cpp
     kwinanimationeffect.cpp
     logging.cpp
     )
 
 set(kwineffects_QT_LIBS
     Qt5::DBus
     Qt5::Widgets
     Qt5::X11Extras
 )
 
 set(kwineffects_KDE_LIBS
     KF5::ConfigCore
     KF5::CoreAddons
     KF5::WindowSystem
 )
 
 set(kwineffects_XCB_LIBS
     XCB::XCB
 )
 
 add_library(kwineffects SHARED ${kwin_EFFECTSLIB_SRCS})
 generate_export_header(kwineffects EXPORT_FILE_NAME kwineffects_export.h)
 target_link_libraries(kwineffects
 PUBLIC
     ${kwineffects_QT_LIBS}
     ${kwineffects_KDE_LIBS}
     ${kwineffects_XCB_LIBS}
 )
 if( KWIN_HAVE_XRENDER_COMPOSITING )
     target_link_libraries(kwineffects PRIVATE kwinxrenderutils XCB::XFIXES)
 endif()
 set_target_properties(kwineffects PROPERTIES
     VERSION ${KWINEFFECTS_VERSION_STRING}
     SOVERSION ${KWINEFFECTS_SOVERSION}
 )
 set_target_properties(kwineffects PROPERTIES OUTPUT_NAME ${KWIN_NAME}effects)
 
 install(TARGETS kwineffects EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 
 # kwingl(es)utils library
 set(kwin_GLUTILSLIB_SRCS
     kwinglutils.cpp
     kwingltexture.cpp
     kwinglutils_funcs.cpp
     kwinglplatform.cpp
     kwinglcolorcorrection.cpp
     logging.cpp
     )
 
 macro( KWIN4_ADD_GLUTILS_BACKEND name glinclude )
     include_directories(${glinclude})
     add_library(${name} SHARED ${kwin_GLUTILSLIB_SRCS})
     generate_export_header(${name} BASE_NAME kwinglutils EXPORT_FILE_NAME kwinglutils_export.h)
     target_link_libraries(${name} PUBLIC Qt5::DBus Qt5::X11Extras XCB::XCB KF5::CoreAddons KF5::WindowSystem)
     set_target_properties(${name} PROPERTIES
         VERSION ${KWINEFFECTS_VERSION_STRING}
         SOVERSION ${KWINEFFECTS_SOVERSION}
     )
     target_link_libraries(${name} PUBLIC ${ARGN})
 
     install(TARGETS ${name} EXPORT kdeworkspaceLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
 endmacro()
 
 kwin4_add_glutils_backend(kwinglutils ${epoxy_INCLUDE_DIR} ${epoxy_LIBRARY})
 set_target_properties(kwinglutils PROPERTIES OUTPUT_NAME ${KWIN_NAME}glutils)
 
 target_link_libraries(kwinglutils PUBLIC ${epoxy_LIBRARY})
 # -ldl used by OpenGL code
 find_library(DL_LIBRARY dl)
 if (DL_LIBRARY)
     target_link_libraries(kwinglutils PRIVATE ${DL_LIBRARY})
 endif()
 
 install( FILES
     kwinglobals.h
     kwineffects.h
     kwinanimationeffect.h
     kwinglplatform.h
     kwinglutils.h
     kwinglutils_funcs.h
     kwingltexture.h
     kwinxrenderutils.h
     ${CMAKE_CURRENT_BINARY_DIR}/kwinconfig.h
     ${CMAKE_CURRENT_BINARY_DIR}/kwineffects_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/kwinglutils_export.h
     ${CMAKE_CURRENT_BINARY_DIR}/kwinxrenderutils_export.h
     DESTINATION ${INCLUDE_INSTALL_DIR} COMPONENT Devel)
-
-add_subdirectory(autotests)