diff --git a/autotests/integration/debug_console_test.cpp b/autotests/integration/debug_console_test.cpp
index 399b6d0fba..6dedca6973 100644
--- a/autotests/integration/debug_console_test.cpp
+++ b/autotests/integration/debug_console_test.cpp
@@ -392,7 +392,7 @@ void DebugConsoleTest::testWaylandClient()
     Test::flushWaylandConnection();
     qDebug() << rowsRemovedSpy.count();
     QEXPECT_FAIL("wlShell", "Deleting a ShellSurface does not result in the server removing the ShellClient", Continue);
-    QVERIFY(rowsRemovedSpy.wait());
+    QVERIFY(rowsRemovedSpy.wait(500));
     surface.reset();
 
     if (rowsRemovedSpy.isEmpty()) {
@@ -449,8 +449,7 @@ void DebugConsoleTest::testInternalWindow()
     w->setGeometry(0, 0, 100, 100);
     w->show();
 
-    QVERIFY(rowsInsertedSpy.wait());
-    QCOMPARE(rowsInsertedSpy.count(), 1);
+    QTRY_COMPARE(rowsInsertedSpy.count(), 1);
     QCOMPARE(rowsInsertedSpy.first().first().value<QModelIndex>(), internalTopLevelIndex);
 
     QModelIndex clientIndex = model.index(rowsInsertedSpy.first().last().toInt(), 0, internalTopLevelIndex);