diff --git a/modules/ve-mw/test/browser/features/anon.feature b/modules/ve-mw/test/browser/features/anon.feature
index 51ceff8e21..e5dcae6cc7 100644
--- a/modules/ve-mw/test/browser/features/anon.feature
+++ b/modules/ve-mw/test/browser/features/anon.feature
@@ -1,7 +1,6 @@
-@clean @ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @test2.wikipedia.org
+@clean @firefox @login @test2.wikipedia.org
 Feature: VisualEditor
 
-  @login
   Scenario: Basic edit
     Given I am at my user page
     When I edit the page with Editing with
diff --git a/modules/ve-mw/test/browser/features/bullets.feature b/modules/ve-mw/test/browser/features/bullets.feature
index 615383443a..ac5a29f6c7 100644
--- a/modules/ve-mw/test/browser/features/bullets.feature
+++ b/modules/ve-mw/test/browser/features/bullets.feature
@@ -1,6 +1,6 @@
-@ie6-bug  @ie7-bug  @ie8-bug  @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @make_selectable_line @test2.wikipedia.org
 Feature: VisualEditor Bullets, Numbering
-@make_selectable_line
+
   Scenario Outline: check strings for bullets and numbering
     When I click <control>
       And I click Save page
@@ -12,7 +12,6 @@ Feature: VisualEditor Bullets, Numbering
     | Numbering | #         |
     | Bullets   | *         |
 
-@make_selectable_line
   Scenario Outline: check increase indent for bullets and numbering
     When I click <control>
       And I click Increase indentation
@@ -26,7 +25,6 @@ Feature: VisualEditor Bullets, Numbering
     | Numbering | ##        |
     | Bullets   | **        |
 
-@make_selectable_line
   Scenario Outline: check decrease indent for bullets and numbering
     When I click <control>
       And I click Decrease indentation
diff --git a/modules/ve-mw/test/browser/features/cursor.feature b/modules/ve-mw/test/browser/features/cursor.feature
index b2a8d40b83..49b4a90d47 100644
--- a/modules/ve-mw/test/browser/features/cursor.feature
+++ b/modules/ve-mw/test/browser/features/cursor.feature
@@ -1,4 +1,4 @@
-@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @login
+@firefox @login
 Feature: VisualEditor cursor
 
   Background:
diff --git a/modules/ve-mw/test/browser/features/edit_utf8_logged_in.feature b/modules/ve-mw/test/browser/features/edit_utf8_logged_in.feature
index 83b4cfc004..9b43139f90 100644
--- a/modules/ve-mw/test/browser/features/edit_utf8_logged_in.feature
+++ b/modules/ve-mw/test/browser/features/edit_utf8_logged_in.feature
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
 Feature: VisualEditor
 
   Background:
diff --git a/modules/ve-mw/test/browser/features/fresh_wiki_install.feature b/modules/ve-mw/test/browser/features/fresh_wiki_install.feature
index 65cf73c904..d28e2db521 100644
--- a/modules/ve-mw/test/browser/features/fresh_wiki_install.feature
+++ b/modules/ve-mw/test/browser/features/fresh_wiki_install.feature
@@ -1,4 +1,4 @@
-@clean
+@clean @firefox
 Feature: VisualEditor on a fresh Mediawiki install
 
   Since this test currently uses a hard-coded
diff --git a/modules/ve-mw/test/browser/features/general_markup.feature b/modules/ve-mw/test/browser/features/general_markup.feature
index 7bc8bce420..13b8567a82 100644
--- a/modules/ve-mw/test/browser/features/general_markup.feature
+++ b/modules/ve-mw/test/browser/features/general_markup.feature
@@ -1,7 +1,6 @@
-@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @make_selectable_line @test2.wikipedia.org
 Feature: VisualEditor general text markup features
 
-  @make_selectable_line
   Scenario Outline: VisualEditor general markup
     When I click the text style menu
     And I click the <type_of_markup> menu option
diff --git a/modules/ve-mw/test/browser/features/headings.feature b/modules/ve-mw/test/browser/features/headings.feature
index 8d3a4af4ea..b780ffbad1 100644
--- a/modules/ve-mw/test/browser/features/headings.feature
+++ b/modules/ve-mw/test/browser/features/headings.feature
@@ -1,7 +1,6 @@
-@ie6-bug  @ie7-bug  @ie8-bug  @ie9-bug @ie10-bug @login
+@edit_user_page @firefox @login
 Feature: VisualEditor Headings
 
-  @edit_user_page
   Scenario Outline: Cycle through headings values
     When I click the down arrow on Headings interface
       And I click <headings_interface_name>
