Drop default settings from individual functional test files.

Define common defaults for all functional tests in `test_functional.py`.

Only specify settings that differ from the default/fallback value
in the individual test files.

git-svn-id: https://svn.code.sf.net/p/docutils/code/trunk@9249 929543f6-e4f2-0310-98a6-ba3bd3dd1d04

33 files changed, 277 insertions, 883 deletions

diff --git a/docutils/test/functional/tests/compact_lists.py b/docutils/test/functional/tests/compact_lists.py
index 9093c93af..a4829d809 100644
--- a/docutils/test/functional/tests/compact_lists.py
+++ b/docutils/test/functional/tests/compact_lists.py
@@ -1,27 +1,10 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "compact_lists.txt"
 test_destination = "compact_lists.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
-writer_name = "html"
-
-# Settings
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+# Keyword parameters passed to publish_file()
+writer_name = "html4"
+settings_overrides = {
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+}
diff --git a/docutils/test/functional/tests/dangerous.py b/docutils/test/functional/tests/dangerous.py
index 467140502..0f523a56c 100644
--- a/docutils/test/functional/tests/dangerous.py
+++ b/docutils/test/functional/tests/dangerous.py
@@ -1,28 +1,12 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "dangerous.txt"
 test_destination = "dangerous.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
-writer_name = "html"
-
-# Settings
-settings_overrides['file_insertion_enabled'] = False
-settings_overrides['raw_enabled'] = False
-# local copy of default stylesheet:
-settings_overrides['stylesheet_path'] = 'functional/input/data/html4css1.css'
+# Keyword parameters passed to publish_file()
+writer_name = "html4"
+settings_overrides = {
+    'file_insertion_enabled': False,
+    'raw_enabled': False,
+    # local copy of default stylesheet:
+    'stylesheet_path': 'functional/input/data/html4css1.css',
+    }
diff --git a/docutils/test/functional/tests/field_name_limit.py b/docutils/test/functional/tests/field_name_limit.py
index d79f2bfce..a9cea539e 100644
--- a/docutils/test/functional/tests/field_name_limit.py
+++ b/docutils/test/functional/tests/field_name_limit.py
@@ -1,29 +1,12 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "field_list.txt"
 test_destination = "field_name_limit.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
-writer_name = "html"
-
-# Settings
-settings_overrides['field_name_limit'] = 0  # no limit
-settings_overrides['docinfo_xform'] = False
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+# Keyword parameters passed to publish_file()
+writer_name = "html4"
+settings_overrides = {
+    'field_name_limit': 0,  # no limit
+    'docinfo_xform': False,
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    }
diff --git a/docutils/test/functional/tests/footnotes_html5.py b/docutils/test/functional/tests/footnotes_html5.py
index fbaead8c2..24ce4a054 100644
--- a/docutils/test/functional/tests/footnotes_html5.py
+++ b/docutils/test/functional/tests/footnotes_html5.py
@@ -1,36 +1,14 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "footnotes.txt"
 test_destination = "footnotes_html5.html"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "html5"
-
-# Settings:
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
-settings_overrides['stylesheet_path'] = 'minimal.css,responsive.css'
-settings_overrides['footnote_references'] = 'superscript'
-settings_overrides['section_self_link'] = True
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    'footnote_references': 'superscript',
+    'section_self_link': True,
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    'stylesheet_path': 'minimal.css,responsive.css',
+}
diff --git a/docutils/test/functional/tests/latex_babel.py b/docutils/test/functional/tests/latex_babel.py
index d8cdf6632..13733eeed 100644
--- a/docutils/test/functional/tests/latex_babel.py
+++ b/docutils/test/functional/tests/latex_babel.py
@@ -1,26 +1,10 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_babel.txt"
 test_destination = "latex_babel.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra settings we need
