diff --git a/ChangeLog b/ChangeLog
index 8109f912a5..3100e69c4b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Mar  6 13:45:37 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/rake/testtask.rb (Rake::TestTask#define): passes each libs
+	  as each arguments with expanded.  incorporated from rake 0.8.4.
+
 Thu Mar  5 18:36:38 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* numeric.c (flo_to_s): keeps enough precision for round trip.
diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
index cc73d7887f..3444012500 100644
--- a/lib/rake/testtask.rb
+++ b/lib/rake/testtask.rb
@@ -93,7 +93,7 @@ module Rake
 
     # Create the tasks defined by this task lib.
     def define
-      lib_path = @libs.join(File::PATH_SEPARATOR)
+      lib_path = @libs.collect {|path| "-I#{File.expand_path(path)}"}
       desc "Run tests" + (@name==:test ? "" : " for #{@name}")
       task @name do
         run_code = ''
@@ -107,7 +107,7 @@ module Rake
             when :rake
               rake_loader
             end
-          @ruby_opts.unshift( "-I#{lib_path}" )
+          @ruby_opts.unshift( *lib_path )
           @ruby_opts.unshift( "-w" ) if @warning
           ruby @ruby_opts.join(" ") +
             " \"#{run_code}\" " +