diff --git a/tests/modeltests/properties/__init__.py b/tests/modeltests/properties/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/tests/modeltests/properties/models.py b/tests/modeltests/properties/models.py
new file mode 100644
index 0000000000..ac7b6fe72f
--- /dev/null
+++ b/tests/modeltests/properties/models.py
@@ -0,0 +1,20 @@
+"""
+22. Using properties on models
+"""
+
+from django.core import meta
+
+class Person(meta.Model):
+    first_name = meta.CharField(maxlength=30)
+    last_name = meta.CharField(maxlength=30)
+
+    def _get_full_name(self):
+        return "%s %s" % (self.first_name, self.last_name)
+    full_name = property(_get_full_name)
+
+API_TESTS = """
+>>> a = Person(first_name='John', last_name='Lennon')
+>>> a.save()
+>>> a.full_name
+John Lennon
+"""