diff --git a/ChangeLog b/ChangeLog
index 39e6c5b01d..328f93f68a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Aug 17 22:10:19 2007  Koichi Sasada  <ko1@atdot.net>
+
+	* test/ruby/test_basicinstructions.rb: fix old tests.
+	  class variables should be inherited.
+
 Fri Aug 17 21:20:44 2007  Koichi Sasada  <ko1@atdot.net>
 
 	* eval.c (rb_call), eval_method.ci (rb_add_method, rb_alias),
diff --git a/test/ruby/test_basicinstructions.rb b/test/ruby/test_basicinstructions.rb
index e49eb75872..2e039f5163 100644
--- a/test/ruby/test_basicinstructions.rb
+++ b/test/ruby/test_basicinstructions.rb
@@ -476,9 +476,9 @@ class TestBasicInstructions < Test::Unit::TestCase
     assert_equal 'B/instance',  CVarA.new.cv
 
     CVarA.cv = 'CVarA@@cv'
-    assert_raise(NameError) {   CVarB.cvB }
-    assert_raise(NameError) {   CVarB.cvB2 }
-    assert_raise(NameError) {   CVarB.new.cvB }
+    assert_equal('CVarA@@cv', CVarB.cvB)
+    assert_equal('CVarA@@cv', CVarB.cvB2)
+    assert_equal('CVarA@@cv', CVarB.new.cvB)
     CVarB.cvB = 'B/singleton'
     assert_equal 'B/singleton', CVarB.cvB
     assert_equal 'B/singleton', CVarB.cvB2