diff --git a/ChangeLog b/ChangeLog
index 96b737e76a..32b211ebfd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Oct  4 08:52:30 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* test/optparse/test_getopts.rb: changed the class name of test case
+	  to get rid of conflict with test_optparse.rb.
+
 Tue Oct  3 23:32:27 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* lib/test/unit/testcase.rb (Test::Unit::TestCase.suite): tset name
diff --git a/test/optparse/test_getopts.rb b/test/optparse/test_getopts.rb
index 4cc8bdb651..fdefe5f3e5 100644
--- a/test/optparse/test_getopts.rb
+++ b/test/optparse/test_getopts.rb
@@ -1,6 +1,6 @@
 require 'test/unit'
 
-class TestOptionParser < Test::Unit::TestCase
+class TestOptionParserGetopts < Test::Unit::TestCase
   def setup
     @opt = OptionParser.new
   end