diff --git a/.rubocop.yml b/.rubocop.yml
index a726ce2b2..342173e6e 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -216,9 +216,6 @@ RSpec/FilePath:
 RSpec/Focus:
   Enabled: true
 
-RSpec/HookArgument:
-  Enabled: true
-
 RSpec/ImplicitExpect:
   Enabled: true
   EnforcedStyle: should
diff --git a/.rubocop_basic.yml b/.rubocop_basic.yml
index 52e7324ce..2adca39ed 100644
--- a/.rubocop_basic.yml
+++ b/.rubocop_basic.yml
@@ -172,6 +172,9 @@ Rails/Validation:
 RSpec/ExampleWording:
   Enabled: true
 
+RSpec/HookArgument:
+  Enabled: true
+
 RSpec/LetSetup:
   Enabled: true
 
diff --git a/spec/shared/request_spec_helper.rb b/spec/shared/request_spec_helper.rb
index f3f8de26b..30959ced6 100644
--- a/spec/shared/request_spec_helper.rb
+++ b/spec/shared/request_spec_helper.rb
@@ -2,8 +2,8 @@ module RequestSpecHelper
   include Warden::Test::Helpers
 
   def self.included(base)
-    base.before(:each) { Warden.test_mode! }
-    base.after(:each) { Warden.test_reset! }
+    base.before { Warden.test_mode! }
+    base.after { Warden.test_reset! }
   end
 
   def sign_in(resource)