diff --git a/src/requirements/dev.txt b/src/requirements/dev.txt
index 553fda240..d34548b41 100644
--- a/src/requirements/dev.txt
+++ b/src/requirements/dev.txt
@@ -1,8 +1,8 @@
 django-debug-toolbar==1.9.1
 sqlparse==0.2.1  # pinned due to difficulties with django-debug-toolbar
 # Testing requirements
-pep8==1.5.7  # exact requirement by flake8 2.4.0
-pyflakes==1.1.0  # later version causes problems currently
+pycodestyle >= 2.4.0, < 2.5.0 # requirement by flake8 3.6.0
+pyflakes >= 2.0.0, < 2.1.0 # requirement by flake8 3.6.0
 pep8-naming
 flake8
 codecov
diff --git a/src/setup.py b/src/setup.py
index d3442f3ca..4e0879174 100644
--- a/src/setup.py
+++ b/src/setup.py
@@ -146,8 +146,8 @@ setup(
         'dev': [
             'django-debug-toolbar==1.9.1',
             'sqlparse==0.2.1',
-            'pep8==1.5.7',
-            'pyflakes==1.1.0',
+            'pycodestyle >= 2.4.0, < 2.5.0',
+            'pyflakes >= 2.0.0, < 2.1.0',
             'flake8',
             'pep8-naming',
             'coveralls',