diff --git a/src/sage/tests/article_heuberger_krenn_kropf_fsm-in-sage.py b/src/sage/tests/article_heuberger_krenn_kropf_fsm-in-sage.py
index b52523cbbde..6125930bd45 100644
--- a/src/sage/tests/article_heuberger_krenn_kropf_fsm-in-sage.py
+++ b/src/sage/tests/article_heuberger_krenn_kropf_fsm-in-sage.py
@@ -1,5 +1,5 @@
 r"""
-This file contains doctests of the article
+This file contains doctests of the article ::
 
     Automata and Transducers
     in the Computer Algebra System Sage
@@ -7,10 +7,12 @@
 by Clemens Heuberger, Daniel Krenn, and Sara Kropf, :arxiv:`1404.7458`.
 
 IF IT BECOMES NECESSARY TO CHANGE ANY TESTS IN THIS FILE, THERE
-NEEDS TO BE A ONE-YEAR DEPRECATION PERIOD. ALSO, PLEASE INFORM
-    Clemens Heuberger <clemens.heuberger@aau.at>,
-    Daniel Krenn <devel@danielkrenn.at>, AND
-    Sara Kropf <sara.kropf@aau.at>
+NEEDS TO BE A ONE-YEAR DEPRECATION PERIOD. ALSO, PLEASE INFORM:
+
+- Clemens Heuberger <clemens.heuberger@aau.at>,
+- Daniel Krenn <devel@danielkrenn.at>, AND
+- Sara Kropf <sara.kropf@aau.at>
+
 IN THIS CASE REGARDING THE CHANGES!
 """
 
diff --git a/src/sage/tests/benchmark.py b/src/sage/tests/benchmark.py
index 3612f941168..1eb66f6c28b 100644
--- a/src/sage/tests/benchmark.py
+++ b/src/sage/tests/benchmark.py
@@ -64,12 +64,16 @@ def run(self, systems=None, timeout=60, trials=1, sort=False, optional=False):
         given.
 
         INPUT:
-            systems -- list of strings of which systems to run tests on
-                if None, runs the standard systems
-            timeout -- how long (in seconds) to run each test for
-            trials -- integer, number of trials
-            sort -- whether to sort system names
-            optional -- if systems is None, whether to test optional systems
+
+        - systems -- optional list of strings of which systems to run tests on;
+          if ``None``, runs the standard systems
+        - timeout -- optional integer (default 60); how long (in seconds)
+          to run each test for
+        - trials -- optional integer (default 1); number of trials
+        - sort -- optional boolean (default ``False``); whether to sort
+          system names
+        - optional -- optional boolean (default ``False``);
+          if systems is ``None``, whether to test optional systems
 
         EXAMPLES::
 
diff --git a/src/sage/tests/gosper-sum.py b/src/sage/tests/gosper-sum.py
index add407f4aa7..95266ac235c 100644
--- a/src/sage/tests/gosper-sum.py
+++ b/src/sage/tests/gosper-sum.py
@@ -1,4 +1,6 @@
 """
+Some tests about Gosper sums.
+
 References
 ==========