diff --git a/tests/system/objects.map b/tests/system/objects.map
index 5f6e2f8e47dcdfb56fe042f77a897671b721efcd..d3f0a2897cb2454d238bb42f0a965910444a79e5 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -1,4 +1,5 @@
 :*Qt Creator.Build Project_Core::Internal::FancyToolButton	{text='Build Project' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:*Qt Creator.Cancel Build_QToolButton	{text='Cancel Build' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Cancel_QPushButton	{text='Cancel' type='QPushButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Clear_QToolButton	{text='Clear' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Continue_Core::Internal::FancyToolButton	{text='Continue' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
diff --git a/tests/system/suite_SCOM/tst_SCOM01/test.py b/tests/system/suite_SCOM/tst_SCOM01/test.py
index 446626f65f3579387cfd9a906420fc67f6f39230..e6cb3ff8283ab281beb4d5c99c5f3303559d2667 100644
--- a/tests/system/suite_SCOM/tst_SCOM01/test.py
+++ b/tests/system/suite_SCOM/tst_SCOM01/test.py
@@ -49,6 +49,9 @@ def main():
         waitForSignal("{type='ProjectExplorer::BuildManager' unnamed='1'}", "buildQueueFinished(bool)")
         # check output if build successful
         ensureChecked(waitForObject(":Qt Creator_CompileOutput_Core::Internal::OutputPaneToggleButton"))
+        waitFor("object.exists(':*Qt Creator.Cancel Build_QToolButton')", 20000)
+        cancelBuildButton = findObject(':*Qt Creator.Cancel Build_QToolButton')
+        waitFor("not cancelBuildButton.enabled", 30000)
         compileOutput = waitForObject(":Qt Creator.Compile Output_Core::OutputWindow")
         if not test.verify(compileSucceeded(compileOutput.plainText),
                            "Verifying building of simple qt quick application."):