diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index b6a1fb6de..e521631c7 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -390,6 +390,20 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
       end
     end
 
+    def test_annotate_latin_1_contents
+      with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
+        [27, '7bbf4c738e71'].each do |r1|
+          get :annotate, :id => PRJ_ID,
+              :path => ['latin-1-dir', "test-#{@char_1}.txt"], :rev => r1
+          assert_tag :tag => 'th',
+                     :content => '1',
+                     :attributes => { :class => 'line-num' },
+                     :sibling => { :tag => 'td',
+                                   :content => /test-#{@char_1}.txt/ }
+        end
+      end
+    end
+
     def test_empty_revision
       @repository.fetch_changesets
       @repository.reload