diff --git a/.zuul.yaml b/.zuul.yaml
index 32b22eb..0fd83ef 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,12 +13,18 @@
     check:
       jobs:
         - gerritlib-jeepyb-integration
-        - tox-py36
-        - tox-py37
-        - tox-py38
+        - tox-py36:
+            nodeset: ubuntu-bionic
+        - tox-py37:
+            nodeset: ubuntu-bionic
+        - tox-py38:
+            nodeset: ubuntu-focal
     gate:
       jobs:
         - gerritlib-jeepyb-integration
-        - tox-py36
-        - tox-py37
-        - tox-py38
+        - tox-py36:
+            nodeset: ubuntu-bionic
+        - tox-py37:
+            nodeset: ubuntu-bionic
+        - tox-py38:
+            nodeset: ubuntu-focal
diff --git a/test-requirements.txt b/test-requirements.txt
index 97b52c3..1e2a6fe 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -1,4 +1,4 @@
-sphinx>=1.1.2,<1.2
+sphinx
 python-subunit
 stestr<3.0.0;python_version<'3.5'
 stestr;python_version>='3.5'