diff --git a/jenkins/jobs/javascript.yaml b/jenkins/jobs/javascript.yaml
index 732e2e1db4..daf833a5e8 100644
--- a/jenkins/jobs/javascript.yaml
+++ b/jenkins/jobs/javascript.yaml
@@ -171,6 +171,22 @@
           version: '4'
       - '{name}-npm-upload'
 
+- job-group:
+    name: nodejs6-jobs
+    jobs:
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
+          command: 'lint'
+          version: '6'
+      - 'gate-{name}-nodejs{version}-npm-run-{command}':
+          command: 'test'
+          version: '6'
+
+- job-group:
+    name: nodejs6-publish-to-npm
+    jobs:
+      - '{name}-nodejs{version}-npm-publish-tarball':
+          version: '6'
+      - '{name}-npm-upload'
 
 
 ## Legacy Jobs (DEPRECATED)
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index 0112028ad6..ca75f407e3 100644
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -3489,6 +3489,7 @@
     jobs:
       - nodejs4-jobs
       - nodejs4-publish-to-npm
+      - nodejs6-jobs
 
 - project:
     name: js-openstack-registry-hooks
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 7cc4ccaec5..75ae7124a0 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1070,6 +1070,16 @@ project-templates:
       - '{name}-nodejs4-npm-publish-tarball':
         - '{name}-npm-upload'
 
+  - name: nodejs6-jobs
+    check:
+      - gate-{name}-nodejs6-npm-run-lint
+      - gate-{name}-nodejs6-npm-run-test
+
+  - name: nodejs6-publish-to-npm
+    release:
+      - '{name}-nodejs6-npm-publish-tarball':
+        - '{name}-npm-upload'
+
   - name: windmill-jobs-centos7
     check:
       - 'gate-windmill-deploy-centos-7'
@@ -3009,6 +3019,9 @@ jobs:
     branch: master
     voting: false
 
+  - name: ^.*-nodejs6-npm-run.*$
+    voting: false
+
   # Mutexes
   - name: reprepro-import-debian-openstack-jessie
     mutex: mirror.deb-openstack
@@ -7938,6 +7951,7 @@ projects:
       - name: merge-check
       - name: nodejs4-jobs
       - name: nodejs4-publish-to-npm
+      - name: nodejs6-jobs
 
   - name: openstack/karma-subunit-reporter
     template: