diff --git a/setup.cfg b/setup.cfg
index 286856a1..2d48e187 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -14,5 +14,5 @@ requires-dist =
     enum34; python_version<"3.4"
     configparser; python_version<"3.2"
     pyflakes >= 1.5.0, < 1.7.0
-    pycodestyle >= 2.3.0, < 2.4.0
+    pycodestyle >= 2.4.0, < 2.5.0
     mccabe >= 0.6.0, < 0.7.0
diff --git a/setup.py b/setup.py
index 4833ff67..c4862e95 100644
--- a/setup.py
+++ b/setup.py
@@ -22,7 +22,7 @@
     # And in which releases we will update those ranges here:
     # http://flake8.pycqa.org/en/latest/internal/releases.html#releasing-flake8
     "pyflakes >= 1.5.0, < 1.7.0",
-    "pycodestyle >= 2.3.0, < 2.4.0",
+    "pycodestyle >= 2.4.0, < 2.5.0",
     "mccabe >= 0.6.0, < 0.7.0",
     "setuptools >= 30",
 ]
@@ -108,7 +108,8 @@ def get_long_description():
             PEP8_PLUGIN('module_imports_on_top_of_file'),
             PEP8_PLUGIN('compound_statements'),
             PEP8_PLUGIN('explicit_line_join'),
-            PEP8_PLUGIN('break_around_binary_operator'),
+            PEP8_PLUGIN('break_after_binary_operator'),
+            PEP8_PLUGIN('break_before_binary_operator'),
             PEP8_PLUGIN('comparison_to_singleton'),
             PEP8_PLUGIN('comparison_negative'),
             PEP8_PLUGIN('comparison_type'),
diff --git a/tox.ini b/tox.ini
index 687a273c..2e6a5bb9 100644
--- a/tox.ini
+++ b/tox.ini
@@ -143,7 +143,7 @@ commands =
 # defaults to selecting all other errors so we do not need select=E,F,W,I,D
 # Once Flake8 3.0 is released and in a good state, we can use both and it will
 # work well \o/
-ignore = D203
+ignore = D203, W504
 exclude =
     .tox,
     .git,