diff --git a/cyborgclient/common/http.py b/cyborgclient/common/http.py
index a857cdb..c12d127 100644
--- a/cyborgclient/common/http.py
+++ b/cyborgclient/common/http.py
@@ -326,7 +326,7 @@ class SessionClient(adapter.LegacyJsonAdapter):
             raise exc.EndpointException(message=message)
         if (self.endpoint_override is not None and
                 location.lower().startswith(self.endpoint_override.lower())):
-                return location[len(self.endpoint_override):]
+            return location[len(self.endpoint_override):]
         else:
             return location
 
diff --git a/cyborgclient/common/utils.py b/cyborgclient/common/utils.py
index 149fb08..3973e12 100644
--- a/cyborgclient/common/utils.py
+++ b/cyborgclient/common/utils.py
@@ -14,12 +14,12 @@
 #
 import logging
 
+from oslo_serialization import jsonutils
+
 from cyborgclient import exceptions as exc
 
 LOG = logging.getLogger(__name__)
 
-from oslo_serialization import jsonutils
-
 
 def common_filters(marker=None, limit=None, sort_key=None, sort_dir=None):
     """Generate common filters for any list request.
diff --git a/test-requirements.txt b/test-requirements.txt
index 1675347..3b83ad7 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.12.0,<0.13 # Apache-2.0
+hacking>=3.0,<3.1.0 # Apache-2.0
 
 coverage>=4.0,!=4.4 # Apache-2.0
 python-subunit>=0.0.18 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 472342a..08efd1b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -61,8 +61,9 @@ commands =
 
 [flake8]
 # E123, E125 skipped as they are invalid PEP-8.
-
+# W504 line break after binary operator
+# E402 module level import not at top of file
 show-source = True
-ignore = E123,E125
+ignore = E123,E125,W504,E402
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build