diff --git a/heat/engine/attributes.py b/heat/engine/attributes.py
index 477b912473..fae19a80b3 100644
--- a/heat/engine/attributes.py
+++ b/heat/engine/attributes.py
@@ -233,7 +233,7 @@ class Attributes(collections.Mapping):
 
     def __repr__(self):
         return ("Attributes for %s:\n\t" % self._resource_name +
-                '\n\t'.join(six.itervalues(self._attributes)))
+                '\n\t'.join(six.itervalues(self)))
 
 
 def select_from_attribute(attribute_value, path):
diff --git a/heat/tests/test_attributes.py b/heat/tests/test_attributes.py
index 2c7c7fb86f..9f2f17d7f5 100644
--- a/heat/tests/test_attributes.py
+++ b/heat/tests/test_attributes.py
@@ -110,6 +110,15 @@ class AttributesTest(common.HeatTestCase):
                                         test_resolver)
         self.assertEqual("value1", attribs['test1'])
 
+    def test_attributes_representation(self):
+        """Test that attributes are displayed correct."""
+        test_resolver = lambda x: "value1"
+        attribs = attributes.Attributes('test resource',
+                                        self.attributes_schema,
+                                        test_resolver)
+        msg = 'Attributes for test resource:\n\tvalue1\n\tvalue1\n\tvalue1'
+        self.assertEqual(msg, str(attribs))
+
     def test_get_attribute_none(self):
         """Test that we get the attribute values we expect."""
         test_resolver = lambda x: None