diff --git a/.zuul.yaml b/.zuul.yaml
index be73dc7..122297a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -6,10 +6,10 @@
       jobs:
         - barbican-tempest-plugin-simple-crypto
         - barbican-tempest-plugin-simple-crypto-secure-rbac
+        - barbican-tempest-plugin-simple-crypto-xena
         - barbican-tempest-plugin-simple-crypto-wallaby
         - barbican-tempest-plugin-simple-crypto-victoria
         - barbican-tempest-plugin-simple-crypto-ussuri
-        - barbican-tempest-plugin-simple-crypto-train
         - barbican-tempest-plugin-simple-crypto-ipv6-only
         - barbican-tempest-plugin-simple-crypto-castellan-src
         - barbican-tempest-plugin-simple-crypto-cursive
@@ -79,6 +79,11 @@
               enforce_scope: True
 
 - job:
+    name: barbican-tempest-plugin-simple-crypto-xena
+    parent: barbican-tempest-plugin-simple-crypto
+    override-checkout: stable/xena
+
+- job:
     name: barbican-tempest-plugin-simple-crypto-wallaby
     parent: barbican-tempest-plugin-simple-crypto
     override-checkout: stable/wallaby
@@ -96,12 +101,6 @@
     override-checkout: stable/ussuri
 
 - job:
-    name: barbican-tempest-plugin-simple-crypto-train
-    parent: barbican-tempest-plugin-simple-crypto
-    nodeset: openstack-single-node-bionic
-    override-checkout: stable/train
-
-- job:
     name: barbican-tempest-plugin-simple-crypto-ipv6-only
     parent: devstack-tempest-ipv6
     required-projects: *barbican-tempest-reqs
diff --git a/setup.cfg b/setup.cfg
index 97da488..a8d2496 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -17,6 +17,7 @@
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index e786626..c1baf1e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.1.1
-envlist = py38,pypy,pep8
+envlist = py39,pypy,pep8
 skipsdist = True
 ignore_basepython_conflict = True