diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py
index ee55e9c2b47..7bf2c882ea7 100644
--- a/tests/system/suite_general/tst_rename_file/test.py
+++ b/tests/system/suite_general/tst_rename_file/test.py
@@ -101,8 +101,12 @@ def renameFile(projectDir, proFile, branch, oldname, newname):
         else:
             menu = ":Qt Creator.Project.Menu.File_QMenu"
         activateItem(waitForObjectItem(menu, "Rename..."))
-    type(waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit"), newname)
-    type(waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit"), "<Return>")
+    replaceEdit = waitForObject(":Qt Creator_Utils::NavigationTreeView::QExpandingLineEdit")
+    if not (oldname.lower().endswith(".qrc") and JIRA.isBugStillOpen(20057)):
+        test.compare(replaceEdit.selectedText, oldname.rsplit(".", 1)[0],
+                     "Only the filename without the extension is selected?")
+    replaceEditorContent(replaceEdit, newname)
+    type(replaceEdit, "<Return>")
     test.verify(waitFor("os.path.exists(newFilePath)", 1000),
                 "Verify that file with new name exists: %s" % newFilePath)
     test.compare(readFile(newFilePath), oldFileText,