diff --git a/roles/add-build-sshkey/library/test_sshagent_remove_keys.py b/roles/add-build-sshkey/library/test_sshagent_remove_keys.py
index 70fa55840..b13dbbd8b 100644
--- a/roles/add-build-sshkey/library/test_sshagent_remove_keys.py
+++ b/roles/add-build-sshkey/library/test_sshagent_remove_keys.py
@@ -78,7 +78,7 @@ class TestAgent(testtools.TestCase):
         l = a.list()
         self.assertEqual(2, len(l))
 
-        run('^(?!\(stdin\)).*')
+        run('^(?!\(stdin\)).*')  # noqa
 
         l = a.list()
         self.assertEqual(1, len(l))
diff --git a/tox.ini b/tox.ini
index 37099aa3e..4ac6fc5cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -53,6 +53,8 @@ commands = {posargs}
 # These are ignored intentionally in openstack-infra projects;
 # please don't submit patches that solely correct them or enable them.
 # E402 - ansible modules put documentation before imports. Align to ansible.
-ignore = E125,E129,E402,E741,H
+# W504 - line break after binary operator, we cannot have both
+#        W503 and W504 enabled
+ignore = E125,E129,E402,E741,W504,H
 show-source = True
 exclude = .venv,.tox,dist,doc,build,*.egg