diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 65b98914a0..c2606824ac 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3522,6 +3522,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.concurrency
@@ -3535,6 +3536,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.config
@@ -3547,6 +3549,7 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.context
@@ -3559,6 +3562,7 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.db
@@ -3577,6 +3581,7 @@
       - translation-jobs
       - 'gate-{name}-tox-{envlist}'
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
       - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
@@ -3595,6 +3600,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.log
@@ -3608,6 +3614,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
       - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
@@ -3626,6 +3633,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
       - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
@@ -3697,6 +3705,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.policy
@@ -3710,6 +3719,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.privsep
@@ -3734,6 +3744,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.rootwrap
@@ -3746,6 +3757,7 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
       - '{pipeline}-tempest-dsvm-largeops-src-{name}{job-suffix}':
           pipeline: gate
           node: 'devstack-precise || devstack-trusty'
@@ -3763,6 +3775,7 @@
       - openstack-publish-jobs
       - pypi-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.service
@@ -3776,6 +3789,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.utils
@@ -3789,6 +3803,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.versionedobjects
@@ -3802,6 +3817,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
 
 - project:
     name: oslo.vmware
@@ -3815,6 +3831,7 @@
       - pypi-jobs
       - translation-jobs
       - 'lib-forward-testing-{name}'
+      - 'stable-compat-jobs-{name}'
       - 'gate-{name}-tox-{envlist}':
           envlist: bandit
 
diff --git a/jenkins/jobs/tempest-jobs.yaml b/jenkins/jobs/tempest-jobs.yaml
index af7a565a4c..42e2e51074 100644
--- a/jenkins/jobs/tempest-jobs.yaml
+++ b/jenkins/jobs/tempest-jobs.yaml
@@ -6,3 +6,12 @@
           node: 'devstack-precise || devstack-trusty'
           job-suffix: ''
           branch-override: default
+
+- job-group:
+    name: 'stable-compat-jobs-{name}'
+    jobs:
+      - '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}':
+          pipeline: gate
+          node: 'devstack-precise || devstack-trusty'
+          job-suffix: '-liberty'
+          branch-override: stable/liberty
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 655f9419f3..abb376ddd5 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -306,6 +306,10 @@ project-templates:
     gate:
       - 'gate-tempest-dsvm-neutron-src-{name}'
 
+  - name: stable-compat-jobs
+    check:
+      - 'gate-tempest-dsvm-neutron-src-{name}-liberty'
+
   - name: lib-forward-testing-plugin
     check:
       - 'gate-tempest-dsvm-neutron-src-{name}-plugin'
@@ -1103,6 +1107,10 @@ jobs:
   - name: ^.*gerrit.*buck$
     branch: ^openstack/(?!2\.4).*$
 
+  - name: ^gate-tempest-dsvm-neutron-src-.*-liberty$
+    branch: ^(?!stable/(?:juno|kilo|liberty)).*$
+    voting: false
+
   - name: gate-oslo.messaging-dsvm-functional-rabbit
     branch: ^(?!stable/juno).*$
 
@@ -6805,6 +6813,7 @@ projects:
       - name: translation-jobs
       - name: python3-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.concurrency
     template:
@@ -6817,6 +6826,7 @@ projects:
       - name: python3-jobs
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
     post:
       - oslo.concurrency-coverage
 
@@ -6830,6 +6840,7 @@ projects:
       - name: check-requirements
       - name: publish-to-pypi
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.context
     template:
@@ -6841,6 +6852,7 @@ projects:
       - name: check-requirements
       - name: publish-to-pypi
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.db
     template:
@@ -6853,6 +6865,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
     check:
       - gate-tempest-dsvm-largeops-src-oslo.db
       - gate-oslo.db-tox-sqla_08
@@ -6870,6 +6883,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
     post:
       - oslo.i18n-coverage
 
@@ -6884,6 +6898,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
     check:
       - gate-tempest-dsvm-largeops-src-oslo.log
 
@@ -6896,6 +6911,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
     check:
       - gate-tempest-dsvm-largeops-src-oslo.messaging
       - gate-oslo.messaging-dsvm-functional-rabbit
@@ -6922,6 +6938,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.policy
     template:
@@ -6933,6 +6950,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.privsep
     template:
@@ -6955,6 +6973,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.rootwrap
     template:
@@ -6966,6 +6985,7 @@ projects:
       - name: check-requirements
       - name: publish-to-pypi
       - name: lib-forward-testing
+      - name: stable-compat-jobs
     check:
       - gate-tempest-dsvm-largeops-src-oslo.rootwrap
 
@@ -6979,6 +6999,7 @@ projects:
       - name: check-requirements
       - name: publish-to-pypi
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.service
     template:
@@ -6990,6 +7011,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.utils
     template:
@@ -7002,6 +7024,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.versionedobjects
     template:
@@ -7013,6 +7036,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
 
   - name: openstack/oslo.vmware
     template:
@@ -7025,6 +7049,7 @@ projects:
       - name: publish-to-pypi
       - name: translation-jobs
       - name: lib-forward-testing
+      - name: stable-compat-jobs
     check:
       - gate-oslo.vmware-tox-bandit