diff --git a/spec/factories.rb b/spec/factories.rb
index 91ef5086a9e..624cb0f7654 100644
--- a/spec/factories.rb
+++ b/spec/factories.rb
@@ -17,16 +17,14 @@ FactoryGirl.define do
     sequence(:username) { |n| "#{Faker::Internet.user_name}#{n}" }
     password "123456"
     password_confirmation { password }
+    confirmed_at { Time.now }
+    confirmation_token { nil }
 
     trait :admin do
       admin true
     end
 
     factory :admin, traits: [:admin]
-
-    after :create do |u|
-      u.confirm!
-    end
   end
 
   factory :project do
diff --git a/spec/support/test_env.rb b/spec/support/test_env.rb
index 6bb5ce608f6..16e10b1a62b 100644
--- a/spec/support/test_env.rb
+++ b/spec/support/test_env.rb
@@ -86,9 +86,8 @@ module TestEnv
     )
 
     ActivityObserver.any_instance.stub(
-        current_user: double("current_user", id: 1)
+      current_user: double("current_user", id: 1)
     )
-
   end
 
   def clear_repo_dir(namespace, name)