diff --git a/test-requirements.txt b/test-requirements.txt
index 40fadb93e1..e3886d14c7 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,8 +1,4 @@
-# Install bounded pep8/pyflakes first, then let flake8 install
-pep8==1.4.5
-pyflakes>=0.7.2,<0.7.4
-flake8==2.0
-hacking>=0.5.6,<0.8
+hacking>=0.8.0,<0.9
 
 coverage>=3.6
 hp3parclient>=2.0,<3.0
diff --git a/tox.ini b/tox.ini
index e0b4cf70ef..f2c7288a3d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -40,6 +40,9 @@ deps = -r{toxinidir}/requirements.txt
 commands = bash tools/lintstack.sh
 
 [flake8]
-ignore = E12,E711,E712,H302,H303,H304,H401,H402,H403,H404,F
+# TODO: These are not intentionally disabled, reenable when fixed:
+# H233: Python 3.x incompatible print operator
+# H501: Do not use locals() for string formatting
+ignore = E12,E711,E712,H233,H302,H303,H304,H401,H402,H403,H404,H501,F
 builtins = _
 exclude = .venv,.tox,dist,doc,openstack,*egg