diff --git a/test/fiber/test_enumerator.rb b/test/fiber/test_enumerator.rb
index 7c97382c52..6679d9e4e5 100644
--- a/test/fiber/test_enumerator.rb
+++ b/test/fiber/test_enumerator.rb
@@ -3,7 +3,7 @@ require 'test/unit'
 require 'socket'
 require_relative 'scheduler'
 
-class TestSchedulerEnumerator < Test::Unit::TestCase
+class TestFiberEnumerator < Test::Unit::TestCase
   MESSAGE = "Hello World"
 
   def test_read_characters
diff --git a/test/fiber/test_http.rb b/test/fiber/test_http.rb
index 82aa73ca35..02e44d71ad 100644
--- a/test/fiber/test_http.rb
+++ b/test/fiber/test_http.rb
@@ -7,7 +7,7 @@ require 'openssl'
 require 'test/unit'
 require_relative 'scheduler'
 
-class TestSchedulerHTTP < Test::Unit::TestCase
+class TestFiberHTTP < Test::Unit::TestCase
   def test_get
     Thread.new do
       scheduler = Scheduler.new
diff --git a/test/fiber/test_io.rb b/test/fiber/test_io.rb
index ef46d1ac2c..e7f06f7429 100644
--- a/test/fiber/test_io.rb
+++ b/test/fiber/test_io.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 require_relative 'scheduler'
 
-class TestSchedulerIO < Test::Unit::TestCase
+class TestFiberIO < Test::Unit::TestCase
   MESSAGE = "Hello World"
 
   def test_read
diff --git a/test/fiber/test_mutex.rb b/test/fiber/test_mutex.rb
index 2ffe0190ca..c4e671f6d9 100644
--- a/test/fiber/test_mutex.rb
+++ b/test/fiber/test_mutex.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 require_relative 'scheduler'
 
-class TestSchedulerMutex < Test::Unit::TestCase
+class TestFiberMutex < Test::Unit::TestCase
   def test_mutex_synchronize
     mutex = Mutex.new
 
diff --git a/test/fiber/test_fiber.rb b/test/fiber/test_scheduler.rb
similarity index 92%
rename from test/fiber/test_fiber.rb
rename to test/fiber/test_scheduler.rb
index 368065016e..f3ea6e8ab6 100644
--- a/test/fiber/test_fiber.rb
+++ b/test/fiber/test_scheduler.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 require_relative 'scheduler'
 
-class TestSchedulerFiber < Test::Unit::TestCase
+class TestFiberScheduler < Test::Unit::TestCase
   def test_fiber_without_scheduler
     # Cannot create fiber without scheduler.
     assert_raise RuntimeError do
diff --git a/test/fiber/test_sleep.rb b/test/fiber/test_sleep.rb
index 0be760341e..bfb892e2c6 100644
--- a/test/fiber/test_sleep.rb
+++ b/test/fiber/test_sleep.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 require_relative 'scheduler'
 
-class TestSchedulerSleep < Test::Unit::TestCase
+class TestFiberSleep < Test::Unit::TestCase
   ITEMS = [0, 1, 2, 3, 4]
 
   def test_sleep