diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 666d56079d70364e34d86d6e1b1182e878544a0e..e5fafe4e53f6fca65273c7b3f2ec48cb3601417e 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -13,12 +13,11 @@ RSpec.configure do |config|
   config.use_instantiated_fixtures  = false
   config.mock_with :rspec
 
-  config.include LoginHelpers, type: :feature
-  config.include LoginHelpers, type: :request
-  config.include FactoryGirl::Syntax::Methods
   config.include Devise::TestHelpers, type: :controller
-
+  config.include LoginHelpers,        type: :feature
+  config.include LoginHelpers,        type: :request
   config.include TestEnv
+
   config.infer_spec_type_from_file_location!
   config.raise_errors_for_deprecations!
 
diff --git a/spec/support/factory_girl.rb b/spec/support/factory_girl.rb
new file mode 100644
index 0000000000000000000000000000000000000000..eec437fb3aa75a4fcb9c82e6ce1b8da96d804924
--- /dev/null
+++ b/spec/support/factory_girl.rb
@@ -0,0 +1,3 @@
+RSpec.configure do |config|
+  config.include FactoryGirl::Syntax::Methods
+end