diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb
index d5b0da950..110e8df27 100644
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -31,8 +31,9 @@ RSpec.configure do |config|
   config.include ActiveSupport::Testing::TimeHelpers
   config.include Requests::SessionHelpers, type: :request
   config.include Features::SessionHelpers, type: :feature
+  config.include AbstractController::Translation, type: :request
   config.include AbstractController::Translation, type: :feature
-  config.include Requests::EPPHelpers
+  config.include Requests::EPPHelpers, type: :request
 
   config.define_derived_metadata(file_path: %r[/spec/features/]) do |metadata|
     metadata[:db] = true if metadata[:db].nil?
@@ -58,10 +59,6 @@ RSpec.configure do |config|
     metadata[:type] = :request
   end
 
-  config.define_derived_metadata(file_path: %r[/spec/requests/epp/]) do |metadata|
-    metadata[:epp] = true if metadata[:epp].nil?
-  end
-
   config.use_transactional_fixtures = false
   config.infer_spec_type_from_file_location!
 
diff --git a/spec/support/requests/session_helpers.rb b/spec/support/requests/session_helpers.rb
index 3f75da577..9d8c69dc3 100644
--- a/spec/support/requests/session_helpers.rb
+++ b/spec/support/requests/session_helpers.rb
@@ -28,5 +28,9 @@ module Requests
 
       post '/epp/session/login', frame: login_xml
     end
+
+    def sign_in_to_admin_area(user: FactoryGirl.create(:admin_user))
+      post admin_sessions_path, admin_user: { username: user.username, password: user.password }
+    end
   end
 end