diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index ce2522e521..15dbc2cd06 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -291,6 +291,16 @@ project-templates:
     gate:
       - 'gate-{name}-pypy'
 
+  - name: stable-compat-jobs
+    # trunk clients and libs are used in stable jobs, so run stable jobs
+    # on those repos
+    # TODO(jogo): run this on libraries
+    check:
+      - 'check-tempest-dsvm-full-havana'
+      - 'check-tempest-dsvm-neutron-havana'
+      - 'check-tempest-dsvm-full-icehouse'
+      - 'check-tempest-dsvm-neutron-icehouse'
+
   - name: openstack-server-publish-jobs
     post:
       - '{name}-docs'
@@ -1107,6 +1117,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
@@ -1132,6 +1143,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
@@ -1197,6 +1209,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-glanceclient-python33
       - gate-python-glanceclient-pypy
@@ -1232,6 +1245,7 @@ projects:
     template:
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-heatclient-pep8
       - gate-python-heatclient-python26
@@ -1302,6 +1316,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-keystoneclient-python33
       - check-devstack-dsvm-cells
@@ -1363,6 +1378,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate-neutron
+      - name: stable-compat-jobs
     check:
       - gate-python-neutronclient-python33
       - gate-python-neutronclient-pypy
@@ -1391,6 +1407,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
@@ -1428,6 +1445,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-openstackclient-python33
     pre-release:
@@ -1463,6 +1481,7 @@ projects:
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-swiftclient-python33
       - gate-python-swiftclient-pypy
@@ -1496,6 +1515,7 @@ projects:
     template:
       - name: check-requirements
       - name: integrated-gate
+      - name: stable-compat-jobs
     check:
       - gate-python-troveclient-pep8
       - gate-python-troveclient-python26