diff --git a/cinderclient/client.py b/cinderclient/client.py
index 6193e9590..485acd93d 100644
--- a/cinderclient/client.py
+++ b/cinderclient/client.py
@@ -35,7 +35,10 @@ from keystoneauth1.identity import base
 from oslo_utils import encodeutils
 from oslo_utils import importutils
 from oslo_utils import strutils
-osprofiler_web = importutils.try_import("osprofiler.web")  # noqa
+try:
+    osprofiler_web = importutils.try_import("osprofiler.web")
+except Exception:
+    pass
 import requests
 from six.moves import urllib
 import six.moves.urllib.parse as urlparse
diff --git a/cinderclient/shell.py b/cinderclient/shell.py
index acbccdad5..7fddb5a08 100644
--- a/cinderclient/shell.py
+++ b/cinderclient/shell.py
@@ -33,7 +33,10 @@ from keystoneauth1 import loading
 from keystoneauth1 import session
 from oslo_utils import encodeutils
 from oslo_utils import importutils
-osprofiler_profiler = importutils.try_import("osprofiler.profiler")  # noqa
+try:
+    osprofiler_profiler = importutils.try_import("osprofiler.profiler")
+except Exception:
+    pass
 import requests
 import six
 import six.moves.urllib.parse as urlparse
diff --git a/cinderclient/tests/unit/v2/test_limits.py b/cinderclient/tests/unit/v2/test_limits.py
index 34ed1d2f4..d8fbdfe59 100644
--- a/cinderclient/tests/unit/v2/test_limits.py
+++ b/cinderclient/tests/unit/v2/test_limits.py
@@ -177,5 +177,5 @@ class TestLimitsManager(utils.TestCase):
         api.client.get.assert_called_once_with('/limits%s' % query_str)
 
         self.assertIsInstance(lim, limits.Limits)
-        for l in lim.absolute:
-            self.assertEqual(l1, l)
+        for limit in lim.absolute:
+            self.assertEqual(l1, limit)
diff --git a/cinderclient/utils.py b/cinderclient/utils.py
index 28c458dc0..04236a309 100644
--- a/cinderclient/utils.py
+++ b/cinderclient/utils.py
@@ -199,7 +199,7 @@ def unicode_key_value_to_string(src):
                     _encode(unicode_key_value_to_string(v)))
                     for k, v in src.items())
     if isinstance(src, list):
-        return [unicode_key_value_to_string(l) for l in src]
+        return [unicode_key_value_to_string(item) for item in src]
     return _encode(src)
 
 
diff --git a/test-requirements.txt b/test-requirements.txt
index fdc3d2596..065e1275b 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 # Hacking already pins down pep8, pyflakes and flake8
 
-hacking>=3.0.1,<3.1.0 # Apache-2.0
+hacking>=3.1.0,<3.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 ddt>=1.0.1 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD