diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index e831f3a004..a1361bd98f 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -253,12 +253,14 @@ project-templates:
   - name: integrated-gate
     check:
       - 'check-tempest-dsvm-full'
+      - 'check-tempest-dsvm-postgres-full'
       - 'check-tempest-dsvm-neutron'
       - 'check-tempest-dsvm-neutron-heat-slow'
       - 'check-grenade-dsvm'
       - 'check-grenade-dsvm-neutron'
     gate:
       - 'gate-tempest-dsvm-full'
+      - 'gate-tempest-dsvm-postgres-full'
       - 'gate-tempest-dsvm-neutron'
       - 'gate-grenade-dsvm'
 
@@ -725,7 +727,6 @@ projects:
       - check-rally-dsvm-cinder
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -799,13 +800,11 @@ projects:
       - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-rally-dsvm-glance
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental:
@@ -838,10 +837,8 @@ projects:
       - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
     post:
       - heat-upstream-translation-update
     experimental-tripleo:
@@ -874,12 +871,10 @@ projects:
       - gate-horizon-python27-django14
       - gate-horizon-selenium
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
     gate:
       - gate-horizon-python27-django14
       - gate-horizon-selenium
       - check-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
     experimental:
       - gate-grenade-dsvm-forward
     post:
@@ -937,7 +932,6 @@ projects:
     check:
       - gate-keystone-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-swift-dsvm-functional
@@ -945,7 +939,6 @@ projects:
       - check-tempest-dsvm-full-apache-services
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-swift-dsvm-functional
@@ -1037,7 +1030,6 @@ projects:
       - name: integrated-gate
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-nova-pylint
@@ -1045,7 +1037,6 @@ projects:
       - check-tempest-dsvm-virtual-ironic-nv
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm-partial-ncpu
@@ -1139,14 +1130,12 @@ projects:
       - gate-swift-tox-func
       - check-swift-dsvm-functional
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-swift-tox-func
       - gate-swift-dsvm-functional
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental:
@@ -1242,12 +1231,10 @@ projects:
       - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
     gate:
       - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
 
   - name: openstack/python-cinderclient
     template:
@@ -1261,12 +1248,10 @@ projects:
       - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
     gate:
       - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
@@ -1284,12 +1269,10 @@ projects:
       - name: publish-to-pypi-2only
     check:
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental:
@@ -1312,13 +1295,11 @@ projects:
       - gate-python-glanceclient-python33
       - gate-python-glanceclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-python-glanceclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental:
@@ -1343,7 +1324,6 @@ projects:
       - gate-python-heatclient-python33
       - gate-python-heatclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
     gate:
       - gate-python-heatclient-pep8
       - gate-python-heatclient-python26
@@ -1351,7 +1331,6 @@ projects:
       - gate-python-heatclient-python33
       - gate-python-heatclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
     post:
       - python-heatclient-branch-tarball
       - python-heatclient-coverage
@@ -1395,14 +1374,12 @@ projects:
     check:
       - gate-python-keystoneclient-python33
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-tempest-dsvm-full-apache-services
     gate:
       - gate-python-keystoneclient-python33
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental:
@@ -1465,14 +1442,12 @@ projects:
       - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental:
@@ -1517,14 +1492,12 @@ projects:
       - gate-python-swiftclient-python33
       - gate-python-swiftclient-pypy
       - check-swift-dsvm-functional
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-python-swiftclient-python33
       - gate-python-swiftclient-pypy
       - gate-swift-dsvm-functional
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
@@ -1852,12 +1825,10 @@ projects:
     check:
       - check-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-neutron-large-ops
     gate:
       - gate-devstack-dsvm-cells
       - gate-tempest-dsvm-large-ops
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
@@ -1980,7 +1951,6 @@ projects:
       - gate-requirements-pypy
       - check-requirements-integration-dsvm
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-swift-dsvm-functional
@@ -1990,7 +1960,6 @@ projects:
       - gate-requirements-pypy
       - gate-requirements-integration-dsvm
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-swift-dsvm-functional
@@ -2111,7 +2080,6 @@ projects:
       - gate-tempest-pep8
       - gate-tempest-docs
       - gate-tempest-python27
-      - check-tempest-dsvm-postgres-full
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
@@ -2134,7 +2102,6 @@ projects:
       - gate-tempest-pep8
       - gate-tempest-docs
       - gate-tempest-python27
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm-partial-ncpu
@@ -2388,7 +2355,6 @@ projects:
     check:
       - gate-devstack-bash8
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - check-tempest-dsvm-neutron-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
@@ -2402,7 +2368,6 @@ projects:
     gate:
       - gate-devstack-bash8
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm-forward
@@ -2482,7 +2447,6 @@ projects:
       - gate-pbr-pypy
       - check-requirements-integration-dsvm
       - check-devstack-dsvm-cells
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-swift-dsvm-functional
@@ -2491,7 +2455,6 @@ projects:
       - gate-pbr-pypy
       - gate-requirements-integration-dsvm
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-swift-dsvm-functional
@@ -2581,7 +2544,6 @@ projects:
       - check-dg-tempest-dsvm-full
       - check-dg-tempest-dsvm-full-reexec
       - check-dg-hooks-dsvm
-      - check-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - check-grenade-dsvm-partial-ncpu
@@ -2600,7 +2562,6 @@ projects:
     gate:
       - gate-devstack-gate-unittests
       - gate-devstack-dsvm-cells
-      - gate-tempest-dsvm-postgres-full
       - gate-tempest-dsvm-large-ops
       - gate-tempest-dsvm-neutron-large-ops
       - gate-grenade-dsvm-partial-ncpu