diff --git a/CHANGELOG.rdoc b/CHANGELOG.rdoc
index e59f4129..f5cb07a4 100644
--- a/CHANGELOG.rdoc
+++ b/CHANGELOG.rdoc
@@ -3,6 +3,7 @@
 * enhancements
   * Add :defaults and :format support on router
   * Add simple form generators
+  * Better localization for devise_error_messages! (by github.com/zedtux)
 
 == 1.4.0
 
diff --git a/test/helpers/devise_helper_test.rb b/test/helpers/devise_helper_test.rb
index b81e1f4c..6b3a6af3 100644
--- a/test/helpers/devise_helper_test.rb
+++ b/test/helpers/devise_helper_test.rb
@@ -10,14 +10,17 @@ class DeviseHelperTest < ActionController::IntegrationTest
       } } },
       :activerecord => { :models => { :user => "utilisateur" } }
     }
-  
+
     I18n.locale = 'fr'
   end
-  
+
+  teardown do
+    I18n.locale = 'en'
+  end
+
   test 'test errors.messages.not_saved with single error from i18n' do
-    
     get new_user_registration_path
-    
+
     fill_in 'password', :with => 'new_user123'
     fill_in 'password confirmation', :with => 'new_user123'
     click_button 'Sign up'
@@ -25,10 +28,10 @@ class DeviseHelperTest < ActionController::IntegrationTest
     assert_have_selector '#error_explanation'
     assert_contain "Erreur lors de l'enregistrement de 'utilisateur': 1 erreur"
   end
-  
+
   test 'test errors.messages.not_saved with multiple errors from i18n' do
     get new_user_registration_path
-    
+
     fill_in 'email', :with => 'invalid_email'
     fill_in 'password', :with => 'new_user123'
     fill_in 'password confirmation', :with => 'new_user321'
@@ -37,5 +40,4 @@ class DeviseHelperTest < ActionController::IntegrationTest
     assert_have_selector '#error_explanation'
     assert_contain "Erreur lors de l'enregistrement de 'utilisateur': 2 erreurs"
   end
-  
 end
\ No newline at end of file