diff --git a/keystoneclient/discover.py b/keystoneclient/discover.py
index 426b0b965..f55a3c91d 100644
--- a/keystoneclient/discover.py
+++ b/keystoneclient/discover.py
@@ -357,7 +357,7 @@ class Discover(object):
             try:
                 v = self._get_factory_from_response_entry(version_data,
                                                           **client_kwargs)
-            except exceptions.DiscoveryFailure, e:
+            except exceptions.DiscoveryFailure as e:
                 _logger.warning("Invalid entry: %s", e, exc_info=True)
             else:
                 versions[v.version] = v
diff --git a/test-requirements.txt b/test-requirements.txt
index 59a3c5dac..0b0397247 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-hacking>=0.5.6,<0.8
+hacking>=0.8.0,<0.9
 coverage>=3.6
 discover
 fixtures>=0.3.14