diff --git a/src/plugins/autotest/autotestunittests.cpp b/src/plugins/autotest/autotestunittests.cpp
index 60f931b5e0faa0e0a3e8fa44164f1db9908ae004..0ae4b4ad5ad5d9b606757eb2ef25d84d5ed2fc78 100644
--- a/src/plugins/autotest/autotestunittests.cpp
+++ b/src/plugins/autotest/autotestunittests.cpp
@@ -96,7 +96,9 @@ void AutoTestUnitTests::testCodeParser()
     QVERIFY(projectInfo.isValid());
 
     QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished()));
+    QSignalSpy modelUpdateSpy(m_model, SIGNAL(sweepingDone()));
     QVERIFY(parserSpy.wait(20000));
+    QVERIFY(modelUpdateSpy.wait());
 
     if (m_isQt4)
         expectedNamedQuickTestsCount = expectedUnnamedQuickTestsCount = 0;
@@ -148,7 +150,9 @@ void AutoTestUnitTests::testCodeParserSwitchStartup()
         QVERIFY(projectInfo.isValid());
 
         QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished()));
+        QSignalSpy modelUpdateSpy(m_model, SIGNAL(sweepingDone()));
         QVERIFY(parserSpy.wait(20000));
+        QVERIFY(modelUpdateSpy.wait());
 
         QCOMPARE(m_model->autoTestsCount(), expectedAutoTestsCount.at(i));
         QCOMPARE(m_model->namedQuickTestsCount(),
@@ -198,7 +202,9 @@ void AutoTestUnitTests::testCodeParserGTest()
     QVERIFY(projectInfo.isValid());
 
     QSignalSpy parserSpy(m_model->parser(), SIGNAL(parsingFinished()));
+    QSignalSpy modelUpdateSpy(m_model, SIGNAL(sweepingDone()));
     QVERIFY(parserSpy.wait(20000));
+    QVERIFY(modelUpdateSpy.wait());
 
     QCOMPARE(m_model->gtestNamesCount(), 6);
 
diff --git a/src/plugins/autotest/testcodeparser.h b/src/plugins/autotest/testcodeparser.h
index 0cdb99d3055410e8325c2236abc1a3e1489464da..e9254221142d258b906be0862fe042bdb6ff06d0 100644
--- a/src/plugins/autotest/testcodeparser.h
+++ b/src/plugins/autotest/testcodeparser.h
@@ -63,6 +63,10 @@ public:
     void setState(State state);
     State state() const { return m_parserState; }
     void setDirty() { m_dirty = true; }
+#ifdef WITH_TESTS
+    bool furtherParsingExpected() const
+    { return m_singleShotScheduled || m_fullUpdatePostponed || m_partialUpdatePostponed; }
+#endif
 
 signals:
     void aboutToPerformFullParse();
diff --git a/src/plugins/autotest/testtreemodel.cpp b/src/plugins/autotest/testtreemodel.cpp
index bb4ca737a24c7aea8c59a81bcabe727c50a62a71..502a24507f8c692be5a70c55dd8c76bc0adc6efc 100644
--- a/src/plugins/autotest/testtreemodel.cpp
+++ b/src/plugins/autotest/testtreemodel.cpp
@@ -569,6 +569,10 @@ void TestTreeModel::sweep()
     }
     if (hasChanged)
         emit testTreeModelChanged();
+#ifdef WITH_TESTS
+    if (m_parser->state() == TestCodeParser::Idle && !m_parser->furtherParsingExpected())
+        emit sweepingDone();
+#endif
 }
 
 QMap<QString, QString> TestTreeModel::testCaseNamesForFiles(QStringList files)
diff --git a/src/plugins/autotest/testtreemodel.h b/src/plugins/autotest/testtreemodel.h
index a4104eafa398aff2753cf56dcb9d9f0f4b3f164b..9c7f08d7b063720bed85abeacf4f8dd10b6c1441 100644
--- a/src/plugins/autotest/testtreemodel.h
+++ b/src/plugins/autotest/testtreemodel.h
@@ -85,6 +85,9 @@ public:
 
 signals:
     void testTreeModelChanged();
+#ifdef WITH_TESTS
+    void sweepingDone();
+#endif
 
 public slots: