diff --git a/.zuul.yaml b/.zuul.yaml
index 3cc48d34f..1354e6eb0 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -165,6 +165,7 @@
 - job:
     name: stx-integ-pylint
     parent: tox
+    nodeset: debian-bullseye
     required-projects:
       - starlingx/config
     vars:
diff --git a/test-requirements.txt b/test-requirements.txt
index 47d1aec21..7e49a722c 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,3 +1,4 @@
+hacking>=1.1.0,<=2.0.0 # Apache-2.0
 bashate >= 0.2
 PyYAML >= 3.1.0
-yamllint >= 0.5.2
+yamllint<1.26.1;python_version>="3.0" # GPLv2
diff --git a/tox.ini b/tox.ini
index 1e820e7d8..f7f0dc7d7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,8 @@
 [tox]
 envlist = linters,pylint
-minversion = 4
+minversion = 2.3
 skipsdist = True
 stxdir = {toxinidir}/..
-# Cap setuptools via virtualenv to prevent compatibility issue with pb5 5.5.0
-requires =
-  virtualenv<20.24.0
 
 [testenv]
 basepython = python3