diff --git a/keystoneclient/access.py b/keystoneclient/access.py
index f8174f618..a93da0a1e 100644
--- a/keystoneclient/access.py
+++ b/keystoneclient/access.py
@@ -554,9 +554,9 @@ class AccessInfoV2(AccessInfo):
             'scoped is deprecated as of the 1.7.0 release in favor of '
             'project_scoped and may be removed in the 2.0.0 release.',
             DeprecationWarning)
-        if ('serviceCatalog' in self
-                and self['serviceCatalog']
-                and 'tenant' in self['token']):
+        if ('serviceCatalog' in self and
+                self['serviceCatalog'] and
+                'tenant' in self['token']):
             return True
         return False
 
diff --git a/test-requirements.txt b/test-requirements.txt
index 92ffcf655..873b0e6a3 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<0.11,>=0.10.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 flake8-docstrings==0.2.1.post1 # MIT
 
 coverage!=4.4,>=4.0 # Apache-2.0