diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index ee19719957..d9e4eef338 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -47,8 +47,7 @@ def self.run_all(reporter = nil)
     mocks.verify_doubled_constant_names = true
   end
 
-  config.filter_run :focus
-  config.run_all_when_everything_filtered = true
+  config.filter_run_when_matching :focus
 
   config.order = :random
   Kernel.srand config.seed