diff --git a/autotests/client/test_drag_drop.cpp b/autotests/client/test_drag_drop.cpp
--- a/autotests/client/test_drag_drop.cpp
+++ b/autotests/client/test_drag_drop.cpp
@@ -204,7 +204,7 @@
     if (!surfaceCreatedSpy.isValid()) {
         return nullptr;
     }
-    if (!surfaceCreatedSpy.wait()) {
+    if (!surfaceCreatedSpy.wait(500)) {
         return nullptr;
     }
     return surfaceCreatedSpy.first().first().value<SurfaceInterface*>();
@@ -389,7 +389,7 @@
     QVERIFY(droppedSpy.isValid());
     m_seatInterface->setTimestamp(4);
     m_seatInterface->pointerButtonReleased(1);
-    QVERIFY(!droppedSpy.wait());
+    QVERIFY(!droppedSpy.wait(500));
 
     // verify that we did not get any further input events
     QVERIFY(pointerMotionSpy.isEmpty());
diff --git a/autotests/client/test_pointer_constraints.cpp b/autotests/client/test_pointer_constraints.cpp
--- a/autotests/client/test_pointer_constraints.cpp
+++ b/autotests/client/test_pointer_constraints.cpp
@@ -213,16 +213,16 @@
     QCOMPARE(serverLockedPointer->lifeTime(), serverLifeTime);
     // setting to unlocked now should not trigger an unlocked spy
     serverLockedPointer->setLocked(false);
-    QVERIFY(!unlockedSpy.wait());
+    QVERIFY(!unlockedSpy.wait(500));
 
     // try setting a region
     QSignalSpy destroyedSpy(serverLockedPointer.data(), &QObject::destroyed);
     QVERIFY(destroyedSpy.isValid());
     QSignalSpy regionChangedSpy(serverLockedPointer.data(), &LockedPointerInterface::regionChanged);
     QVERIFY(regionChangedSpy.isValid());
     lockedPointer->setRegion(m_compositor->createRegion(QRegion(0, 5, 10, 20), m_compositor));
     // it's double buffered
-    QVERIFY(!regionChangedSpy.wait());
+    QVERIFY(!regionChangedSpy.wait(500));
     surface->commit(Surface::CommitFlag::None);
     QVERIFY(regionChangedSpy.wait());
     QCOMPARE(serverLockedPointer->region(), QRegion(0, 5, 10, 20));
@@ -318,16 +318,16 @@
     QCOMPARE(serverConfinedPointer->lifeTime(), serverLifeTime);
     // setting to unconfined now should not trigger an unconfined spy
     serverConfinedPointer->setConfined(false);
-    QVERIFY(!unconfinedSpy.wait());
+    QVERIFY(!unconfinedSpy.wait(500));
 
     // try setting a region
     QSignalSpy destroyedSpy(serverConfinedPointer.data(), &QObject::destroyed);
     QVERIFY(destroyedSpy.isValid());
     QSignalSpy regionChangedSpy(serverConfinedPointer.data(), &ConfinedPointerInterface::regionChanged);
     QVERIFY(regionChangedSpy.isValid());
     confinedPointer->setRegion(m_compositor->createRegion(QRegion(0, 5, 10, 20), m_compositor));
     // it's double buffered
-    QVERIFY(!regionChangedSpy.wait());
+    QVERIFY(!regionChangedSpy.wait(500));
     surface->commit(Surface::CommitFlag::None);
     QVERIFY(regionChangedSpy.wait());
     QCOMPARE(serverConfinedPointer->region(), QRegion(0, 5, 10, 20));
diff --git a/autotests/client/test_selection.cpp b/autotests/client/test_selection.cpp
--- a/autotests/client/test_selection.cpp
+++ b/autotests/client/test_selection.cpp
@@ -108,7 +108,7 @@
     c->thread->start();
 
     c->connection->initConnection();
-    if (!connectedSpy.wait()) {
+    if (!connectedSpy.wait(500)) {
         return false;
     }
 
@@ -126,7 +126,7 @@
         return false;
     }
     registry.setup();
-    if (!interfacesAnnouncedSpy.wait()) {
+    if (!interfacesAnnouncedSpy.wait(500)) {
         return false;
     }
 
@@ -152,7 +152,7 @@
     if (!keyboardSpy.isValid()) {
         return false;
     }
-    if (!keyboardSpy.wait()) {
+    if (!keyboardSpy.wait(500)) {
         return false;
     }
     if (!c->seat->hasKeyboard()) {
diff --git a/autotests/client/test_text_input.cpp b/autotests/client/test_text_input.cpp
--- a/autotests/client/test_text_input.cpp
+++ b/autotests/client/test_text_input.cpp
@@ -199,7 +199,7 @@
     if (!surfaceCreatedSpy.isValid()) {
         return nullptr;
     }
-    if (!surfaceCreatedSpy.wait()) {
+    if (!surfaceCreatedSpy.wait(500)) {
         return nullptr;
     }
     if (surfaceCreatedSpy.count() != 1) {
diff --git a/autotests/client/test_wayland_seat.cpp b/autotests/client/test_wayland_seat.cpp
--- a/autotests/client/test_wayland_seat.cpp
+++ b/autotests/client/test_wayland_seat.cpp
@@ -542,7 +542,7 @@
 
     // now a relative motion should not be sent to the relative pointer
     m_seatInterface->relativePointerMotion(QSizeF(1, 2), QSizeF(3, 4), quint64(-1));
-    QVERIFY(!relativeMotionSpy.wait());
+    QVERIFY(!relativeMotionSpy.wait(500));
 
     // enter it again
     m_seatInterface->setFocusedPointerSurface(serverSurface, QPoint(0, 0));
@@ -975,7 +975,7 @@
 
     // another start should not be possible
     m_seatInterface->startPointerSwipeGesture(2);
-    QVERIFY(!startSpy.wait());
+    QVERIFY(!startSpy.wait(500));
 
     // send in some updates
     m_seatInterface->setTimestamp(timestamp++);
@@ -1091,7 +1091,7 @@
 
     // another start should not be possible
     m_seatInterface->startPointerPinchGesture(3);
-    QVERIFY(!startSpy.wait());
+    QVERIFY(!startSpy.wait(500));
 
     // send in some updates
     m_seatInterface->setTimestamp(timestamp++);
diff --git a/autotests/client/test_wayland_surface.cpp b/autotests/client/test_wayland_surface.cpp
--- a/autotests/client/test_wayland_surface.cpp
+++ b/autotests/client/test_wayland_surface.cpp
@@ -1143,12 +1143,12 @@
 
     // creating a second idle inhibition should not trigger the signal
     QScopedPointer<IdleInhibitor> inhibitor2(m_idleInhibitManager->createInhibitor(s.data()));
-    QVERIFY(!inhibitsChangedSpy.wait());
+    QVERIFY(!inhibitsChangedSpy.wait(500));
     QCOMPARE(serverSurface->inhibitsIdle(), true);
 
     // and also deleting the first inhibitor should not yet change the inhibition
     inhibitor1.reset();
-    QVERIFY(!inhibitsChangedSpy.wait());
+    QVERIFY(!inhibitsChangedSpy.wait(500));
     QCOMPARE(serverSurface->inhibitsIdle(), true);
 
     // but deleting also the second inhibitor should trigger