diff --git a/src/plugins/help/generalsettingspage.cpp b/src/plugins/help/generalsettingspage.cpp
index 459face1180..9ec864e0b88 100644
--- a/src/plugins/help/generalsettingspage.cpp
+++ b/src/plugins/help/generalsettingspage.cpp
@@ -114,8 +114,10 @@ GeneralSettingsPageWidget::GeneralSettingsPageWidget()
 
     // startup group box
     auto startupGroupBox = new QGroupBox(Tr::tr("Startup"));
+    startupGroupBox->setObjectName("startupGroupBox");
 
     contextHelpComboBox = new QComboBox(startupGroupBox);
+    contextHelpComboBox->setObjectName("contextHelpComboBox");
     contextHelpComboBox->addItem(Tr::tr("Show Side-by-Side if Possible"));
     contextHelpComboBox->addItem(Tr::tr("Always Show Side-by-Side"));
     contextHelpComboBox->addItem(Tr::tr("Always Show in Help Mode"));
diff --git a/tests/system/shared/utils.py b/tests/system/shared/utils.py
index aa39725745b..4e26d3913fc 100644
--- a/tests/system/shared/utils.py
+++ b/tests/system/shared/utils.py
@@ -280,11 +280,12 @@ def addCurrentCreatorDocumentation():
     clickButton(waitForObject("{type='QPushButton' name='addButton' visible='1' text='Add...'}"))
     selectFromFileDialog(docPath)
     try:
-        waitForObject("{type='QMessageBox' unnamed='1' visible='1' "
-                      "text~='Unable to register documentation.*'}", 3000)
+        windowStr = ("{type='QMessageBox' unnamed='1' visible='1' "
+                      "text~='Unable to register documentation.*'}")
+        waitForObject(windowStr, 3000)
         test.passes("Qt Creator's documentation found already registered.")
         clickButton(waitForObject("{type='QPushButton' text='OK' unnamed='1' visible='1' "
-                                  "container={name='groupBox' type='QGroupBox' visible='1'}}"))
+                                  "window=%s}" % windowStr))
     except:
         test.fail("Added Qt Creator's documentation explicitly.")
     clickButton(waitForObject(":Options.OK_QPushButton"))