3 files changed, 10 insertions, 8 deletions
diff --git a/test/ruby/test_continuation.rb b/test/ruby/test_continuation.rb
index 729da88e60..eccc973932 100644
--- a/test/ruby/test_continuation.rb
+++ b/test/ruby/test_continuation.rb
@@ -1,4 +1,6 @@
 require 'test/unit'
+require 'continuation'
+require 'fiber'
 
 class TestContinuation < Test::Unit::TestCase
   def test_create
diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb
index 885cb4a5fe..27a71e423d 100644
--- a/test/ruby/test_enumerator.rb
+++ b/test/ruby/test_enumerator.rb
@@ -24,14 +24,13 @@ class TestEnumerator < Test::Unit::TestCase
     assert_raise(StopIteration){e.next}
   end
 
-  def test_next?
+  def test_loop
     e = 3.times
-    assert_equal true, e.next?
-    3.times{|i|
-      assert_equal true, e.next?
-      assert_equal i, e.next
+    i = 0
+    loop{
+      assert_equal(i, e.next)
+      i += 1
     }
-    assert_equal false, e.next?
   end
 
   def test_nested_itaration
diff --git a/test/ruby/test_fiber.rb b/test/ruby/test_fiber.rb
index bd39ba5af4..a8bce8a06d 100644
--- a/test/ruby/test_fiber.rb
+++ b/test/ruby/test_fiber.rb
@@ -1,4 +1,5 @@
 require 'test/unit'
+require 'fiber'
 
 class TestFiber < Test::Unit::TestCase
   def test_normal
@@ -118,11 +119,11 @@ class TestFiber < Test::Unit::TestCase
   def test_transfer
     ary = []
     f2 = nil
-    f1 = Fiber::Core.new{
+    f1 = Fiber.new{
       ary << f2.transfer(:foo)
       :ok
     }
-    f2 = Fiber::Core.new{
+    f2 = Fiber.new{
       ary << f1.transfer(:baz)
       :ng
     }