diff --git a/autotests/integration/xdgshellclient_rules_test.cpp b/autotests/integration/xdgshellclient_rules_test.cpp
index aa5e7bc2ab..b44216227a 100644
--- a/autotests/integration/xdgshellclient_rules_test.cpp
+++ b/autotests/integration/xdgshellclient_rules_test.cpp
@@ -206,6 +206,10 @@ void TestXdgShellClientRules::init()
 
 void TestXdgShellClientRules::cleanup()
 {
+    if (!m_shellSurface.isNull()) {
+        destroyTestWindow();
+    }
+
     Test::destroyWaylandConnection();
 
     // Wipe the window rule config clean.