diff -r d4fcb362f7c6 Lib/test/test_property.py
--- a/Lib/test/test_property.py	Fri Sep 18 15:06:34 2015 +0200
+++ b/Lib/test/test_property.py	Fri Sep 18 10:26:07 2015 -0400
@@ -171,7 +171,10 @@
         sub = PropertyWritableDoc()
         self.assertEqual(sub.__class__.spam.__doc__, 'Eggs')
         sub.__class__.spam.__doc__ = 'Spam'
-        self.assertEqual(sub.__class__.spam.__doc__, 'Spam')
+        try:
+            self.assertEqual(sub.__class__.spam.__doc__, 'Spam')
+        finally:
+            sub.__class__.spam.__doc__ = 'Eggs'
 
 # Issue 5890: subclasses of property do not preserve method __doc__ strings
 class PropertySub(property):