1 files changed, 7 insertions, 8 deletions
diff --git a/spec/ruby/core/threadgroup/enclose_spec.rb b/spec/ruby/core/threadgroup/enclose_spec.rb
index 5827ddb6aa..6f703d4ce2 100644
--- a/spec/ruby/core/threadgroup/enclose_spec.rb
+++ b/spec/ruby/core/threadgroup/enclose_spec.rb
@@ -1,15 +1,14 @@
-require File.expand_path('../../../spec_helper', __FILE__)
-require File.expand_path('../fixtures/classes', __FILE__)
+require_relative '../../spec_helper'
 
 describe "ThreadGroup#enclose" do
   before :each do
-    @chan1,@chan2 = Channel.new,Channel.new
-    @thread = Thread.new { @chan1 << :go; @chan2.receive }
-    @chan1.receive
+    @q1, @q2 = Queue.new, Queue.new
+    @thread = Thread.new { @q1 << :go; @q2.pop }
+    @q1.pop
   end
 
   after :each do
-    @chan2 << :done
+    @q2 << :done
     @thread.join
   end
 
@@ -18,8 +17,8 @@ describe "ThreadGroup#enclose" do
     default_group = @thread.group
     thread_group.add(@thread)
     thread_group.enclose
-    lambda do
+    -> do
       default_group.add(@thread)
-    end.should raise_error(ThreadError)
+    end.should.raise(ThreadError)
   end
 end