diff --git a/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb b/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
index 8a7e6776da5ab9dcb6f9f074b30357463481661f..0b3d18301efca4abe07884a220b6b3f15c12a00e 100644
--- a/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
+++ b/activesupport/lib/active_support/core_ext/module/attribute_accessors_per_thread.rb
@@ -47,7 +47,7 @@ def self.#{sym}
       unless options[:instance_reader] == false || options[:instance_accessor] == false
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{sym}
-            Thread.current[:"attr_#{self.class.name}_#{sym}"]
+            Thread.current[:"attr_#{name}_#{sym}"]
           end
         EOS
       end
@@ -86,7 +86,7 @@ def self.#{sym}=(obj)
       unless options[:instance_writer] == false || options[:instance_accessor] == false
         class_eval(<<-EOS, __FILE__, __LINE__ + 1)
           def #{sym}=(obj)
-            Thread.current[:"attr_#{self.class.name}_#{sym}"] = obj
+            Thread.current[:"attr_#{name}_#{sym}"] = obj
           end
         EOS
       end
diff --git a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
index 65fadc5c2066f9448e51ac9b3803c54578f39619..a9fd878b803120a42e132affc930a5c5f5730c05 100644
--- a/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
+++ b/activesupport/test/core_ext/module/attribute_accessor_per_thread_test.rb
@@ -106,4 +106,10 @@ def test_should_raise_name_error_if_attribute_name_is_invalid
     end
     assert_equal "invalid attribute name: 2valid_part", exception.message
   end
+
+  def test_should_return_same_value_by_class_or_instance_accessor
+    @class.foo = 'fries'
+
+    assert_equal @class.foo, @object.foo
+  end
 end