diff --git a/test-requirements.txt b/test-requirements.txt
index 735b4dd..baf6cad 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,6 @@
-hacking>=0.12.0,!=0.13.0,<0.14  # Apache-2.0
+pep8
+pyflakes
+flake8
 
 coverage>=3.6
 sphinx>=1.5.1,<1.6
diff --git a/tox.ini b/tox.ini
index 8235483..174a496 100644
--- a/tox.ini
+++ b/tox.ini
@@ -51,6 +51,6 @@
 [flake8]
 # These are ignored intentionally in openstack-infra projects;
 # please don't submit patches that solely correct them or enable them.
-ignore = E125,E129,H
+ignore = E305,E125,E129,E402,H,F405,W503
 show-source = True
 exclude = .venv,.tox,dist,doc,build,*.egg