diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index bb5b6f6884..d6df35ff91 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -1147,15 +1147,12 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: stable-compat-jobs
       - name: publish-to-pypi
-    check:
-      - gate-keystonemiddleware-python33
-    gate:
-      - gate-keystonemiddleware-python33
 
   - name: openstack/kite
     template:
@@ -1442,18 +1439,17 @@ projects:
   - name: openstack/python-barbicanclient
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: publish-to-pypi
     check:
       - gate-python-barbicanclient-pep8
       - gate-python-barbicanclient-python26
       - gate-python-barbicanclient-python27
-      - gate-python-barbicanclient-python33
       - gate-python-barbicanclient-pypy
     gate:
       - gate-python-barbicanclient-pep8
       - gate-python-barbicanclient-python26
       - gate-python-barbicanclient-python27
-      - gate-python-barbicanclient-python33
       - gate-python-barbicanclient-pypy
     post:
       - python-barbicanclient-branch-tarball
@@ -1462,17 +1458,16 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: stable-compat-jobs
       - name: publish-to-pypi
     check:
-      - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
       - check-devstack-dsvm-cells
     gate:
-      - gate-python-ceilometerclient-python33
       - gate-python-ceilometerclient-pypy
       - gate-devstack-dsvm-cells
 
@@ -1480,17 +1475,16 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: stable-compat-jobs
       - name: publish-to-pypi
     check:
-      - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
       - check-devstack-dsvm-cells
     gate:
-      - gate-python-cinderclient-python33
       - gate-python-cinderclient-pypy
       - gate-devstack-dsvm-cells
     experimental:
@@ -1563,6 +1557,7 @@ projects:
   - name: openstack/python-heatclient
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: stable-compat-jobs
@@ -1571,14 +1566,12 @@ projects:
       - gate-python-heatclient-pep8
       - gate-python-heatclient-python26
       - gate-python-heatclient-python27
-      - gate-python-heatclient-python33
       - gate-python-heatclient-pypy
       - check-devstack-dsvm-cells
     gate:
       - gate-python-heatclient-pep8
       - gate-python-heatclient-python26
       - gate-python-heatclient-python27
-      - gate-python-heatclient-python33
       - gate-python-heatclient-pypy
       - gate-devstack-dsvm-cells
     post:
@@ -1595,19 +1588,18 @@ projects:
   - name: openstack/python-ironicclient
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: python-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: publish-to-pypi
     check:
-      - gate-python-ironicclient-python33
       - gate-python-ironicclient-pypy
       - check-tempest-dsvm-ironic
       - check-tempest-dsvm-virtual-ironic
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise-nonha
     gate:
-      - gate-python-ironicclient-python33
       - gate-python-ironicclient-pypy
       - gate-tempest-dsvm-ironic
       - gate-tempest-dsvm-virtual-ironic
@@ -1616,6 +1608,7 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
@@ -1623,10 +1616,8 @@ projects:
       - name: stable-compat-jobs
       - name: publish-to-pypi
     check:
-      - gate-python-keystoneclient-python33
       - check-devstack-dsvm-cells
     gate:
-      - gate-python-keystoneclient-python33
       - gate-devstack-dsvm-cells
     experimental:
       - gate-grenade-dsvm-forward
@@ -1640,30 +1631,28 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: publish-to-pypi
     check:
       - gate-python-kiteclient-requirements
-      - gate-python-kiteclient-python33
     gate:
       - gate-python-kiteclient-requirements
-      - gate-python-kiteclient-python33
 
   - name: openstack/python-zaqarclient
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: check-requirements
       - name: publish-to-pypi
     check:
       - gate-python-zaqarclient-pep8
       - gate-python-zaqarclient-python26
       - gate-python-zaqarclient-python27
-      - gate-python-zaqarclient-python33
       - gate-python-zaqarclient-pypy
     gate:
       - gate-python-zaqarclient-pep8
       - gate-python-zaqarclient-python26
       - gate-python-zaqarclient-python27
-      - gate-python-zaqarclient-python33
       - gate-python-zaqarclient-pypy
     post:
       - python-zaqarclient-branch-tarball
@@ -1694,6 +1683,7 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
@@ -1701,11 +1691,9 @@ projects:
       - name: stable-compat-jobs
       - name: publish-to-pypi
     check:
-      - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
       - check-devstack-dsvm-cells
     gate:
-      - gate-python-novaclient-python33
       - gate-python-novaclient-pypy
       - gate-devstack-dsvm-cells
     experimental:
