7 files changed, 21 insertions, 31 deletions
diff --git a/spec/ruby/shared/queue/clear.rb b/spec/ruby/shared/queue/clear.rb
index 5db5a5b497..742468a859 100644
--- a/spec/ruby/shared/queue/clear.rb
+++ b/spec/ruby/shared/queue/clear.rb
@@ -3,9 +3,9 @@ describe :queue_clear, shared: true do
     queue = @object.call
     queue << Object.new
     queue << 1
-    queue.empty?.should be_false
+    queue.empty?.should == false
     queue.clear
-    queue.empty?.should be_true
+    queue.empty?.should == true
   end
 
   # TODO: test for atomicity of Queue#clear
diff --git a/spec/ruby/shared/queue/close.rb b/spec/ruby/shared/queue/close.rb
index 0e7c69acba..1b0908c27c 100644
--- a/spec/ruby/shared/queue/close.rb
+++ b/spec/ruby/shared/queue/close.rb
@@ -2,9 +2,9 @@ describe :queue_close, shared: true do
   it "may be called multiple times" do
     q = @object.call
     q.close
-    q.closed?.should be_true
+    q.closed?.should == true
     q.close # no effect
-    q.closed?.should be_true
+    q.closed?.should == true
   end
 
   it "returns self" do
diff --git a/spec/ruby/shared/queue/closed.rb b/spec/ruby/shared/queue/closed.rb
index b3cea0c524..8a7d65055f 100644
--- a/spec/ruby/shared/queue/closed.rb
+++ b/spec/ruby/shared/queue/closed.rb
@@ -1,12 +1,12 @@
 describe :queue_closed?, shared: true do
   it "returns false initially" do
     queue = @object.call
-    queue.closed?.should be_false
+    queue.closed?.should == false
   end
 
   it "returns true when the queue is closed" do
     queue = @object.call
     queue.close
-    queue.closed?.should be_true
+    queue.closed?.should == true
   end
 end
diff --git a/spec/ruby/shared/queue/deque.rb b/spec/ruby/shared/queue/deque.rb
index a154da6274..45cbc4a995 100644
--- a/spec/ruby/shared/queue/deque.rb
+++ b/spec/ruby/shared/queue/deque.rb
@@ -105,18 +105,18 @@ describe :queue_deq, shared: true do
       q = @object.call
       -> {
         q.send(@method, timeout: "1")
-      }.should raise_error(TypeError, "no implicit conversion to float from string")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of String into Float")
 
       -> {
         q.send(@method, timeout: false)
-      }.should raise_error(TypeError, "no implicit conversion to float from false")
+      }.should raise_consistent_error(TypeError, "no implicit conversion of false into Float")
     end
 
     it "raise ArgumentError if non_block = true is passed too" do
       q = @object.call
       -> {
         q.send(@method, true, timeout: 1)
-      }.should raise_error(ArgumentError, "can't set a timeout if non_block is enabled")
+      }.should.raise(ArgumentError, "can't set a timeout if non_block is enabled")
     end
 
     it "returns nil for a closed empty queue" do
@@ -137,7 +137,7 @@ describe :queue_deq, shared: true do
 
     it "raises a ThreadError if the queue is empty" do
       q = @object.call
-      -> { q.send(@method, true) }.should raise_error(ThreadError)
+      -> { q.send(@method, true) }.should.raise(ThreadError)
     end
 
     it "removes an item from a closed queue" do
@@ -150,15 +150,15 @@ describe :queue_deq, shared: true do
     it "raises a ThreadError for a closed empty queue" do
       q = @object.call
       q.close
-      -> { q.send(@method, true) }.should raise_error(ThreadError)
+      -> { q.send(@method, true) }.should.raise(ThreadError)
     end
 
     it "converts true-ish non_blocking argument to true" do
       q = @object.call
 
-      -> { q.send(@method, true) }.should raise_error(ThreadError)
-      -> { q.send(@method, 1) }.should raise_error(ThreadError)
-      -> { q.send(@method, "") }.should raise_error(ThreadError)
+      -> { q.send(@method, true) }.should.raise(ThreadError)
+      -> { q.send(@method, 1) }.should.raise(ThreadError)
+      -> { q.send(@method, "") }.should.raise(ThreadError)
     end
   end
 end
diff --git a/spec/ruby/shared/queue/empty.rb b/spec/ruby/shared/queue/empty.rb
index 4acd831d48..052ce6ac23 100644
--- a/spec/ruby/shared/queue/empty.rb
+++ b/spec/ruby/shared/queue/empty.rb
@@ -1,12 +1,12 @@
 describe :queue_empty?, shared: true do
   it "returns true on an empty Queue" do
     queue = @object.call
-    queue.empty?.should be_true
+    queue.empty?.should == true
   end
 
   it "returns false when Queue is not empty" do
     queue = @object.call
     queue << Object.new
-    queue.empty?.should be_false
+    queue.empty?.should == false
   end
 end
diff --git a/spec/ruby/shared/queue/enque.rb b/spec/ruby/shared/queue/enque.rb
index 8aba02e544..61d962b788 100644
--- a/spec/ruby/shared/queue/enque.rb
+++ b/spec/ruby/shared/queue/enque.rb
@@ -13,6 +13,6 @@ describe :queue_enq, shared: true do
     q.close
     -> {
       q.send @method, Object.new
-    }.should raise_error(ClosedQueueError)
+    }.should.raise(ClosedQueueError)
   end
 end
diff --git a/spec/ruby/shared/queue/freeze.rb b/spec/ruby/shared/queue/freeze.rb
index 4c506a4235..7f1f72fd7e 100644
--- a/spec/ruby/shared/queue/freeze.rb
+++ b/spec/ruby/shared/queue/freeze.rb
@@ -1,18 +1,8 @@
 describe :queue_freeze, shared: true do
-  ruby_version_is ""..."3.3" do
-    it "can be frozen" do
-      queue = @object.call
+  it "raises an exception when freezing" do
+    queue = @object.call
+    -> {
       queue.freeze
-      queue.should.frozen?
-    end
-  end
-
-  ruby_version_is "3.3" do
-    it "raises an exception when freezing" do
-      queue = @object.call
-      -> {
-        queue.freeze
-      }.should raise_error(TypeError, "cannot freeze #{queue}")
-    end
+    }.should.raise(TypeError, "cannot freeze #{queue}")
   end
 end