diff --git a/.zuul.yaml b/.zuul.yaml
index 395e82da21..699ee5212e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -47,6 +47,7 @@
     vars:
       devstack_localrc:
         TEMPEST_PLUGINS: "'{{ ansible_user_dir }}/src/git.openstack.org/openstack/tempest-horizon'"
+        USE_PYTHON3: true
       devstack_services:
         horizon: true
         tempest: true
diff --git a/setup.cfg b/setup.cfg
index 8ded47ecaf..a29c0b04f4 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -19,7 +19,9 @@ classifier =
     Programming Language :: Python
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
+    Programming Language :: Python :: 3
     Programming Language :: Python :: 3.5
+    Programming Language :: Python :: 3.6
     Topic :: Internet :: WWW/HTTP
 
 [global]