diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index fa7c9160b..f15686554 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -591,13 +591,13 @@ class OpenStackCinderShell(object):
             return 0
 
         (os_username, os_password, os_tenant_name, os_auth_url,
-         os_region_name, os_tenant_id, endpoint_type, insecure,
+         os_region_name, os_tenant_id, endpoint_type,
          service_type, service_name, volume_service_name, bypass_url,
          cacert, os_auth_system) = (
              args.os_username, args.os_password,
              args.os_tenant_name, args.os_auth_url,
              args.os_region_name, args.os_tenant_id,
-             args.os_endpoint_type, args.insecure,
+             args.os_endpoint_type,
              args.service_type, args.service_name,
              args.volume_service_name,
              args.bypass_url, args.os_cacert,
diff --git a/cinderclient/tests/unit/v1/test_shell.py b/cinderclient/tests/unit/v1/test_shell.py
index 44e7b09b9..fd3e5f7ac 100644
--- a/cinderclient/tests/unit/v1/test_shell.py
+++ b/cinderclient/tests/unit/v1/test_shell.py
@@ -92,7 +92,7 @@ class ShellTest(utils.TestCase):
 
     def test_extract_metadata(self):
         # mimic the result of argparse's parse_args() method
-        class Arguments:
+        class Arguments(object):
 
             def __init__(self, metadata=None):
                 self.metadata = metadata or []
diff --git a/test-requirements.txt b/test-requirements.txt
index 3ceb21cbb..016e0e52e 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -2,7 +2,7 @@
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
-hacking>=0.8.0,<0.9
+hacking>=0.10.0,<0.11
 coverage>=3.6
 discover
 fixtures>=0.3.14
diff --git a/tox.ini b/tox.ini
index bd966b0a5..26bca85e0 100644
--- a/tox.ini
+++ b/tox.ini
@@ -35,5 +35,5 @@ downloadcache = ~/cache/pip
 
 [flake8]
 show-source = True
-ignore = F811,F821,H302,H306,H404
+ignore = F811,F821,H302,H306,H404,H405,E122,E123,E128,E251
 exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools