diff --git a/test/functional/repositories_mercurial_controller_test.rb b/test/functional/repositories_mercurial_controller_test.rb
index 23c3b71bf..9fb88b0d2 100644
--- a/test/functional/repositories_mercurial_controller_test.rb
+++ b/test/functional/repositories_mercurial_controller_test.rb
@@ -354,6 +354,17 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
                  :sibling => { :tag => 'td', :content => /watcher =/ }
     end
 
+    def test_annotate_not_in_tip
+      @repository.fetch_changesets
+      @repository.reload
+      assert @repository.changesets.size > 0
+
+      get :annotate, :id => PRJ_ID,
+          :path => ['sources', 'welcome_controller.rb']
+      assert_response 404
+      assert_error_tag :content => /was not found/
+    end
+
     def test_annotate_at_given_revision
       @repository.fetch_changesets
       @repository.reload