diff --git a/.zuul.yaml b/.zuul.yaml
index e83a94115d5..419779ef293 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -88,6 +88,9 @@
             voting: false
             irrelevant-files: *gate-irrelevant-files
         - devstack-plugin-nfs-tempest-full:
+            required-projects:
+              - name: openstack/cinder-tempest-plugin
+                override-checkout: 2024.1-last
             irrelevant-files: *gate-irrelevant-files
         - devstack-plugin-nfs-tempest-full-fips:
             voting: false
diff --git a/tox.ini b/tox.ini
index 85529259edc..8c0b7f85524 100644
--- a/tox.ini
+++ b/tox.ini
@@ -27,6 +27,8 @@ setenv =
 deps =
   -r{toxinidir}/test-requirements.txt
   -r{toxinidir}/requirements.txt
+  # we need pkg_resources because of os-win
+  setuptools<82
 
 # By default stestr will set concurrency
 # to ncpu, to specify something else use
@@ -108,6 +110,9 @@ install_command = {[testenv:py3]install_command}
 deps = -r{toxinidir}/requirements.txt
        -r{toxinidir}/test-requirements.txt
        pylint==3.0.2
+       # we need pkg_resources because of os-win
+       setuptools<82
+
 commands =
   {toxinidir}/tools/coding-checks.sh --pylint {posargs:all}
 
@@ -156,6 +161,8 @@ allowlist_externals = rm
 deps =
   doc8
   -r{toxinidir}/doc/requirements.txt
+  # we need pkg_resources because of os-win
+  setuptools<82
 commands =
   doc8
   rm -rf doc/source/contributor/api doc/build/html doc/build/doctrees