2 files changed, 36 insertions, 0 deletions
diff --git a/test/ruby/test_class.rb b/test/ruby/test_class.rb
index 3f18294e0f..55940a8891 100644
--- a/test/ruby/test_class.rb
+++ b/test/ruby/test_class.rb
@@ -240,4 +240,22 @@ class TestClass < Test::Unit::TestCase
   def test_nested_class_removal
     assert_normal_exit('File.__send__(:remove_const, :Stat); at_exit{File.stat(".")}; GC.start')
   end
+
+  class PrivateClass
+  end
+  private_constant :PrivateClass
+
+  def test_redefine_private_class
+    assert_raise(NameError) do
+      eval("class ::TestClass::PrivateClass; end")
+    end
+    eval <<-END
+      class ::TestClass
+        class PrivateClass
+          def foo; 42; end
+        end
+      end
+    END
+    assert_equal(42, PrivateClass.new.foo)
+  end
 end
diff --git a/test/ruby/test_module.rb b/test/ruby/test_module.rb
index 87a4905e3c..3306c0db74 100644
--- a/test/ruby/test_module.rb
+++ b/test/ruby/test_module.rb
@@ -947,6 +947,24 @@ class TestModule < Test::Unit::TestCase
     c.private_constant(:FOO)
     assert_raise(NameError) { c::FOO }
     assert_equal("foo", c.class_eval("FOO"))
+    assert_equal("foo", c.const_get("FOO"))
+  end
+
+  class PrivateClass
+  end
+  private_constant :PrivateClass
+
+  def test_define_module_under_private_constant
+    assert_raise(NameError) do
+      eval %q{class TestModule::PrivateClass; end}
+    end
+    assert_raise(NameError) do
+      eval %q{module TestModule::PrivateClass::TestModule; end}
+    end
+    eval %q{class PrivateClass; end}
+    eval %q{module PrivateClass::TestModule; end}
+    assert_instance_of(Module, PrivateClass::TestModule)
+    PrivateClass.class_eval { remove_const(:TestModule) }
   end
 
   def test_public_constant