1 files changed, 6 insertions, 8 deletions
diff --git a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
index 109c69cd7..f11d9236c 100644
--- a/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
+++ b/tests/auto/widgets/certificateerror/tst_certificateerror.cpp
@@ -48,13 +48,13 @@ private Q_SLOTS:
 struct PageWithCertificateErrorHandler : QWebEnginePage
 {
     PageWithCertificateErrorHandler(bool defer, bool accept, QObject *p = nullptr)
-        : QWebEnginePage(p), deferError(defer), acceptCertificate(accept) {
-        connect(this, &QWebEnginePage::loadFinished, [&] (bool result) { spyLoad(result); });
+        : QWebEnginePage(p), deferError(defer), acceptCertificate(accept)
+        , loadSpy(this, &QWebEnginePage::loadFinished) {
     }
 
     bool deferError, acceptCertificate;
 
-    CallbackSpy<bool> spyLoad;
+    QSignalSpy loadSpy;
     QScopedPointer<QWebEngineCertificateError> error;
 
     bool certificateError(const QWebEngineCertificateError &e) override {
@@ -104,7 +104,7 @@ void tst_CertificateError::handleError()
     if (deferError) {
         QVERIFY(page.error->deferred());
         QVERIFY(!page.error->answered());
-        QVERIFY(!page.spyLoad.wasCalled());
+        QCOMPARE(page.loadSpy.count(), 0);
         QCOMPARE(toPlainTextSync(&page), QString());
 
         if (acceptCertificate)
@@ -115,10 +115,8 @@ void tst_CertificateError::handleError()
         QVERIFY(page.error->answered());
         page.error.reset();
     }
-
-    bool loadResult = page.spyLoad.waitForResult();
-    QVERIFY(page.spyLoad.wasCalled());
-    QCOMPARE(loadResult, acceptCertificate);
+    QTRY_COMPARE_WITH_TIMEOUT(page.loadSpy.count(), 1, 30000);
+    QCOMPARE(page.loadSpy.takeFirst().value(0).toBool(), acceptCertificate);
     QCOMPARE(toPlainTextSync(&page), expectedContent);
 }