diff --git a/spec/features/users_spec.rb b/spec/features/users_spec.rb
index 63743169302..73d6fb6b651 100644
--- a/spec/features/users_spec.rb
+++ b/spec/features/users_spec.rb
@@ -61,16 +61,17 @@ feature 'Users', feature: true, js: true do
     before(:each) do
       visit new_user_session_path
       click_link 'Register'
-      @username_field = find '.username'
+      @username_form_group = find '.username'
+      @username_field = find '#new_user_username'
     end
 
-    scenario 'shows an error border if the username already exists' do
+    scenario 'shows an error border if the username already exists', focus: true do
       fill_in username_input, with: user.username
       wait_for_ajax
-      expect(@username_field).to have_css '.gl-field-error-outline'
+      expect(@username_form_group).to have_css '.gl-field-error-outline'
     end
 
-    scenario 'doesn\'t show an error border if the username is available' do
+    scenario 'doesn\'t show an error border if the username is available', focus: true do
       fill_in username_input, with: 'new-user'
       wait_for_ajax
       expect(@username_field).not_to have_css '.gl-field-error-outline'
diff --git a/spec/support/login_helpers.rb b/spec/support/login_helpers.rb
index c0b3e83244d..3e90c95918c 100644
--- a/spec/support/login_helpers.rb
+++ b/spec/support/login_helpers.rb
@@ -33,7 +33,9 @@ module LoginHelpers
     fill_in "user_login", with: user.email
     fill_in "user_password", with: "12345678"
     check 'user_remember_me' if remember
-    click_button "Sign in"
+    page.within '.login-box' do
+      click_button "Sign in"
+    end
     Thread.current[:current_user] = user
   end