diff --git a/.zuul.yaml b/.zuul.yaml
index d630d5e..6de3f0d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,5 @@
 - project:
+    queue: trove
     templates:
       - check-requirements
       - publish-openstack-docs-pti
@@ -10,7 +11,6 @@
         - trove-tempest-ipv6-only:
             voting: false
     gate:
-      queue: trove
       jobs:
         - trove-tempest-plugin:
             voting: false
diff --git a/tox.ini b/tox.ini
index 4c23b5e..5dc3d09 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,10 @@
 [tox]
 minversion = 3.18.0
-envlist = py39,pypy,pep8
+envlist = py39,pep8
 skipsdist = True
 ignore_basepython_conflict = True
 
 [testenv]
-basepython = python3
 usedevelop = True
 setenv =
    VIRTUAL_ENV={envdir}
@@ -16,6 +15,8 @@ setenv =
 deps =
   -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
   -r{toxinidir}/test-requirements.txt
+  -r{toxinidir}/requirements.txt
+allowlist_externals = rm
 commands = stestr run {posargs}
 
 [testenv:pep8]
@@ -37,6 +38,7 @@ commands =
 [testenv:docs]
 deps =
     -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master}
+    -r{toxinidir}/requirements.txt
     -r{toxinidir}/doc/requirements.txt
 commands =
     rm -rf doc/build