diff --git a/ChangeLog b/ChangeLog
index fe2c0688bd..94042faf45 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 16 21:59:29 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* lib/test/unit.rb (Test::Unit.setup_argv): ALT_SEPARATOR support.
+
 Tue Dec 16 20:34:44 2008  Tanaka Akira  <akr@fsij.org>
 
 	* ext/pty/pty.c (getDevice): add nomesg argument.
diff --git a/lib/test/unit.rb b/lib/test/unit.rb
index c42631b4be..7362beb889 100644
--- a/lib/test/unit.rb
+++ b/lib/test/unit.rb
@@ -32,6 +32,7 @@ module Test
       end
 
       files.map! {|f|
+        f.gsub!(/#{File::ALT_SEPARATOR}/o, File::SEPARATOR) if File::ALT_SEPARATOR
         if File.directory? f
           Dir["#{f}/**/test_*.rb"]
         elsif File.file? f