1 files changed, 13 insertions, 11 deletions
diff --git a/spec/ruby/core/struct/hash_spec.rb b/spec/ruby/core/struct/hash_spec.rb
index 5ed4ace489..750387b326 100644
--- a/spec/ruby/core/struct/hash_spec.rb
+++ b/spec/ruby/core/struct/hash_spec.rb
@@ -4,18 +4,18 @@ require_relative 'shared/accessor'
 
 describe "Struct#hash" do
 
-  it "returns the same fixnum for structs with the same content" do
+  it "returns the same integer for structs with the same content" do
     [StructClasses::Ruby.new("1.8.6", "PPC"),
      StructClasses::Car.new("Hugo", "Foo", "1972")].each do |stc|
       stc.hash.should == stc.dup.hash
-      stc.hash.should be_kind_of(Fixnum)
+      stc.hash.should.is_a?(Integer)
     end
   end
 
   it "returns the same value if structs are #eql?" do
     car = StructClasses::Car.new("Honda", "Accord", "1998")
     similar_car = StructClasses::Car.new("Honda", "Accord", "1998")
-    car.should eql(similar_car)
+    car.should.eql?(similar_car)
     car.hash.should == similar_car.hash
   end
 
@@ -25,14 +25,12 @@ describe "Struct#hash" do
     s1.hash.should_not == s2.hash
   end
 
-  ruby_version_is "2.5" do
-    it "returns different hashes for structs with different values when using keyword_init: true" do
-      key = :"1 non symbol member"
-      struct_class = Struct.new(key, keyword_init: true)
-      t1 = struct_class.new(key => 1)
-      t2 = struct_class.new(key => 2)
-      t1.hash.should_not == t2.hash
-    end
+  it "returns different hashes for structs with different values when using keyword_init: true" do
+    key = :"1 non symbol member"
+    struct_class = Struct.new(key, keyword_init: true)
+    t1 = struct_class.new(key => 1)
+    t2 = struct_class.new(key => 2)
+    t1.hash.should_not == t2.hash
   end
 
   it "allows for overriding methods in an included module" do
@@ -58,5 +56,9 @@ describe "Struct#hash" do
     # See the Struct#eql? specs
   end
 
+  it "returns different hashes for different struct classes" do
+    Struct.new(:x).new(1).hash.should != Struct.new(:y).new(1).hash
+  end
+
   it_behaves_like :struct_accessor, :hash
 end