diff --git a/app/controllers/epp/base_controller.rb b/app/controllers/epp/base_controller.rb
index 024a39406..a481a8f9a 100644
--- a/app/controllers/epp/base_controller.rb
+++ b/app/controllers/epp/base_controller.rb
@@ -62,7 +62,7 @@ module Epp
     private
 
     def throttled_user
-      authorize!(:throttled_user, @domain) unless current_user
+      authorize!(:throttled_user, @domain) unless current_user || instance_of?(Epp::SessionsController)
       current_user
     end
 
diff --git a/test/integration/epp/login_test.rb b/test/integration/epp/login_test.rb
index 0e07da9c6..80d7251d6 100644
--- a/test/integration/epp/login_test.rb
+++ b/test/integration/epp/login_test.rb
@@ -3,11 +3,6 @@ require 'test_helper'
 class EppLoginTest < EppTestCase
   setup do
     @original_sessions_per_registrar_setting = EppSession.sessions_per_registrar
-
-    ENV["shunter_default_threshold"] = '10000'
-    ENV["shunter_enabled"] = 'false'
-    adapter = ENV["shunter_default_adapter"].constantize.new
-    adapter&.clear!
   end
 
   teardown do
@@ -186,83 +181,6 @@ class EppLoginTest < EppTestCase
     assert_epp_response :session_limit_exceeded_server_closing_connection
   end
 
-  def test_returns_valid_response_if_not_throttled
-    ENV["shunter_enabled"] = 'true'
-    user = users(:api_bestnames)
-    new_session_id = 'new-session-id'
-
-    request_xml = <<-XML
-      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-      <epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee', for_version: '1.0')}">
-        <command>
-          <login>
-            <clID>#{user.username}</clID>
-            <pw>#{user.plain_text_password}</pw>
-            <options>
-              <version>1.0</version>
-              <lang>en</lang>
-            </options>
-            <svcs>
-              <objURI>#{Xsd::Schema.filename(for_prefix: 'domain-ee', for_version: '1.2')}</objURI>
-              <objURI>#{Xsd::Schema.filename(for_prefix: 'contact-ee', for_version: '1.1')}</objURI>
-              <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
-              <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>
-            </svcs>
-          </login>
-        </command>
-      </epp>
-    XML
-
-    post '/epp/session/login', params: { frame: request_xml },
-         headers: { 'HTTP_COOKIE' => "session=#{new_session_id}" }
-
-    response_xml = Nokogiri::XML(response.body)
-    assert_epp_response :completed_successfully
-    assert_correct_against_schema response_xml
-  end
-
-  def test_returns_error_response_if_throttled
-    ENV["shunter_default_threshold"] = '1'
-    ENV["shunter_enabled"] = 'true'
-    user = users(:api_bestnames)
-    new_session_id = 'new-session-id'
-
-    request_xml = <<-XML
-      <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-      <epp xmlns="#{Xsd::Schema.filename(for_prefix: 'epp-ee', for_version: '1.0')}">
-        <command>
-          <login>
-            <clID>#{user.username}</clID>
-            <pw>#{user.plain_text_password}</pw>
-            <options>
-              <version>1.0</version>
-              <lang>en</lang>
-            </options>
-            <svcs>
-              <objURI>#{Xsd::Schema.filename(for_prefix: 'domain-ee', for_version: '1.2')}</objURI>
-              <objURI>#{Xsd::Schema.filename(for_prefix: 'contact-ee', for_version: '1.1')}</objURI>
-              <objURI>urn:ietf:params:xml:ns:host-1.0</objURI>
-              <objURI>urn:ietf:params:xml:ns:keyrelay-1.0</objURI>
-            </svcs>
-          </login>
-        </command>
-      </epp>
-    XML
-
-    post '/epp/session/login', params: { frame: request_xml },
-         headers: { 'HTTP_COOKIE' => "session=#{new_session_id}" }
-
-    post '/epp/session/login', params: { frame: request_xml },
-         headers: { 'HTTP_COOKIE' => "session=#{new_session_id}" }
-
-    response_xml = Nokogiri::XML(response.body)
-    assert_epp_response :session_limit_exceeded_server_closing_connection
-    assert_correct_against_schema response_xml
-    assert response.body.include?(Shunter.default_error_message)
-    ENV["shunter_default_threshold"] = '10000'
-    ENV["shunter_enabled"] = 'false'
-  end
-
   private
 
   def eliminate_effect_of_existing_epp_sessions
diff --git a/test/integration/repp/v1/contacts/search_test.rb b/test/integration/repp/v1/contacts/search_test.rb
index 949e9718d..dfbed9cee 100644
--- a/test/integration/repp/v1/contacts/search_test.rb
+++ b/test/integration/repp/v1/contacts/search_test.rb
@@ -49,11 +49,11 @@ class ReppV1ContactsSearchTest < ActionDispatch::IntegrationTest
     ENV["shunter_enabled"] = 'true'
 
     get '/repp/v1/contacts/search', headers: @auth_headers, params: { query: '000' }
-    get '/repp/v1/contacts/search', headers: @auth_headers, params: { query: 'j' }
-    json = JSON.parse(response.body, symbolize_names: true)
 
-    assert_equal json[:code], 2502
-    assert response.body.include?(Shunter.default_error_message)
+    assert_raise Shunter::ThrottleError do
+      get '/repp/v1/contacts/search', headers: @auth_headers, params: { query: '000' }
+    end
+
     ENV["shunter_default_threshold"] = '10000'
     ENV["shunter_enabled"] = 'false'
   end