diff --git a/ChangeLog b/ChangeLog
index dc80d6ae3d..a13e4ac6ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Aug  6 12:05:06 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/test/unit/testcase.rb (Test::Unit): removes silly TestCase
+	  class.
+
 Thu Aug  6 01:37:20 2009  Akinori MUSHA  <knu@iDaemons.org>
 
 	* ext/digest/sha2/sha2.[ch]: Update to 1.0 RELEASE which fixes an
diff --git a/lib/test/unit/testcase.rb b/lib/test/unit/testcase.rb
index 89aa0f34c0..ec3d362c21 100644
--- a/lib/test/unit/testcase.rb
+++ b/lib/test/unit/testcase.rb
@@ -2,6 +2,9 @@ require 'test/unit/assertions'
 
 module Test
   module Unit
+    # remove silly TestCase class
+    remove_const(:TestCase) if defined?(self::TestCase)
+
     class TestCase < MiniTest::Unit::TestCase
       include Assertions
       def self.test_order