diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index b07bc7b7b9f..e20c86b7b15 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -84,3 +84,14 @@ def waitForSignal(object, signal, timeout=30000):
     beforeCount = signalObjects[realName]
     installLazySignalHandler(object, signal, "callbackFunction")
     waitFor("signalObjects[realName] > beforeCount", timeout)
+
+def markText(editor, startPosition, endPosition):
+    cursor = editor.textCursor()
+    cursor.setPosition(startPosition)
+    cursor.movePosition(QTextCursor.StartOfLine)
+    editor.setTextCursor(cursor)
+    cursor.movePosition(QTextCursor.Right, QTextCursor.KeepAnchor, endPosition-startPosition)
+    cursor.movePosition(QTextCursor.EndOfLine, QTextCursor.KeepAnchor)
+    cursor.setPosition(endPosition, QTextCursor.KeepAnchor)
+    editor.setTextCursor(cursor)
+
diff --git a/tests/system/suite_qtquick/tst_qml_indent/test.py b/tests/system/suite_qtquick/tst_qml_indent/test.py
new file mode 100644
index 00000000000..4b0d0c0c24b
--- /dev/null
+++ b/tests/system/suite_qtquick/tst_qml_indent/test.py
@@ -0,0 +1,127 @@
+source("../../shared/qtcreator.py")
+
+def main():
+    global workingDir
+    startApplication("qtcreator" + SettingsPath)
+    # using a temporary directory won't mess up an eventually exisiting
+    workingDir = tempDir()
+    createNewQtQuickApplication()
+    # wait for parsing to complete
+    waitForSignal("{type='CppTools::Internal::CppModelManager' unnamed='1'}", "sourceFilesRefreshed(QStringList)", 5000)
+    if not prepareQmlFile():
+        invokeMenuItem("File", "Save All")
+        invokeMenuItem("File", "Exit")
+        return
+    testReIndent()
+    invokeMenuItem("File", "Save All")
+    invokeMenuItem("File", "Exit")
+
+def createNewQtQuickApplication():
+    global workingDir
+    invokeMenuItem("File", "New File or Project...")
+    clickItem(waitForObject("{type='QTreeView' name='templateCategoryView'}", 20000),
+              "Projects.Qt Quick Project", 5, 5, 0, Qt.LeftButton)
+    clickItem(waitForObject("{name='templatesView' type='QListView'}", 20000),
+              "Qt Quick Application", 5, 5, 0, Qt.LeftButton)
+    clickButton(waitForObject("{text='Choose...' type='QPushButton' unnamed='1' visible='1'}", 20000))
+    baseLineEd = waitForObject("{name='nameLineEdit' visible='1' "
+                               "type='Utils::ProjectNameValidatingLineEdit'}", 20000)
+    replaceLineEditorContent(baseLineEd, "untitled")
+    baseLineEd = waitForObject("{type='Utils::BaseValidatingLineEdit' unnamed='1' visible='1'}", 20000)
+    replaceLineEditorContent(baseLineEd, workingDir)
+    stateLabel = findObject("{type='QLabel' name='stateLabel'}")
+    labelCheck = stateLabel.text=="" and stateLabel.styleSheet == ""
+    test.verify(labelCheck, "Project name and base directory without warning or error")
+    # make sure this is not set as default location
+    cbDefaultLocation = waitForObject("{type='QCheckBox' name='projectsDirectoryCheckBox' visible='1'}", 20000)
+    if cbDefaultLocation.checked:
+        clickButton(cbDefaultLocation)
+    # now there's the 'untitled' project inside a temporary directory - step forward...!
+    nextButton = waitForObject("{text='Next' type='QPushButton' visible='1'}", 20000)
+    clickButton(nextButton)
+    chooseComponents()
+    clickButton(nextButton)
+    chooseDestination(QtQuickConstants.Destinations.DESKTOP)
+    snooze(1)
+    clickButton(nextButton)
+    clickButton(waitForObject("{type='QPushButton' text='Finish' visible='1'}", 20000))
+
+def prepareQmlFile():
+    # make sure the QML file is opened
+    navTree = waitForObject("{type='Utils::NavigationTreeView' unnamed='1' visible='1' "
+                            "window=':Qt Creator_Core::Internal::MainWindow'}", 20000)
+    model = navTree.model()
+    waitForObjectItem(navTree, "untitled.QML.qml/untitled.main\\.qml")
+    doubleClickItem(navTree, "untitled.QML.qml/untitled.main\\.qml", 5, 5, 0, Qt.LeftButton)
+    editor = waitForObject("{type='QmlJSEditor::QmlJSTextEditorWidget' unnamed='1' visible='1' "
+                           "window=':Qt Creator_Core::Internal::MainWindow'}", 20000)
+    for i in range(3):
+        content = "%s" % editor.plainText
+        start = content.find("Text {")
+        end = content.rfind("}")
+        end = content.rfind("}", end-1)
+        if start==-1 or end==-1:
+            test.fatal("Couldn't find line(s) I'm looking for - QML file seems to "
+                       "have changed!\nLeaving test...")
+            return False
+        markText(editor, start, end)
+        type(editor, "<Ctrl+C>")
+        for i in range(10):
+            type(editor, "<Ctrl+V>")
+    global originalText
+    # assume the current editor content to be indented correctly
+    originalText = "%s" % editor.plainText
+    indented = editor.plainText
+    unindented = ""
+    lines = str(indented).split("\n")
+    test.log("Using %d lines..." % len(lines))
+    for line in lines:
+        unindented += line.lstrip()+"\n"
+    unindented=unindented[0:-1]
+    editor.plainText = unindented
+    return True
+
+def handleTextChanged(object):
+    global textHasChanged
+    textHasChanged = True
+
+def testReIndent():
+    global originalText,textHasChanged
+    installLazySignalHandler("QmlJSEditor::QmlJSTextEditorWidget", "textChanged()", "handleTextChanged")
+    textHasChanged = False
+    editor = waitForObject("{type='QmlJSEditor::QmlJSTextEditorWidget' unnamed='1' visible='1' "
+                           "window=':Qt Creator_Core::Internal::MainWindow'}")
+    type(editor, "<Ctrl+A>")
+    test.log("calling re-indent")
+    type(editor, "<Ctrl+I>")
+    waitFor("textHasChanged==True", 20000)
+    textAfterReIndent = "%s" % editor.plainText
+    if originalText==textAfterReIndent:
+        test.passes("Text successfully reindented...")
+    else:
+        # remove the 2nd parameter of the following???
+        # (it's huge output that takes long time to finish & screenshot is taken either!)
+        originalText = shrinkText(originalText, 20)
+        textAfterReIndent = shrinkText(textAfterReIndent, 20)
+        test.fail("Re-indent of text unsuccessful...",
+                  "Original (first 20 lines):\n%s\n\n______________________\nAfter re-indent (first 20 lines):\n%s"
+                  % (originalText, textAfterReIndent))
+
+def shrinkText(txt, lines=10):
+    count = 0
+    index = -1
+    while count<lines:
+        index=originalText.find("\n", index+1)
+        if index==-1:
+            break
+        count += 1
+    return originalText[0:index]
+
+def cleanup():
+    global workingDir
+    # waiting for a clean exit - for a full-remove of the temp directory
+    appCtxt = currentApplicationContext()
+    waitFor("appCtxt.isRunning==False")
+    if workingDir!=None:
+        deleteDirIfExists(workingDir)
+