diff --git a/openstackclient/shell.py b/openstackclient/shell.py
index cd5ab552bf..35d8255ddb 100644
--- a/openstackclient/shell.py
+++ b/openstackclient/shell.py
@@ -24,7 +24,7 @@
 from cliff import help
 
 from openstackclient.common import clientmanager
-from openstackclient.common.commandmanager import CommandManager
+from openstackclient.common import commandmanager
 from openstackclient.common import exceptions as exc
 from openstackclient.common import openstackkeyring
 from openstackclient.common import utils
@@ -63,7 +63,7 @@ def __init__(self):
         super(OpenStackShell, self).__init__(
             description=__doc__.strip(),
             version=VERSION,
-            command_manager=CommandManager('openstack.cli'))
+            command_manager=commandmanager.CommandManager('openstack.cli'))
 
         # This is instantiated in initialize_app() only when using
         # password flow auth
diff --git a/tools/test-requires b/tools/test-requires
index 405b408ffa..1eb2509c73 100644
--- a/tools/test-requires
+++ b/tools/test-requires
@@ -1,3 +1,9 @@
+# Install bounded pep8/pyflakes first, then let flake8 install
+pep8==1.4.5
+pyflakes==0.7.2
+flake8==2.0
+hacking>=0.5.3,<0.6
+
 distribute>=0.6.24
 
 coverage
@@ -5,7 +11,6 @@ discover
 fixtures>=0.3.12
 mock
 openstack.nose_plugin
-pep8==1.3.3
 sphinx>=1.1.2
 testrepository>=0.0.13
 testtools>=0.9.26
diff --git a/tox.ini b/tox.ini
index 9b5a843bf1..f6de18d137 100644
--- a/tox.ini
+++ b/tox.ini
@@ -11,8 +11,7 @@ deps = -r{toxinidir}/tools/pip-requires
 commands = python setup.py testr --testr-args='{posargs}'
 
 [testenv:pep8]
-deps = pep8==1.3.3
-commands = pep8 --ignore=E126,E202,W602 --repeat --show-source openstackclient setup.py
+commands = flake8
 
 [testenv:venv]
 commands = {posargs}
@@ -22,3 +21,8 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
 
 [tox:jenkins]
 downloadcache = ~/cache/pip
+
+[flake8]
+ignore = E126,E202,W602,H402
+show-source = True
+exclude =  .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools