4 files changed, 6 insertions, 6 deletions
diff --git a/spec/ruby/core/threadgroup/default_spec.rb b/spec/ruby/core/threadgroup/default_spec.rb
index d7d4726cc2..4f57508abf 100644
--- a/spec/ruby/core/threadgroup/default_spec.rb
+++ b/spec/ruby/core/threadgroup/default_spec.rb
@@ -2,7 +2,7 @@ require_relative '../../spec_helper'
 
 describe "ThreadGroup::Default" do
   it "is a ThreadGroup instance" do
-    ThreadGroup::Default.should be_kind_of(ThreadGroup)
+    ThreadGroup::Default.should.is_a?(ThreadGroup)
   end
 
   it "is the ThreadGroup of the main thread" do
diff --git a/spec/ruby/core/threadgroup/enclose_spec.rb b/spec/ruby/core/threadgroup/enclose_spec.rb
index dd9a7a362d..6f703d4ce2 100644
--- a/spec/ruby/core/threadgroup/enclose_spec.rb
+++ b/spec/ruby/core/threadgroup/enclose_spec.rb
@@ -19,6 +19,6 @@ describe "ThreadGroup#enclose" do
     thread_group.enclose
     -> do
       default_group.add(@thread)
-    end.should raise_error(ThreadError)
+    end.should.raise(ThreadError)
   end
 end
diff --git a/spec/ruby/core/threadgroup/enclosed_spec.rb b/spec/ruby/core/threadgroup/enclosed_spec.rb
index a734256a64..cf8a5bb4c6 100644
--- a/spec/ruby/core/threadgroup/enclosed_spec.rb
+++ b/spec/ruby/core/threadgroup/enclosed_spec.rb
@@ -3,12 +3,12 @@ require_relative '../../spec_helper'
 describe "ThreadGroup#enclosed?" do
   it "returns false when a ThreadGroup has not been enclosed (default state)" do
     thread_group = ThreadGroup.new
-    thread_group.enclosed?.should be_false
+    thread_group.enclosed?.should == false
   end
 
   it "returns true when a ThreadGroup is enclosed" do
     thread_group = ThreadGroup.new
     thread_group.enclose
-    thread_group.enclosed?.should be_true
+    thread_group.enclosed?.should == true
   end
 end
diff --git a/spec/ruby/core/threadgroup/list_spec.rb b/spec/ruby/core/threadgroup/list_spec.rb
index b2ac64324a..ef601d75ea 100644
--- a/spec/ruby/core/threadgroup/list_spec.rb
+++ b/spec/ruby/core/threadgroup/list_spec.rb
@@ -7,13 +7,13 @@ describe "ThreadGroup#list" do
     q.pop.should == :go
     tg = ThreadGroup.new
     tg.add(th1)
-    tg.list.should include(th1)
+    tg.list.should.include?(th1)
 
     th2 = Thread.new { q << :go; sleep }
     q.pop.should == :go
 
     tg.add(th2)
-    (tg.list & [th1, th2]).should include(th1, th2)
+    (tg.list & [th1, th2]).to_set.should == Set[th1, th2]
 
     Thread.pass while th1.status and th1.status != 'sleep'
     Thread.pass while th2.status and th2.status != 'sleep'