-settings_overrides['legacy_column_widths'] = False
-settings_overrides['use_latex_citations'] = True
+settings_overrides = {
+    'legacy_column_widths': False,
+    'use_latex_citations': True,
+}
diff --git a/docutils/test/functional/tests/latex_cornercases.py b/docutils/test/functional/tests/latex_cornercases.py
index 2e3bc6b95..328df8a0c 100644
--- a/docutils/test/functional/tests/latex_cornercases.py
+++ b/docutils/test/functional/tests/latex_cornercases.py
@@ -1,26 +1,10 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_cornercases.txt"
 test_destination = "latex_cornercases.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-settings_overrides['legacy_column_widths'] = False
-settings_overrides['use_latex_citations'] = True
+settings_overrides = {
+    'legacy_column_widths': False,
+    'use_latex_citations': True,
+    }
diff --git a/docutils/test/functional/tests/latex_cyrillic.py b/docutils/test/functional/tests/latex_cyrillic.py
index 5dcd56526..d1d816531 100644
--- a/docutils/test/functional/tests/latex_cyrillic.py
+++ b/docutils/test/functional/tests/latex_cyrillic.py
@@ -1,32 +1,14 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "cyrillic.txt"
 test_destination = "cyrillic.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-
-settings_overrides['font_encoding'] = 'T1,T2A'
-settings_overrides['stylesheet'] = 'cmlgc'
-settings_overrides['language_code'] = 'ru'
-
-settings_overrides['smart_quotes'] = True
-settings_overrides['legacy_column_widths'] = False
-settings_overrides['use_latex_citations'] = True
+settings_overrides = {
+    'font_encoding': 'T1,T2A',
+    'stylesheet': 'cmlgc',
+    'language_code': 'ru',
+    'smart_quotes': True,
+    'legacy_column_widths': False,
+    'use_latex_citations': True,
+    }
diff --git a/docutils/test/functional/tests/latex_docinfo.py b/docutils/test/functional/tests/latex_docinfo.py
index b6097645c..66dd42edf 100644
--- a/docutils/test/functional/tests/latex_docinfo.py
+++ b/docutils/test/functional/tests/latex_docinfo.py
@@ -1,28 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_docinfo.txt"
 test_destination = "latex_docinfo.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-
-settings_overrides['use_latex_docinfo'] = 1
-settings_overrides['legacy_column_widths'] = False
-settings_overrides['use_latex_citations'] = True
+settings_overrides = {
+    'use_latex_docinfo': 1,
+    'legacy_column_widths': False,
+    'use_latex_citations': True,
+    }
diff --git a/docutils/test/functional/tests/latex_leavevmode.py b/docutils/test/functional/tests/latex_leavevmode.py
index 27e1c0e84..668a1c7f5 100644
--- a/docutils/test/functional/tests/latex_leavevmode.py
+++ b/docutils/test/functional/tests/latex_leavevmode.py
@@ -1,26 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_leavevmode.txt"
 test_destination = "latex_leavevmode.tex"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Settings
-# use "smartquotes" transition:
-settings_overrides['smart_quotes'] = True
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
+settings_overrides = {
+    'smart_quotes': True,
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    }
diff --git a/docutils/test/functional/tests/latex_literal_block.py b/docutils/test/functional/tests/latex_literal_block.py
index 9991b40e3..4dfa76d7e 100644
--- a/docutils/test/functional/tests/latex_literal_block.py
+++ b/docutils/test/functional/tests/latex_literal_block.py
@@ -1,29 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_literal_block.txt"
 test_destination = "latex_literal_block.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-settings_overrides['syntax_highlight'] = 'none'
-settings_overrides['stylesheet'] = 'docutils'
-
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
+settings_overrides = {
+    'stylesheet': 'docutils',
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    }
diff --git a/docutils/test/functional/tests/latex_literal_block_fancyvrb.py b/docutils/test/functional/tests/latex_literal_block_fancyvrb.py
index ffb934e98..627d0f99f 100644
--- a/docutils/test/functional/tests/latex_literal_block_fancyvrb.py
+++ b/docutils/test/functional/tests/latex_literal_block_fancyvrb.py
@@ -1,30 +1,12 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_literal_block.txt"
 test_destination = "latex_literal_block_fancyvrb.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-settings_overrides['syntax_highlight'] = 'none'
