diff --git a/.zuul.yaml b/.zuul.yaml
index 980f881..718c629 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-ussuri-jobs
+      - openstack-python3-xena-jobs
       - publish-openstack-docs-pti
diff --git a/setup.cfg b/setup.cfg
index ec3ca7b..1bf23e1 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,6 +19,7 @@ classifier =
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
+    Programming Language :: Python :: 3.8
 
 [files]
 packages =
diff --git a/tox.ini b/tox.ini
index 42dee8e..c5de120 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 minversion = 3.18.0
-envlist = py36,py37,pep8
+envlist = py36,py38,pep8
 skipsdist = True
 ignore_basepython_conflict = True