diff --git a/app/models/query.rb b/app/models/query.rb
index 90970c96e..5ed529998 100644
--- a/app/models/query.rb
+++ b/app/models/query.rb
@@ -108,7 +108,7 @@ class WatcherQueryColumn < QueryColumn
   def value_object(object)
     return nil unless User.current.allowed_to?(:"view_#{object.class.name.underscore}_watchers", object.try(:project))
 
-    super
+    super.sorted
   end
 end
 
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 7b8147ece..e4bade67c 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1981,7 +1981,8 @@ class IssuesControllerTest < Redmine::ControllerTest
     )
 
     assert_response :success
-    assert_include "\"#{User.find(1).name}\n#{User.find(3).name}\"", response.body
+    watcher_names = User.where(id: [1, 3]).sorted.map(&:name).join("\n")
+    assert_include "\"#{watcher_names}\"", response.body
   end
 
   def test_index_with_estimated_hours_total