diff --git a/tests/system/objects.map b/tests/system/objects.map
index 461b867b905..f5343e9118b 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -189,7 +189,7 @@
 :Send to Codepaster.protocolBox_QComboBox	{name='protocolBox' type='QComboBox' visible='1' window=':Send to Codepaster_CodePaster::PasteView'}
 :Send to Codepaster.qt_spinbox_lineedit_QLineEdit	{name='qt_spinbox_lineedit' type='QLineEdit' visible='1' window=':Send to Codepaster_CodePaster::PasteView'}
 :Send to Codepaster_CodePaster::PasteView	{name='CodePaster.ViewDialog' type='QDialog' visible='1' windowTitle='Send to Codepaster'}
-:Session Manager_ProjectExplorer::Internal::SessionDialog	{name='ProjectExplorer.SessionDialog' type='Core::Internal::SessionDialog' visible='1'}
+:Session Manager_ProjectExplorer::Internal::SessionDialog	{name='ProjectExplorer.SessionDialog' type='QDialog' visible='1'}
 :Startup.contextHelpComboBox_QComboBox	{container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
 :User Interface.languageBox_QComboBox	{name='languageBox' type='QComboBox' visible='1'}
 :Utils::FakeToolTip	{type='Utils::FakeToolTip' unnamed='1' visible='1'}
diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py
index 20b4ae51bb1..d6a1ad2a14f 100644
--- a/tests/system/suite_general/tst_session_handling/test.py
+++ b/tests/system/suite_general/tst_session_handling/test.py
@@ -70,8 +70,7 @@ def switchSession(toSession):
                               "window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}"))
 
 def createAndSwitchToSession(toSession):
-    sessionInputDialog = ("{type='Core::Internal::SessionNameInputDialog' unnamed='1' "
-                          "visible='1' windowTitle='New Session Name'}")
+    sessionInputDialog = ("{type='QDialog' unnamed='1' visible='1' windowTitle='New Session Name'}")
     test.log("Switching to session '%s' after creating it." % toSession)
     invokeMenuItem("File", "Sessions", "Manage...")
     clickButton(waitForObject("{name='btCreateNew' type='QPushButton' visible='1' "