Pluck more unrelated bits from #422
diff --git a/tests/test_ssl.py b/tests/test_ssl.py
index 433fa2c..da313f7 100644
--- a/tests/test_ssl.py
+++ b/tests/test_ssl.py
@@ -356,6 +356,11 @@
 
 
 class TestContext(object):
+    """
+    py.test-based tests for :class:`OpenSSL.SSL.Context`.
+
+    If possible, add new tests here.
+    """
     @pytest.mark.parametrize("cipher_string", [
         b"hello world:AES128-SHA",
         u"hello world:AES128-SHA",
@@ -387,7 +392,9 @@
 
 class ContextTests(TestCase, _LoopbackMixin):
     """
-    Unit tests for :py:obj:`OpenSSL.SSL.Context`.
+    Unit tests for :class:`OpenSSL.SSL.Context`.
+
+    If possible, add new tests to :class:`TestContext` above.
     """
     def test_method(self):
         """
@@ -2016,7 +2023,7 @@
 
 class ConnectionTests(TestCase, _LoopbackMixin):
     """
-    Unit tests for :py:obj:`OpenSSL.SSL.Connection`.
+    Unit tests for :class:`OpenSSL.SSL.Connection`.
     """
     # XXX get_peer_certificate -> None
     # XXX sock_shutdown