diff --git a/.zuul.yaml b/.zuul.yaml
index c56b8754d..dec90e3da 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -20,21 +20,22 @@
       - ^cinderclient/tests/unit/.*$
 
 - job:
-    name: python-cinderclient-functional-py39
+    name: python-cinderclient-functional-py310
     parent: python-cinderclient-functional-base
-    nodeset: devstack-single-node-centos-9-stream
+    # Python 3.10 is the default on Ubuntu 22.04 (Jammy)
+    nodeset: openstack-single-node-jammy
     vars:
-      python_version: 3.9
-      tox_envlist: functional-py39
+      python_version: 3.10
+      tox_envlist: functional-py310
 
 - job:
-    name: python-cinderclient-functional-py311
+    name: python-cinderclient-functional-py312
     parent: python-cinderclient-functional-base
-    # use debian bookworm, where py3.11 is the default
-    nodeset: devstack-single-node-debian-bookworm
+    # Python 3.12 is the default on Ubuntu 24.04 (Noble)
+    nodeset: openstack-single-node-noble
     vars:
-      python_version: 3.11
-      tox_envlist: functional-py311
+      python_version: 3.12
+      tox_envlist: functional-py312
 
 - project:
     vars:
@@ -48,11 +49,11 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        - python-cinderclient-functional-py39
-        - python-cinderclient-functional-py311
+        - python-cinderclient-functional-py310
+        - python-cinderclient-functional-py312
         - openstack-tox-pylint:
             voting: false
     gate:
       jobs:
-        - python-cinderclient-functional-py39
-        - python-cinderclient-functional-py311
+        - python-cinderclient-functional-py310
+        - python-cinderclient-functional-py312
diff --git a/tox.ini b/tox.ini
index 82f6b98f8..8e97545c7 100644
--- a/tox.ini
+++ b/tox.ini
@@ -107,7 +107,7 @@ setenv =
 # TLS (https) server certificate.
 passenv = OS_*
 
-[testenv:functional-py{3,39,310,311,312}]
+[testenv:functional-py{3,310,311,312,313}]
 deps = {[testenv:functional]deps}
 setenv = {[testenv:functional]setenv}
 passenv = {[testenv:functional]passenv}