diff --git a/tests/example.py b/tests/example.py
index 7393eb1..43b1bbc 100644
--- a/tests/example.py
+++ b/tests/example.py
@@ -23,29 +23,24 @@ def load_content(ex):
 
 
 ex_linuxdoc = Namespace(
-               doctype=tldp.doctypes.linuxdoc.Linuxdoc,
-               filename=opj(sampledocs, 'linuxdoc-simple.sgml'),
-              )
+    doctype=tldp.doctypes.linuxdoc.Linuxdoc,
+    filename=opj(sampledocs, 'linuxdoc-simple.sgml'),)
 
 ex_docbooksgml = Namespace(
-                  doctype=tldp.doctypes.docbooksgml.DocbookSGML,
-                  filename=opj(sampledocs, 'docbooksgml-simple.sgml'),
-                 )
+    doctype=tldp.doctypes.docbooksgml.DocbookSGML,
+    filename=opj(sampledocs, 'docbooksgml-simple.sgml'),)
 
 ex_docbook4xml = Namespace(
-                 doctype=tldp.doctypes.docbook4xml.Docbook4XML,
-                 filename=opj(sampledocs, 'docbook4xml-simple.xml'),
-                )
+    doctype=tldp.doctypes.docbook4xml.Docbook4XML,
+    filename=opj(sampledocs, 'docbook4xml-simple.xml'),)
 
 ex_docbook5xml = Namespace(
-                 doctype=tldp.doctypes.docbook5xml.Docbook5XML,
-                 filename=opj(sampledocs, 'docbook5xml-simple.xml'),
-                )
+    doctype=tldp.doctypes.docbook5xml.Docbook5XML,
+    filename=opj(sampledocs, 'docbook5xml-simple.xml'),)
 
 ex_asciidoc = Namespace(
-           doctype=tldp.doctypes.asciidoc.Asciidoc,
-           filename=opj(sampledocs, 'asciidoc-complete.txt'),
-          )
+    doctype=tldp.doctypes.asciidoc.Asciidoc,
+    filename=opj(sampledocs, 'asciidoc-complete.txt'),)
 #
 # ex_rst = Namespace(
 #           doctype=tldp.doctypes.rst.RestructuredText,
@@ -58,22 +53,19 @@ ex_asciidoc = Namespace(
 #               )
 
 ex_linuxdoc_dir = Namespace(
-               doctype=tldp.doctypes.linuxdoc.Linuxdoc,
-               filename=opj(sampledocs, 'Linuxdoc-Larger',
-                            'Linuxdoc-Larger.sgml'),
-              )
+    doctype=tldp.doctypes.linuxdoc.Linuxdoc,
+    filename=opj(sampledocs, 'Linuxdoc-Larger',
+                             'Linuxdoc-Larger.sgml'),)
 
 ex_docbook4xml_dir = Namespace(
-               doctype=tldp.doctypes.docbook4xml.Docbook4XML,
-               filename=opj(sampledocs, 'DocBook-4.2-WHYNOT',
-                            'DocBook-4.2-WHYNOT.xml'),
-              )
+    doctype=tldp.doctypes.docbook4xml.Docbook4XML,
+    filename=opj(sampledocs, 'DocBook-4.2-WHYNOT',
+                             'DocBook-4.2-WHYNOT.xml'),)
 
 ex_docbooksgml_dir = Namespace(
-               doctype=tldp.doctypes.docbooksgml.DocbookSGML,
-               filename=opj(sampledocs, 'DocBookSGML-Larger',
-                            'DocBookSGML-Larger.sgml'),
-              )
+    doctype=tldp.doctypes.docbooksgml.DocbookSGML,
+    filename=opj(sampledocs, 'DocBookSGML-Larger',
+                             'DocBookSGML-Larger.sgml'),)
 
 # -- a bit ugly, but grab each dict
 sources = [y for x, y in locals().items() if x.startswith('ex_')]
