3 files changed, 34 insertions, 23 deletions
diff --git a/spec/ruby/core/nil/match_spec.rb b/spec/ruby/core/nil/match_spec.rb
index 27646e9749..bc1c591793 100644
--- a/spec/ruby/core/nil/match_spec.rb
+++ b/spec/ruby/core/nil/match_spec.rb
@@ -1,23 +1,21 @@
 require_relative '../../spec_helper'
 
-ruby_version_is "2.6" do
-  describe "NilClass#=~" do
-    it "returns nil matching any object" do
-      o = Object.new
+describe "NilClass#=~" do
+  it "returns nil matching any object" do
+    o = nil
 
-      suppress_warning do
-        (o =~ /Object/).should   be_nil
-        (o =~ 'Object').should   be_nil
-        (o =~ Object).should     be_nil
-        (o =~ Object.new).should be_nil
-        (o =~ nil).should        be_nil
-        (o =~ false).should      be_nil
-        (o =~ true).should       be_nil
-      end
+    suppress_warning do
+      (o =~ /Object/).should   be_nil
+      (o =~ 'Object').should   be_nil
+      (o =~ Object).should     be_nil
+      (o =~ Object.new).should be_nil
+      (o =~ nil).should        be_nil
+      (o =~ false).should      be_nil
+      (o =~ true).should       be_nil
     end
+  end
 
-    it "should not warn" do
-      -> { nil =~ /a/ }.should_not complain(verbose: true)
-    end
+  it "should not warn" do
+    -> { nil =~ /a/ }.should_not complain(verbose: true)
   end
 end
diff --git a/spec/ruby/core/nil/singleton_method_spec.rb b/spec/ruby/core/nil/singleton_method_spec.rb
new file mode 100644
index 0000000000..8d898b1cc9
--- /dev/null
+++ b/spec/ruby/core/nil/singleton_method_spec.rb
@@ -0,0 +1,15 @@
+require_relative '../../spec_helper'
+
+describe "NilClass#singleton_method" do
+  ruby_version_is '3.3' do
+    it "raises regardless of whether NilClass defines the method" do
+      -> { nil.singleton_method(:foo) }.should raise_error(NameError)
+      begin
+        def (nil).foo; end
+        -> { nil.singleton_method(:foo) }.should raise_error(NameError)
+      ensure
+        NilClass.send(:remove_method, :foo)
+      end
+    end
+  end
+end
diff --git a/spec/ruby/core/nil/to_s_spec.rb b/spec/ruby/core/nil/to_s_spec.rb
index 283d26477a..fa0b929677 100644
--- a/spec/ruby/core/nil/to_s_spec.rb
+++ b/spec/ruby/core/nil/to_s_spec.rb
@@ -5,13 +5,11 @@ describe "NilClass#to_s" do
     nil.to_s.should == ""
   end
 
-  ruby_version_is "2.7" do
-    it "returns a frozen string" do
-      nil.to_s.should.frozen?
-    end
+  it "returns a frozen string" do
+    nil.to_s.should.frozen?
+  end
 
-    it "always returns the same string" do
-      nil.to_s.should equal(nil.to_s)
-    end
+  it "always returns the same string" do
+    nil.to_s.should equal(nil.to_s)
   end
 end