diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
index 371218c28a..3d41a347e6 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
@@ -538,7 +538,7 @@
 
     wrappers:
       - timeout:
-          timeout: 90
+          timeout: 120
           fail: true
       - timestamps
 
@@ -562,7 +562,6 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST=1
           export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_GATE_CINDER=1
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
       - link-logs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 4bd1033773..44324b6fc7 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -97,6 +97,9 @@ jobs:
   - name: gate-devstack-vm-quantum
     branch: ^(?!stable/(diablo|essex|folsom)).*$
     voting: false
+  - name: gate-tempest-devstack-vm-postgres
+    branch: ^(?!stable/(diablo|essex|folsom)).*$
+    voting: false
 
 
 projects:
@@ -629,40 +632,42 @@ projects:
     check:
       - gate-tempest-devstack-vm
       - gate-tempest-devstack-vm-cinder
+      - gate-tempest-devstack-vm-postgres
       - gate-tempest-devstack-vm-quantum
       - gate-devstack-vm-quantum
     gate:
       - gate-tempest-devstack-vm
       - gate-tempest-devstack-vm-cinder
+      - gate-tempest-devstack-vm-postgres
       - gate-tempest-devstack-vm-quantum
       - gate-devstack-vm-quantum
-    silent:
-      - gate-tempest-devstack-vm-postgres
 
   - name: openstack-infra/devstack-gate
     check:
       - gate-tempest-devstack-vm
       - gate-tempest-devstack-vm-cinder
+      - gate-tempest-devstack-vm-postgres
       - gate-tempest-devstack-vm-quantum
       - gate-devstack-vm-quantum
     gate:
       - gate-tempest-devstack-vm
       - gate-tempest-devstack-vm-cinder
+      - gate-tempest-devstack-vm-postgres
       - gate-tempest-devstack-vm-quantum
       - gate-devstack-vm-quantum
-    silent:
-      - gate-tempest-devstack-vm-postgres
 
   - name: openstack/tempest
     check:
       - gate-tempest-pep8
       - gate-tempest-devstack-vm
+      - gate-tempest-devstack-vm-postgres
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-quantum
       - gate-devstack-vm-quantum
     gate:
       - gate-tempest-pep8
       - gate-tempest-devstack-vm
+      - gate-tempest-devstack-vm-postgres
       - gate-tempest-devstack-vm-cinder
       - gate-tempest-devstack-vm-quantum
       - gate-devstack-vm-quantum