4 files changed, 24 insertions, 31 deletions
diff --git a/spec/ruby/core/basicobject/equal_spec.rb b/spec/ruby/core/basicobject/equal_spec.rb
index 3c1ad56d4a..ce28eaed95 100644
--- a/spec/ruby/core/basicobject/equal_spec.rb
+++ b/spec/ruby/core/basicobject/equal_spec.rb
@@ -11,8 +11,10 @@ describe "BasicObject#equal?" do
   it "is unaffected by overriding __id__" do
     o1 = mock("object")
     o2 = mock("object")
-    def o1.__id__; 10; end
-    def o2.__id__; 10; end
+    suppress_warning {
+      def o1.__id__; 10; end
+      def o2.__id__; 10; end
+    }
     o1.equal?(o2).should be_false
   end
 
diff --git a/spec/ruby/core/basicobject/instance_eval_spec.rb b/spec/ruby/core/basicobject/instance_eval_spec.rb
index 1f3a43f341..633b5c2cb1 100644
--- a/spec/ruby/core/basicobject/instance_eval_spec.rb
+++ b/spec/ruby/core/basicobject/instance_eval_spec.rb
@@ -141,22 +141,11 @@ describe "BasicObject#instance_eval" do
       caller.get_constant_with_string(receiver).should == :singleton_class
     end
 
-    ruby_version_is ""..."3.1" do
-      it "looks in the caller scope next" do
-        receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
-        caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
+    it "looks in the receiver class next" do
+      receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
+      caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
 
-        caller.get_constant_with_string(receiver).should == :Caller
-      end
-    end
-
-    ruby_version_is "3.1" do
-      it "looks in the receiver class next" do
-        receiver = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::ReceiverScope::Receiver.new
-        caller = BasicObjectSpecs::InstEval::Constants::ConstantInReceiverClass::CallerScope::Caller.new
-
-        caller.get_constant_with_string(receiver).should == :Receiver
-      end
+      caller.get_constant_with_string(receiver).should == :Receiver
     end
 
     it "looks in the caller class next" do
diff --git a/spec/ruby/core/basicobject/instance_exec_spec.rb b/spec/ruby/core/basicobject/instance_exec_spec.rb
index 289fdd889b..370f03d33c 100644
--- a/spec/ruby/core/basicobject/instance_exec_spec.rb
+++ b/spec/ruby/core/basicobject/instance_exec_spec.rb
@@ -84,17 +84,17 @@ describe "BasicObject#instance_exec" do
     end.should raise_error(TypeError)
   end
 
-quarantine! do # Not clean, leaves cvars lying around to break other specs
-  it "scopes class var accesses in the caller when called on an Integer" do
-    # Integer can take instance vars
-    Integer.class_eval "@@__tmp_instance_exec_spec = 1"
-    (defined? @@__tmp_instance_exec_spec).should == nil
-
-    @@__tmp_instance_exec_spec = 2
-    1.instance_exec { @@__tmp_instance_exec_spec }.should == 2
-    Integer.__send__(:remove_class_variable, :@@__tmp_instance_exec_spec)
+  quarantine! do # Not clean, leaves cvars lying around to break other specs
+    it "scopes class var accesses in the caller when called on an Integer" do
+      # Integer can take instance vars
+      Integer.class_eval "@@__tmp_instance_exec_spec = 1"
+      (defined? @@__tmp_instance_exec_spec).should == nil
+
+      @@__tmp_instance_exec_spec = 2
+      1.instance_exec { @@__tmp_instance_exec_spec }.should == 2
+      Integer.__send__(:remove_class_variable, :@@__tmp_instance_exec_spec)
+    end
   end
-end
 
   it "raises a TypeError when defining methods on numerics" do
     -> do
diff --git a/spec/ruby/core/basicobject/singleton_method_added_spec.rb b/spec/ruby/core/basicobject/singleton_method_added_spec.rb
index ab6b2a2d10..bd21458ea7 100644
--- a/spec/ruby/core/basicobject/singleton_method_added_spec.rb
+++ b/spec/ruby/core/basicobject/singleton_method_added_spec.rb
@@ -94,8 +94,10 @@ describe "BasicObject#singleton_method_added" do
         -> {
           def self.foo
           end
-        }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for/)
+        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for/)
       end
+    ensure
+      BasicObjectSpecs.send(:remove_const, :NoSingletonMethodAdded)
     end
 
     it "raises NoMethodError for a singleton instance" do
@@ -106,16 +108,16 @@ describe "BasicObject#singleton_method_added" do
         -> {
           def foo
           end
-        }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for #<Object:/)
+        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
 
         -> {
           define_method(:bar) {}
-        }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for #<Object:/)
+        }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
       end
 
       -> {
         object.define_singleton_method(:baz) {}
-      }.should raise_error(NoMethodError, /undefined method `singleton_method_added' for #<Object:/)
+      }.should raise_error(NoMethodError, /undefined method [`']singleton_method_added' for #<Object:/)
     end
 
     it "calls #method_missing" do