diff --git a/sphinx/search/jssplitter.py b/sphinx/search/jssplitter.py
index a3bd8b767..9dc0ca6e7 100644
--- a/sphinx/search/jssplitter.py
+++ b/sphinx/search/jssplitter.py
@@ -1,14 +1,14 @@
-
-"""# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
+"""
     sphinx.search.jssplitter
     ~~~~~~~~~~~~~~~~~~~~~~~~
 
     Provides Python compatible word splitter to JavaScript
 
+    DO NOT EDIT. This is generated by utils/jssplitter_generator.py
+
     :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
-
-    DO NOT EDIT. This is generated by utils/jssplitter_generator.py
 """
 
 splitter_code = """
diff --git a/sphinx/transforms/__init__.py b/sphinx/transforms/__init__.py
index 88efd4c47..efd2d546c 100644
--- a/sphinx/transforms/__init__.py
+++ b/sphinx/transforms/__init__.py
@@ -135,7 +135,7 @@ class CitationReferences(Transform):
         # type: () -> None
         for citnode in self.document.traverse(nodes.citation_reference):
             cittext = citnode.astext()
-            refnode = addnodes.pending_xref(cittext, reftype='citation',
+            refnode = addnodes.pending_xref(cittext, refdomain='std', reftype='citation',
                                             reftarget=cittext, refwarn=True,
                                             ids=citnode["ids"])
             refnode.source = citnode.source or citnode.parent.source
diff --git a/tests/test_ext_inheritance_diagram.py b/tests/test_ext_inheritance_diagram.py
index 968bb1473..fb78c89f4 100644
--- a/tests/test_ext_inheritance_diagram.py
+++ b/tests/test_ext_inheritance_diagram.py
@@ -9,6 +9,7 @@
     :license: BSD, see LICENSE for details.
 """
 
+import re
 import sys
 from util import with_app, rootdir, raises
 from test_ext_graphviz import skip_if_graphviz_not_found
diff --git a/utils/jssplitter_generator.py b/utils/jssplitter_generator.py
index 6eef86cc3..e236f00d0 100644
--- a/utils/jssplitter_generator.py
+++ b/utils/jssplitter_generator.py
@@ -113,17 +113,17 @@ console.log('   ... ok\\n')
 
 ''' % js_src
 
-python_src = '''
-"""# -*- coding: utf-8 -*-
+python_src = '''# -*- coding: utf-8 -*-
+"""
     sphinx.search.jssplitter
     ~~~~~~~~~~~~~~~~~~~~~~~~
 
     Provides Python compatible word splitter to JavaScript
 
+    DO NOT EDIT. This is generated by utils/jssplitter_generator.py
+
     :copyright: Copyright 2007-2016 by the Sphinx team, see AUTHORS.
     :license: BSD, see LICENSE for details.
-
-    DO NOT EDIT. This is generated by utils/jssplitter_generator.py
 """
 
 splitter_code = """