1 files changed, 11 insertions, 9 deletions
diff --git a/spec/ruby/core/warning/element_reference_spec.rb b/spec/ruby/core/warning/element_reference_spec.rb
index 8cb4018c20..5f977759ec 100644
--- a/spec/ruby/core/warning/element_reference_spec.rb
+++ b/spec/ruby/core/warning/element_reference_spec.rb
@@ -2,24 +2,26 @@ require_relative '../../spec_helper'
 
 describe "Warning.[]" do
   it "returns default values for categories :deprecated and :experimental" do
+    # If any warning options were set on the Ruby that will be executed, then
+    # it's possible this test will fail. In this case we will skip this test.
+    skip if ruby_exe.any? { |opt| opt.start_with?("-W") }
+
     ruby_exe('p [Warning[:deprecated], Warning[:experimental]]').chomp.should == "[false, true]"
     ruby_exe('p [Warning[:deprecated], Warning[:experimental]]', options: "-w").chomp.should == "[true, true]"
   end
 
-  ruby_version_is '3.3' do
-    it "returns default values for :performance category" do
-      ruby_exe('p Warning[:performance]').chomp.should == "false"
-      ruby_exe('p Warning[:performance]', options: "-w").chomp.should == "false"
-    end
+  it "returns default values for :performance category" do
+    ruby_exe('p Warning[:performance]').chomp.should == "false"
+    ruby_exe('p Warning[:performance]', options: "-w").chomp.should == "false"
   end
 
   it "raises for unknown category" do
-    -> { Warning[:noop] }.should raise_error(ArgumentError, /unknown category: noop/)
+    -> { Warning[:noop] }.should.raise(ArgumentError, /unknown category: noop/)
   end
 
   it "raises for non-Symbol category" do
-    -> { Warning[42] }.should raise_error(TypeError)
-    -> { Warning[false] }.should raise_error(TypeError)
-    -> { Warning["noop"] }.should raise_error(TypeError)
+    -> { Warning[42] }.should.raise(TypeError)
+    -> { Warning[false] }.should.raise(TypeError)
+    -> { Warning["noop"] }.should.raise(TypeError)
   end
 end