diff --git a/.zuul.yaml b/.zuul.yaml
index de124890..1cf1d2c9 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,14 +1,16 @@
 - project:
     templates:
-      - nodejs16-jobs
+      - nodejs18-jobs
       - openstack-cover-jobs
-      - openstack-python3-zed-jobs
+      - openstack-python3-antelope-jobs
     check:
       jobs:
+        - openstack-tox-py39
         - refstack-tox-functional
         - opendev-tox-docs
     gate:
       jobs:
+        - openstack-tox-py39
         - refstack-tox-functional
         - opendev-tox-docs
     promote:
diff --git a/setup.cfg b/setup.cfg
index eb70e5ea..bfd1276c 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -16,6 +16,8 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
+    Programming Language :: Python :: 3.10
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: Implementation :: CPython
 
diff --git a/tools/test-setup.sh b/tools/test-setup.sh
index 505a58cb..6bc69d2e 100755
--- a/tools/test-setup.sh
+++ b/tools/test-setup.sh
@@ -5,7 +5,8 @@
 # Developers should setup their test systems in a similar way.
 
 # This setup needs to be run as a user that can run sudo.
-
+sudo apt-get install xdg-utils
+sudo apt-get install dbus-user-session && systemctl --user start dbus.service
 # The root password for the MySQL database; pass it in via
 # MYSQL_ROOT_PW.
 DB_ROOT_PW=${MYSQL_ROOT_PW:-insecure_slave}