diff --git a/libra/admin_api/expunge/expunge.py b/libra/admin_api/expunge/expunge.py
index 1c38275d..90b4b9a7 100644
--- a/libra/admin_api/expunge/expunge.py
+++ b/libra/admin_api/expunge/expunge.py
@@ -36,7 +36,7 @@ class ExpungeScheduler(object):
         if self.args.server_id != day % self.args.number_of_servers:
             self.logger.info('Not our turn to run expunge check, sleeping')
             self.expunge_timer = threading.Timer(
-                24*60*60, self.run_expunge, ()
+                24 * 60 * 60, self.run_expunge, ()
             )
         with db_session() as session:
             try:
@@ -59,4 +59,5 @@ class ExpungeScheduler(object):
             except:
                 self.logger.exception('Exception occurred during expunge')
         self.logger.info('Expunge thread sleeping for 24 hours')
-        self.expunge_timer = threading.Timer(24*60*60, self.run_expunge, ())
+        self.expunge_timer = threading.Timer(
+            24 * 60 * 60, self.run_expunge, ())
diff --git a/libra/api/wsme_overrides.py b/libra/api/wsme_overrides.py
index 90a72512..15d501a5 100644
--- a/libra/api/wsme_overrides.py
+++ b/libra/api/wsme_overrides.py
@@ -110,7 +110,7 @@ def wsexpose(*args, **kwargs):
                 except (OperationalError, ResourceClosedError):
                     logger = logging.getLogger(__name__)
                     logger.warning(
-                        "Galera deadlock, retry {0}".format(x+1)
+                        "Galera deadlock, retry {0}".format(x + 1)
                     )
                     args = old_args
                     kwargs = old_kwargs
diff --git a/libra/common/api/gearman_client.py b/libra/common/api/gearman_client.py
index c9f0a3c9..4f8dda7c 100644
--- a/libra/common/api/gearman_client.py
+++ b/libra/common/api/gearman_client.py
@@ -70,7 +70,7 @@ def client_job(logger, job_type, host, data, lbid):
         except OperationalError:
             # Auto retry on galera locking error
             logger.warning(
-                "Galera deadlock in gearman, retry {0}".format(x+1)
+                "Galera deadlock in gearman, retry {0}".format(x + 1)
             )
         except:
             logger.exception("Gearman thread unhandled exception")
diff --git a/setup.cfg b/setup.cfg
index 5fc599a5..297b9671 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,8 +1,3 @@
-[build_sphinx]
-all_files = 1
-build-dir = build/sphinx
-source-dir = doc
-
 [metadata]
 name = libra
 author = David Shrewsbury <shrewsbury.dave@gmail.com>, Andrew Hutchings <andrew@linuxjedi.co.uk>
@@ -23,13 +18,14 @@ classifier =
 packages =
 	libra
 
-[global]
-setup-hooks =
-        pbr.hooks.setup_hook
-
 [entry_points]
 console_scripts =
 	libra_worker = libra.worker.main:main
 	libra_pool_mgm = libra.mgm.mgm:main
 	libra_api = libra.api.app:main
         libra_admin_api = libra.admin_api.app:main
+
+[build_sphinx]
+all_files = 1
+build-dir = build/sphinx
+source-dir = doc
diff --git a/test-requirements.txt b/test-requirements.txt
index 3e721ee0..fd23e5c3 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,5 +1,6 @@
+hacking>=0.5.6,<0.8
+
 fixtures>=0.3.12
-flake8
 mock
 python-subunit
 sphinx>=1.1.2
diff --git a/tox.ini b/tox.ini
index 5ff230ca..9a713de1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,11 +13,8 @@ downloadcache = ~/cache/pip
 deps = flake8
 commands = flake8
 
-[testenv:pyflakes]
-deps = pyflakes
-commands = pyflakes libra
-
 [flake8]
+ignore = H
 show-source = True
 exclude = .venv,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tests,build