@@ -1743,6 +1731,7 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-client-publish-jobs
       - name: check-requirements
       - name: integrated-gate
@@ -1750,11 +1739,9 @@ projects:
       - name: stable-compat-jobs
       - name: publish-to-pypi
     check:
-      - gate-python-swiftclient-python33
       - gate-python-swiftclient-pypy
       - check-swift-dsvm-functional
     gate:
-      - gate-python-swiftclient-python33
       - gate-python-swiftclient-pypy
       - gate-swift-dsvm-functional
     experimental-tripleo:
@@ -1769,14 +1756,13 @@ projects:
       - name: check-requirements
       - name: openstack-client-publish-jobs
       - name: python-jobs
+      - name: python3-jobs
       - name: integrated-gate
       - name: stable-compat-jobs
       - name: publish-to-pypi
     check:
-      - gate-python-troveclient-python33
       - gate-python-troveclient-pypy
     gate:
-      - gate-python-troveclient-python33
       - gate-python-troveclient-pypy
 
   - name: openstack/python-tuskarclient
@@ -2097,12 +2083,9 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
-    check:
-      - gate-oslo-incubator-python33
-    gate:
-      - gate-oslo-incubator-python33
 
   - name: openstack/oslo-specs
     template:
@@ -2128,16 +2111,15 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: publish-to-pypi
     check:
-      - gate-oslo.config-python33
       - check-devstack-dsvm-cells
       - check-oslotest-dsvm-oslo.config
     gate:
-      - gate-oslo.config-python33
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-novabm-undercloud-precise-nonha
@@ -2172,17 +2154,16 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: publish-to-pypi
       - name: translation-jobs
     check:
-      - gate-oslo.i18n-python33
       - check-devstack-dsvm-cells
       - check-oslotest-dsvm-oslo.i18n
     gate:
-      - gate-oslo.i18n-python33
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-novabm-undercloud-precise-nonha
@@ -2239,6 +2220,7 @@ projects:
     template:
       - name: merge-check
       - name: openstack-server-publish-jobs
+      - name: python3-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: large-ops
@@ -2247,13 +2229,11 @@ projects:
       - gate-oslo.rootwrap-pep8
       - gate-oslo.rootwrap-python26
       - gate-oslo.rootwrap-python27
-      - gate-oslo.rootwrap-python33
       - check-devstack-dsvm-cells
     gate:
       - gate-oslo.rootwrap-pep8
       - gate-oslo.rootwrap-python26
       - gate-oslo.rootwrap-python27
-      - gate-oslo.rootwrap-python33
       - gate-devstack-dsvm-cells
     post:
       - oslo.rootwrap-branch-tarball
@@ -2267,44 +2247,37 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: publish-to-pypi
-    check:
-      - gate-oslo.serialization-python33
-    gate:
-      - gate-oslo.serialization-python33
 
   - name: openstack/oslo.utils
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: publish-to-pypi
       - name: translation-jobs
-    check:
-      - gate-oslo.utils-python33
-    gate:
-      - gate-oslo.utils-python33
 
   - name: openstack/oslo.version
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: openstack-server-publish-jobs
       - name: check-requirements
       - name: integrated-gate
       - name: publish-to-pypi
     check:
       - gate-oslo.version-pypy
-      - gate-oslo.version-python33
       - check-devstack-dsvm-cells
     gate:
       - gate-oslo.version-pypy
-      - gate-oslo.version-python33
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-novabm-undercloud-precise-nonha
@@ -2845,13 +2818,12 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: publish-to-pypi
     check:
-      - gate-hacking-python33
       - gate-hacking-pypy
       - gate-hacking-integration-nova
     gate:
-      - gate-hacking-python33
       - gate-hacking-pypy
       - gate-hacking-integration-nova
     post:
@@ -2890,17 +2862,16 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: integrated-gate
       - name: large-ops
       - name: publish-to-pypi
     check:
-      - gate-pbr-python33
       - gate-pbr-pypy
       - check-requirements-integration-dsvm
       - check-devstack-dsvm-cells
       - check-swift-dsvm-functional
     gate:
-      - gate-pbr-python33
       - gate-pbr-pypy
       - gate-requirements-integration-dsvm
       - gate-devstack-dsvm-cells
@@ -3082,12 +3053,11 @@ projects:
   - name: openstack-infra/gerrit-powered-agenda
     template:
       - name: merge-check
