diff --git a/core/modules/language/config/optional/tour.tour.language.yml b/core/modules/language/config/optional/tour.tour.language.yml
index 2d310cbf4f..3a052c4487 100644
--- a/core/modules/language/config/optional/tour.tour.language.yml
+++ b/core/modules/language/config/optional/tour.tour.language.yml
@@ -46,7 +46,7 @@ tips:
     body: '<p>Operations are provided for editing and deleting your languages.</p><p>You can edit the name and the direction of the language.</p><p>Deleted languages can be added back at a later time. Deleting a language will remove all interface translations associated with it, and content in this language will be set to be language neutral. Note that you cannot delete the default language of the site.</p>'
     weight: 5
     attributes:
-      data-class: dropbutton-wrapper
+      data-class: js-splitbutton
   language-continue:
     id: language-continue
     plugin: text
diff --git a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
index 42193dd6f5..f831bbd792 100644
--- a/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
+++ b/core/modules/views_ui/config/optional/tour.tour.views-ui.yml
@@ -66,7 +66,7 @@ tips:
     body: 'Add, rearrange or remove filters.'
     weight: 7
     attributes:
-      data-class: 'views-ui-display-tab-bucket.filter .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.filter .js-splitbutton'
   views-ui-sorts:
     id: views-ui-sorts
     plugin: text
@@ -82,7 +82,7 @@ tips:
     body: 'Add, rearrange or remove sorting rules.'
     weight: 9
     attributes:
-      data-class: 'views-ui-display-tab-bucket.sort .dropbutton-widget'
+      data-class: 'views-ui-display-tab-bucket.sort .js-splitbutton'
   views-ui-preview:
     id: views-ui-preview
     plugin: text
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayTest.php b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
index 0de6f42cc3..d5b6123ce7 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayTest.php
@@ -140,8 +140,8 @@ public function testDisplayAreas() {
 
     // Assert that the expected text is found in each area category.
     foreach ($areas as $type) {
-      $element = $this->xpath('//div[contains(@class, :class)]/div', [':class' => $type]);
-      $this->assertEqual($element[0]->getHtml(), new FormattableMarkup('The selected display type does not use @type plugins', ['@type' => $type]));
+      $element = $this->xpath("//div[contains(concat(' ', normalize-space(@class), ' '), concat(' ', :class, ' '))]/div", [':class' => $type]);
+      $this->assertEqual($element[1]->getHtml(), new FormattableMarkup('The selected display type does not use @type plugins', ['@type' => $type]));
     }
   }