diff --git a/modules/ve-mw/test/browser/features/indent_outdent.feature b/modules/ve-mw/test/browser/features/indent_outdent.feature
index 1fc2409c34..77ee852bff 100644
--- a/modules/ve-mw/test/browser/features/indent_outdent.feature
+++ b/modules/ve-mw/test/browser/features/indent_outdent.feature
@@ -1,12 +1,10 @@
-@ie6-bug  @ie7-bug  @ie8-bug  @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @make_selectable_line @test2.wikipedia.org
 Feature: VisualEditor Indent, Outdent
 
-@make_selectable_line
  Scenario: Check indentation controls disabled by default
     Then Decrease indentation should be disabled
       And Increase indentation should be disabled
 
-@make_selectable_line
   Scenario Outline: check indent and outdent enable and disable
     When I click <control>
     Then Decrease indentation should be <initial_state>
diff --git a/modules/ve-mw/test/browser/features/links.feature b/modules/ve-mw/test/browser/features/links.feature
index 94120df3e7..6441026c31 100644
--- a/modules/ve-mw/test/browser/features/links.feature
+++ b/modules/ve-mw/test/browser/features/links.feature
@@ -1,4 +1,4 @@
-@ie6-bug  @ie7-bug  @ie8-bug  @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
 Feature: VisualEditor Links
 
   Background:
diff --git a/modules/ve-mw/test/browser/features/media_interface.feature b/modules/ve-mw/test/browser/features/media_interface.feature
index 82b6f0e3a5..60bd10bda4 100644
--- a/modules/ve-mw/test/browser/features/media_interface.feature
+++ b/modules/ve-mw/test/browser/features/media_interface.feature
@@ -1,4 +1,4 @@
-@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
 Feature: VisualEditor Media Interface
 
   Scenario Outline: VisualEditor insert new media
diff --git a/modules/ve-mw/test/browser/features/multiedit_workflow.feature b/modules/ve-mw/test/browser/features/multiedit_workflow.feature
index 482d824dad..ad0ac6352d 100644
--- a/modules/ve-mw/test/browser/features/multiedit_workflow.feature
+++ b/modules/ve-mw/test/browser/features/multiedit_workflow.feature
@@ -1,5 +1,5 @@
 # encoding: UTF-8
-@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@edit_user_page @en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
 Feature: VisualEditor multi-edit workflow
 
   Goal of the test is to make sure the "Save" and "Review Changes"
@@ -10,7 +10,6 @@ Feature: VisualEditor multi-edit workflow
   Not implemented as a Scenario outline since the goal is
   to test multiple page edits within a single session.
 
-  @edit_user_page
   Scenario: Make multiple edits to the same article
     Given I enter and save the first edit
     And I enter and save a second edit
diff --git a/modules/ve-mw/test/browser/features/references.feature b/modules/ve-mw/test/browser/features/references.feature
index e067a52d59..8e04fbe33b 100644
--- a/modules/ve-mw/test/browser/features/references.feature
+++ b/modules/ve-mw/test/browser/features/references.feature
@@ -1,4 +1,4 @@
-@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
 Feature: VisualEditor References
 
   Scenario: VisualEditor References
diff --git a/modules/ve-mw/test/browser/features/switch_editing_mode.feature b/modules/ve-mw/test/browser/features/switch_editing_mode.feature
index 0ea03bd61f..14491a8cce 100644
--- a/modules/ve-mw/test/browser/features/switch_editing_mode.feature
+++ b/modules/ve-mw/test/browser/features/switch_editing_mode.feature
@@ -1,4 +1,4 @@
-@ie6-bug  @ie7-bug  @ie8-bug  @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
 Feature: Switching between wikitext and Visual Editor modes
 
   Test for both pathways that allow switching between Visual Editor and wikitext editing modes.
diff --git a/modules/ve-mw/test/browser/features/transclusion.feature b/modules/ve-mw/test/browser/features/transclusion.feature
index c6011eda9a..ddf2c8a56c 100644
--- a/modules/ve-mw/test/browser/features/transclusion.feature
+++ b/modules/ve-mw/test/browser/features/transclusion.feature
@@ -1,4 +1,4 @@
-@ie6-bug  @ie7-bug  @ie8-bug @ie9-bug @ie10-bug @en.wikipedia.beta.wmflabs.org @test2.wikipedia.org @login
+@en.wikipedia.beta.wmflabs.org @firefox @login @test2.wikipedia.org
 Feature: VisualEditor Transclusion
 
   Background:
diff --git a/modules/ve-mw/test/browser/features/verify_production_wikis.feature b/modules/ve-mw/test/browser/features/verify_production_wikis.feature
index 7ed4894283..ba1181bb4c 100644
--- a/modules/ve-mw/test/browser/features/verify_production_wikis.feature
+++ b/modules/ve-mw/test/browser/features/verify_production_wikis.feature
@@ -1,3 +1,4 @@
+@firefox
 Feature: VisualEditor on production wikis
 
   Verify that VisualEditor is available as