diff --git a/unit_tests/test_barbican_handlers.py b/unit_tests/test_barbican_handlers.py
index 49ea057..a4c87ad 100644
--- a/unit_tests/test_barbican_handlers.py
+++ b/unit_tests/test_barbican_handlers.py
@@ -11,13 +11,15 @@ import reactive.barbican_handlers as handlers
 _when_args = {}
 _when_not_args = {}
 
+
 def mock_hook_factory(d):
 
     def mock_hook(*args, **kwargs):
 
         def inner(f):
-            # remember what we were passed.  Note that we can't actually determine
-            # the class we're attached to, as the decorator only gets the function.
+            # remember what we were passed.  Note that we can't actually
+            # determine the class we're attached to, as the decorator only gets
+            # the function.
             try:
                 d[f.__name__].append(dict(args=args, kwargs=kwargs))
             except KeyError:
@@ -35,7 +37,7 @@ class TestBarbicanHandlers(unittest.TestCase):
                                        mock_hook_factory(_when_args))
         cls._patched_when_started = cls._patched_when.start()
         cls._patched_when_not = mock.patch('charms.reactive.when_not',
-                                            mock_hook_factory(_when_not_args))
+                                           mock_hook_factory(_when_not_args))
         cls._patched_when_not_started = cls._patched_when_not.start()
         # force requires to rerun the mock_hook decorator:
         reload(handlers)
@@ -63,7 +65,7 @@ class TestBarbicanHandlers(unittest.TestCase):
         self._patches_start = None
 
     def patch(self, obj, attr, return_value=None):
-        mocked = mock.patch.object(obj , attr)
+        mocked = mock.patch.object(obj, attr)
         self._patches[attr] = mocked
         started = mocked.start()
         started.return_value = return_value
diff --git a/unit_tests/test_lib_charm_openstack_barbican.py b/unit_tests/test_lib_charm_openstack_barbican.py
index 6f159af..bed1a88 100644
--- a/unit_tests/test_lib_charm_openstack_barbican.py
+++ b/unit_tests/test_lib_charm_openstack_barbican.py
@@ -22,7 +22,7 @@ class Helper(unittest.TestCase):
         self._patches_start = None
 
     def patch(self, obj, attr, return_value=None):
-        mocked = mock.patch.object(obj , attr)
+        mocked = mock.patch.object(obj, attr)
         self._patches[attr] = mocked
         started = mocked.start()
         started.return_value = return_value
@@ -147,11 +147,11 @@ class TestBarbicanCharm(Helper):
 
     def test__init__(self):
         self.patch(barbican.ch_utils, 'os_release')
-        b = barbican.BarbicanCharm()
+        barbican.BarbicanCharm()
         self.os_release.assert_called_once_with('python-keystonemiddleware')
 
     def test_install(self):
-        self.patch(barbican.charmhelpers.fetch,'add_source')
+        self.patch(barbican.charmhelpers.fetch, 'add_source')
         b = barbican.BarbicanCharm()
         self.patch(barbican.charmers.openstack.charm.OpenStackCharm,
                    'configure_source')