diff --git a/ChangeLog b/ChangeLog
index 3e50c741c1..14eacc5efc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Dec 16 22:55:11 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* bin/testrb: set $0.
+
 Tue Dec 16 22:42:16 2008  NAKAMURA Usaku  <usa@ruby-lang.org>
 
 	* lib/test/unit.rb (Test::Unit.setup_argv): sorry, fixed wrong commit.
diff --git a/bin/testrb b/bin/testrb
index 2e323f5cb0..e4eb9099b3 100755
--- a/bin/testrb
+++ b/bin/testrb
@@ -5,5 +5,10 @@ Test::Unit.setup_argv {|files|
     puts "Usage: testrb [options] tests..."
     exit 1
   end
+  if files.size == 1
+    $0 = File.basename(files[0])
+  else
+    $0 = files.to_s
+  end
   files
 }