1 files changed, 13 insertions, 28 deletions
diff --git a/spec/ruby/core/kernel/untaint_spec.rb b/spec/ruby/core/kernel/untaint_spec.rb
index 44d87da5d5..26b2aabbe9 100644
--- a/spec/ruby/core/kernel/untaint_spec.rb
+++ b/spec/ruby/core/kernel/untaint_spec.rb
@@ -2,35 +2,14 @@ require_relative '../../spec_helper'
 require_relative 'fixtures/classes'
 
 describe "Kernel#untaint" do
-  ruby_version_is ''...'2.7' do
-    it "returns self" do
-      o = Object.new
-      o.untaint.should equal(o)
-    end
-
-    it "clears the tainted bit" do
-      o = Object.new.taint
-      o.untaint
-      o.should_not.tainted?
-    end
-
-    it "raises FrozenError on a tainted, frozen object" do
-      o = Object.new.taint.freeze
-      -> { o.untaint }.should raise_error(FrozenError)
-    end
-
-    it "does not raise an error on an untainted, frozen object" do
-      o = Object.new.freeze
-      o.untaint.should equal(o)
-    end
-  end
-
-  ruby_version_is "2.7"..."3.0" do
+  ruby_version_is ""..."3.2" do
     it "is a no-op" do
-      o = Object.new.taint
-      o.should_not.tainted?
-      o.untaint
-      o.should_not.tainted?
+      suppress_warning do
+        o = Object.new.taint
+        o.should_not.tainted?
+        o.untaint
+        o.should_not.tainted?
+      end
     end
 
     it "warns in verbose mode" do
@@ -40,4 +19,10 @@ describe "Kernel#untaint" do
       }.should complain(/Object#untaint is deprecated and will be removed in Ruby 3.2/, verbose: true)
     end
   end
+
+  ruby_version_is "3.2" do
+    it "has been removed" do
+      Object.new.should_not.respond_to?(:untaint)
+    end
+  end
 end