diff --git a/tests/system/shared/editor_utils.py b/tests/system/shared/editor_utils.py
index 1a1730c053d..4b3a279990e 100644
--- a/tests/system/shared/editor_utils.py
+++ b/tests/system/shared/editor_utils.py
@@ -406,7 +406,7 @@ def replaceLine(fileSpec, oldLine, newLine):
     if openDocumentPlaceCursor(fileSpec, oldLine) == None:
         return False
     editor = waitForObject(":Qt Creator_CppEditor::Internal::CPPEditorWidget")
-    for i in range(len(oldLine)):
+    for _ in oldLine:
         type(editor, "<Backspace>")
     type(editor, newLine)
     return True
diff --git a/tests/system/suite_debugger/tst_qml_locals/Tree.py b/tests/system/suite_debugger/tst_qml_locals/Tree.py
index d5cdf5ed6d1..4e8be558acd 100644
--- a/tests/system/suite_debugger/tst_qml_locals/Tree.py
+++ b/tests/system/suite_debugger/tst_qml_locals/Tree.py
@@ -79,7 +79,7 @@ class Tree:
     def countChildOccurrences(self, name):
         if not self.__children__:
             return 0
-        return len(filter(lambda x: x.getName() == name, self.__children__))
+        return map(lambda x: x.getName(), self.__children__).count(name)
 
     # internal functions
     def __repr__(self):
diff --git a/tests/system/suite_general/tst_rename_file/test.py b/tests/system/suite_general/tst_rename_file/test.py
index 907df3a93a7..c37f7729cf0 100644
--- a/tests/system/suite_general/tst_rename_file/test.py
+++ b/tests/system/suite_general/tst_rename_file/test.py
@@ -53,23 +53,25 @@ def main():
         if isQt4Build and platform.system() == 'Darwin':
             # avoid QTCREATORBUG-9197
             filtered = [filenames[0]]
-            for i in range(1, len(filenames)):
-                if filenames[i].lower() != filtered[-1].lower():
-                    filtered.append(filenames[i])
+            for filename in filenames[1:]:
+                if filename.lower() != filtered[-1].lower():
+                    filtered.append(filename)
             filenames = filtered
-        for i in range(len(filenames)):
+        previous = filenames[-1]
+        for filename in filenames:
             tempFiletype = filetype
-            if filetype == "QML" and filenames[i - 1][-4:] != ".qml":
+            if filetype == "QML" and previous[-4:] != ".qml":
                 tempFiletype = "Other files"
             # following is necessary due to QTCREATORBUG-10179
             # will be fixed when Qt5's MIME type database can be used
-            if ((filenames[-1] in ("main.cpp", "utility.cpp") and filenames[i - 1][-4:] != ".cpp")
-                or (filenames[-1] == "utility.h" and filenames[i - 1][-2:].lower() != ".h")
-                or (filetype == "Resources" and filenames[i - 1][-4:] != ".qrc")):
+            if ((filenames[-1] in ("main.cpp", "utility.cpp") and previous[-4:] != ".cpp")
+                or (filenames[-1] == "utility.h" and previous[-2:].lower() != ".h")
+                or (filetype == "Resources" and previous[-4:] != ".qrc")):
                 tempFiletype = "Other files"
             # end of handling QTCREATORBUG-10179
             renameFile(templateDir, usedProFile, projectName + "." + tempFiletype,
-                       filenames[i - 1], filenames[i])
+                       previous, filename)
+            previous = filename
     invokeMenuItem("File", "Exit")
 
 def renameFile(projectDir, proFile, branch, oldname, newname):