diff --git a/autotests/wayland/dont_crash_glxgears.cpp b/autotests/wayland/dont_crash_glxgears.cpp
index cb168f3e1a..3ce7dbed01 100644
--- a/autotests/wayland/dont_crash_glxgears.cpp
+++ b/autotests/wayland/dont_crash_glxgears.cpp
@@ -43,7 +43,6 @@ private Q_SLOTS:
 
 void DontCrashGlxgearsTest::initTestCase()
 {
-    qputenv("KWIN_COMPOSE", QByteArrayLiteral("Q"));
     qRegisterMetaType<KWin::Deleted*>();
     QSignalSpy workspaceCreatedSpy(kwinApp(), &Application::workspaceCreated);
     QVERIFY(workspaceCreatedSpy.isValid());
diff --git a/autotests/wayland/kwin_wayland_test.cpp b/autotests/wayland/kwin_wayland_test.cpp
index e5fdd267e9..76b1b9a866 100644
--- a/autotests/wayland/kwin_wayland_test.cpp
+++ b/autotests/wayland/kwin_wayland_test.cpp
@@ -46,7 +46,7 @@ WaylandTestApplication::WaylandTestApplication(int &argc, char **argv)
 #ifdef KWIN_BUILD_ACTIVITIES
     setUseKActivities(false);
 #endif
-    qputenv("KWIN_COMPOSE", QByteArrayLiteral("O2"));
+    qputenv("KWIN_COMPOSE", QByteArrayLiteral("Q"));
     WaylandServer *server = WaylandServer::create(this);
     QPluginLoader loader(QStringLiteral(KWINBACKENDPATH));
     loader.instance()->setParent(server);