diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 5478eb21b4..e6c3d309c3 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -78,6 +78,12 @@ jobs:
     voting: false
   - name: gate-tempest-devstack-vm-postgres-full
     branch: ^(?!stable/folsom).*$
+  - name: gate-tempest-devstack-vm-cells
+    branch: ^(?!stable/folsom).*$
+    voting: false
+  - name: gate-tempest-devstack-vm-cells-full
+    branch: ^(?!stable/folsom).*$
+    voting: false
   - name: gate-grenade-devstack-vm
     branch: ^(?!stable/folsom).*$
     voting: false
@@ -363,6 +369,7 @@ projects:
       - gate-cinder-pylint
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -399,6 +406,7 @@ projects:
       - gate-glance-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -436,6 +444,7 @@ projects:
       - gate-horizon-selenium
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -473,6 +482,7 @@ projects:
       - gate-keystone-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -510,6 +520,7 @@ projects:
       - gate-nova-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -655,6 +666,7 @@ projects:
       - gate-swift-devstack-vm-functional
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
       - gate-tempest-devstack-vm-postgres-full
@@ -713,6 +725,7 @@ projects:
       - gate-python-cinderclient-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
@@ -748,6 +761,7 @@ projects:
       - gate-python-glanceclient-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
@@ -783,6 +797,7 @@ projects:
       - gate-python-keystoneclient-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
@@ -818,6 +833,7 @@ projects:
       - gate-python-novaclient-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
@@ -876,6 +892,7 @@ projects:
       - gate-python-neutronclient-python27
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
@@ -975,6 +992,7 @@ projects:
       - gate-pbr-devstack-vm-rawinstall
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -1007,6 +1025,7 @@ projects:
     check:
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -1023,6 +1042,7 @@ projects:
     check:
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
@@ -1060,6 +1080,7 @@ projects:
       - gate-tempest-docs
       - gate-tempest-devstack-vm-smoke
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-neutron
@@ -1145,6 +1166,7 @@ projects:
       - gate-heat-python26
       - gate-heat-python27
       - gate-tempest-devstack-vm-full
+      - gate-tempest-devstack-vm-cells-full
       - gate-tempest-devstack-vm-postgres-full
       - gate-tempest-devstack-vm-neutron
     gate: