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 9b07272d6f..73ab461a40 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/manuals.yaml
@@ -1,3 +1,30 @@
+- job:
+    name: gate-openstack-cli-guide
+    project-type: maven
+    node: precise
+
+    triggers:
+      - zuul
+
+    prebuilders:
+      - gerrit-git-prep
+
+    maven:
+      root-module:
+        group-id: org.openstack.docs
+        artifact-id: openstack-guide
+      root-pom: doc/src/docbkx/cli-guide/pom.xml
+      goals: 'clean generate-sources'
+
+    publishers:
+      - console-log
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'docs-draft/$JOB_NAME/$ZUUL_PIPELINE/$BUILD_NUMBER/cli/quick-start'
+              source: 'doc/src/docbkx/cli-guide/target/docbkx/webhelp/cli-guide/**'
+              copy-after-failure: true
+
 - job:
     name: openstack-cli-guide
     project-type: maven
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index a4f84f72a7..84901db572 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -77,6 +77,8 @@ jobs:
     branch: ^master$
   - name: openstack-ha-guide
     branch: ^master$
+  - name: gate-openstack-cli-guide
+    success-pattern: http://docs-draft.openstack.org/{job.name}/{pipeline.name}/{build.number}/cli/quick-start
 
 
 projects:
@@ -759,9 +761,9 @@ projects:
 
   - name: openstack/openstack-manuals
     check:
-      - gate-noop
+      - gate-openstack-cli-guide
     gate:
-      - gate-noop
+      - gate-openstack-cli-guide
     post:
       - openstack-admin-manual-compute
       - openstack-admin-manual-keystone-diablo