@@ -81,18 +73,14 @@ sources = [y for x, y in locals().items() if x.startswith('ex_')]
 for ex in sources:
     load_content(ex)
 
-
 unknown_doctype = Namespace(
-               doctype=None,
-               filename=opj(sampledocs, 'Unknown-Doctype.xqf'),
-              )
+    doctype=None,
+    filename=opj(sampledocs, 'Unknown-Doctype.xqf'),)
 
 broken_docbook4xml = Namespace(
-                 doctype=tldp.doctypes.docbook4xml.Docbook4XML,
-                 filename=opj(sampledocs, 'docbook4xml-broken.xml'),
-                )
+    doctype=tldp.doctypes.docbook4xml.Docbook4XML,
+    filename=opj(sampledocs, 'docbook4xml-broken.xml'),)
+
 load_content(broken_docbook4xml)
 
-
-
 # -- end of file
diff --git a/tests/test_cascadingconfig.py b/tests/test_cascadingconfig.py
index 80c3911..f517444 100644
--- a/tests/test_cascadingconfig.py
+++ b/tests/test_cascadingconfig.py
@@ -80,14 +80,13 @@ class CascadingConfigBasicTest(CCTestTools):
         ap.add_argument('--size', default=9, type=int)
 
         c = Namespace(
-          tag='tag',
-          argparser=ap,
-          argv=''.split(),
-          env=dict(),
-          cfg='',
-          exp_config=Namespace(size=9),
-          exp_args=[],
-        )
+            tag='tag',
+            argparser=ap,
+            argv=''.split(),
+            env=dict(),
+            cfg='',
+            exp_config=Namespace(size=9),
+            exp_args=[],)
 
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
         config, args = cc.parse()
@@ -99,14 +98,13 @@ class CascadingConfigBasicTest(CCTestTools):
         ap.add_argument('--size', default=9, type=int)
 
         c = Namespace(
-          tag='tag',
-          argparser=ap,
-          argv=''.split(),
-          env=dict(),
-          cfg='[tag]\nsize = 8',
-          exp_config=Namespace(size=8),
-          exp_args=[],
-        )
+            tag='tag',
+            argparser=ap,
+            argv=''.split(),
+            env=dict(),
+            cfg='[tag]\nsize = 8',
+            exp_config=Namespace(size=8),
+            exp_args=[],)
 
         self.writeconfig(c)
         c.env.setdefault('TAG_CONFIGFILE', c.configfile)
@@ -122,14 +120,13 @@ class CascadingConfigBasicTest(CCTestTools):
         import logging
         logging.getLogger().setLevel(logging.DEBUG)
         c = Namespace(
-          tag='tag',
-          argparser=ap,
-          argv=''.split(),
-          env=dict(),
-          cfg='[tag]\nsize = 8',
-          exp_config=Namespace(size=8),
-          exp_args=[],
-        )
+            tag='tag',
+            argparser=ap,
+            argv=''.split(),
+            env=dict(),
+            cfg='[tag]\nsize = 8',
+            exp_config=Namespace(size=8),
+            exp_args=[],)
         self.writeconfig(c)
         c.argv.extend(['--configfile', c.configfile])
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
@@ -144,14 +141,13 @@ class CascadingConfigBasicTest(CCTestTools):
         import logging
         logging.getLogger().setLevel(logging.DEBUG)
         c = Namespace(
-          tag='tag',
-          argparser=ap,
-          argv=''.split(),
-          env=dict(TAG_SIZE=7, ),
-          cfg='[tag]\nsize = 8',
-          exp_config=Namespace(size=7),
-          exp_args=[],
-        )
+            tag='tag',
+            argparser=ap,
+            argv=''.split(),
+            env=dict(TAG_SIZE=7, ),
+            cfg='[tag]\nsize = 8',
+            exp_config=Namespace(size=7),
+            exp_args=[],)
         self.writeconfig(c)
         c.argv.extend(['--configfile', c.configfile])
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
@@ -166,14 +162,13 @@ class CascadingConfigBasicTest(CCTestTools):
         import logging
         logging.getLogger().setLevel(logging.DEBUG)
         c = Namespace(
-          tag='tag',
-          argparser=ap,
-          argv='--size 6'.split(),
-          env=dict(TAG_SIZE=7, ),
-          cfg='[tag]\nsize = 8',
-          exp_config=Namespace(size=6),
-          exp_args=[],
-        )
+            tag='tag',
+            argparser=ap,
+            argv='--size 6'.split(),
+            env=dict(TAG_SIZE=7, ),
+            cfg='[tag]\nsize = 8',
+            exp_config=Namespace(size=6),
+            exp_args=[],)
         self.writeconfig(c)
         c.argv.extend(['--configfile', c.configfile])
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
@@ -185,14 +180,13 @@ class CascadingConfigBasicTest(CCTestTools):
         ap.add_argument('--source', default='', action='append', type=str)
 
         c = Namespace(
-          tag='tag',
-          argparser=ap,
-          argv=''.split(),
-          env=dict(),
-          cfg='',
-          exp_config=Namespace(source=''),
-          exp_args=[],
-        )
+            tag='tag',
+            argparser=ap,
+            argv=''.split(),
+            env=dict(),
+            cfg='',
+            exp_config=Namespace(source=''),
+            exp_args=[],)
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
         config, args = cc.parse()
         self.assertEqual(c.exp_config, config)
