diff --git a/.zuul.yaml b/.zuul.yaml
index ab158eb..1e0a6cd 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -89,20 +89,10 @@
       - release-notes-jobs-python3
     check:
       jobs:
-        # NOTE(rpittau): yoga jobs support py38 and py39 but we want to keep
-        # testing py36 to maintain compatibility with older distributions like
-        # CentOS Stream 8, Ubuntu Bionic, Debian 10, and openSuse Leap
-        # Remove after Yoga
-        - openstack-tox-py36
         - ironic-prometheus-exporter-redfish
         - bifrost-integration-tinyipa-keystone-centos-8
     gate:
       queue: ironic
       jobs:
-        # NOTE(rpittau): yoga jobs support py38 and py39 but we want to keep
-        # testing py36 to maintain compatibility with older distributions like
-        # CentOS Stream 8, Ubuntu Bionic, Debian 10, and openSuse Leap
-        # Remove after Yoga
-        - openstack-tox-py36
         - ironic-prometheus-exporter-redfish
         - bifrost-integration-tinyipa-keystone-centos-8
diff --git a/setup.cfg b/setup.cfg
index 036a74f..911cd1b 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -18,6 +18,8 @@ classifier =
     Programming Language :: Python :: Implementation :: CPython
     Programming Language :: Python :: 3 :: Only
     Programming Language :: Python :: 3
+    Programming Language :: Python :: 3.6
+    Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9