diff --git a/modules/jenkins/files/slave_scripts/run-jsbuild.sh b/modules/jenkins/files/slave_scripts/run-jsbuild.sh
new file mode 100755
index 0000000000..e33f852238
--- /dev/null
+++ b/modules/jenkins/files/slave_scripts/run-jsbuild.sh
@@ -0,0 +1,38 @@
+#!/bin/bash -xe
+# Copyright 2013 OpenStack Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+command=$1
+org=$2
+project=$3
+
+source /usr/local/jenkins/slave_scripts/functions.sh
+check_variable_org_project "$org" "$project" "$0"
+
+rm -f dist/*.tar.gz
+
+venv=grunt
+VDISPLAY=99
+DIMENSIONS='1280x1024x24'
+
+set +e
+/usr/bin/Xvfb :${VDISPLAY} -screen 0 ${DIMENSIONS} 2>&1 > /dev/null &
+
+DISPLAY=:${VDISPLAY} tox -e$venv $command
+result=$?
+
+pkill Xvfb 2>&1 > /dev/null
+set -e
+
+exit $result
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
new file mode 100644
index 0000000000..44dd27b87b
--- /dev/null
+++ b/modules/openstack_project/files/jenkins_job_builder/config/javascript.yaml
@@ -0,0 +1,33 @@
+- job-template:
+    name: 'gate-{name}-js-unittests'
+
+    wrappers:
+      - timeout:
+          timeout: 40
+          fail: true
+      - timestamps
+
+    builders:
+      - gerrit-git-prep
+      - js-build:
+          command: 'test'
+          envlist: 'grunt'
+          github-org: '{github-org}'
+          project: '{name}'
+      - assert-no-extra-files
+
+    publishers:
+      - console-log
+      - coverage-log
+      - scp:
+          site: 'static.openstack.org'
+          files:
+            - target: 'logs/$LOG_PATH'
+              source: 'reports/**'
+              keep-hierarchy: true
+              copy-after-failure: true
+            - target: 'docs-draft/$LOG_PATH'
+              source: 'dist/**'
+              keep-hierarchy: true
+              copy-after-failure: true
+    node: '{node}'
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
index bb6204b8e7..b0aa221e44 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
@@ -131,6 +131,11 @@
     builders:
       - shell: "/usr/local/jenkins/slave_scripts/run-selenium.sh {github-org} {project}"
 
+- builder:
+    name: js-build
+    builders:
+      - shell: "/usr/local/jenkins/slave_scripts/run-jsbuild.sh {command} {github-org} {project}"
+
 - builder:
     name: python26
     builders:
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 e6c0950557..f73e08b578 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1063,6 +1063,7 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
+      - gate-{name}-js-unittests
       - 'storyboard-webclient-release-{branch-designator}':
           branch-designator: 'master'
       - 'storyboard-webclient-release-{branch-designator}':
diff --git a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
index 5e0da772ea..0bbb740e9c 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/storyboard.yaml
@@ -1,23 +1,3 @@
-- job:
-    name: gate-storyboard-webclient-unittests
-    node: bare-precise
-
-    builders:
-      - gerrit-git-prep
-      - shell: |
-          ./bin/bootstrap.sh
-          ./bin/build.sh
-    publishers:
-      - console-log
-      - coverage-log
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$LOG_PATH'
-              source: 'reports/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-
 - job-template:
     name: 'storyboard-webclient-release-{branch-designator}'
     node: bare-precise
@@ -50,4 +30,4 @@
               copy-after-failure: true
       - tarball:
           project: '{name}'
-          site: '{tarball-site}'
\ No newline at end of file
+          site: '{tarball-site}'
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index f247590612..e508dc3624 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -381,6 +381,8 @@ jobs:
     branch: stable/grizzly
   - name: ^gate-.*-docs$
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/doc/build/html/
+  - name: gate-storyboard-webclient-js-unittests
+    success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/
   - name: infra-publications-publish
     branch: ^(?!master).*$
   - name: ^gate-.*-requirements$
@@ -2634,9 +2636,9 @@ projects:
 
   - name: openstack-infra/storyboard-webclient
     check:
-      - gate-storyboard-webclient-unittests
+      - gate-storyboard-webclient-js-unittests
     gate:
-      - gate-storyboard-webclient-unittests
+      - gate-storyboard-webclient-js-unittests
     post:
       - storyboard-webclient-release-branch
     release: