diff --git a/sphinx/ext/__init__.py b/sphinx/ext/__init__.py
index d0fb18c81..d111f11b9 100644
--- a/sphinx/ext/__init__.py
+++ b/sphinx/ext/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 """
-    sphinx.addons
-    ~~~~~~~~~~~~~
+    sphinx.ext
+    ~~~~~~~~~~
 
     Contains Sphinx features not activated by default.
 
diff --git a/sphinx/util/_json.py b/sphinx/util/_json.py
index 9847376f4..26b2a62da 100644
--- a/sphinx/util/_json.py
+++ b/sphinx/util/_json.py
@@ -11,7 +11,7 @@
 
     Uses the basestring encode function from simplejson.
 
-    :copyright: Copyright 2008 by Armin Ronacher, Bob Ippolito.
+    :copyright: 2008 by Armin Ronacher, Bob Ippolito.
     :license: BSD.
 """
 import re
diff --git a/sphinx/util/json.py b/sphinx/util/json.py
index 1686fe6a5..75277a5ea 100644
--- a/sphinx/util/json.py
+++ b/sphinx/util/json.py
@@ -5,7 +5,7 @@
 
     This module imports JSON functions from various locations.
 
-    :copyright: Copyright 2008 by Armin Ronacher.
+    :copyright: 2008 by Armin Ronacher.
     :license: BSD.
 """
 
diff --git a/tests/root/conf.py b/tests/root/conf.py
index ae4e2fa81..5fbbe49b8 100644
--- a/tests/root/conf.py
+++ b/tests/root/conf.py
@@ -149,7 +149,8 @@ htmlhelp_basename = 'SphinxTestsdoc'
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title, author, document class [howto/manual]).
 latex_documents = [
-  ('contents', 'SphinxTests.tex', 'Sphinx Tests Documentation', 'Georg Brandl', 'manual'),
+  ('contents', 'SphinxTests.tex', 'Sphinx Tests Documentation',
+   'Georg Brandl', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
diff --git a/tests/test_build.py b/tests/test_build.py
index e15119681..b4ab61c08 100644
--- a/tests/test_build.py
+++ b/tests/test_build.py
@@ -28,7 +28,8 @@ latex_warnfile = StringIO()
 ENV_WARNINGS = """\
 WARNING: %(root)s/images.txt:9: Image file not readable: foo.png
 WARNING: %(root)s/images.txt:20: Nonlocal image URI found: http://www.python.org/logo.png
-WARNING: %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading included file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
+WARNING: %(root)s/includes.txt:: (WARNING/2) Encoding 'utf-8' used for reading included \
+file u'wrongenc.inc' seems to be wrong, try giving an :encoding: option
 """
 
 HTML_WARNINGS = ENV_WARNINGS + """\
diff --git a/tests/test_env.py b/tests/test_env.py
index e0399f40e..a7e1e0e57 100644
--- a/tests/test_env.py
+++ b/tests/test_env.py
@@ -61,7 +61,8 @@ def test_images():
     latexbuilder = LaTeXBuilder(app, env)
     latexbuilder.post_process_images(tree)
     assert "no matching candidate for image URI u'foo.*'" in app._warning.content[-1]
-    assert set(latexbuilder.images.keys()) == set(['subdir/img.png', 'img.png', 'img.pdf'])
+    assert set(latexbuilder.images.keys()) == set(['subdir/img.png',
+                                                   'img.png', 'img.pdf'])
     assert set(latexbuilder.images.values()) == set(['img.pdf', 'img.png', 'img1.png'])
 
 def test_second_update():