diff --git a/test-requirements.txt b/test-requirements.txt
index b98be228..2ef970f8 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,6 +1,5 @@
-# Packages needed for dev testing
+hacking>=0.8.0,<0.9
 
-# Needed for testing
 unittest2
 coverage>=3.6
 fixtures>=0.3.14
@@ -9,7 +8,6 @@ nose
 nose-exclude
 openstack.nose_plugin>=0.7
 nosehtmloutput>=0.0.3
-pep8==1.3.3
 sphinx>=1.1.2,<1.2
 requests>=1.1
 testtools>=0.9.32
@@ -17,4 +15,3 @@ mock>=1.0
 
 # Optional packages that should be installed when testing
 xattr>=0.4
-pysendfile==2.0.0
diff --git a/tox.ini b/tox.ini
index 5845bf98..76c73d32 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
-envlist = py26,py27,pep8,pyflakes
+envlist = py26,py27,pep8
+minversion = 1.6
+skipsdist = True
 
 [testenv]
+usedevelop = True
+install_command  = pip install -U {opts} {packages}
 setenv = VIRTUAL_ENV={envdir}
          NOSE_WITH_OPENSTACK=1
          NOSE_OPENSTACK_COLOR=1
@@ -13,8 +17,8 @@ deps = -r{toxinidir}/requirements.txt
 commands = nosetests
 
 [testenv:pep8]
-deps = pep8==1.3.3
-commands = pep8 --repeat --show-source muranoapi setup.py
+commands =
+    flake8 {posargs}
 
 [testenv:venv]
 commands = {posargs}
@@ -50,9 +54,20 @@ deps = flake8
 commands = flake8
 
 [flake8]
+# F401 module imported but unused
+# H101 Use TODO(NAME)
+# H102 license header not found
+# H202 assertRaises Exception too broad
+# H231 Python 3.x incompatible 'except x,y:' construct
 # H301 one import per line
 # H302 import only modules
-ignore = H301,H302
+# H306 imports not in alphabetical order
+# H402 one line docstring needs punctuation
+# H404 multi line docstring should start without a leading new line
+# H501 Do not use locals() for string formatting
+# H702 Argument to _ must be just a string
+# H902 Use the 'not in' operator for collection membership evaluation
+ignore = F401,H101,H102,H202,H231,H301,H302,H306,H402,H404,H501,H702,H902
 show-source = true
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,tools
\ No newline at end of file