diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 983ed330..e3995e3f 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -18,8 +18,10 @@
   config.mock_framework = :rspec
   config.include ActionControllerHelpers
 
-  config.filter_run_including :focus => true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+  config.filter_run_including :focus
   config.run_all_when_everything_filtered = true
+  config.fail_fast = false
 
   config.before(:suite) do
     ActiveRecordHelpers.setup_active_record