diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 81e20c1b6..d076aba86 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -22,6 +22,7 @@ require File.expand_path('../../test_helper', __FILE__)
 class ApplicationHelperTest < Redmine::HelperTest
   include ERB::Util
   include Rails.application.routes.url_helpers
+  include AvatarsHelper
 
   fixtures :projects, :enabled_modules,
            :users, :email_addresses,
@@ -1704,6 +1705,31 @@ class ApplicationHelperTest < Redmine::HelperTest
     end
   end
 
+  def test_principals_check_box_tag_with_avatar
+    principals = [User.find(1), Group.find(10)]
+    with_settings :gravatar_enabled => '1' do
+      tags = principals_check_box_tags("watcher[user_ids][]", principals)
+      principals.each do |principal|
+        assert_include avatar(principal, :size => 16), tags
+        assert_not_include content_tag('span', nil, :class => "name icon icon-#{principal.class.name.downcase}"), tags
+      end
+    end
+  end
+
+  def test_principals_check_box_tag_without_avatar
+    principals = [User.find(1), Group.find(10)]
+    Setting.gravatar_enabled = '1'
+    avatar_tags = principals.collect{|p| avatar(p, :size => 16) }
+
+    with_settings :gravatar_enabled => '0' do
+      tags = principals_check_box_tags(name, principals)
+      principals.each_with_index do |principal, i|
+        assert_not_include avatar_tags[i], tags
+        assert_include content_tag('span', nil, :class => "name icon icon-#{principal.class.name.downcase}"), tags
+      end
+    end
+  end
+
   def test_principals_options_for_select_with_users
     User.current = nil
     users = [User.find(2), User.find(4)]
diff --git a/test/helpers/groups_helper_test.rb b/test/helpers/groups_helper_test.rb
index 0865daa56..8424cc450 100644
--- a/test/helpers/groups_helper_test.rb
+++ b/test/helpers/groups_helper_test.rb
@@ -22,6 +22,7 @@ require File.expand_path('../../test_helper', __FILE__)
 class GroupsHelperTest < Redmine::HelperTest
   include ERB::Util
   include GroupsHelper
+  include AvatarsHelper
   include Rails.application.routes.url_helpers
 
   fixtures :users
diff --git a/test/helpers/members_helper_test.rb b/test/helpers/members_helper_test.rb
index e4f2e1541..8858ab57d 100644
--- a/test/helpers/members_helper_test.rb
+++ b/test/helpers/members_helper_test.rb
@@ -22,6 +22,7 @@ require File.expand_path('../../test_helper', __FILE__)
 class MembersHelperTest < Redmine::HelperTest
   include ERB::Util
   include MembersHelper
+  include AvatarsHelper
   include Rails.application.routes.url_helpers
 
   fixtures :projects, :users, :members, :member_roles,