diff --git a/tests/system/objects.map b/tests/system/objects.map
index 01e364285d2..60d760a6817 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -96,7 +96,7 @@
 :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'}
-:New_Core::Internal::NewDialog	{name='Core__Internal__NewDialog' type='Core::Internal::NewDialog' visible='1' windowTitle?='New*'}
+:New_Core::Internal::NewDialog	{name='Core__Internal__NewDialog' type='Core::Internal::NewDialogWidget' visible='1' windowTitle?='New*'}
 :New_ProjectExplorer::JsonWizard	{type='ProjectExplorer::JsonWizard' unnamed='1' visible='1'}
 :Next_QPushButton	{text~='(Next.*|Continue)' type='QPushButton' visible='1'}
 :No valid kits found._QLabel	{text?='*No suitable kits found.*' type='QLabel' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
@@ -154,7 +154,7 @@
 :Qt Creator_Core::Internal::NavComboBox	{type='Core::Internal::NavComboBox' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Core::Internal::ProgressBar	{type='Core::Internal::ProgressBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_Core::OutputWindow	{type='Core::OutputWindow' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator_CppEditor::Internal::CPPEditorWidget	{type='CppEditor::Internal::CppEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator_CppEditor::Internal::CPPEditorWidget	{type='CppEditor::CppEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_DiffEditor::Internal::DescriptionEditorWidget	{type='DiffEditor::Internal::DescriptionEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_DiffEditor::SideDiffEditorWidget	{type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator_DiffEditor::SideDiffEditorWidget2	{occurrence='2' type='DiffEditor::Internal::SideDiffEditorWidget' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index ecc1ae98756..e8ee09bda9d 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -276,11 +276,12 @@ def createProject_Qt_Console(path, projectName, checks = True, buildSystem = Non
     if checks:
         __verifyFileCreation__(path, expectedFiles)
 
+
 def createNewQtQuickApplication(workingDir, projectName=None,
                                 targets=Targets.desktopTargetClasses(), minimumQtVersion="5.12",
-                                template="Qt Quick Application - Empty", fromWelcome=False,
+                                template="Qt Quick Application", fromWelcome=False,
                                 buildSystem=None):
-    available = __createProjectOrFileSelectType__("  Application (Qt Quick)", template, fromWelcome)
+    available = __createProjectOrFileSelectType__("  Application (Qt)", template, fromWelcome)
     projectName = __createProjectSetNameAndPath__(workingDir, projectName)
     __handleBuildSystem__(buildSystem)
     requiredQt = __createProjectHandleQtQuickSelection__(minimumQtVersion)
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index dedd43179c2..71427adb03d 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -172,6 +172,7 @@ def cleanUpUserFiles(pathsToProFiles=None):
             doneWithoutErrors = False
     return doneWithoutErrors
 
+
 def invokeMenuItem(menu, item, *subItems):
     if platform.system() == "Darwin":
         try:
@@ -191,10 +192,9 @@ def invokeMenuItem(menu, item, *subItems):
     activateItem(itemObject)
     numberedPrefix = "(&\\d \| )?"
     for subItem in subItems:
-        sub = itemObject.menu()
-        waitFor("sub.visible", 1000)
         # we might have numbered sub items (e.g. "Recent Files") - these have this special prefix
         if subItem.startswith(numberedPrefix):
+             # TODO: Find fix for Qt 6
             actions = sub.actions()
             triggered = False
             for i in range(actions.count()):
@@ -211,9 +211,10 @@ def invokeMenuItem(menu, item, *subItems):
                           "Function arguments: '%s', '%s', %s" % (menu, item, str(subItems)))
                 break # we failed to trigger - no need to process subItems further
         else:
-            itemObject = waitForObjectItem(sub, subItem)
+            itemObject = waitForObjectItem(itemObject, subItem)
             activateItem(itemObject)
 
+
 def logApplicationOutput():
     # make sure application output is shown
     ensureChecked(":Qt Creator_AppOutput_Core::Internal::OutputPaneToggleButton")