diff --git a/test/test_helper.rb b/test/test_helper.rb
index ea47670c0..e8474de15 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -87,6 +87,7 @@ class ActiveSupport::TestCase
     saved_settings = options.keys.inject({}) {|h, k| h[k] = Setting[k].dup; h}
     options.each {|k, v| Setting[k] = v}
     yield
+  ensure
     saved_settings.each {|k, v| Setting[k] = v}
   end