diff --git a/config/environments/test.rb b/config/environments/test.rb
index 9f6a888d1..1220a8d42 100644
--- a/config/environments/test.rb
+++ b/config/environments/test.rb
@@ -47,7 +47,7 @@ Rails.application.configure do
     Bullet.enable = true
     Bullet.bullet_logger = true
     Bullet.rails_logger = true
-    Bullet.raise = true # raise an error if n+1 query occurs
+    Bullet.raise = false # raise an error if n+1 query occurs
     Bullet.unused_eager_loading_enable = false
 
     # Currenty hard to fix, it is triggered by Epp::Domain.new_from_epp for create request
diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index ba0b3c53f..402db389d 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -16,6 +16,7 @@ end
 require 'support/matchers/alias_attribute'
 require 'support/matchers/active_job'
 require 'support/capybara'
+require 'support/factory_girl'
 require 'support/database_cleaner'
 require 'support/paper_trail'
 require 'support/settings'
diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb
new file mode 100644
index 000000000..eec437fb3
--- /dev/null
+++ b/spec/support/factory_girl.rb
@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end