diff --git a/test/ui/issues_test.rb b/test/ui/issues_test.rb
index 5225e2f..64d60eb 100644
--- a/test/ui/issues_test.rb
+++ b/test/ui/issues_test.rb
@@ -49,7 +49,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
     # check issue attributes
     assert_equal 'jsmith', issue.author.login
     assert_equal 1, issue.project.id
-    assert_equal IssueStatus.find_by_name('New'), issue.status 
+    assert_equal IssueStatus.find_by_name('New'), issue.status
     assert_equal Tracker.find_by_name('Bug'), issue.tracker
     assert_equal IssuePriority.find_by_name('Low'), issue.priority
     assert_equal 'Value for field 2', issue.custom_field_value(CustomField.find_by_name('Searchable field'))
@@ -60,13 +60,13 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
       :field_format => 'string',
       :name => 'Field1',
       :is_for_all => true,
-      :trackers => Tracker.find_all_by_id([1, 2])
+      :trackers => Tracker.where(id: [1, 2]).to_a
     )
     field2 = IssueCustomField.create!(
       :field_format => 'string',
       :name => 'Field2',
       :is_for_all => true,
-      :trackers => Tracker.find_all_by_id(2)
+      :trackers => Tracker.where(id: 2).to_a
     )
 
     Role.non_member.add_permission! :add_issues
@@ -188,7 +188,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
       :field_format => 'string',
       :name => 'Form update CF',
       :is_for_all => true,
-      :trackers => Tracker.find_all_by_name('Feature request')
+      :trackers => Tracker.where(name: 'Feature request').to_a
     )
 
     Role.non_member.add_permission! :edit_issues
@@ -237,6 +237,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
       within('#context-menu') do
         click_link 'Watch'
       end
+      assert page.has_css?('#context-menu .issue-1-watcher.icon-fav')
       assert page.has_css?('tr#issue-1')
     end
     assert Issue.find(1).watched_by?(User.find_by_login('jsmith'))
@@ -254,6 +255,7 @@ class Redmine::UiTest::IssuesTest < Redmine::UiTest::Base
       within('#context-menu') do
         click_link 'Watch'
       end
+      assert page.has_css?('#context-menu .issue-bulk-watcher.icon-fav')
       assert page.has_css?('tr#issue-1')
       assert page.has_css?('tr#issue-4')
     end