diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index d3abc1cf6d2a03f7b0473f5b778f36b41b6e04b5..c38531afda6cb7d6e86a0a57b45c1a77ff623218 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -113,7 +113,7 @@ def __createProjectSetNameAndPath__(path, projectName = None, checks = True, lib
                                   "toolTip?='Full path: *'}")
     replaceEditorContent(directoryEdit, path)
     projectNameEdit = waitForObject("{name='nameLineEdit' visible='1' "
-                                    "type='Utils::ProjectNameValidatingLineEdit'}")
+                                    "type='Utils::FancyLineEdit'}")
     if projectName == None:
         projectName = projectNameEdit.text
     else:
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 6fd874b8305e5ab1f3c9987ba13dea13067a8d85..bfd3a1d75552fa6dc1475f1e85cf8cb780d82085 100644
--- a/tests/system/suite_tools/tst_git_first_commit/test.py
+++ b/tests/system/suite_tools/tst_git_first_commit/test.py
@@ -65,5 +65,9 @@ def main():
     changedEdit = waitForObject(":Qt Creator_DiffEditor::SideDiffEditorWidget")
     waitFor("len(str(changedEdit.plainText)) > 0 and "
             "str(changedEdit.plainText) != 'Waiting for data...'", 20000)
-    test.xverify(str(changedEdit.plainText) != "No difference", "Does Creator show actual changes?")
+    diffPlainText = str(changedEdit.plainText)
+    test.verify("# This file is used to ignore files which are generated" in diffPlainText,
+                "Comment from .gitignore in diff?")
+    test.verify("SharedTools::QtSingleApplication app((QLatin1String(appNameC)), argc, argv);"
+                in diffPlainText, "main function in diff?")
     invokeMenuItem("File", "Exit")
diff --git a/tests/system/suite_tools/tst_git_local/test.py b/tests/system/suite_tools/tst_git_local/test.py
index ca0e73890d50cfb5b86cd6def98a68383d4bf656..121c286b82d1c631812dd7d0dbcca5eb6859174e 100644
--- a/tests/system/suite_tools/tst_git_local/test.py
+++ b/tests/system/suite_tools/tst_git_local/test.py
@@ -57,7 +57,7 @@ def commit(commitMessage, expectedLogMessage, uncheckUntracked=False):
 
 def verifyItemsInGit(commitMessages):
     gitEditor = waitForObject(":Qt Creator_Git::Internal::GitEditor")
-    waitFor("len(str(gitEditor.plainText)) > 0 and str(gitEditor.plainText) != 'Waiting for data...'", 20000)
+    waitFor("len(str(gitEditor.plainText)) > 0 and str(gitEditor.plainText) != 'Working...'", 20000)
     plainText = str(gitEditor.plainText)
     verifyItemOrder(commitMessages, plainText)
     return plainText