diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
index 65139ca356..9d46fc465a 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals-jobs.yaml
@@ -156,3 +156,15 @@
           source: 'doc/src/docbkx/{install}/target/docbkx/webhelp/**/atom.xml'
           target: ''
           remove-prefix: 'doc/src/docbkx/{install}/target/docbkx/webhelp/'
+
+- job-group:
+    name: openstack-doc-jobs
+    jobs:
+      - gate-{name}-tox-{envlist}:
+          envlist: checkniceness
+      - gate-{name}-tox-{envlist}:
+          envlist: checksyntax
+      - gate-{name}-tox-{envlist}:
+          envlist: checkdeletions
+      - gate-{name}-tox-{envlist}:
+          envlist: checkbuild
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 40a42f8b09..01cdfeab8e 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1990,3 +1990,11 @@
       - gate-{name}-pep8
       - '{name}-tarball'
       - pypi-jobs
+
+- project:
+    name: api-site
+    github-org: openstack
+    node: precise
+
+    jobs:
+      - openstack-doc-jobs
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 4b61b15c33..ab8f3b1188 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -177,6 +177,18 @@ project-templates:
       - 'periodic-{name}-python26-havana'
       - 'periodic-{name}-python27-havana'
 
+  - name: openstack-doc-gate
+    check:
+      - gate-{name}-tox-checkniceness
+      - gate-{name}-tox-checksyntax
+      - gate-{name}-tox-checkdeletions
+      - gate-{name}-tox-checkbuild
+    gate:
+      - gate-{name}-tox-checkniceness
+      - gate-{name}-tox-checksyntax
+      - gate-{name}-tox-checkdeletions
+      - gate-{name}-tox-checkbuild
+
 
 jobs:
   - name: ^.*$
@@ -342,6 +354,8 @@ jobs:
     branch: ^(?!stable/grizzly).*$
   - name: gate-operations-guide-tox-checkniceness
     voting: false
+  - name: gate-api-site-tox-checkniceness
+    voting: false
 # Deprecated documentation targets:
   - name: openstack-block-storage-admin-old
     branch: stable/grizzly
@@ -1988,10 +2002,8 @@ projects:
 # Section: OpenStack documentation projects
 
   - name: openstack/api-site
-    check:
-      - gate-noop
-    gate:
-      - gate-noop
+    template:
+      - name: openstack-doc-gate
     post:
       - openstack-api-quick-start
       - openstack-api-site