diff -r 8e7a738c3840 Lib/test/test_contextlib.py
--- a/Lib/test/test_contextlib.py	Sat Nov 16 10:47:17 2013 -0500
+++ b/Lib/test/test_contextlib.py	Sat Nov 16 21:39:52 2013 +0200
@@ -101,12 +101,14 @@
         self.assertEqual(baz.__name__,'baz')
         self.assertEqual(baz.foo, 'bar')
 
-    @support.requires_docstrings
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "Docstrings are omitted with -OO and above")
     def test_contextmanager_doc_attrib(self):
         baz = self._create_contextmanager_attribs()
         self.assertEqual(baz.__doc__, "Whee!")
 
-    @support.requires_docstrings
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "Docstrings are omitted with -OO and above")
     def test_instance_docstring_given_cm_docstring(self):
         baz = self._create_contextmanager_attribs()(None)
         self.assertEqual(baz.__doc__, "Whee!")
diff -r 8e7a738c3840 Lib/test/test_docxmlrpc.py
--- a/Lib/test/test_docxmlrpc.py	Sat Nov 16 10:47:17 2013 -0500
+++ b/Lib/test/test_docxmlrpc.py	Sat Nov 16 21:39:52 2013 +0200
@@ -202,10 +202,12 @@
         """ Test that annotations works as expected """
         self.client.request("GET", "/")
         response = self.client.getresponse()
+        docstring = (b'' if sys.flags.optimize >= 2 else
+                     b'<dd><tt>Use&nbsp;function&nbsp;annotations.</tt></dd>')
         self.assertIn(
             (b'<dl><dt><a name="-annotation"><strong>annotation</strong></a>'
-             b'(x: int)</dt><dd><tt>Use&nbsp;function&nbsp;annotations.</tt>'
-             b'</dd></dl>\n<dl><dt><a name="-method_annotation"><strong>'
+             b'(x: int)</dt>' + docstring + b'</dl>\n'
+             b'<dl><dt><a name="-method_annotation"><strong>'
              b'method_annotation</strong></a>(x: bytes)</dt></dl>'),
             response.read())
 
diff -r 8e7a738c3840 Lib/test/test_functools.py
--- a/Lib/test/test_functools.py	Sat Nov 16 10:47:17 2013 -0500
+++ b/Lib/test/test_functools.py	Sat Nov 16 21:39:52 2013 +0200
@@ -1124,7 +1124,8 @@
             "Simple test"
             return "Test"
         self.assertEqual(g.__name__, "g")
-        self.assertEqual(g.__doc__, "Simple test")
+        if sys.flags.optimize < 2:
+            self.assertEqual(g.__doc__, "Simple test")
 
     @unittest.skipUnless(decimal, 'requires _decimal')
     @support.cpython_only
diff -r 8e7a738c3840 Lib/test/test_inspect.py
--- a/Lib/test/test_inspect.py	Sat Nov 16 10:47:17 2013 -0500
+++ b/Lib/test/test_inspect.py	Sat Nov 16 21:39:52 2013 +0200
@@ -2525,7 +2525,8 @@
         # Just a quick sanity check on the output
         self.assertIn(module.__name__, output)
         self.assertIn(module.__file__, output)
-        self.assertIn(module.__cached__, output)
+        if not sys.flags.optimize:
+            self.assertIn(module.__cached__, output)
         self.assertEqual(err, b'')
 
 
diff -r 8e7a738c3840 Lib/test/test_statistics.py
--- a/Lib/test/test_statistics.py	Sat Nov 16 10:47:17 2013 -0500
+++ b/Lib/test/test_statistics.py	Sat Nov 16 21:39:52 2013 +0200
@@ -8,6 +8,7 @@
 import doctest
 import math
 import random
+import sys
 import types
 import unittest
 
@@ -625,6 +626,8 @@
 
 
 class DocTests(unittest.TestCase):
+    @unittest.skipIf(sys.flags.optimize >= 2,
+                     "Docstrings are omitted with -OO and above")
     def test_doc_tests(self):
         failed, tried = doctest.testmod(statistics)
         self.assertGreater(tried, 0)