diff --git a/test/unit/query_test.rb b/test/unit/query_test.rb
index aced780f1..31a4ac2d3 100644
--- a/test/unit/query_test.rb
+++ b/test/unit/query_test.rb
@@ -32,6 +32,8 @@ class QueryTest < ActiveSupport::TestCase
            :workflows,
            :attachments
 
+  INTEGER_KLASS = RUBY_VERSION >= "2.4" ? Integer : Fixnum
+
   def setup
     User.current = nil
   end
@@ -1612,7 +1614,7 @@ class QueryTest < ActiveSupport::TestCase
     count_by_group = q.issue_count_by_group
     assert_kind_of Hash, count_by_group
     assert_equal %w(NilClass User), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
-    assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
+    assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
     assert count_by_group.has_key?(User.find(3))
   end
 
@@ -1621,7 +1623,7 @@ class QueryTest < ActiveSupport::TestCase
     count_by_group = q.issue_count_by_group
     assert_kind_of Hash, count_by_group
     assert_equal %w(NilClass String), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
-    assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
+    assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
     assert count_by_group.has_key?('MySQL')
   end
 
@@ -1630,7 +1632,7 @@ class QueryTest < ActiveSupport::TestCase
     count_by_group = q.issue_count_by_group
     assert_kind_of Hash, count_by_group
     assert_equal %w(Date NilClass), count_by_group.keys.collect {|k| k.class.name}.uniq.sort
-    assert_equal %w(Fixnum), count_by_group.values.collect {|k| k.class.name}.uniq
+    assert_equal %W(#{INTEGER_KLASS}), count_by_group.values.collect {|k| k.class.name}.uniq
   end
 
   def test_issue_count_with_nil_group_only