1 files changed, 3 insertions, 3 deletions
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 6393e482904..32eeeb5dfb4 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -208,11 +208,11 @@ RSpec.configure do |config|
     example.run if config.inclusion_filter[:quarantine]
   end
 
-  config.before(:example, :request_store) do
+  config.around(:example, :request_store) do |example|
     RequestStore.begin!
-  end
 
-  config.after(:example, :request_store) do
+    example.run
+
     RequestStore.end!
     RequestStore.clear!
   end