diff --git a/tests/browser/features/live_preview_of_display_language.feature b/tests/browser/features/live_preview_of_display_language.feature
index e035a1f2..fc29644b 100644
--- a/tests/browser/features/live_preview_of_display_language.feature
+++ b/tests/browser/features/live_preview_of_display_language.feature
@@ -32,20 +32,13 @@ Feature: Live preview of display language changes
       And I open Display panel of language settings
     Then I should see the text in the language panel in English
 
-  Scenario: Live preview of display language changes can be reverted on closing the dialog on cancel from a different section
-    Given I open "Language" panel of language settings
+  # https://bugzilla.wikimedia.org/57967
+  # @commons.wikimedia.beta.wmflabs.org
+  Scenario: Live preview of display language changes can be reverted on closing the dialog on cancel from a different panel
+    Given I open the Universal Language Selector
+      And I open Display panel of language settings
       And I select a language different than English for display language
-      And I switch to "Input" panel of language settings
+      And I switch to Input panel of language settings
     When I click Cancel
-      And I open "Language" panel of language settings
+      And I open Display panel of language settings
     Then I should see the text in the language panel in English
-
-  Scenario: Font setting is reset after pressing "Cancel"
-    Given I open "Fonts" panel of language settings
-    When I set English font to OpenDyslexic
-      And I apply the changes
-      And I open "Fonts" panel of language settings
-      And I set English font to System
-      And I click Cancel
-    When I open "Fonts" panel of language settings
-    Then the selected content font must be OpenDyslexic
diff --git a/tests/browser/features/settings_panel.feature b/tests/browser/features/settings_panel.feature
index e2ff8fe7..aedb962b 100644
--- a/tests/browser/features/settings_panel.feature
+++ b/tests/browser/features/settings_panel.feature
@@ -46,7 +46,7 @@ Feature: Settings panel
     When I open "Language" panel of language settings
       And I click the button with the ellipsis
       And I use the panel to change my interface language to "German"
-      And I switch to "Input" panel of language settings
+      And I switch to Input panel of language settings
       And I click X
       And I open "Language" panel of language settings
       Then the panel is in English
diff --git a/tests/browser/features/step_definitions/panel_steps.rb b/tests/browser/features/step_definitions/panel_steps.rb
index 3c0433fa..84e576f9 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -68,8 +68,8 @@ Then(/^the panel is in English/) do
 	on(PanelPage).panel_language_element.text.should == "Language"
 end
 
-When(/^I switch to "Input" panel of language settings/) do
-	on(PanelPage).panel_input_element.when_visible.click
+When(/^I switch to Input panel of language settings/) do
+	on(PanelPage).panel_side_input_element.click
 end
 
 Then(/^the language list of ULS should use Autonym font$/) do