diff --git a/ChangeLog b/ChangeLog
index d364c9e6c2..369fbf1f57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb  7 23:08:53 2010  Tanaka Akira  <akr@fsij.org>
+
+	* bootstraptest/runner.rb: sort test files.
+
 Sun Feb  7 12:53:12 2010  Tanaka Akira  <akr@fsij.org>
 
 	* lib/rake.rb (Rake::FileList::ARRAY_METHODS): fix test failure by <=>
diff --git a/bootstraptest/runner.rb b/bootstraptest/runner.rb
index df444f3181..b48329665a 100755
--- a/bootstraptest/runner.rb
+++ b/bootstraptest/runner.rb
@@ -72,7 +72,7 @@ def main
       @ruby.gsub!(/(\s+-r\s*)(\.\.?\/\S+)/){$1+File.expand_path($2)}
       true
     when /\A--sets=(.*)/
-      tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb")
+      tests = Dir.glob("#{File.dirname($0)}/test_{#{$1}}*.rb").sort
       puts tests.map {|path| File.basename(path) }.inspect
       true
     when /\A--dir=(.*)/
@@ -106,7 +106,7 @@ End
     exit false
   end
   tests ||= ARGV
-  tests = Dir.glob("#{File.dirname($0)}/test_*.rb") if tests.empty?
+  tests = Dir.glob("#{File.dirname($0)}/test_*.rb").sort if tests.empty?
   pathes = tests.map {|path| File.expand_path(path) }
 
   unless quiet