diff --git a/tests/browser/features/autonym.feature b/tests/browser/features/autonym.feature
index 0d063747..1876be49 100644
--- a/tests/browser/features/autonym.feature
+++ b/tests/browser/features/autonym.feature
@@ -7,30 +7,30 @@ Feature: Autonym font
 
   @login @commons.wikimedia.beta.wmflabs.org
   Scenario: Autonym font is used in the ULS language search dialog for display language selection by logged-in users
-
     Given I am logged in
-    When I open "Language" panel of language settings
-      And I click the button with the ellipsis
+      And I open the Universal Language Selector
+      And I open Display panel of language settings
+    When I click the button with the ellipsis
     Then the language list of ULS should use Autonym font
 
   @login @commons.wikimedia.beta.wmflabs.org
   Scenario: Autonym font is used in the ULS language search dialog for input language selection by logged-in users
-
     Given I am logged in
-    When I open "Input" panel of language settings
-      And I click the button with the ellipsis
+      And I open the Universal Language Selector
+      And I open Input panel of language settings
+    When I click the button with the ellipsis
     Then the language list of ULS should use Autonym font
 
   @login @en.wikipedia.beta.wmflabs.org
   Scenario: Autonym font should be used in the Interlanguage area of a page with Interlanguage links
-
     Given I am logged in
     When I am on a page with interlanguage links
     Then the Interlanguage area should use Autonym font
 
   @anon-language-selection @commons.wikimedia.beta.wmflabs.org
   Scenario: Autonym font is used in the ULS language search dialog for input language selection by anonymous users
-
-    When I open "Input" panel of language settings
-      And I click the button with the ellipsis
+    Given I am at random page
+      And I open the Universal Language Selector
+      And I open Input panel of language settings
+    When I click the button with the ellipsis
     Then the language list of ULS should use Autonym font
diff --git a/tests/browser/features/step_definitions/autonym_steps.rb b/tests/browser/features/step_definitions/autonym_steps.rb
new file mode 100644
index 00000000..106b745b
--- /dev/null
+++ b/tests/browser/features/step_definitions/autonym_steps.rb
@@ -0,0 +1,3 @@
+Then(/^I open Input panel of language settings$/) do
+  on(PanelPage).panel_input_element.when_visible.click
+end
diff --git a/tests/browser/features/step_definitions/panel_steps.rb b/tests/browser/features/step_definitions/panel_steps.rb
index 963cce07..9bde273f 100644
--- a/tests/browser/features/step_definitions/panel_steps.rb
+++ b/tests/browser/features/step_definitions/panel_steps.rb
@@ -18,27 +18,6 @@ When(/^I open Fonts panel of language settings$/) do
 	on(PanelPage).panel_fonts_element.click
 end
 
-When(/^I open "(.*?)" panel of language settings$/) do |panel|
-	visit(PanelPage) do |page|
-		# Open the ULS panel if it's not open already
-		if !page.language_settings_dialog_element.visible?
-			# These can be of two different type of elements, which PageObjects do not like.
-			if uls_position() == 'interlanguage'
-				page.trigger_cog_element.when_visible.click
-			elsif uls_position() == 'personal'
-				page.trigger_personal_element.when_visible.click
-			end
-		end
-
-		case panel
-		when "Input"
-			page.panel_input_element.when_visible.click
-		else
-			pending
-		end
-	end
-end
-
 When(/^I select (.*?) font for the interface language for the live preview$/) do |font|
 	on(PanelPage).font_for_interface = font
 end
@@ -47,7 +26,6 @@ When(/^I select (.*?) font for the content language for the live preview$/) do |
 	on(PanelPage).font_for_content = font
 end
 
-
 When(/^I close the panel to discard the changes$/) do
 	on(PanelPage).panel_button_close_element.click
 end