diff --git a/requirements.txt b/requirements.txt
index 0aa3368d..8dde2162 100755
--- a/requirements.txt
+++ b/requirements.txt
@@ -118,6 +118,8 @@ flake8==3.7.9;python_version<"3.5"
 flake8==3.9.2;python_version>="3.5" and python_version<"3.6"
 flake8==4.0.1;python_version>="3.6"
 pyflakes==2.1.1;python_version<"3.5"
+pyflakes==2.3.1;python_version>="3.5" and python_version<"3.6"
 pyflakes==2.4.0;python_version>="3.5"
 pycodestyle==2.5.0;python_version<"3.5"
-pycodestyle==2.8.0;python_version>="3.5"
+pycodestyle==2.7.0;python_version>="3.5" and python_version<"3.6"
+pycodestyle==2.8.0;python_version>="3.6"
diff --git a/setup.py b/setup.py
index 39983b5b..94b20d60 100755
--- a/setup.py
+++ b/setup.py
@@ -237,9 +237,11 @@ setup(
             'flake8==3.9.2;python_version>="3.5" and python_version<"3.6"',
             'flake8==4.0.1;python_version>="3.6"',
             'pyflakes==2.1.1;python_version<"3.5"',
+            'pyflakes==2.3.1;python_version>="3.5" and python_version<"3.6"',
             'pyflakes==2.4.0;python_version>="3.5"',
             'pycodestyle==2.5.0;python_version<"3.5"',
-            'pycodestyle==2.8.0;python_version>="3.5"',
+            'pycodestyle==2.7.0;python_version>="3.5" and python_version<"3.6"',  # noqa: E501
+            'pycodestyle==2.8.0;python_version>="3.6"',
         ],
     },
     packages=[