diff --git a/ChangeLog b/ChangeLog
index 0183b8b397..aa1c3ee188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Nov 17 11:48:17 2004  Michael Neumann  <mneumann@ruby-lang.org>
+
+	* lib/xmlrpc/parser.rb, test/xmlrpc/test_features.rb: fixed "assinging
+	  to constants" warnings
+
 Wed Nov 17 18:59:16 2004  Kazuhiro NISHIYAMA  <zn@mbf.nifty.com>
 
 	* process.c (proc_getrlimit, proc_setrlimit): add rb_secure(2) to
diff --git a/lib/xmlrpc/parser.rb b/lib/xmlrpc/parser.rb
index db99bafafc..2062ec1f05 100644
--- a/lib/xmlrpc/parser.rb
+++ b/lib/xmlrpc/parser.rb
@@ -578,12 +578,9 @@ module XMLRPC
     class XMLStreamParser < AbstractStreamParser
       def initialize
         require "xmlparser"
-        eval %{
-          class XMLRPCParser < ::XMLParser
-            include StreamParserMixin
-          end
+        @parser_class = Class.new(::XMLParser) {
+          include StreamParserMixin
         }
-        @parser_class = XMLRPCParser
       end
     end # class XMLStreamParser
     # ---------------------------------------------------------------------------
diff --git a/test/xmlrpc/test_features.rb b/test/xmlrpc/test_features.rb
index 273e0bc4db..96a6313202 100644
--- a/test/xmlrpc/test_features.rb
+++ b/test/xmlrpc/test_features.rb
@@ -13,15 +13,18 @@ class Test_Features < Test::Unit::TestCase
     XMLRPC::XMLWriter.each_installed_writer do |writer|
       c = XMLRPC::Create.new(writer)
 
+      XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
       XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, false)
       assert_raises(RuntimeError) { str = c.methodCall("test", *@params) }
 
+      XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
       XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, true)
       assert_nothing_raised { str = c.methodCall("test", *@params) }
     end
   end
 
   def test_nil_parse
+    XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_CREATE)}
     XMLRPC::Config.const_set(:ENABLE_NIL_CREATE, true)
 
     XMLRPC::XMLWriter.each_installed_writer do |writer|
@@ -30,9 +33,11 @@ class Test_Features < Test::Unit::TestCase
       XMLRPC::XMLParser.each_installed_parser do |parser|
         para = nil
 
+        XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_PARSER)}
         XMLRPC::Config.const_set(:ENABLE_NIL_PARSER, false)
         assert_raises(RuntimeError) { para = parser.parseMethodCall(str) }
 
+        XMLRPC::Config.module_eval {remove_const(:ENABLE_NIL_PARSER)}
         XMLRPC::Config.const_set(:ENABLE_NIL_PARSER, true)
         assert_nothing_raised { para = parser.parseMethodCall(str) }
         assert_equal(para[1], @params)