diff --git a/tests/browser/features/math.feature b/tests/browser/features/math.feature
index 6dcb5f2..ffefceb 100644
--- a/tests/browser/features/math.feature
+++ b/tests/browser/features/math.feature
@@ -1,9 +1,8 @@
-@chrome @en.wikipedia.beta.wmflabs.org @firefox @login
+@chrome @en.wikipedia.beta.wmflabs.org @firefox
 Feature: Math
 
   Scenario: Display simple math
-    Given I am logged in
-      And I am creating a page with source editor
+    Given I am editing a random page with source editor
     When I type <math>3 + 2</math>
       And I click Preview
     Then the page should contain an img tag
diff --git a/tests/browser/features/step_definitions/math_steps.rb b/tests/browser/features/step_definitions/math_steps.rb
index 8a1f031..833e25c 100644
--- a/tests/browser/features/step_definitions/math_steps.rb
+++ b/tests/browser/features/step_definitions/math_steps.rb
@@ -1,9 +1,5 @@
-Given(/^I am creating a page with source editor$/) do
-  visit(DoesNotExistPage, using_params: { page_name: @random_string })
-end
-
-When(/^I click link Create$/) do
-  on(DoesNotExistPage).action_edit_element.when_present.click
+Given(/^I am editing a random page with source editor$/) do
+  visit EditPage
 end
 
 When(/^I click Preview$/) do
diff --git a/tests/browser/features/support/pages/does_not_exist_page.rb b/tests/browser/features/support/pages/does_not_exist_page.rb
deleted file mode 100644
index b5699f8..0000000
--- a/tests/browser/features/support/pages/does_not_exist_page.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class DoesNotExistPage
-  include PageObject
-
-  page_url '<%=params[:page_name]%>?action=edit'
-end
diff --git a/tests/browser/features/support/pages/edit_page.rb b/tests/browser/features/support/pages/edit_page.rb
index 471f911..0d1aa1f 100644
--- a/tests/browser/features/support/pages/edit_page.rb
+++ b/tests/browser/features/support/pages/edit_page.rb
@@ -1,6 +1,8 @@
 class EditPage
   include PageObject
 
+  page_url 'Special:Random?action=edit'
+
   text_area(:article_text, id: 'wpTextbox1')
   img(:math_image, class: 'tex')
   button(:preview, id: 'wpPreview')