diff --git a/mistralclient/tests/functional/client/v1/tests.py b/mistralclient/tests/functional/client/v1/tests.py
index 1a955e83..48afd4fc 100644
--- a/mistralclient/tests/functional/client/v1/tests.py
+++ b/mistralclient/tests/functional/client/v1/tests.py
@@ -12,7 +12,7 @@ class Workbooks(MistralBase):
         self.mistral_client.workbooks.create("new_wb")
         wbs_with_new_wb = self.mistral_client.workbooks.list()
 
-        self.assertEqual(len(wbs)+1, len(wbs_with_new_wb))
+        self.assertEqual(len(wbs) + 1, len(wbs_with_new_wb))
         self.assertTrue(self.assert_item_in_list(
             wbs_with_new_wb, name="new_wb"))
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 601ed362..76bf0149 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-pep8==1.5.7
+hacking>=0.9.2,<0.10
 pyflakes==0.8.1
 flake8==2.1.0
 pylint==0.25.2
diff --git a/tox.ini b/tox.ini
index ed858c38..b8548c1e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -39,5 +39,6 @@ commands = bash tools/lintstack.sh
 
 [flake8]
 show-source = true
+ignore = H803,H305,H405,H904,H101,H102,H201,H302,H306,H307
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools