diff --git a/tests/system/objects.map b/tests/system/objects.map
index 9865323bf11..9bd6992fc03 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -1,7 +1,6 @@
 :*Qt Creator.Add Kit_QPushButton	{text='Add Kit' type='QPushButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*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	{toolTip?='Continue *' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Events_QDockWidget	{name='QmlProfilerStatisticsViewDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
@@ -125,6 +124,7 @@
 :Qt Creator.CloseDoc_QToolButton	{toolTip?='Close Document *' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.CloseFind_QToolButton	{name='close' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Compile Output_Core::OutputWindow	{type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Compile Output'}
+:Qt Creator.Configure Project_QPushButton	{text='Configure Project' type='QPushButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.DebugModeWidget_QSplitter	{name='DebugModeWidget' type='QSplitter' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Issues_QListView	{type='QListView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Issues'}
 :Qt Creator.Project.Menu.File_QMenu	{name='Project.Menu.File' type='QMenu'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 3eba7a13d67..6b7f7dbd054 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -50,8 +50,7 @@ def openQmakeProject(projectPath, targets=Targets.desktopTargetClasses(), fromWe
     except:
         pass
     checkedTargets = __chooseTargets__(targets)
-    configureButton = waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'"
-                                    "window=':Qt Creator_Core::Internal::MainWindow'}")
+    configureButton = waitForObject(":Qt Creator.Configure Project_QPushButton")
     clickButton(configureButton)
     return checkedTargets
 
@@ -74,8 +73,7 @@ def openCmakeProject(projectPath, buildDir):
     selectFromFileDialog(projectPath)
     __chooseTargets__(0) # uncheck all
     __chooseTargets__(Targets.DESKTOP_480_DEFAULT, additionalFunc=additionalFunction)
-    clickButton(waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'"
-                              "window=':Qt Creator_Core::Internal::MainWindow'}"))
+    clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton"))
     return True
 
 # this function returns a list of available targets - this is not 100% error proof
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index 97e40d3700f..8ba0263e0ab 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -90,8 +90,7 @@ def main():
                 "Verifying: The example application is opened inside Help.")
     sendEvent("QCloseEvent", helpWidget)
     # assume the correct kit is selected, hit Configure Project
-    clickButton(waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'"
-                              "window=':Qt Creator_Core::Internal::MainWindow'}"))
+    clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton"))
     test.verify(checkIfObjectExists("{column='0' container=':Qt Creator_Utils::NavigationTreeView'"
                                     " text='2dpainting' type='QModelIndex'}"),
                 "Verifying: The project is shown in 'Edit' mode.")
@@ -124,8 +123,7 @@ def main():
                 "Verifying: The example application is opened inside Help.")
     sendEvent("QCloseEvent", helpWidget)
     # assume the correct kit is selected, hit Configure Project
-    clickButton(waitForObject("{text='Configure Project' type='QPushButton' unnamed='1' visible='1'"
-                              "window=':Qt Creator_Core::Internal::MainWindow'}"))
+    clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton"))
     # close second example application
     test.verify(checkIfObjectExists("{column='0' container=':Qt Creator_Utils::NavigationTreeView'"
                                     " text='propertyanimation' type='QModelIndex'}", False) and
diff --git a/tests/system/suite_tools/tst_git_clone/test.py b/tests/system/suite_tools/tst_git_clone/test.py
index 21ce9ba6bbb..85206b309cd 100644
--- a/tests/system/suite_tools/tst_git_clone/test.py
+++ b/tests/system/suite_tools/tst_git_clone/test.py
@@ -124,7 +124,7 @@ def main():
             if button == ":Git Repository Clone.Finish_QPushButton":
                 try:
                     # Projects mode shown
-                    clickButton(waitForObject(":*Qt Creator.Cancel_QPushButton", 5000))
+                    clickButton(waitForObject(":Qt Creator.Configure Project_QPushButton", 5000))
                     test.passes("The checked out project was being opened.")
                 except:
                     clickButton(waitForObject(":Cannot Open Project.Show Details..._QPushButton"))