diff --git a/.zuul.yaml b/.zuul.yaml
index 97f521e..890c22e 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -11,3 +11,17 @@
       - openstack-python3-yoga-jobs
       - publish-openstack-docs-pti
       - 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
+    gate:
+      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
\ No newline at end of file