diff --git a/osc_lib/tests/command/test_commandmanager.py b/osc_lib/tests/command/test_commandmanager.py
index 8763a4d..137a64f 100644
--- a/osc_lib/tests/command/test_commandmanager.py
+++ b/osc_lib/tests/command/test_commandmanager.py
@@ -28,6 +28,7 @@ class FakeCommand(object):
     def __init__(self):
         return
 
+
 FAKE_CMD_ONE = FakeCommand
 FAKE_CMD_TWO = FakeCommand
 FAKE_CMD_ALPHA = FakeCommand
diff --git a/test-requirements.txt b/test-requirements.txt
index c9851b0..2a9f1fb 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.11,>=0.10.0
+hacking>=2.0,<2.1 # Apache-2.0
 
 coverage!=4.4,>=4.0 # Apache-2.0
 fixtures>=3.0.0 # Apache-2.0/BSD
diff --git a/tox.ini b/tox.ini
index 73267d2..afc2f3c 100644
--- a/tox.ini
+++ b/tox.ini
@@ -60,7 +60,7 @@ show-source = True
 exclude = .git,.tox,dist,doc,*lib/python*,*egg,build,tools
 # If 'ignore' is not set there are default errors and warnings that are set
 # Doc: http://flake8.readthedocs.org/en/latest/config.html#default
-ignore = __
+ignore = W504
 
 [testenv:lower-constraints]
 deps =