diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 8b83d19c6f4..8fc7177e9ce 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -423,6 +423,8 @@ def __getSupportedPlatforms__(text, getAsStrings=False):
                 result.append(QtQuickConstants.Targets.EMBEDDED_LINUX)
         if 'MeeGo/Harmattan' in supports:
             result.append(QtQuickConstants.Targets.HARMATTAN)
+            addSimulator = True
+        if 'Maemo/Fremantle' in supports:
             result.append(QtQuickConstants.Targets.MAEMO5)
             addSimulator = True
         if len(result) == 0 or addSimulator:
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index 8e11a04d7e2..09ad3f769b7 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -286,23 +286,40 @@ def __checkParentAccess__(filePath):
 # options dialog and returns a dict holding the targets as keys
 # and a list of supported versions as value
 def getCorrectlyConfiguredTargets():
+    def __retrieveQtVersionName__(target, version):
+        treeWidget = waitForObject(":QtSupport__Internal__QtVersionManager.qtdirList_QTreeWidget")
+        return treeWidget.currentItem().text(0)
+    targetQtVersionNames = {}
     result = {}
-    for tv in iterateQtVersions():
-        for target,version in tv.iteritems():
-         # Dialog sometimes differs from targets' names
-            if target == "Maemo":
-                target = "Maemo5"
-            implicitTargets = [target]
-            if target == "Desktop" and platform.system() in ("Linux", "Darwin"):
-                implicitTargets.append("Embedded Linux")
-            for currentTarget in implicitTargets:
-                if currentTarget in result:
-                    oldV = result[currentTarget]
-                    if version not in oldV:
-                        oldV.append(version)
-                        result.update({currentTarget:oldV})
-                else:
-                    result.update({currentTarget:[version]})
+    targetsQtVersions, qtVersionNames = iterateQtVersions(True, __retrieveQtVersionName__)
+    clickTab(waitForObject(":Options.qt_tabwidget_tabbar_QTabBar"), "Targets")
+    treeView = waitForObject(":Targets_QTreeView")
+    model = treeView.model()
+    test.compare(model.rowCount(), 2, "Verifying expected target section count")
+    autoDetected = model.index(0, 0)
+    test.compare(autoDetected.data().toString(), "Auto-detected",
+                 "Verifying label for target section")
+    manual = model.index(1, 0)
+    test.compare(manual.data().toString(), "Manual", "Verifying label for target section")
+    for section in [autoDetected, manual]:
+        for index in [section.child(i, 0) for i in range(model.rowCount(section))]:
+            targetName = str(index.data().toString())
+            if (targetName.endswith(" (default)")):
+                targetName = targetName.rstrip(" (default)")
+            item = ".".join([str(section.data().toString()),
+                             str(index.data().toString()).replace(".", "\\.")])
+            clickItem(treeView, item, 5, 5, 0, Qt.LeftButton)
+            qtVersionStr = str(waitForObject(":Targets_QtVersion_QComboBox").currentText)
+            targetQtVersionNames[targetName] = qtVersionStr
+    # merge defined target names with their configured Qt versions and devices
+    for target,qtVersion in targetQtVersionNames.iteritems():
+        result[target] = targetsQtVersions[qtVersionNames.index(qtVersion)].items()[0]
+    clickButton(waitForObject(":Options.Cancel_QPushButton"))
+    # adjust device name(s) to match getStringForTarget() - some differ from time to time
+    for targetName in result.keys():
+        targetInfo = result[targetName]
+        if targetInfo[0] == "Maemo":
+            result.update({targetName:("Maemo5", targetInfo[1])})
     test.log("Correctly configured targets: %s" % str(result))
     return result
 
diff --git a/tests/system/suite_general/tst_create_proj_wizard/test.py b/tests/system/suite_general/tst_create_proj_wizard/test.py
index e600f3e7d48..85fe151d3fa 100644
--- a/tests/system/suite_general/tst_create_proj_wizard/test.py
+++ b/tests/system/suite_general/tst_create_proj_wizard/test.py
@@ -70,23 +70,24 @@ def main():
             except LookupError:
                 pass
         waitForObject("{type='QLabel' unnamed='1' visible='1' text='Target Setup'}")
-        availableCheckboxes = filter(visibleCheckBoxExists, QtQuickConstants.getAllTargetStrings())
+        availableCheckboxes = filter(visibleCheckBoxExists, targets.keys())
         JIRA.performWorkaroundIfStillOpen(6994, JIRA.Bug.CREATOR, template, displayedPlatforms)
         # verification whether expected, found and configured match
         for t in targets:
             if requiredVersion:
-                if max(targets[t]) < requiredVersion:
+                if targets[t][1] < requiredVersion:
                     if t in availableCheckboxes:
                         test.fail("Target '%s' found as checkbox, but required version (%s) is higher "
-                                  "than configured version(s) (%s)!" % (t, requiredVersion, str(targets[t])))
+                                  "than configured version (%s)!" % (t, requiredVersion,
+                                                                     str(targets[t][1])))
                         availableCheckboxes.remove(t)
                     else:
                         test.passes("Irrelevant target '%s' not found on 'Target setup' page - "
-                                    "required version is '%s', current version(s) are '%s'." %
-                                    (t, requiredVersion, str(targets[t])))
+                                    "required version is '%s', current version is '%s'." %
+                                    (t, requiredVersion, str(targets[t][1])))
                     continue
             found = False
-            if t in displayedPlatforms:
+            if targets[t][0] in displayedPlatforms:
                 if t in availableCheckboxes:
                     test.passes("Found expected target '%s' on 'Target setup' page." % t)
                     availableCheckboxes.remove(t)