4 files changed, 20 insertions, 54 deletions
diff --git a/spec/ruby/core/integer/ceildiv_spec.rb b/spec/ruby/core/integer/ceildiv_spec.rb
index 18d07c66d0..c6e22a457d 100644
--- a/spec/ruby/core/integer/ceildiv_spec.rb
+++ b/spec/ruby/core/integer/ceildiv_spec.rb
@@ -1,22 +1,20 @@
 require_relative '../../spec_helper'
 
 describe "Integer#ceildiv" do
-  ruby_version_is '3.2' do
-    it "returns a quotient of division which is rounded up to the nearest integer" do
-      0.ceildiv(3).should eql(0)
-      1.ceildiv(3).should eql(1)
-      3.ceildiv(3).should eql(1)
-      4.ceildiv(3).should eql(2)
+  it "returns a quotient of division which is rounded up to the nearest integer" do
+    0.ceildiv(3).should eql(0)
+    1.ceildiv(3).should eql(1)
+    3.ceildiv(3).should eql(1)
+    4.ceildiv(3).should eql(2)
 
-      4.ceildiv(-3).should eql(-1)
-      -4.ceildiv(3).should eql(-1)
-      -4.ceildiv(-3).should eql(2)
+    4.ceildiv(-3).should eql(-1)
+    -4.ceildiv(3).should eql(-1)
+    -4.ceildiv(-3).should eql(2)
 
-      3.ceildiv(1.2).should eql(3)
-      3.ceildiv(6/5r).should eql(3)
+    3.ceildiv(1.2).should eql(3)
+    3.ceildiv(6/5r).should eql(3)
 
-      (10**100-11).ceildiv(10**99-1).should eql(10)
-      (10**100-9).ceildiv(10**99-1).should eql(11)
-    end
+    (10**100-11).ceildiv(10**99-1).should eql(10)
+    (10**100-9).ceildiv(10**99-1).should eql(11)
   end
 end
diff --git a/spec/ruby/core/integer/constants_spec.rb b/spec/ruby/core/integer/constants_spec.rb
index 2077ad451e..937806c72f 100644
--- a/spec/ruby/core/integer/constants_spec.rb
+++ b/spec/ruby/core/integer/constants_spec.rb
@@ -1,41 +1,13 @@
 require_relative '../../spec_helper'
 
 describe "Fixnum" do
-  ruby_version_is ""..."3.2" do
-    it "is unified into Integer" do
-      suppress_warning do
-        Fixnum.should equal(Integer)
-      end
-    end
-
-    it "is deprecated" do
-      -> { Fixnum }.should complain(/constant ::Fixnum is deprecated/)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "is no longer defined" do
-      Object.should_not.const_defined?(:Fixnum)
-    end
+  it "is no longer defined" do
+    Object.should_not.const_defined?(:Fixnum)
   end
 end
 
 describe "Bignum" do
-  ruby_version_is ""..."3.2" do
-    it "is unified into Integer" do
-      suppress_warning do
-        Bignum.should equal(Integer)
-      end
-    end
-
-    it "is deprecated" do
-      -> { Bignum }.should complain(/constant ::Bignum is deprecated/)
-    end
-  end
-
-  ruby_version_is "3.2" do
-    it "is no longer defined" do
-      Object.should_not.const_defined?(:Bignum)
-    end
+  it "is no longer defined" do
+    Object.should_not.const_defined?(:Bignum)
   end
 end
diff --git a/spec/ruby/core/integer/left_shift_spec.rb b/spec/ruby/core/integer/left_shift_spec.rb
index 0781371d93..86c2b18ae2 100644
--- a/spec/ruby/core/integer/left_shift_spec.rb
+++ b/spec/ruby/core/integer/left_shift_spec.rb
@@ -181,10 +181,8 @@ describe "Integer#<< (with n << m)" do
       (bignum_value << -(2**40)).should == 0
     end
 
-    ruby_bug "#18517", ""..."3.2" do
-      it "returns 0 when m > 0 long and n == 0" do
-        (0 << (2**40)).should == 0
-      end
+    it "returns 0 when m > 0 long and n == 0" do
+      (0 << (2**40)).should == 0
     end
 
     it "returns 0 when m > 0 bignum and n == 0" do
diff --git a/spec/ruby/core/integer/right_shift_spec.rb b/spec/ruby/core/integer/right_shift_spec.rb
index e91613d8d1..c902674e2f 100644
--- a/spec/ruby/core/integer/right_shift_spec.rb
+++ b/spec/ruby/core/integer/right_shift_spec.rb
@@ -203,10 +203,8 @@ describe "Integer#>> (with n >> m)" do
       (bignum_value >> (2**40)).should == 0
     end
 
-    ruby_bug "#18517", ""..."3.2" do
-      it "returns 0 when m < 0 long and n == 0" do
-        (0 >> -(2**40)).should == 0
-      end
+    it "returns 0 when m < 0 long and n == 0" do
+      (0 >> -(2**40)).should == 0
     end
 
     it "returns 0 when m < 0 bignum and n == 0" do