diff --git a/tests/browser/features/ime.feature b/tests/browser/features/ime.feature
index 83e10007..9d6e2f26 100644
--- a/tests/browser/features/ime.feature
+++ b/tests/browser/features/ime.feature
@@ -1,4 +1,3 @@
-@commons.wikimedia.beta.wmflabs.org
 Feature: Input method engine
 
 User is able to select among different input methods via a menu which is
diff --git a/tests/browser/features/live_preview_of_display_language.feature b/tests/browser/features/live_preview_of_display_language.feature
index 748dd4c5..e2fc529b 100644
--- a/tests/browser/features/live_preview_of_display_language.feature
+++ b/tests/browser/features/live_preview_of_display_language.feature
@@ -1,4 +1,4 @@
-@login @reset-preferences-after @commons.wikimedia.beta.wmflabs.org
+@login @reset-preferences-after
 Feature: Live preview of display language changes
 
   Background:
diff --git a/tests/browser/features/persistent_settings.feature b/tests/browser/features/persistent_settings.feature
index f3bc6769..ba1fa2d5 100644
--- a/tests/browser/features/persistent_settings.feature
+++ b/tests/browser/features/persistent_settings.feature
@@ -1,4 +1,4 @@
-@login @reset-preferences-after @commons.wikimedia.beta.wmflabs.org
+@login @reset-preferences-after
 Feature: Persistent settings
 
   This assumes wiki content language is English.
diff --git a/tests/browser/features/settings_panel.feature b/tests/browser/features/settings_panel.feature
index f2524642..d4a07fc3 100644
--- a/tests/browser/features/settings_panel.feature
+++ b/tests/browser/features/settings_panel.feature
@@ -1,4 +1,3 @@
-@commons.wikimedia.beta.wmflabs.org 
 Feature: Settings panel
 
   @login @ime-default-on
diff --git a/tests/browser/features/support/hooks.rb b/tests/browser/features/support/hooks.rb
index d5358c1c..9731900d 100644
--- a/tests/browser/features/support/hooks.rb
+++ b/tests/browser/features/support/hooks.rb
@@ -16,6 +16,5 @@ Before('@uls-in-sidebar-only') do |scenario|
 end
 
 After('@reset-preferences-after') do |scenario|
-  visit(ResetPreferencesPage)
-  on(ResetPreferencesPage).submit_element.click
+  visit(ResetPreferencesPage).submit_element.click if @browser.exist?
 end
diff --git a/tests/browser/features/textarea_font.feature b/tests/browser/features/textarea_font.feature
index 2b6a83b9..28d8fb11 100644
--- a/tests/browser/features/textarea_font.feature
+++ b/tests/browser/features/textarea_font.feature
@@ -1,4 +1,4 @@
-@login @commons.wikimedia.beta.wmflabs.org
+@login
 Feature: Font preferences respected in different languages
 
   If a user has an edit font preferences respect that preference.
diff --git a/tests/browser/features/triggers.feature b/tests/browser/features/triggers.feature
index e44c84d2..5f259005 100644
--- a/tests/browser/features/triggers.feature
+++ b/tests/browser/features/triggers.feature
@@ -1,4 +1,3 @@
-@commons.wikimedia.beta.wmflabs.org 
 Feature: Trigger in personal toolbar
 
   @login @uls-in-personal-only