diff --git a/autotests/CMakeLists.txt b/autotests/CMakeLists.txt
index 9cdf7962b7..bb491c1eca 100644
--- a/autotests/CMakeLists.txt
+++ b/autotests/CMakeLists.txt
@@ -1,7 +1,7 @@
 add_definitions(-DKWIN_UNIT_TEST)
 remove_definitions(-DQT_USE_QSTRINGBUILDER)
 add_subdirectory(libxrenderutils)
-add_subdirectory(wayland)
+add_subdirectory(integration)
 if (HAVE_INPUT)
     add_subdirectory(libinput)
 endif()
diff --git a/autotests/wayland/CMakeLists.txt b/autotests/integration/CMakeLists.txt
similarity index 100%
rename from autotests/wayland/CMakeLists.txt
rename to autotests/integration/CMakeLists.txt
diff --git a/autotests/wayland/data/anim-data-delete-effect/effect.js b/autotests/integration/data/anim-data-delete-effect/effect.js
similarity index 100%
rename from autotests/wayland/data/anim-data-delete-effect/effect.js
rename to autotests/integration/data/anim-data-delete-effect/effect.js
diff --git a/autotests/wayland/debug_console_test.cpp b/autotests/integration/debug_console_test.cpp
similarity index 100%
rename from autotests/wayland/debug_console_test.cpp
rename to autotests/integration/debug_console_test.cpp
diff --git a/autotests/wayland/decoration_input_test.cpp b/autotests/integration/decoration_input_test.cpp
similarity index 100%
rename from autotests/wayland/decoration_input_test.cpp
rename to autotests/integration/decoration_input_test.cpp
diff --git a/autotests/wayland/dont_crash_aurorae_destroy_deco.cpp b/autotests/integration/dont_crash_aurorae_destroy_deco.cpp
similarity index 100%
rename from autotests/wayland/dont_crash_aurorae_destroy_deco.cpp
rename to autotests/integration/dont_crash_aurorae_destroy_deco.cpp
diff --git a/autotests/wayland/dont_crash_cancel_animation.cpp b/autotests/integration/dont_crash_cancel_animation.cpp
similarity index 100%
rename from autotests/wayland/dont_crash_cancel_animation.cpp
rename to autotests/integration/dont_crash_cancel_animation.cpp
diff --git a/autotests/wayland/dont_crash_empty_deco.cpp b/autotests/integration/dont_crash_empty_deco.cpp
similarity index 100%
rename from autotests/wayland/dont_crash_empty_deco.cpp
rename to autotests/integration/dont_crash_empty_deco.cpp
diff --git a/autotests/wayland/dont_crash_glxgears.cpp b/autotests/integration/dont_crash_glxgears.cpp
similarity index 100%
rename from autotests/wayland/dont_crash_glxgears.cpp
rename to autotests/integration/dont_crash_glxgears.cpp
diff --git a/autotests/wayland/dont_crash_no_border.cpp b/autotests/integration/dont_crash_no_border.cpp
similarity index 100%
rename from autotests/wayland/dont_crash_no_border.cpp
rename to autotests/integration/dont_crash_no_border.cpp
diff --git a/autotests/wayland/helper/CMakeLists.txt b/autotests/integration/helper/CMakeLists.txt
similarity index 100%
rename from autotests/wayland/helper/CMakeLists.txt
rename to autotests/integration/helper/CMakeLists.txt
diff --git a/autotests/wayland/helper/copy.cpp b/autotests/integration/helper/copy.cpp
similarity index 100%
rename from autotests/wayland/helper/copy.cpp
rename to autotests/integration/helper/copy.cpp
diff --git a/autotests/wayland/helper/paste.cpp b/autotests/integration/helper/paste.cpp
similarity index 100%
rename from autotests/wayland/helper/paste.cpp
rename to autotests/integration/helper/paste.cpp
diff --git a/autotests/wayland/input_stacking_order.cpp b/autotests/integration/input_stacking_order.cpp
similarity index 100%
rename from autotests/wayland/input_stacking_order.cpp
rename to autotests/integration/input_stacking_order.cpp
diff --git a/autotests/wayland/internal_window.cpp b/autotests/integration/internal_window.cpp
similarity index 100%
rename from autotests/wayland/internal_window.cpp
rename to autotests/integration/internal_window.cpp
diff --git a/autotests/wayland/kwin_wayland_test.cpp b/autotests/integration/kwin_wayland_test.cpp
similarity index 100%
rename from autotests/wayland/kwin_wayland_test.cpp
rename to autotests/integration/kwin_wayland_test.cpp
diff --git a/autotests/wayland/kwin_wayland_test.h b/autotests/integration/kwin_wayland_test.h
similarity index 100%
rename from autotests/wayland/kwin_wayland_test.h
rename to autotests/integration/kwin_wayland_test.h
diff --git a/autotests/wayland/lockscreen.cpp b/autotests/integration/lockscreen.cpp
similarity index 100%
rename from autotests/wayland/lockscreen.cpp
rename to autotests/integration/lockscreen.cpp
diff --git a/autotests/wayland/maximize_test.cpp b/autotests/integration/maximize_test.cpp
similarity index 100%
rename from autotests/wayland/maximize_test.cpp
rename to autotests/integration/maximize_test.cpp
diff --git a/autotests/wayland/move_resize_window_test.cpp b/autotests/integration/move_resize_window_test.cpp
similarity index 100%
rename from autotests/wayland/move_resize_window_test.cpp
rename to autotests/integration/move_resize_window_test.cpp
diff --git a/autotests/wayland/plasma_surface_test.cpp b/autotests/integration/plasma_surface_test.cpp
similarity index 100%
rename from autotests/wayland/plasma_surface_test.cpp
rename to autotests/integration/plasma_surface_test.cpp
diff --git a/autotests/wayland/plasmawindow_test.cpp b/autotests/integration/plasmawindow_test.cpp
similarity index 100%
rename from autotests/wayland/plasmawindow_test.cpp
rename to autotests/integration/plasmawindow_test.cpp
diff --git a/autotests/wayland/platformcursor.cpp b/autotests/integration/platformcursor.cpp
similarity index 100%
rename from autotests/wayland/platformcursor.cpp
rename to autotests/integration/platformcursor.cpp
diff --git a/autotests/wayland/pointer_input.cpp b/autotests/integration/pointer_input.cpp
similarity index 100%
rename from autotests/wayland/pointer_input.cpp
rename to autotests/integration/pointer_input.cpp
diff --git a/autotests/wayland/quick_tiling_test.cpp b/autotests/integration/quick_tiling_test.cpp
similarity index 100%
rename from autotests/wayland/quick_tiling_test.cpp
rename to autotests/integration/quick_tiling_test.cpp
diff --git a/autotests/wayland/shade_test.cpp b/autotests/integration/shade_test.cpp
similarity index 100%
rename from autotests/wayland/shade_test.cpp
rename to autotests/integration/shade_test.cpp
diff --git a/autotests/wayland/shell_client_test.cpp b/autotests/integration/shell_client_test.cpp
similarity index 100%
rename from autotests/wayland/shell_client_test.cpp
rename to autotests/integration/shell_client_test.cpp
diff --git a/autotests/wayland/start_test.cpp b/autotests/integration/start_test.cpp
similarity index 100%
rename from autotests/wayland/start_test.cpp
rename to autotests/integration/start_test.cpp
diff --git a/autotests/wayland/struts_test.cpp b/autotests/integration/struts_test.cpp
similarity index 100%
rename from autotests/wayland/struts_test.cpp
rename to autotests/integration/struts_test.cpp
diff --git a/autotests/wayland/touch_input_test.cpp b/autotests/integration/touch_input_test.cpp
similarity index 100%
rename from autotests/wayland/touch_input_test.cpp
rename to autotests/integration/touch_input_test.cpp
diff --git a/autotests/wayland/transient_no_input_test.cpp b/autotests/integration/transient_no_input_test.cpp
similarity index 100%
rename from autotests/wayland/transient_no_input_test.cpp
rename to autotests/integration/transient_no_input_test.cpp
diff --git a/autotests/wayland/transient_placement.cpp b/autotests/integration/transient_placement.cpp
similarity index 100%
rename from autotests/wayland/transient_placement.cpp
rename to autotests/integration/transient_placement.cpp
diff --git a/autotests/wayland/xclipboardsync_test.cpp b/autotests/integration/xclipboardsync_test.cpp
similarity index 100%
rename from autotests/wayland/xclipboardsync_test.cpp
rename to autotests/integration/xclipboardsync_test.cpp