diff --git a/tests/system/suite_general/tst_build_speedcrunch/test.py b/tests/system/suite_general/tst_build_speedcrunch/test.py
index 0d664a7f8da..42e2a9ea589 100644
--- a/tests/system/suite_general/tst_build_speedcrunch/test.py
+++ b/tests/system/suite_general/tst_build_speedcrunch/test.py
@@ -4,10 +4,15 @@ import re;
 SpeedCrunchPath = ""
 buildSucceeded = 0
 buildFinished = False
+refreshFinishedCount = 0
+
+def handleRefreshFinished(object, fileList):
+    global refreshFinishedCount
+    refreshFinishedCount += 1
 
 def main():
+    global buildSucceeded, buildFinished, refreshFinishedCount
     test.verify(os.path.exists(SpeedCrunchPath))
-    global buildSucceeded, buildFinished
     startApplication("qtcreator" + SettingsPath)
     openQmakeProject(SpeedCrunchPath)
 
@@ -17,6 +22,8 @@ def main():
         value = testData.field(record, "value")
         test.compare(waitForObject(node).text, value)
 
+    installLazySignalHandler("{type='CppTools::Internal::CppModelManager'}", "sourceFilesRefreshed(QStringList)", "handleRefreshFinished")
+
     clickButton(waitForObject(":*Qt Creator_Core::Internal::FancyToolButton"))
     buildCombo = waitForObject(":Build:_QComboBox")
     sendEvent("QMouseEvent", waitForObject(":QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector"), QEvent.MouseButtonPress, -5, 5, Qt.LeftButton, 0)
@@ -24,12 +31,14 @@ def main():
     prog = re.compile("Qt.*Release")
     for row in range(buildCombo.count):
         if prog.match(str(buildCombo.itemText(row))):
+            refreshFinishedCount = 0;
             clickButton(waitForObject(":*Qt Creator_Core::Internal::FancyToolButton"))
             itemText = buildCombo.itemText(row);
             test.log("Testing build configuration: "+str(itemText))
             if str(itemText) != str(buildCombo.currentText):
                 buildCombo.setCurrentIndex(row)
             sendEvent("QMouseEvent", waitForObject(":QtCreator.MenuBar_ProjectExplorer::Internal::MiniProjectTargetSelector"), QEvent.MouseButtonPress, -45, 64, Qt.LeftButton, 0)
+            waitFor("refreshFinishedCount == 1", 300000)
             buildSucceeded = 0
             buildFinished = False
             invokeMenuItem("Build", "Rebuild All")