1 files changed, 6 insertions, 8 deletions
diff --git a/spec/ruby/library/objectspace/reachable_objects_from_spec.rb b/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
index 7e70bc8569..4620bdec31 100644
--- a/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
+++ b/spec/ruby/library/objectspace/reachable_objects_from_spec.rb
@@ -16,7 +16,7 @@ describe "ObjectSpace.reachable_objects_from" do
   end
 
   it "enumerates objects directly reachable from a given object" do
-    ObjectSpace.reachable_objects_from(['a', 'b', 'c']).should include(Array, 'a', 'b', 'c')
+    ObjectSpace.reachable_objects_from(['a', 'b', 'c']).to_set.should >= Set[Array, 'a', 'b', 'c']
     ObjectSpace.reachable_objects_from(Object.new).should == [Object]
   end
 
@@ -24,7 +24,7 @@ describe "ObjectSpace.reachable_objects_from" do
     obj = Object.new
     ary = [obj]
     reachable = ObjectSpace.reachable_objects_from(ary)
-    reachable.should include(obj)
+    reachable.should.include?(obj)
   end
 
   it "finds an object stored in a copy-on-write Array" do
@@ -33,29 +33,27 @@ describe "ObjectSpace.reachable_objects_from" do
     ary = [removed, obj]
     ary.shift
     reachable = ObjectSpace.reachable_objects_from(ary)
-    reachable.should include(obj)
-    reachable.should_not include(removed)
+    reachable.should.include?(obj)
+    reachable.should_not.include?(removed)
   end
 
   it "finds an object stored in a Queue" do
-    require 'thread'
     o = Object.new
     q = Queue.new
     q << o
 
     reachable = ObjectSpace.reachable_objects_from(q)
     reachable = reachable + reachable.flat_map { |r| ObjectSpace.reachable_objects_from(r) }
-    reachable.should include(o)
+    reachable.should.include?(o)
   end
 
   it "finds an object stored in a SizedQueue" do
-    require 'thread'
     o = Object.new
     q = SizedQueue.new(3)
     q << o
 
     reachable = ObjectSpace.reachable_objects_from(q)
     reachable = reachable + reachable.flat_map { |r| ObjectSpace.reachable_objects_from(r) }
-    reachable.should include(o)
+    reachable.should.include?(o)
   end
 end