diff --git a/src/testlib/qtestresult.cpp b/src/testlib/qtestresult.cpp
index e3545802cb..d5f43ee8e0 100644
--- a/src/testlib/qtestresult.cpp
+++ b/src/testlib/qtestresult.cpp
@@ -534,7 +534,8 @@ bool QTestResult::compare(bool success, const char *failureMsg,
 void QTestResult::addFailure(const char *message, const char *file, int line)
 {
     clearExpectFail();
-    QTestEventLoop::instance().exitLoop();
+    if (qApp && QThread::currentThread() == qApp->thread())
+        QTestEventLoop::instance().exitLoop();
 
     if (QTest::blacklistCurrentTest)
         QTestLog::addBFail(message, file, line);