diff --git a/.zuul.yaml b/.zuul.yaml
index 2cd277f..876fd7f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -4,6 +4,7 @@
       jobs:
         - openstack-tox-linters
         - refstack-client-devstack-master
+        - refstack-client-devstack-xena
         - refstack-client-devstack-wallaby
         - refstack-client-devstack-victoria
         - refstack-client-devstack-ussuri
@@ -12,6 +13,7 @@
       jobs:
         - openstack-tox-linters
         - refstack-client-devstack-master
+        - refstack-client-devstack-xena
         - refstack-client-devstack-wallaby
         - refstack-client-devstack-victoria
         - refstack-client-devstack-ussuri
@@ -78,6 +80,13 @@
     irrelevant-files:
       - ^.*\.md$
 
+- job:
+    name: refstack-client-devstack-xena
+    parent: refstack-client-devstack-master
+    override-checkout: stable/xena
+    vars:
+      branch: stable/xena
+
 - job:
     name: refstack-client-devstack-wallaby
     parent: refstack-client-devstack-master
diff --git a/setup.cfg b/setup.cfg
index c60ccfc..3b6ba14 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,7 @@ classifier =
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
+    Programming Language :: Python :: 3.9
 
 [global]
 setup-hooks =