diff --git a/oslo_db/sqlalchemy/update_match.py b/oslo_db/sqlalchemy/update_match.py
index 543101ef..8e139e96 100644
--- a/oslo_db/sqlalchemy/update_match.py
+++ b/oslo_db/sqlalchemy/update_match.py
@@ -292,8 +292,8 @@ def manufacture_entity_criteria(entity, include_only=None, exclude=None):
     existing = dict(
         (attr.key, attr.loaded_value)
         for attr in state.attrs
-        if attr.loaded_value is not orm.attributes.NO_VALUE
-        and attr.key not in exclude
+        if attr.loaded_value is not orm.attributes.NO_VALUE and
+        attr.key not in exclude
     )
     if include_only:
         existing = dict(
diff --git a/test-requirements.txt b/test-requirements.txt
index 0f5306d0..98fdbe80 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,7 +1,7 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
+hacking>=1.1.0,<1.2.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT
 fixtures>=3.0.0 # Apache-2.0/BSD