diff --git a/tests/system/suite_editors/tst_rename_macros/test.py b/tests/system/suite_editors/tst_rename_macros/test.py
index 4dbd617fe2f..62adf7526f4 100644
--- a/tests/system/suite_editors/tst_rename_macros/test.py
+++ b/tests/system/suite_editors/tst_rename_macros/test.py
@@ -46,7 +46,9 @@ def main():
     openQmakeProject(proFile)
     if not testRenameMacroAfterSourceModification():
         return
-    addCPlusPlusFileToCurrentProject("anothertestfile.h", "C++ Header File")
+    headerName = "anothertestfile.h"
+    addCPlusPlusFileToCurrentProject(headerName, "C++ Header File",
+                                     expectedHeaderName=headerName)
     if not testRenameMacroAfterSourceMoving():
         return
     invokeMenuItem("File", "Save All")
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index 7e6021e8f26..622f2990421 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/tests/system/suite_tools/tst_git_local/test.py
@@ -173,7 +173,9 @@ def main():
     createLocalGitConfig(os.path.join(srcPath, projectName, ".git"))
     commitMessages = [commit("Initial Commit", "Committed 5 file(s).")]
     clickButton(waitForObject(":*Qt Creator.Clear_QToolButton"))
-    addCPlusPlusFileToCurrentProject("pointless_header.h", "C++ Header File", addToVCS = "Git")
+    headerName = "pointless_header.h"
+    addCPlusPlusFileToCurrentProject(headerName, "C++ Header File", addToVCS="Git",
+                                     expectedHeaderName=headerName)
     commitMessages.insert(0, commit("Added pointless header file", "Committed 2 file(s)."))
     __createProjectOrFileSelectType__("  General", "Empty File", isProject=False)
     readmeName = "README.txt"