@@ -203,14 +197,13 @@ class CascadingConfigBasicTest(CCTestTools):
         ap.add_argument('--source', default='', action='append', type=str)
 
         c = Namespace(
-          tag='tag',
-          argparser=ap,
-          argv='--source /some/path'.split(),
-          env=dict(),
-          cfg='',
-          exp_config=Namespace(source=['/some/path']),
-          exp_args=[],
-        )
+            tag='tag',
+            argparser=ap,
+            argv='--source /some/path'.split(),
+            env=dict(),
+            cfg='',
+            exp_config=Namespace(source=['/some/path']),
+            exp_args=[],)
         cc = CascadingConfig(c.tag, c.argparser, argv=c.argv, env=c.env)
         config, args = cc.parse()
         self.assertEqual(c.exp_config, config)
diff --git a/tests/test_outputs.py b/tests/test_outputs.py
index 2332bb5..66b2b2d 100644
--- a/tests/test_outputs.py
+++ b/tests/test_outputs.py
@@ -38,7 +38,7 @@ class TestOutputCollection(TestToolsFilesystem):
 
     def test_file_in_output_collection(self):
         reldir, absdir = self.adddir('collection')
-        self.addfile('collection', __file__,  stem='non-directory')
+        self.addfile('collection', __file__, stem='non-directory')
         oc = OutputCollection(absdir)
         self.assertEqual(0, len(oc))
 
diff --git a/tests/test_utils.py b/tests/test_utils.py
index bf88c24..0268fad 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -61,6 +61,7 @@ class Test_arg_isstr(unittest.TestCase):
         self.assertEqual('s', arg_isstr('s'))
         self.assertEqual(None, arg_isstr(7))
 
+
 class Test_arg_isloglevel(unittest.TestCase):
 
     def test_arg_isloglevel_integer(self):
diff --git a/tests/tldptesttools.py b/tests/tldptesttools.py
index 81ff993..03a4fce 100644
--- a/tests/tldptesttools.py
+++ b/tests/tldptesttools.py
@@ -3,7 +3,6 @@ from __future__ import absolute_import, division, print_function
 from __future__ import unicode_literals
 
 import os
-import time
 import codecs
 import random
 import shutil
@@ -102,7 +101,7 @@ class CCTestTools(unittest.TestCase):
         tf = ntf(prefix=case.tag, suffix='.cfg', dir=self.tempdir, delete=False)
         tf.close()
         with codecs.open(tf.name, 'w', encoding='utf-8') as f:
-          f.write(case.cfg)
+            f.write(case.cfg)
         case.configfile = tf.name