diff --git a/Testing/dialog_lifecycle_test.xml b/Testing/dialog_lifecycle_test.xml
new file mode 100644
index 000000000..00510b802
--- /dev/null
+++ b/Testing/dialog_lifecycle_test.xml
@@ -0,0 +1,11 @@
+<events>
+  <!-- Open and close Settings dialog (modal exec) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="actionSettings" />
+  <event widget="MainWindow/settingsDialog" command="key" arguments="16777216" />
+
+  <!-- Open and close About dialog (modal exec) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="&amp;About Cockatrice" />
+  <event widget="MainWindow/aboutDialog" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/menu_open_close_test.xml b/Testing/menu_open_close_test.xml
new file mode 100644
index 000000000..d894b47b5
--- /dev/null
+++ b/Testing/menu_open_close_test.xml
@@ -0,0 +1,19 @@
+<events>
+  <!-- Test 1: Open and close each top-level menu -->
+
+  <!-- Cockatrice menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+
+  <!-- Database menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="dbMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+
+  <!-- Tabs menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="tabsMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+
+  <!-- Help menu -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/nonmodal_manage_sets_test.xml b/Testing/nonmodal_manage_sets_test.xml
new file mode 100644
index 000000000..5fe2bfc0c
--- /dev/null
+++ b/Testing/nonmodal_manage_sets_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Test non-modal dialog lifecycle: open and close Manage Sets (QMainWindow) -->
+  <event widget="MainWindow/menubar" command="activate" arguments="dbMenu" />
+  <event widget="MainWindow/menubar/dbMenu" command="activate" arguments="&amp;Manage sets..." />
+  <event widget="MainWindow/manageSetsWindow" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/nonmodal_tip_test.xml b/Testing/nonmodal_tip_test.xml
new file mode 100644
index 000000000..0f4ffc825
--- /dev/null
+++ b/Testing/nonmodal_tip_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Test non-modal dialog lifecycle: open and close Tip of the Day -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="&amp;Tip of the Day" />
+  <event widget="MainWindow/tipOfTheDayDialog" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/nonmodal_view_log_test.xml b/Testing/nonmodal_view_log_test.xml
new file mode 100644
index 000000000..3369f1fd5
--- /dev/null
+++ b/Testing/nonmodal_view_log_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Test non-modal dialog lifecycle: open and close ViewLog -->
+  <event widget="MainWindow/menubar" command="activate" arguments="helpMenu" />
+  <event widget="MainWindow/menubar/helpMenu" command="activate" arguments="View &amp;Debug Log" />
+  <event widget="MainWindow/viewLogDialog" command="key" arguments="16777216" />
+</events>
diff --git a/Testing/settings_dialog_test.xml b/Testing/settings_dialog_test.xml
new file mode 100644
index 000000000..2dd9dda0a
--- /dev/null
+++ b/Testing/settings_dialog_test.xml
@@ -0,0 +1,6 @@
+<events>
+  <!-- Open Settings dialog via Cockatrice menu, then close with Escape -->
+  <event widget="MainWindow/menubar" command="activate" arguments="cockatriceMenu" />
+  <event widget="MainWindow/menubar/cockatriceMenu" command="activate" arguments="actionSettings" />
+  <event widget="MainWindow/settingsDialog" command="key" arguments="16777216" />
+</events>
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
index 1f567989e..e4411ec1d 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp
@@ -33,6 +33,7 @@ class QWidget;
 
 DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("connectDialog");
     previousHostButton = new QRadioButton(tr("Known Hosts"), this);
     previousHosts = new QComboBox(this);
 
@@ -85,6 +86,11 @@ DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent)
     passwordLabel->setBuddy(passwordEdit);
     passwordEdit->setEchoMode(QLineEdit::Password);
 