-settings_overrides['stylesheet'] = 'docutils'
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
-
-settings_overrides['literal_block_env'] = 'Verbatim'
+settings_overrides = {
+    'stylesheet': 'docutils',
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    'literal_block_env': 'Verbatim',
+    }
diff --git a/docutils/test/functional/tests/latex_literal_block_listings.py b/docutils/test/functional/tests/latex_literal_block_listings.py
index 1120c76e0..f94de7160 100644
--- a/docutils/test/functional/tests/latex_literal_block_listings.py
+++ b/docutils/test/functional/tests/latex_literal_block_listings.py
@@ -1,34 +1,15 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_literal_block.txt"
 test_destination = "latex_literal_block_listings.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-settings_overrides['stylesheet'] = 'docutils'
-settings_overrides['syntax_highlight'] = 'none'
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
-
-settings_overrides['literal_block_env'] = 'lstlisting'
-settings_overrides['latex_preamble'] = r"""
+settings_overrides = {
+    'stylesheet': 'docutils',
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    'literal_block_env': 'lstlisting',
+    'latex_preamble': r"""
 % PDF Standard Fonts
 \usepackage{mathptmx} % Times
 \usepackage[scaled=.90]{helvet}
@@ -36,4 +17,5 @@ settings_overrides['latex_preamble'] = r"""
 % LaTeX syntax highlight with "listings":
 \lstloadlanguages{[LaTeX]TeX} %  comma separated list of languages
 \newcommand{\DUCLASSlatex}{\lstset{language=[LaTeX]TeX}}
-"""
+""",
+}
diff --git a/docutils/test/functional/tests/latex_literal_block_verbatim.py b/docutils/test/functional/tests/latex_literal_block_verbatim.py
index 4e5faf076..2c606bc0a 100644
--- a/docutils/test/functional/tests/latex_literal_block_verbatim.py
+++ b/docutils/test/functional/tests/latex_literal_block_verbatim.py
@@ -1,30 +1,12 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_literal_block.txt"
 test_destination = "latex_literal_block_verbatim.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-settings_overrides['syntax_highlight'] = 'none'
-settings_overrides['stylesheet'] = 'docutils'
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
-
-settings_overrides['literal_block_env'] = 'verbatim'
+settings_overrides = {
+    'stylesheet': 'docutils',
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    'literal_block_env': 'verbatim',
+    }
diff --git a/docutils/test/functional/tests/latex_literal_block_verbatimtab.py b/docutils/test/functional/tests/latex_literal_block_verbatimtab.py
index 6c5b971d2..6f47f1555 100644
--- a/docutils/test/functional/tests/latex_literal_block_verbatimtab.py
+++ b/docutils/test/functional/tests/latex_literal_block_verbatimtab.py
@@ -1,30 +1,12 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "latex_literal_block.txt"
 test_destination = "latex_literal_block_verbatimtab.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-settings_overrides['syntax_highlight'] = 'none'
-settings_overrides['stylesheet'] = 'docutils'
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
-
-settings_overrides['literal_block_env'] = 'verbatimtab'
+settings_overrides = {
+    'stylesheet': 'docutils',
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    'literal_block_env': 'verbatimtab',
+    }
diff --git a/docutils/test/functional/tests/latex_memoir.py b/docutils/test/functional/tests/latex_memoir.py
index 617d547b1..afa531167 100644
--- a/docutils/test/functional/tests/latex_memoir.py
+++ b/docutils/test/functional/tests/latex_memoir.py
@@ -1,33 +1,15 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_latex.txt"
 test_destination = "latex_memoir.tex"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Extra setting we need
-
-settings_overrides['use_latex_docinfo'] = 1
-settings_overrides['documentclass'] = "memoir"
-settings_overrides['template'] = "titlingpage.tex"
-
-# test the legacy class functions (since 0.18 default is False )
-settings_overrides['legacy_class_functions'] = True
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
+settings_overrides = {
+    'use_latex_docinfo': 1,
+    'documentclass': "memoir",
+    'template': "titlingpage.tex",
+    # test the legacy class functions (since 0.18 default is False )
+    'legacy_class_functions': True,
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    }
diff --git a/docutils/test/functional/tests/math_output_html.py b/docutils/test/functional/tests/math_output_html.py
index 15448c1fc..f4e71420a 100644
--- a/docutils/test/functional/tests/math_output_html.py
+++ b/docutils/test/functional/tests/math_output_html.py
@@ -1,28 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "data/math.txt"
 test_destination = "math_output_html.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
-writer_name = "html"
-
-# Extra settings
-settings_overrides['math_output'] = 'HTML math.css'
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+# Keyword parameters passed to publish_file()
+writer_name = "html4"
+settings_overrides = {
+    'math_output': 'HTML math.css',
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    }
diff --git a/docutils/test/functional/tests/math_output_latex.py b/docutils/test/functional/tests/math_output_latex.py
index fb9e236b7..ace3f8f36 100644
--- a/docutils/test/functional/tests/math_output_latex.py
+++ b/docutils/test/functional/tests/math_output_latex.py
@@ -1,28 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "data/math.txt"
 test_destination = "math_output_latex.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
-writer_name = "html"
-
-# Settings
-settings_overrides['math_output'] = 'latex'
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+# Keyword parameters passed to publish_file()
+writer_name = "html4"
+settings_overrides = {
+    'math_output': 'latex',
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data',),
+    }
diff --git a/docutils/test/functional/tests/math_output_mathjax.py b/docutils/test/functional/tests/math_output_mathjax.py
index ee755f74d..6acbde940 100644
--- a/docutils/test/functional/tests/math_output_mathjax.py
+++ b/docutils/test/functional/tests/math_output_mathjax.py
@@ -1,29 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "data/math.txt"
 test_destination = "math_output_mathjax.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
-writer_name = "html"
-
-# Settings
-settings_overrides['math_output'] \
-    = 'MathJax /usr/share/javascript/mathjax/MathJax.js'
-# local copy of default stylesheet:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+# Keyword parameters passed to publish_file()
+writer_name = "html4"
+settings_overrides = {
+    'math_output': 'MathJax /usr/share/javascript/mathjax/MathJax.js',
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    }
diff --git a/docutils/test/functional/tests/math_output_mathml.py b/docutils/test/functional/tests/math_output_mathml.py
index 1e52edc26..1a5f053a9 100644
--- a/docutils/test/functional/tests/math_output_mathml.py
+++ b/docutils/test/functional/tests/math_output_mathml.py
@@ -1,28 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "data/math.txt"
 test_destination = "math_output_mathml.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "html5"
-
-# Settings
-settings_overrides['math_output'] = 'MathML'
-# local copy of default stylesheet:
-# (test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+settings_overrides = {
+    'math_output': 'MathML',
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    }
diff --git a/docutils/test/functional/tests/misc_rst_html4css1.py b/docutils/test/functional/tests/misc_rst_html4css1.py
index 8d2ae10b5..5f9f8ecb3 100644
--- a/docutils/test/functional/tests/misc_rst_html4css1.py
+++ b/docutils/test/functional/tests/misc_rst_html4css1.py
@@ -1,31 +1,15 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "misc_rst_html4css1.txt"
 test_destination = "misc_rst_html4css1.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "html4css1"
-
-# Settings
-# test for encoded attribute value in optional stylesheet name,
-# 'stylesheet' setting, values are used verbatim
-settings_overrides['stylesheet'] = 'foo&bar.css, ../input/data/html4css1.css'
-# reset to avoid conflict with 'stylesheet'
-settings_overrides['stylesheet_path'] = ''
-# stylesheet_dirs not used with 'stylesheet'
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+settings_overrides = {
+    # test for encoded attribute value in optional stylesheet name,
+    # 'stylesheet' setting, values are used verbatim
+    'stylesheet': 'foo&bar.css, ../input/data/html4css1.css',
+    # reset to avoid conflict with 'stylesheet'
+    'stylesheet_path': '',
+    # stylesheet_dirs not used with 'stylesheet'
+    'stylesheet_dirs': ('functional/input/data', ),
+    }
diff --git a/docutils/test/functional/tests/misc_rst_html5.py b/docutils/test/functional/tests/misc_rst_html5.py
index add484e25..4a3a5c275 100644
--- a/docutils/test/functional/tests/misc_rst_html5.py
+++ b/docutils/test/functional/tests/misc_rst_html5.py
@@ -1,32 +1,15 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "misc_rst_html5.txt"
 test_destination = "misc_rst_html5.html"
 
-# Keyword parameters passed to publish_file.
-reader_name = "standalone"
-parser_name = "rst"
+# Keyword parameters passed to publish_file()
 writer_name = "html5"
-
-# Settings
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
-settings_overrides['stylesheet_path'] = 'minimal.css,responsive.css'
-settings_overrides['smart_quotes'] = 'yes'
-settings_overrides['image_loading'] = 'embed'
-settings_overrides['toc_backlinks'] = 'top'
-settings_overrides['section_self_link'] = True
+settings_overrides = {
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    'stylesheet_path': 'minimal.css,responsive.css',
+    'smart_quotes': 'yes',
+    'image_loading': 'embed',
+    'toc_backlinks': 'top',
+    'section_self_link': True,
+    }
diff --git a/docutils/test/functional/tests/pep_html.py b/docutils/test/functional/tests/pep_html.py
index b2acbbbbf..93ccd04e7 100644
--- a/docutils/test/functional/tests/pep_html.py
+++ b/docutils/test/functional/tests/pep_html.py
@@ -1,30 +1,15 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "pep_html.txt"
 test_destination = "pep_html.html"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 reader_name = "pep"
-parser_name = "rst"
 writer_name = "pep_html"
-
-# Settings
-settings_overrides['python_home'] = "http://www.python.org"
-settings_overrides['pep_home'] = "http://www.python.org/peps"
-settings_overrides['no_random'] = 1
-settings_overrides['cloak_email_addresses'] = 1
-# local copy of default stylesheet:
-settings_overrides['stylesheet_path'] = 'functional/input/data/html4css1.css'
+settings_overrides = {
+    'python_home': "http://www.python.org",
+    'pep_home': "http://www.python.org/peps",
+    'no_random': 1,
+    'cloak_email_addresses': 1,
+    # local copy of default stylesheet:
+    'stylesheet_path': 'functional/input/data/html4css1.css',
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_docutils_xml.py b/docutils/test/functional/tests/standalone_rst_docutils_xml.py
index 18c78f8be..f9004e14f 100644
--- a/docutils/test/functional/tests/standalone_rst_docutils_xml.py
+++ b/docutils/test/functional/tests/standalone_rst_docutils_xml.py
@@ -1,35 +1,13 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_docutils_xml.txt"
 test_destination = "standalone_rst_docutils_xml.xml"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "docutils_xml"
-
-# Settings
-# enable INFO-level system messages in this test:
-settings_overrides['report_level'] = 1
-
-# format output with indents and newlines
-settings_overrides['indents'] = True
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    # enable INFO-level system messages in this test:
+    'report_level': 1,
+    # format output with indents and newlines
+    'indents': True,
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_html4css1.py b/docutils/test/functional/tests/standalone_rst_html4css1.py
index ab2f17845..11faf973d 100644
--- a/docutils/test/functional/tests/standalone_rst_html4css1.py
+++ b/docutils/test/functional/tests/standalone_rst_html4css1.py
@@ -1,33 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_html4css1.txt"
 test_destination = "standalone_rst_html4css1.html"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "html4css1"
-
-# Settings:
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_html5.py b/docutils/test/functional/tests/standalone_rst_html5.py
index 8e3b68046..6e194864d 100644
--- a/docutils/test/functional/tests/standalone_rst_html5.py
+++ b/docutils/test/functional/tests/standalone_rst_html5.py
@@ -1,35 +1,13 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_html5.txt"
 test_destination = "standalone_rst_html5.html"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "html5"
-
-# Settings:
-# "smart" quotes:
-# settings_overrides['smart_quotes']='yes'
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    # "smart" quotes:
+    # 'smart_quotes': 'yes',
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_html5_tuftig.py b/docutils/test/functional/tests/standalone_rst_html5_tuftig.py
index adf544853..edae18361 100644
--- a/docutils/test/functional/tests/standalone_rst_html5_tuftig.py
+++ b/docutils/test/functional/tests/standalone_rst_html5_tuftig.py
@@ -1,37 +1,15 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "rst_html5_tuftig.txt"
 test_destination = "rst_html5_tuftig.html"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "html5"
-
-# Settings:
-settings_overrides['smart_quotes'] = 'yes'
-settings_overrides['footnote_references'] = 'superscript'
-settings_overrides['table_style'] = 'booktabs numbered captionbelow'
-# local copy of stylesheets:
-# (Test runs in ``docutils/test/``, we need relative path from there.)
-settings_overrides['stylesheet_dirs'] = ('.', 'functional/input/data')
-settings_overrides['stylesheet_path'] = 'minimal.css, tuftig.css'
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    'smart_quotes': 'yes',
+    'footnote_references': 'superscript',
+    'table_style': 'booktabs numbered captionbelow',
+    # location of stylesheets (relative to ``docutils/test/``)
+    'stylesheet_dirs': ('functional/input/data', ),
+    'stylesheet_path': 'minimal.css, tuftig.css',
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_latex.py b/docutils/test/functional/tests/standalone_rst_latex.py
index 3c14e0536..05557a22a 100644
--- a/docutils/test/functional/tests/standalone_rst_latex.py
+++ b/docutils/test/functional/tests/standalone_rst_latex.py
@@ -1,34 +1,13 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_latex.txt"
 test_destination = "standalone_rst_latex.tex"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "latex"
-
-# Settings
-# use "smartquotes" transition:
-settings_overrides['smart_quotes'] = True
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    # use "smartquotes" transition:
+    'smart_quotes': True,
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_manpage.py b/docutils/test/functional/tests/standalone_rst_manpage.py
index f4b133c11..89ac9b42c 100644
--- a/docutils/test/functional/tests/standalone_rst_manpage.py
+++ b/docutils/test/functional/tests/standalone_rst_manpage.py
@@ -1,28 +1,9 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_manpage.txt"
 test_destination = "standalone_rst_manpage.man"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "manpage"
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_pseudoxml.py b/docutils/test/functional/tests/standalone_rst_pseudoxml.py
index 25872b101..e831f7c73 100644
--- a/docutils/test/functional/tests/standalone_rst_pseudoxml.py
+++ b/docutils/test/functional/tests/standalone_rst_pseudoxml.py
@@ -1,32 +1,11 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_pseudoxml.txt"
 test_destination = "standalone_rst_pseudoxml.txt"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "pseudoxml"
-
-# Settings
-# enable INFO-level system messages in this test:
-settings_overrides['report_level'] = 1
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    # enable INFO-level system messages in this test:
+    'report_level': 1,
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_s5_html_1.py b/docutils/test/functional/tests/standalone_rst_s5_html_1.py
index e0c59b54e..fa5f438b6 100755
--- a/docutils/test/functional/tests/standalone_rst_s5_html_1.py
+++ b/docutils/test/functional/tests/standalone_rst_s5_html_1.py
@@ -1,33 +1,12 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
 # Source and destination file names:
 test_source = 'standalone_rst_s5_html.txt'
 test_destination = 'standalone_rst_s5_html_1.html'
 
 # Keyword parameters passed to publish_file:
 writer_name = 's5_html'
-
-# Settings:
-settings_overrides['theme'] = 'small-black'
-# local copy of default stylesheet:
-settings_overrides['stylesheet_path'] = 'functional/input/data/html4css1.css'
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    'theme': 'small-black',
+    # local copy of default stylesheet:
+    'stylesheet_path': 'functional/input/data/html4css1.css',
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_s5_html_2.py b/docutils/test/functional/tests/standalone_rst_s5_html_2.py
index 4e6540b74..34f177de7 100755
--- a/docutils/test/functional/tests/standalone_rst_s5_html_2.py
+++ b/docutils/test/functional/tests/standalone_rst_s5_html_2.py
@@ -1,34 +1,12 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
 # Source and destination file names:
 test_source = 'standalone_rst_s5_html.txt'
 test_destination = 'standalone_rst_s5_html_2.html'
 
 # Keyword parameters passed to publish_file:
 writer_name = 's5_html'
-
-# Settings:
-
-# local copy of default stylesheet:
-settings_overrides['stylesheet_path'] = 'functional/input/data/html4css1.css'
-settings_overrides['current_slide'] = 1
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    # local copy of default stylesheet:
+    'stylesheet_path': 'functional/input/data/html4css1.css',
+    'current_slide': 1,
+    }
diff --git a/docutils/test/functional/tests/standalone_rst_xetex.py b/docutils/test/functional/tests/standalone_rst_xetex.py
index aa1207013..a3d37a76f 100644
--- a/docutils/test/functional/tests/standalone_rst_xetex.py
+++ b/docutils/test/functional/tests/standalone_rst_xetex.py
@@ -1,38 +1,17 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Keyword parameters passed to publish_file.
-reader_name = 'standalone'
-parser_name = 'rst'
-
-# Settings.
-settings_overrides['sectsubtitle_xform'] = True
-settings_overrides['syntax_highlight'] = 'none'
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "standalone_rst_xetex.txt"
 test_destination = "standalone_rst_xetex.tex"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "xetex"
-
-# Settings
-# use "smartquotes" transition:
-settings_overrides['smart_quotes'] = True
-# use docutils.sty and up-to-date class functions:
-settings_overrides['stylesheet'] = 'docutils'
-# Test the ToC generation by Docutils:
-settings_overrides['use_latex_toc'] = False
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
+settings_overrides = {
+    'sectsubtitle_xform': True,
+    # use "smartquotes" transition:
+    'smart_quotes': True,
+    # use docutils.sty and up-to-date class functions:
+    'stylesheet': 'docutils',
+    # Test the ToC generation by Docutils:
+    'use_latex_toc': False,
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    }
diff --git a/docutils/test/functional/tests/xetex_cyrillic.py b/docutils/test/functional/tests/xetex_cyrillic.py
index 6c8ba767d..c548710ae 100644
--- a/docutils/test/functional/tests/xetex_cyrillic.py
+++ b/docutils/test/functional/tests/xetex_cyrillic.py
@@ -1,27 +1,13 @@
-# Default settings for all tests.
-
-settings_overrides = {
-    '_disable_config': True,
-    'report_level': 2,
-    'halt_level': 5,
-    'warning_stream': '',
-    'input_encoding': 'utf-8',
-    'embed_stylesheet': False,
-    'auto_id_prefix': '%',
-    # avoid "Pygments not found"
-    'syntax_highlight': 'none'
-}
-
-# Source and destination file names.
+# Source and destination file names
 test_source = "cyrillic.txt"
 test_destination = "xetex-cyrillic.tex"
 
-# Keyword parameters passed to publish_file.
+# Keyword parameters passed to publish_file()
 writer_name = "xetex"
-
-# Settings
-settings_overrides['language_code'] = 'ru'
-# use "smartquotes" transition:
-settings_overrides['smart_quotes'] = True
-settings_overrides['legacy_column_widths'] = True
-settings_overrides['use_latex_citations'] = False
+settings_overrides = {
+    'language_code': 'ru',
+    # use "smartquotes" transition:
+    'smart_quotes': True,
+    'legacy_column_widths': True,
+    'use_latex_citations': False,
+    }