+      - name: python3-jobs
     check:
       - gate-gerrit-powered-agenda-pep8
-      - gate-gerrit-powered-agenda-python33
     gate:
       - gate-gerrit-powered-agenda-pep8
-      - gate-gerrit-powered-agenda-python33
 
   - name: openstack-infra/gerritbot
     template:
@@ -3122,17 +3092,16 @@ projects:
   - name: openstack-infra/git-review
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: publish-to-pypi
     check:
       - gate-git-review-pep8
       - gate-git-review-python26
       - gate-git-review-python27
-      - gate-git-review-python33
     gate:
       - gate-git-review-pep8
       - gate-git-review-python26
       - gate-git-review-python27
-      - gate-git-review-python33
     post:
       - git-review-branch-tarball
 
@@ -3363,10 +3332,7 @@ projects:
       - name: merge-check
       - name: publish-to-pypi
       - name: python-jobs
-    check:
-      - gate-reviewstats-python33
-    gate:
-      - gate-reviewstats-python33
+      - name: python3-jobs
 
   - name: openstack-infra/statusbot
     template:
@@ -3639,18 +3605,17 @@ projects:
     template:
       - name: merge-check
       - name: docs-on-rtfd
+      - name: python3-jobs
     check:
       - gate-cloudkitty-docs
       - gate-cloudkitty-pep8
       - gate-cloudkitty-python26
       - gate-cloudkitty-python27
-      - gate-cloudkitty-python33
     gate:
       - gate-cloudkitty-docs
       - gate-cloudkitty-pep8
       - gate-cloudkitty-python26
       - gate-cloudkitty-python27
-      - gate-cloudkitty-python33
 
   - name: stackforge/cloudkitty-dashboard
     template:
@@ -3825,18 +3790,17 @@ projects:
   - name: stackforge/entropy
     template:
       - name: merge-check
+      - name: python3-jobs
     check:
       - gate-entropy-docs
       - gate-entropy-pep8
       - gate-entropy-python26
       - gate-entropy-python27
-      - gate-entropy-python33
     gate:
       - gate-entropy-docs
       - gate-entropy-pep8
       - gate-entropy-python26
       - gate-entropy-python27
-      - gate-entropy-python33
     post:
       - entropy-coverage
 
@@ -3913,18 +3877,17 @@ projects:
   - name: stackforge/gnocchi
     template:
       - name: merge-check
+      - name: python3-jobs
     check:
       - gate-gnocchi-pep8
       - gate-gnocchi-python26
       - gate-gnocchi-python27
       - gate-gnocchi-tox-py27-postgresql
       - gate-gnocchi-tox-py27-mysql
-      - gate-gnocchi-python33
     gate:
       - gate-gnocchi-pep8
       - gate-gnocchi-python26
       - gate-gnocchi-python27
-      - gate-gnocchi-python33
       - gate-gnocchi-tox-py27-postgresql
       - gate-gnocchi-tox-py27-mysql
 
@@ -3953,10 +3916,7 @@ projects:
       - name: docs-on-rtfd
       - name: merge-check
       - name: python-jobs
-    check:
-      - gate-heat-translator-python33
-    gate:
-      - gate-heat-translator-python33
+      - name: python3-jobs
     post:
       - heat-translator-coverage
       - heat-translator-branch-tarball
@@ -4390,13 +4350,13 @@ projects:
   - name: stackforge/pecan
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: publish-to-pypi
       - name: docs-on-rtfd
     check:
       - gate-pecan-pep8
       - gate-pecan-python26
       - gate-pecan-python27
-      - gate-pecan-python33
       - gate-pecan-pypy
       - gate-pecan-tox-scaffolds-26
       - gate-pecan-tox-scaffolds-27
@@ -4415,7 +4375,6 @@ projects:
       - gate-pecan-pep8
       - gate-pecan-python26
       - gate-pecan-python27
-      - gate-pecan-python33
       - gate-pecan-pypy
       - gate-pecan-tox-scaffolds-26
       - gate-pecan-tox-scaffolds-27
@@ -4673,19 +4632,18 @@ projects:
   - name: stackforge/python-manilaclient
     template:
       - name: merge-check
+      - name: python3-jobs
     check:
       - gate-python-manilaclient-docs
       - gate-python-manilaclient-pep8
       - gate-python-manilaclient-python26
       - gate-python-manilaclient-python27
