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 c550627234..756537f5e0 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml
@@ -1501,7 +1501,10 @@
     tarball-site: tarballs.openstack.org
 
     jobs:
-      - gate-{name}-js-unittests
+      - gate-{name}-js-test-unit
+      - gate-{name}-js-test-integration
+      - gate-{name}-js-test-functional
+      - gate-{name}-js-draft
       - '{name}-js-release-{branch-designator}':
           branch-designator: 'master'
       - '{name}-js-release-{branch-designator}':
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 6b0cd59475..d7636538ed 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -643,9 +643,6 @@ jobs:
   - name: ^gate-.*-js-draft
     parameter-function: set_node_options_default_trusty
     success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/
-  - name: gate-vinz-webclient-js-unittests
-    parameter-function: set_node_options_default_trusty
-    success-pattern: http://docs-draft.openstack.org/{build.parameters[LOG_PATH]}/dist/
   - name: infra-publications-publish
     branch: ^(?!master).*$
   - name: ^gate-.*-requirements$
@@ -3421,9 +3418,14 @@ projects:
     template:
       - name: merge-check
     check:
-      - gate-vinz-webclient-js-unittests
+      - gate-vinz-webclient-js-test-unit
+      - gate-vinz-webclient-js-test-integration
+      - gate-vinz-webclient-js-test-functional
+      - gate-vinz-webclient-js-draft
     gate:
-      - gate-vinz-webclient-js-unittests
+      - gate-vinz-webclient-js-test-unit
+      - gate-vinz-webclient-js-test-integration
+      - gate-vinz-webclient-js-test-functional
     post:
       - vinz-webclient-js-release-branch
     release: