diff --git a/tests/system/objects.map b/tests/system/objects.map
index dd5db34925c..bd8c30bce2d 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -153,8 +153,8 @@
 :Qt Creator_Core::OutputWindow	{type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_CppEditor::Internal::CPPEditorWidget	{type='CppEditor::CppEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_DiffEditor::Internal::DescriptionEditorWidget	{type='DiffEditor::Internal::DescriptionEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_DiffEditor::SideDiffEditorWidget	{type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_DiffEditor::SideDiffEditorWidget2	{occurrence='2' type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator_DiffEditor::SideDiffEditorWidgetChanged	{type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' x~='[1-9][0-9]*'}
+:Qt Creator_DiffEditor::SideDiffEditorWidgetOriginal	{type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow' x='0'}
 :Qt Creator_FilenameQComboBox	{leftWidget=':Qt Creator.DragDoc_QToolButton' type='QComboBox' unnamed='1' visible='1'}
 :Qt Creator_Find::Internal::SearchResultTreeView	{type='Core::Internal::SearchResultTreeView' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Git::Internal::GitEditor	{type='Git::Internal::GitEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
diff --git a/tests/system/suite_tools/tst_git_first_commit/test.py b/tests/system/suite_tools/tst_git_first_commit/test.py
index 1ef7090602b..0ee8f2505bf 100644
--- a/tests/system/suite_tools/tst_git_first_commit/test.py
+++ b/tests/system/suite_tools/tst_git_first_commit/test.py
@@ -35,7 +35,7 @@ def main():
     test.verify(" files changed, 229938 insertions(+)" in commitDetails,
                 "Summary in details view?")
     clickButton(waitForObject(":Select a Git Commit.Show_QPushButton"))
-    changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
+    changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetChanged")
     waitFor("len(str(changedEdit.plainText)) > 0 and "
             "str(changedEdit.plainText) != 'Waiting for data...'", 40000)
     diffPlainText = str(changedEdit.plainText)
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index c74ad6e20cf..1c9cd01712a 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/tests/system/suite_tools/tst_git_local/test.py
@@ -105,8 +105,8 @@ def verifyClickCommit():
     for i in range(1, 3):
         if not __clickCommit__(i):
             continue
-        changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
-        original = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget2")
+        changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetChanged")
+        original = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetOriginal")
         waitFor('str(changed.plainText) != "Waiting for data..." '
                 'and str(original.plainText) != "Waiting for data..."', 5000)
         # content of diff editors is merge of modified files
@@ -202,7 +202,7 @@ def main():
         type(gitEditor, "<Right>")
     rect = gitEditor.cursorRect(gitEditor.textCursor())
     mouseClick(gitEditor, rect.x+rect.width/2, rect.y+rect.height/2, 0, Qt.LeftButton)
-    changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
+    changed = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidgetChanged")
     waitFor('str(changed.plainText) != "Waiting for data..."', 5000)
     test.compare(str(changed.plainText), "Retrieving data failed.",
                  "Showing an invalid commit can't succeed but Creator survived.")