-      - gate-python-manilaclient-python33
       - gate-manila-tempest-dsvm-neutron
     gate:
       - gate-python-manilaclient-docs
       - gate-python-manilaclient-pep8
       - gate-python-manilaclient-python26
       - gate-python-manilaclient-python27
-      - gate-python-manilaclient-python33
     post:
       - python-manilaclient-branch-tarball
       - python-manilaclient-coverage
@@ -4725,16 +4683,15 @@ projects:
   - name: stackforge/python-opentsdbclient
     template:
       - name: merge-check
+      - name: python3-jobs
     check:
       - gate-python-opentsdbclient-pep8
       - gate-python-opentsdbclient-python26
       - gate-python-opentsdbclient-python27
-      - gate-python-opentsdbclient-python33
     gate:
       - gate-python-opentsdbclient-pep8
       - gate-python-opentsdbclient-python26
       - gate-python-opentsdbclient-python27
-      - gate-python-opentsdbclient-python33
 
   - name: stackforge/python-rackclient
     template:
@@ -4757,13 +4714,12 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: check-requirements
       - name: publish-to-pypi
     check:
-      - gate-python-solumclient-python33
       - gate-python-solumclient-pypy
     gate:
-      - gate-python-solumclient-python33
       - gate-python-solumclient-pypy
 
   - name: stackforge/python-tackerclient
@@ -4799,13 +4755,12 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: check-requirements
       - name: publish-to-pypi
     check:
-      - gate-solum-infra-guestagent-python33
       - gate-solum-infra-guestagent-pypy
     gate:
-      - gate-solum-infra-guestagent-python33
       - gate-solum-infra-guestagent-pypy
 
   - name: stackforge/radar
@@ -4882,14 +4837,13 @@ projects:
   - name: stackforge/rubick
     template:
       - name: merge-check
+      - name: python3-jobs
     check:
       - gate-rubick-pep8
       - gate-rubick-python27
-      - gate-rubick-python33
     gate:
       - gate-rubick-pep8
       - gate-rubick-python27
-      - gate-rubick-python33
     post:
       - rubick-coverage
 
@@ -4897,12 +4851,11 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: docs-on-rtfd
     check:
-      - gate-satori-python33
       - gate-satori-pypy
     gate:
-      - gate-satori-python33
       - gate-satori-pypy
 
   - name: stackforge/solum
@@ -4927,17 +4880,16 @@ projects:
   - name: stackforge/sphinxcontrib-docbookrestapi
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: publish-to-pypi
     check:
       - gate-sphinxcontrib-docbookrestapi-pep8
       - gate-sphinxcontrib-docbookrestapi-python26
       - gate-sphinxcontrib-docbookrestapi-python27
-      - gate-sphinxcontrib-docbookrestapi-python33
     gate:
       - gate-sphinxcontrib-docbookrestapi-pep8
       - gate-sphinxcontrib-docbookrestapi-python26
       - gate-sphinxcontrib-docbookrestapi-python27
-      - gate-sphinxcontrib-docbookrestapi-python33
 
   - name: stackforge/sqlalchemy-migrate
     template:
@@ -4967,19 +4919,18 @@ projects:
   - name: stackforge/stackalytics
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: docs-on-rtfd
     check:
       - gate-stackalytics-docs
       - gate-stackalytics-pep8
       - gate-stackalytics-python26
       - gate-stackalytics-python27
-      - gate-stackalytics-python33
     gate:
       - gate-stackalytics-docs
       - gate-stackalytics-pep8
       - gate-stackalytics-python26
       - gate-stackalytics-python27
-      - gate-stackalytics-python33
     post:
       - stackalytics-branch-tarball
     pre-release:
@@ -5095,16 +5046,15 @@ projects:
   - name: stackforge/wsme
     template:
       - name: merge-check
+      - name: python3-jobs
       - name: publish-to-pypi
     check:
       - gate-wsme-python26
       - gate-wsme-python27
-      - gate-wsme-python33
       - gate-wsme-pep8
     gate:
       - gate-wsme-python26
       - gate-wsme-python27
-      - gate-wsme-python33
       - gate-wsme-pep8
     post:
       - wsme-branch-tarball
@@ -5113,12 +5063,11 @@ projects:
     template:
       - name: merge-check
       - name: python-jobs
+      - name: python3-jobs
       - name: check-requirements
     check:
-      - gate-python-openstacksdk-python33
       - gate-python-openstacksdk-pypy
     gate:
-      - gate-python-openstacksdk-python33
       - gate-python-openstacksdk-pypy
 
   - name: stackforge/graffiti