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 cf4faca188..b47d15e329 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
@@ -1,3 +1,14 @@
+- job-template:
+    name: gate-openstack-manuals-validate-{check}
+    node: precise
+
+    builders:
+      - gerrit-git-prep
+      - shell: "./tools/test.py --check-{check}"
+
+    publishers:
+      - console-log
+
 - job-template:
     name: 'openstack-{manual}'
     project-type: maven
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
index 1be390a72d..641c1062e5 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
@@ -24,6 +24,8 @@
               keep-hierarchy: true
               copy-after-failure: true
 
+# in zuul/layout.yaml specified to only run against stable/folsom and grizzly
+# branches.
 - job:
     name: gate-openstack-manuals-validate
     node: precise
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 c05295fcb8..af4ca35705 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1397,6 +1397,12 @@
 
 - project:
     name: manuals
+    check:
+       - niceness
+       - syntax
+       - deletions
+       - build
+
     manual:
       - admin-guide-cloud
       - config-reference
@@ -1413,6 +1419,8 @@
         - network-connectivity-admin
 
     jobs:
+      - gate-openstack-manuals-validate-{check}
+
       - 'openstack-{manual}'
 
       - openstack-install-deploy-guide-{distribution}:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 606ec726be..5c3fe01280 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -207,6 +207,15 @@ jobs:
     branch: ^(?!stable/(folsom|grizzly)).*$
   - name: openstack-install-deploy-guide-ubuntu
     branch: ^(?!stable/(folsom|grizzly)).*$
+  - name: gate-openstack-manuals-validate-niceness
+    branch: ^(?!stable/(folsom|grizzly)).*$
+    voting: false
+  - name: gate-openstack-manuals-validate-syntax
+    branch: ^(?!stable/(folsom|grizzly)).*$
+  - name: gate-openstack-manuals-validate-deletions
+    branch: ^(?!stable/(folsom|grizzly)).*$
+  - name: gate-openstack-manuals-validate-build
+    branch: ^(?!stable/(folsom|grizzly)).*$
 # Deprecated documentation targets:
   - name: openstack-block-storage-admin-old
     branch: stable/(grizzly|folsom)
@@ -222,6 +231,8 @@ jobs:
     branch: stable/(grizzly|folsom)
   - name: openstack-openstack-install-ubuntu-old
     branch: stable/(grizzly|folsom)
+  - name: gate-openstack-manuals-validate
+    branch: stable/(grizzly|folsom)
   - name: ^gate-.*-docs$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/doc/build/html/
   - name: infra-publications-publish
@@ -2018,8 +2029,15 @@ projects:
 
   - name: openstack/openstack-manuals
     check:
+      - gate-openstack-manuals-validate-niceness
+      - gate-openstack-manuals-validate-syntax
+      - gate-openstack-manuals-validate-deletions
+      - gate-openstack-manuals-validate-build
       - gate-openstack-manuals-validate
     gate:
+      - gate-openstack-manuals-validate-syntax
+      - gate-openstack-manuals-validate-deletions
+      - gate-openstack-manuals-validate-build
       - gate-openstack-manuals-validate
     post:
       - openstack-admin-guide-cloud