+    hostEdit->setObjectName("connectHostEdit");
+    portEdit->setObjectName("connectPortEdit");
+    playernameEdit->setObjectName("connectPlayernameEdit");
+    passwordEdit->setObjectName("connectPasswordEdit");
+
     savePasswordCheckBox = new QCheckBox(tr("&Save password"));
 
     autoConnectCheckBox = new QCheckBox(tr("A&uto connect"));
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
index cbf61a394..3845029f7 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp
@@ -40,6 +40,7 @@ class QWidget;
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)
 {
+    setObjectName("editTokensDialog");
     nameLabel = new QLabel(tr("&Name:"));
     nameEdit = new QLineEdit;
     nameEdit->setMaxLength(MAX_NAME_LENGTH);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
index dbfe38e26..caca5da92 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp
@@ -48,6 +48,7 @@
 
 WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 {
+    setObjectName("manageSetsWindow");
     setOrderIsSorted = false;
 
     // left toolbar
@@ -221,6 +222,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent)
 
 WndSets::~WndSets()
 {
+    disconnect(view->header(), &QHeaderView::geometriesChanged, this, &WndSets::saveHeaderState);
 }
 
 void WndSets::closeEvent(QCloseEvent * /*ev*/)
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
index ab870a2c8..3602e67c6 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp
@@ -73,6 +73,8 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
     resize(calculateDialogSize(hostSize, available.size(), minimum));
     setSizeGripEnabled(true);
 
+    setObjectName("settingsDialog");
+
     connect(&SettingsCache::instance().personal(), &PersonalSettings::langChanged, this, &DlgSettings::updateLanguage);
 
     settingsView = new SettingsView(this);
@@ -82,6 +84,7 @@ DlgSettings::DlgSettings(QWidget *parent) : QDialog(parent)
     buttonBox->addStretch();
     okButton = new QPushButton;
     okButton->setDefault(true);
+    okButton->setObjectName("settingsOkButton");
     connect(okButton, &QPushButton::clicked, this, &DlgSettings::close);
     buttonBox->addWidget(okButton);
 
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
index 511ff1c7d..c1df0c963 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp
@@ -28,6 +28,7 @@
 
 DlgTipOfTheDay::DlgTipOfTheDay(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("tipOfTheDayDialog");
     successfulInit = false;
     QString xmlPath = "theme:tips/tips_of_the_day.xml";
     tipDatabase = new TipsOfTheDay(xmlPath, this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
index ca55c7b41..11dcd7e27 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp
@@ -42,6 +42,7 @@ static const QString UPDATE_INSTALLER_OVERRIDE = "Cockatrice-Update-Override.exe
 
 DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("updateDialog");
 
     // Handle layout
     statusLabel = new QLabel(this);
diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
index d55e800a1..e75cf352a 100644
--- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
+++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp
@@ -18,6 +18,7 @@ class QWidget;
 
 DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent)
 {
+    setObjectName("viewLogDialog");
     logArea = new QPlainTextEdit;
     logArea->setReadOnly(true);
 
diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp
index a69f6df87..13f2e43cd 100644
--- a/cockatrice/src/interface/window_main.cpp
+++ b/cockatrice/src/interface/window_main.cpp
@@ -431,24 +431,33 @@ void MainWindow::retranslateUi()
 void MainWindow::createActions()
 {
     aConnect = new QAction(this);
+    aConnect->setObjectName("actionConnect");
     connect(aConnect, &QAction::triggered, this, &MainWindow::actConnect);
     aDisconnect = new QAction(this);
+    aDisconnect->setObjectName("actionDisconnect");
     aDisconnect->setEnabled(false);
     connect(aDisconnect, &QAction::triggered, this, &MainWindow::actDisconnect);
     aSinglePlayer = new QAction(this);
+    aSinglePlayer->setObjectName("actionSinglePlayer");
     connect(aSinglePlayer, &QAction::triggered, this, &MainWindow::actSinglePlayer);
     aWatchReplay = new QAction(this);
+    aWatchReplay->setObjectName("actionWatchReplay");
     connect(aWatchReplay, &QAction::triggered, this, &MainWindow::actWatchReplay);
     aFullScreen = new QAction(this);
+    aFullScreen->setObjectName("actionFullScreen");
     aFullScreen->setCheckable(true);
     connect(aFullScreen, &QAction::toggled, this, &MainWindow::actFullScreen);
     aRegister = new QAction(this);
+    aRegister->setObjectName("actionRegister");
     connect(aRegister, &QAction::triggered, connectionController, &ConnectionController::registerToServer);
     aForgotPassword = new QAction(this);
+    aForgotPassword->setObjectName("actionForgotPassword");
     connect(aForgotPassword, &QAction::triggered, connectionController, &ConnectionController::forgotPasswordRequest);
     aSettings = new QAction(this);
+    aSettings->setObjectName("actionSettings");
     connect(aSettings, &QAction::triggered, this, &MainWindow::actSettings);
     aExit = new QAction(this);
+    aExit->setObjectName("actionExit");
     connect(aExit, &QAction::triggered, this, &MainWindow::actExit);
 
     aManageSets = new QAction(QString(), this);
@@ -533,6 +542,7 @@ void MainWindow::createMenus()
 {
     menuBar()->setObjectName("menubar");
     cockatriceMenu = menuBar()->addMenu(QString());
+    cockatriceMenu->setObjectName("cockatriceMenu");
     cockatriceMenu->addAction(aConnect);
     cockatriceMenu->addAction(aDisconnect);
     cockatriceMenu->addAction(aRegister);
@@ -548,6 +558,7 @@ void MainWindow::createMenus()
     cockatriceMenu->addAction(aExit);
 
     dbMenu = menuBar()->addMenu(QString());
+    dbMenu->setObjectName("dbMenu");
     dbMenu->addAction(aManageSets);
     dbMenu->addAction(aEditTokens);
     dbMenu->addSeparator();
@@ -558,6 +569,7 @@ void MainWindow::createMenus()
     dbMenu->addAction(aReloadCardDatabase);
 
     tabsMenu = menuBar()->addMenu(QString());
+    tabsMenu->setObjectName("tabsMenu");
 
     helpMenu = menuBar()->addMenu(QString());
     helpMenu->setObjectName("helpMenu");