diff --git a/.zuul.yaml b/.zuul.yaml
index 1940796..ef34a33 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -2,16 +2,18 @@
     templates:
       - openstack-cover-jobs
       - openstack-python37-jobs
-      - openstack-python3-wallaby-jobs
+      - openstack-python3-xena-jobs
     check:
       jobs:
         - refstack-client-devstack-master
+        - refstack-client-devstack-wallaby
         - refstack-client-devstack-victoria
         - refstack-client-devstack-ussuri
         - refstack-client-devstack-train
     gate:
       jobs:
         - refstack-client-devstack-master
+        - refstack-client-devstack-wallaby
         - refstack-client-devstack-victoria
         - refstack-client-devstack-ussuri
         - refstack-client-devstack-train
diff --git a/setup.cfg b/setup.cfg
index 6cf62e9..fc70e30 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,6 +20,7 @@ classifier =
     Programming Language :: Python :: 3.5
     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 0a13ad6..3eebfb1 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = pep8,py35,py36,py37,py27
+envlist = pep8,py35,py36,py38,py27
 minversion = 3.18
 skipsdist = True