diff --git a/test/thread/test_cv.rb b/test/ruby/test_thread_cv.rb
similarity index 98%
rename from test/thread/test_cv.rb
rename to test/ruby/test_thread_cv.rb
index b010b1fe5c..4161ba2341 100644
--- a/test/thread/test_cv.rb
+++ b/test/ruby/test_thread_cv.rb
@@ -2,7 +2,7 @@
 require 'test/unit'
 require 'tmpdir'
 
-class TestConditionVariable < Test::Unit::TestCase
+class TestThreadConditionVariable < Test::Unit::TestCase
   ConditionVariable = Thread::ConditionVariable
   Mutex = Thread::Mutex
 
diff --git a/test/thread/test_queue.rb b/test/ruby/test_thread_queue.rb
similarity index 99%
rename from test/thread/test_queue.rb
rename to test/ruby/test_thread_queue.rb
index d69ecf92b2..6ea37104c4 100644
--- a/test/thread/test_queue.rb
+++ b/test/ruby/test_thread_queue.rb
@@ -3,7 +3,7 @@ require 'test/unit'
 require 'tmpdir'
 require 'timeout'
 
-class TestQueue < Test::Unit::TestCase
+class TestThreadQueue < Test::Unit::TestCase
   Queue = Thread::Queue
   SizedQueue = Thread::SizedQueue
 
diff --git a/test/thread/test_sync.rb b/test/test_sync.rb
similarity index 100%
rename from test/thread/test_sync.rb
rename to test/test_sync.rb