diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
index 665b005bc8..410f331178 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -430,6 +430,7 @@
     jobs:
       - python-jobs
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - 'gate-tempest-dsvm-ceilometer-{backend}{branch-designator}':
@@ -459,6 +460,7 @@
     jobs:
       - python-jobs
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - gate-{name}-pylint
       - translation-jobs
@@ -678,6 +680,7 @@
     jobs:
       - python-jobs
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - rally-jobs
@@ -715,6 +718,7 @@
           branch-designator: ''
           branch-override: default
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - rally-jobs
@@ -768,6 +772,7 @@
     jobs:
       - python-jobs
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
 
 
@@ -828,6 +833,7 @@
     jobs:
       - python-jobs
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - rally-jobs
@@ -890,6 +896,7 @@
     jobs:
       - python-jobs
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - gate-{name}-pylint
       - gate-{name}-pip-missing-reqs
@@ -1244,6 +1251,7 @@
     jobs:
       - python-jobs
       - python-havana-bitrot-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - rally-jobs
       - translation-jobs
@@ -1288,6 +1296,7 @@
 
     jobs:
       - python-jobs
+      - python-icehouse-bitrot-jobs
       - openstack-publish-jobs
       - translation-jobs
       - openstack-doc-jobs
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
index 19da3e760a..329e80d386 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/python-bitrot-jobs.yaml
@@ -77,3 +77,14 @@
       - 'periodic-{name}-python26{branch-name}'
       - 'periodic-{name}-python27{branch-name}'
       - 'periodic-{name}-docs{branch-name}'
+
+
+- job-group:
+    name: python-icehouse-bitrot-jobs
+    branch: 'stable/icehouse'
+    branch-name: '-icehouse'
+    node: 'bare-precise || bare-trusty'
+    jobs:
+      - 'periodic-{name}-python26{branch-name}'
+      - 'periodic-{name}-python27{branch-name}'
+      - 'periodic-{name}-docs{branch-name}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f75ca6e8bc..a20b76c832 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -349,6 +349,12 @@ project-templates:
       - 'periodic-{name}-python26-havana'
       - 'periodic-{name}-python27-havana'
 
+  - name: periodic-icehouse
+    periodic-stable:
+      - 'periodic-{name}-docs-icehouse'
+      - 'periodic-{name}-python26-icehouse'
+      - 'periodic-{name}-python27-icehouse'
+
   - name: openstack-doc-gate
     check:
       - gate-{name}-tox-checklinks
@@ -769,6 +775,7 @@ projects:
       - name: python3-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: translation-jobs
@@ -803,6 +810,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: translation-jobs
@@ -908,6 +916,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: translation-jobs
@@ -971,6 +980,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: translation-jobs
@@ -1005,6 +1015,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: translation-jobs
@@ -1065,6 +1076,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: large-ops
@@ -1154,6 +1166,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate-neutron
       - name: translation-jobs
@@ -1201,6 +1214,7 @@ projects:
       - name: python-jobs
       - name: openstack-server-publish-jobs
       - name: periodic-havana
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: large-ops
@@ -1343,6 +1357,7 @@ projects:
       - name: merge-check
       - name: python-jobs
       - name: openstack-server-publish-jobs
+      - name: periodic-icehouse
       - name: check-requirements
       - name: integrated-gate
       - name: openstack-doc-gate
@@ -2428,6 +2443,9 @@ projects:
       - periodic-tempest-dsvm-full-havana
       - periodic-tempest-dsvm-neutron-havana
       - periodic-tempest-dsvm-postgres-full-havana
+      - periodic-tempest-dsvm-full-icehouse
+      - periodic-tempest-dsvm-neutron-icehouse
+      - periodic-tempest-dsvm-postgres-full-icehouse
     periodic-qa:
       - periodic-tempest-dsvm-full-non-isolated-master
       - periodic-tempest-dsvm-neutron-full-non-isolated-master