2 files changed, 2 insertions, 9 deletions
diff --git a/tests/auto/controls/data/tst_tooltip.qml b/tests/auto/controls/data/tst_tooltip.qml
index d9c95dbf..51601d66 100644
--- a/tests/auto/controls/data/tst_tooltip.qml
+++ b/tests/auto/controls/data/tst_tooltip.qml
@@ -240,8 +240,7 @@ TestCase {
         else
             control.visible = false
         verify(control.exit.running)
-        wait(100) // TODO: replace with tryVerify() in 5.8
-        verify(control.opacity < 1)
+        tryVerify(function() { return control.opacity < 1; })
 
         if (data.imperative)
             control.open()
diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml
index b3230ca4..01d5cdee 100644
--- a/tests/auto/controls/data/tst_tumbler.qml
+++ b/tests/auto/controls/data/tst_tumbler.qml
@@ -83,16 +83,10 @@ TestCase {
     }
 
     function cleanup() {
-        var destroyed = false;
-        cleanupItem.Component.destruction.connect(function() { destroyed = true; });
-
         cleanupItem.destroy();
-
         // Waiting until it's deleted before continuing makes debugging
         // test failures much easier, because there aren't unrelated items hanging around.
-        // TODO: Replace with tryVerify(!tumbler) in 5.8.
-        while (!destroyed)
-            wait(0)
+        tryVerify(function() { return !tumbler; });
     }
 
     function createTumbler(args) {