diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index f305424b..3021c148 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -60,8 +60,8 @@ cpp:
     env: 'export EXTRA_ENV="DYLD_LIBRARY_PATH=$LOCAL_HOMEBREW_DIRECTORY/lib/:$DYLD_LIBRARY_PATH"'
 system:
   node_gyp_cache:
-    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.1/artifacts/public/node-gyp-cache.tar.gz'
-    namespace: 'project.deepspeech.node-gyp-cache.1'
+    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.2/artifacts/public/node-gyp-cache.tar.gz'
+    namespace: 'project.deepspeech.node-gyp-cache.2'
   swig:
     repo: "https://github.com/lissyx/swig"
     sha1: "b5fea54d39832d1d132d7dd921b69c0c2c9d5118"
diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh
index 4bbadf25..0246b78f 100755
--- a/taskcluster/tc-all-vars.sh
+++ b/taskcluster/tc-all-vars.sh
@@ -82,4 +82,4 @@ SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-3.5.8:ucs4 3.6.10:ucs4 3.
 # deepspeech.node-gyp-cache.<X> in both `system.node_gyp_cache` (taskcluster/.shared.yml)
 # and route index (taskcluster/node-gyp-cache.yml) to ensure the cache is updated
 SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-10.18.1 11.15.0 12.8.1 13.1.0}
-SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-5.0.13 6.0.12 6.1.7 7.0.1 7.1.8}
+SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-5.0.13 6.0.12 6.1.7 7.0.1 7.1.8 8.0.1}
diff --git a/taskcluster/test-electronjs_v8.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v8.0-darwin-amd64-opt.yml
new file mode 100644
index 00000000..aab47159
--- /dev/null
+++ b/taskcluster/test-electronjs_v8.0-darwin-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-darwin-opt-base.tyml
+  dependencies:
+    - "darwin-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
+  args:
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 8.0.1 16k"
+  metadata:
+    name: "DeepSpeech OSX AMD64 CPU ElectronJS v8.0 tests"
+    description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v8.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v8.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v8.0-win-amd64-opt.yml
new file mode 100644
index 00000000..5c33a767
--- /dev/null
+++ b/taskcluster/test-electronjs_v8.0-win-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "win-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${system.sox_win} && ${nodejs.win.prep_12}
+  args:
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 8.0.1 16k"
+  metadata:
+    name: "DeepSpeech Windows AMD64 CPU ElectronJS v8.0 tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v8.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v8.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v8.0_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..fa2387c7
--- /dev/null
+++ b/taskcluster/test-electronjs_v8.0_16k-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 8.0.1 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v8.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v8.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v8.0_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v8.0_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..f971042a
--- /dev/null
+++ b/taskcluster/test-electronjs_v8.0_8k-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 8.0.1 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v8.0 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v8.0, CPU only, optimized version (8kHz)"