diff --git a/.zuul.yaml b/.zuul.yaml
index cdf2547..dd0f35f 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,3 +1,25 @@
+- job:
+    name: stackviz-nodejs10-run-lint
+    parent: nodejs-run-lint
+    description: |
+      Run lint using Node 10.
+    vars:
+      node_version: 10
+    nodeset: ubuntu-focal
+    pre-run: playbooks/nodejs/pre.yaml
+    required-projects:
+      - openstack/stackviz
+
+- job:
+    name: stackviz-nodejs10-run-test-browser
+    parent: nodejs-run-test-browser
+    vars:
+      node_version: 10
+    nodeset: ubuntu-focal
+    pre-run: playbooks/nodejs/pre.yaml
+    required-projects:
+      - openstack/stackviz
+
 - job:
     name: tempest-full-rocky
     parent: tempest-full-py3
@@ -6,12 +28,13 @@
 
 - project:
     templates:
-      - nodejs8-jobs
       - publish-openstack-docs-pti
       - openstack-python35-jobs
       - openstack-python3-victoria-jobs
     check:
       jobs:
+      - stackviz-nodejs10-run-lint
+      - stackviz-nodejs10-run-test-browser
       - tempest-full-py3:
           irrelevant-files: &irrelevant-files
             - ^.*\.rst$
@@ -27,6 +50,11 @@
           irrelevant-files: *irrelevant-files
       - tempest-full-rocky:
           irrelevant-files: *irrelevant-files
+    gate:
+      jobs:
+      - stackviz-nodejs10-run-lint
+      - stackviz-nodejs10-run-test-browser
+
     post:
       jobs:
         - publish-openstack-stackviz-element
diff --git a/package.json b/package.json
index 726ab7c..d8ccf4c 100644
--- a/package.json
+++ b/package.json
@@ -70,7 +70,7 @@
     "watchify": "3.7.0"
   },
   "scripts": {
-    "postinstall": "if [ ! -d .venv ]; then tox -epy36 --notest; fi",
+    "postinstall": "if [ ! -d .venv ]; then tox -epy38 --notest; fi",
     "test": "gulp unit",
     "lint": "eslint ./",
     "prod": "gulp prod; python setup.py sdist"
diff --git a/playbooks/nodejs/pre.yaml b/playbooks/nodejs/pre.yaml
new file mode 100644
index 0000000..b346b04
--- /dev/null
+++ b/playbooks/nodejs/pre.yaml
@@ -0,0 +1,6 @@
+- hosts: all
+  roles:
+    # package.json needs to run 'tox' as command, ensure that it's
+    # installed and can be used globally.
+    - role: ensure-tox
+      ensure_global_symlinks: True