diff --git a/tests/system/objects.map b/tests/system/objects.map
index edca350ceca..bac9601f3a9 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -2,18 +2,14 @@
 :*Qt Creator.Cancel Build_QToolButton	{text='Cancel Build' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Clear_QToolButton	{text='Clear' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Continue_Core::Internal::FancyToolButton	{toolTip?='Continue *' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:*Qt Creator.Events_QDockWidget	{name='QmlProfilerStatisticsViewDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:*Qt Creator.Events_QDockWidget	{name='QmlProfiler.Statistics.DockDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Events_QTabBar	{aboveWidget=':*Qt Creator.Events_QDockWidget' type='QTabBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Find_Find::Internal::FindToolBar	{name='Core__Internal__FindWidget' type='Core::Internal::FindToolBar' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Find'}
 :*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack	{name='FormEditorStack' type='Designer::Internal::FormEditorStack' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Interrupt_Core::Internal::FancyToolButton	{toolTip='Interrupt' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:*Qt Creator.JavaScript_QDockWidget	{name='QmlProfilerV8ProfileViewDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='V8'}
-:*Qt Creator.JavaScript_QTabBar	{aboveWidget=':*Qt Creator.JavaScript_QDockWidget' type='QTabBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.ProjectSelectorDockWidget_QDockWidget	{name='ProjectSelectorDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Run_Core::Internal::FancyToolButton	{text='Run' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Start Debugging_Core::Internal::FancyToolButton	{toolTip?='Start Debugging *' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:*Qt Creator.Timeline_QDockWidget	{name='QML ProfilerDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Timeline'}
-:*Qt Creator.Timeline_QTabBar	{aboveWidget=':*Qt Creator.Timeline_QDockWidget' type='QTabBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator.Widget Box_QDockWidget	{name='WidgetBoxDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Widget Box'}
 :*Qt Creator.findEdit_Utils::FilterLineEdit	{name='findEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :*Qt Creator_Core::Internal::FancyToolButton	{occurrence='3' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
@@ -136,6 +132,8 @@
 :Qt Creator.Replace All_QToolButton	{name='replaceAllButton' text='Replace All' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Replace_QToolButton	{name='replaceButton' text='Replace' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Stop_QToolButton	{text='Stop' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
+:Qt Creator.Timeline_QDockWidget	{container=':Qt Creator.DebugModeWidget_QSplitter' name='QmlProfiler.Timeline.DockDockWidget' type='QDockWidget' visible='1'}
+:Qt Creator.Timeline_QTabBar	{aboveWidget=':Qt Creator.Timeline_QDockWidget' container=':Qt Creator.DebugModeWidget_QSplitter' type='QTabBar' unnamed='1' visible='1'}
 :Qt Creator.replaceEdit_Utils::FilterLineEdit	{name='replaceEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.scrollArea_QScrollArea	{type='ProjectExplorer::PanelsWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.splitter_QSplitter	{name='splitter' type='QSplitter' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py
index 15f938d7083..89e107eacea 100644
--- a/tests/system/suite_debugger/tst_simple_analyze/test.py
+++ b/tests/system/suite_debugger/tst_simple_analyze/test.py
@@ -111,7 +111,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs):
             # cannot run following test on colShortest (unstable)
             for i in [colTotal, colMean, colMedian, colLongest]:
                 for item in dumpItems(model, column=i)[1:5]:
-                    test.verify(item.endswith(' ms'), "Verify that '%s' ends with ' ms'" % item)
+                    test.verify(item.endswith('ms'), "Verify that '%s' ends with 'ms'" % item)
             for i in [colTotal, colMean, colMedian, colLongest, colShortest]:
                 for item in dumpItems(model, column=i):
                     test.verify(not item.startswith('0.000 '),
@@ -158,9 +158,8 @@ def containsOnce(tuple, items):
     return True
 
 def safeClickTab(tab):
-    for bar in [":*Qt Creator.JavaScript_QTabBar",
-                ":*Qt Creator.Events_QTabBar",
-                ":*Qt Creator.Timeline_QTabBar"]:
+    for bar in [":*Qt Creator.Events_QTabBar",
+                ":Qt Creator.Timeline_QTabBar"]:
         try:
             clickOnTab(bar, tab, 1000)
             return True
diff --git a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv
index f59b0df27eb..7e1b41e3422 100644
--- a/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv
+++ b/tests/system/suite_debugger/tst_simple_analyze/testdata/events_qt5.tsv
@@ -1,20 +1,20 @@
 "0"	"1"	"6"	"11"
 "<program>"	""	"1"	"Main Program"
-"main.qml:15"	"Signal"	"2"	"onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }"
+"main.qml:15"	"Handling Signal"	"2"	"onTriggered: { runCount += 1; var i; for (i = 1; i < 2500; ++i) { var j = i * i; console.log(j); } }"
 "main.qml:15"	"JavaScript"	"2"	"onTriggered"
-"main.qml:4"	"Create"	"2"	"QtQuick.Window/Window"
-"main.qml:33"	"Create"	"2"	"QtQuick/TextEdit"
-"main.qml:1"	"Compile"	"1"	"main.qml"
-"main.qml:10"	"Create"	"2"	"QtQuick/Timer"
+"main.qml:4"	"Creating"	"2"	"QtQuick.Window/Window"
+"main.qml:33"	"Creating"	"2"	"QtQuick/TextEdit"
+"main.qml:1"	"Compiling"	"1"	"main.qml"
+"main.qml:10"	"Creating"	"2"	"QtQuick/Timer"
 "main.qml:37"	"Binding"	"1"	"anchors.top: parent.top"
-"main.qml:40"	"Create"	"2"	"QtQuick/Rectangle"
+"main.qml:40"	"Creating"	"2"	"QtQuick/Rectangle"
 "main.qml:37"	"JavaScript"	"1"	"expression for top"
 "main.qml:14"	"Binding"	"3"	"running: runCount < 2"
-"main.qml:26"	"Create"	"2"	"QtQuick/MouseArea"
+"main.qml:26"	"Creating"	"2"	"QtQuick/MouseArea"
 "main.qml:38"	"Binding"	"1"	"anchors.horizontalCenter: parent.horizontalCenter"
 "main.qml:38"	"JavaScript"	"1"	"expression for horizontalCenter"
 "main.qml:41"	"Binding"	"1"	"anchors.fill: parent"
 "main.qml:27"	"Binding"	"1"	"anchors.fill: parent"
 "main.qml:14"	"JavaScript"	"3"	"expression for running"
-"main.qml:41"	JavaScript	"1"	"expression for fill"
-"main.qml:27"	JavaScript	"1"	"expression for fill"
+"main.qml:41"	"JavaScript"	"1"	"expression for fill"
+"main.qml:27"	"JavaScript"	"1"	"expression for fill"