1 files changed, 6 insertions, 15 deletions
diff --git a/spec/ruby/core/string/shared/succ.rb b/spec/ruby/core/string/shared/succ.rb
index 3605fa99a2..7c68345f10 100644
--- a/spec/ruby/core/string/shared/succ.rb
+++ b/spec/ruby/core/string/shared/succ.rb
@@ -1,4 +1,4 @@
-# -*- encoding: binary -*-
+# encoding: binary
 describe :string_succ, shared: true do
   it "returns an empty string for empty strings" do
     "".send(@method).should == ""
@@ -59,20 +59,10 @@ describe :string_succ, shared: true do
     "\xFF\xFF".send(@method).should == "\x01\x00\x00"
   end
 
-  ruby_version_is ''...'3.0' do
-    it "returns subclass instances when called on a subclass" do
-      StringSpecs::MyString.new("").send(@method).should be_an_instance_of(StringSpecs::MyString)
-      StringSpecs::MyString.new("a").send(@method).should be_an_instance_of(StringSpecs::MyString)
-      StringSpecs::MyString.new("z").send(@method).should be_an_instance_of(StringSpecs::MyString)
-    end
-  end
-
-  ruby_version_is '3.0' do
-    it "returns String instances when called on a subclass" do
-      StringSpecs::MyString.new("").send(@method).should be_an_instance_of(String)
-      StringSpecs::MyString.new("a").send(@method).should be_an_instance_of(String)
-      StringSpecs::MyString.new("z").send(@method).should be_an_instance_of(String)
-    end
+  it "returns String instances when called on a subclass" do
+    StringSpecs::MyString.new("").send(@method).should be_an_instance_of(String)
+    StringSpecs::MyString.new("a").send(@method).should be_an_instance_of(String)
+    StringSpecs::MyString.new("z").send(@method).should be_an_instance_of(String)
   end
 
   it "returns a String in the same encoding as self" do
@@ -83,6 +73,7 @@ end
 describe :string_succ_bang, shared: true do
   it "is equivalent to succ, but modifies self in place (still returns self)" do
     ["", "abcd", "THX1138"].each do |s|
+      s = +s
       r = s.dup.send(@method)
       s.send(@method).should equal(s)
       s.should == r