diff --git a/spec/acceptance/acceptance_helper.rb b/spec/acceptance/acceptance_helper.rb
index 8167bef..66417be 100644
--- a/spec/acceptance/acceptance_helper.rb
+++ b/spec/acceptance/acceptance_helper.rb
@@ -22,13 +22,7 @@ end
 
 def log_in(user)
   visit '/'
-
-  if Errbit::Config.user_has_username
-    fill_in :user_username, with: user.username
-  else
-    fill_in :user_email, with: user.email
-  end
-
+  fill_in :user_email, with: user.email
   fill_in :user_password, with: 'password'
   click_on I18n.t('devise.sessions.new.sign_in')
 end
diff --git a/spec/controllers/devise_sessions_controller_spec.rb b/spec/controllers/devise_sessions_controller_spec.rb
index e50e6f6..58061e9 100644
--- a/spec/controllers/devise_sessions_controller_spec.rb
+++ b/spec/controllers/devise_sessions_controller_spec.rb
@@ -10,24 +10,13 @@ describe Devise::SessionsController, type: 'controller' do
     let(:user) { Fabricate(:user) }
 
     it 'redirects to app index page if there are no apps for the user' do
-      details = { 'email' => user.email, 'password' => user.password }
-      if Errbit::Config.user_has_username
-        details['username'] = user.username 
-      end
-
-      post :create, user: details
+      post :create, user: { 'email' => user.email, 'password' => user.password }
       expect(response).to redirect_to(root_path)
     end
 
     it 'displays a friendly error when credentials are invalid' do
-      details = { 'email' => 'whatever', 'password' => 'somethinginvalid' }
-      msg = I18n.t('devise.failure.user.email_invalid')
-      if Errbit::Config.user_has_username
-        details['username'] = 'somethinginvalid'
-        msg = I18n.t('devise.failure.user.username_invalid')
-      end
-      post :create, user: details
-      expect(request.flash["alert"]).to eq(msg)
+      post :create, user: { 'email' => 'whatever', 'password' => 'somethinginvalid' }
+      expect(request.flash["alert"]).to eq(I18n.t 'devise.failure.user.email_invalid')
     end
   end
 end
diff --git a/spec/fabricators/user_fabricator.rb b/spec/fabricators/user_fabricator.rb
index d682ebd..eb5fab6 100644
--- a/spec/fabricators/user_fabricator.rb
+++ b/spec/fabricators/user_fabricator.rb
@@ -1,9 +1,6 @@
 Fabricator :user do
   name 'Clyde Frog'
   email { sequence(:user_email) { |n| "user.#{n}@example.com" } }
-  if Errbit::Config.user_has_username
-    username { sequence(:username) { |n| "User Name #{n}" } }
-  end
   password 'password'
   password_confirmation 'password'
 end
--
libgit2 0.21.2