diff --git a/tests/system/objects.map b/tests/system/objects.map
index a67704818e2..efb0f00cbc8 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -103,9 +103,9 @@
 :JavaScript.QmlProfilerEventsTable_QmlProfiler::Internal::QV8ProfilerEventsMainView	{container=':*Qt Creator.JavaScript_QDockWidget' name='QmlProfilerEventsTable' type='QmlProfiler::Internal::QV8ProfilerEventsMainView' visible='1'}
 :Kits_QtVersion_QComboBox	{container=':qt_tabwidget_stackedwidget_QWidget' occurrence='5' type='QComboBox' unnamed='1' visible='1'}
 :Locals and Expressions_Debugger::Internal::WatchTreeView	{container=':DebugModeWidget.Locals and Expressions_QDockWidget' name='WatchWindow' type='Debugger::Internal::WatchTreeView' visible='1' windowTitle='Locals and Expressions'}
-:New Text File.Add to project:_QLabel	{name='projectLabel' text='Add to project:' type='QLabel' visible='1' window=':New Text File_Utils::FileWizardDialog'}
-:New Text File.nameLineEdit_Utils::FileNameValidatingLineEdit	{name='nameLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1' window=':New Text File_Utils::FileWizardDialog'}
-:New Text File_Utils::FileWizardDialog	{type='Utils::FileWizardDialog' unnamed='1' visible='1' windowTitle='New Text File'}
+:New Text File.Add to project:_QLabel	{name='projectLabel' text='Add to project:' type='QLabel' visible='1' window=':New Text File_Core::BaseFileWizard'}
+:New Text File.nameLineEdit_Utils::FileNameValidatingLineEdit	{name='nameLineEdit' type='Utils::FileNameValidatingLineEdit' visible='1' window=':New Text File_Core::BaseFileWizard'}
+:New Text File_Core::BaseFileWizard	{type='Core::BaseFileWizard' unnamed='1' visible='1' windowTitle='New Text File'}
 :New.comboBox_QComboBox	{name='comboBox' type='QComboBox' visible='1' window=':New_Core::Internal::NewDialog'}
 :New.frame_QFrame	{name='frame' type='QFrame' visible='1' window=':New_Core::Internal::NewDialog'}
 :New.templateCategoryView_QTreeView	{name='templateCategoryView' type='QTreeView' visible='1' window=':New_Core::Internal::NewDialog'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index 07e0317cfed..3e62cccb85c 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -719,7 +719,7 @@ def addCPlusPlusFileToCurrentProject(name, template, forceOverwrite=False, addTo
         test.fatal("File must have a name - got None.")
         return
     __createProjectOrFileSelectType__("  C++", template, isProject=False)
-    window = "{type='Utils::FileWizardDialog' unnamed='1' visible='1'}"
+    window = "{type='Core::BaseFileWizard' unnamed='1' visible='1'}"
     basePath = str(waitForObject("{type='Utils::FancyLineEdit' unnamed='1' visible='1' "
                                  "window=%s}" % window).text)
     lineEdit = waitForObject("{name='nameLineEdit' type='Utils::FileNameValidatingLineEdit' "
diff --git a/tests/system/suite_editors/tst_generic_highlighter/test.py b/tests/system/suite_editors/tst_generic_highlighter/test.py
index 335eb1a825c..3b6591ca822 100644
--- a/tests/system/suite_editors/tst_generic_highlighter/test.py
+++ b/tests/system/suite_editors/tst_generic_highlighter/test.py
@@ -34,12 +34,12 @@ def createFile(folder, filename):
     replaceEditorContent(waitForObject("{name='nameLineEdit' visible='1' "
                                        "type='Utils::FileNameValidatingLineEdit'}"), filename)
     replaceEditorContent(waitForObject("{type='Utils::FancyLineEdit' unnamed='1' visible='1' "
-                                       "window=':New Text File_Utils::FileWizardDialog'}"), folder)
+                                       "window=':New Text File_Core::BaseFileWizard'}"), folder)
     clickButton(waitForObject(":Next_QPushButton"))
     __createProjectHandleLastPage__()
 
 def clickTableGetPatternLineEdit(table, row):
-    clickItem(table, "%d/0" % row, 5, 5, 0, Qt.LeftButton)
+    clickItem(table, row, 5, 5, 0, Qt.LeftButton)
     return waitForObject("{name='patternsLineEdit' type='QLineEdit' visible='1'}")
 
 def getOrModifyFilePatternsFor(mimeType, filter='', toBePresent=None):
@@ -54,11 +54,11 @@ def getOrModifyFilePatternsFor(mimeType, filter='', toBePresent=None):
     clickOnTab(":Options.qt_tabwidget_tabbar_QTabBar", "MIME Types")
     replaceEditorContent(waitForObject("{name='filterLineEdit' type='QLineEdit' visible='1'}"),
                          filter)
-    mimeTypeTable = waitForObject("{name='mimeTypesTableView' type='QTableView' visible='1'}")
+    mimeTypeTable = waitForObject("{name='mimeTypesTreeView' type='QTreeView' visible='1'}")
     model = mimeTypeTable.model()
     if filter == '':
-        for row in range(model.rowCount()):
-            if str(model.data(model.index(row, 0)).toString()) == mimeType:
+        for row in dumpItems(model):
+            if row == mimeType:
                 result = toSuffixArray(str(clickTableGetPatternLineEdit(mimeTypeTable, row).text))
                 break
         clickButton(":Options.Cancel_QPushButton")
@@ -67,7 +67,7 @@ def getOrModifyFilePatternsFor(mimeType, filter='', toBePresent=None):
         return result
     waitFor('model.rowCount() == 1', 2000)
     if model.rowCount() == 1:
-        patternsLineEd = clickTableGetPatternLineEdit(mimeTypeTable, 0)
+        patternsLineEd = clickTableGetPatternLineEdit(mimeTypeTable, dumpItems(model)[0])
         patterns = str(patternsLineEd.text)
         if toBePresent:
             actualSuffixes = toSuffixArray(patterns)