diff --git a/lib/vsc/install/shared_setup.py b/lib/vsc/install/shared_setup.py
index 10b0b7de..b0e15e6c 100644
--- a/lib/vsc/install/shared_setup.py
+++ b/lib/vsc/install/shared_setup.py
@@ -1507,7 +1507,7 @@ def parse_target(self, target, urltemplate=None):
             tests_requires.extend([
                 'mock',
             ])
-            if sys.version_info < (3, 7):
+            if sys.version_info < (3, 9):
                 tests_requires.extend([
                     'pyflakes~=2.3.0',
                     'pycodestyle~=2.7.0',
@@ -1523,9 +1523,9 @@ def parse_target(self, target, urltemplate=None):
                 ])
             else:  # tested for fedora36 py3.10
                 tests_requires.extend([
+                    'flake8 < 5.0.0',
                     'astroid <= 2.12.0-dev0',
-                    'pyflakes < 3.0.0',
-                    'pycodestyle < 2.9.0',
+                    'pyflakes < 2.5.0',
                     'pylint~=2.14.4',
                     'prospector~=1.7.7',
                 ])