diff --git a/src/plugins/projectexplorer/sessiondialog.cpp b/src/plugins/projectexplorer/sessiondialog.cpp
index 285836cab39..568247f7e2c 100644
--- a/src/plugins/projectexplorer/sessiondialog.cpp
+++ b/src/plugins/projectexplorer/sessiondialog.cpp
@@ -109,17 +109,21 @@ bool SessionNameInputDialog::isSwitchToRequested() const
 
 SessionDialog::SessionDialog(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("ProjectExplorer.SessionDialog");
     resize(550, 400);
     setWindowTitle(tr("Session Manager"));
 
 
     auto sessionView = new SessionView(this);
+    sessionView->setObjectName("sessionView");
     sessionView->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
     sessionView->setActivationMode(Utils::DoubleClickActivation);
 
     auto createNewButton = new QPushButton(tr("&New"));
+    createNewButton->setObjectName("btCreateNew");
 
     m_openButton = new QPushButton(tr("&Open"));
+    m_openButton->setObjectName("btOpen");
     m_renameButton = new QPushButton(tr("&Rename"));
     m_cloneButton = new QPushButton(tr("C&lone"));
     m_deleteButton = new QPushButton(tr("&Delete"));
diff --git a/tests/system/objects.map b/tests/system/objects.map
index 773dff3db25..308a357a828 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -192,7 +192,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__Internal__SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'}
+:Session Manager_ProjectExplorer::Internal::SessionDialog	{name='ProjectExplorer.SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'}
 :Startup.contextHelpComboBox_QComboBox	{container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
 :User Interface.languageBox_QComboBox	{container=':Core__Internal__GeneralSettings.User Interface_QGroupBox' 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 07808adcfdf..f510040c447 100644
--- a/tests/system/suite_general/tst_session_handling/test.py
+++ b/tests/system/suite_general/tst_session_handling/test.py
@@ -66,7 +66,7 @@ def switchSession(toSession):
     sessionView = ("{name='sessionView' type='ProjectExplorer::Internal::SessionView' visible='1' "
                    "window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}")
     mouseClick(waitForObjectItem(sessionView, toSession))
-    clickButton(waitForObject("{name='btSwitch' type='QPushButton' visible='1' "
+    clickButton(waitForObject("{name='btOpen' type='QPushButton' visible='1' "
                               "window=':Session Manager_ProjectExplorer::Internal::SessionDialog'}"))
 
 def createAndSwitchToSession(toSession):