diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index 00e2346c..765ad3a0 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -65,8 +65,8 @@ nodejs:
     prep_14: '/usr/bin/wget.exe https://nodejs.org/dist/v14.3.0/node-v14.3.0-win-x64.zip && ""C:\Program Files\7-zip\7z.exe"" x -o$TASKCLUSTER_NODE_DIR -tzip -aoa node-v14.3.0-win-x64.zip && rm node-*.zip && export PATH=$TASKCLUSTER_TASK_DIR/bin/node-v14.3.0-win-x64/:$PATH'
 system:
   node_gyp_cache:
-    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.6/artifacts/public/node-gyp-cache.tar.gz'
-    namespace: 'project.deepspeech.node-gyp-cache.6'
+    url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.node-gyp-cache.7/artifacts/public/node-gyp-cache.tar.gz'
+    namespace: 'project.deepspeech.node-gyp-cache.7'
   homebrew_builds:
     url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.homebrew_builds.7/artifacts/public/homebrew_builds.tar.gz'
     namespace: 'project.deepspeech.homebrew_builds.7'
diff --git a/taskcluster/android-arm64-cpu-opt.yml b/taskcluster/android-arm64-cpu-opt.yml
index abc55412..3a796e03 100644
--- a/taskcluster/android-arm64-cpu-opt.yml
+++ b/taskcluster/android-arm64-cpu-opt.yml
@@ -11,7 +11,7 @@ build:
     - "index.project.deepspeech.deepspeech.native_client.android-arm64.${event.head.sha}"
   tensorflow: ${system.tensorflow.android_arm64.url}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android-build.sh arm64-v8a"
     package: "taskcluster/android-package.sh arm64-v8a"
   nc_asset_name: "native_client.arm64.cpu.android.tar.xz"
diff --git a/taskcluster/android-cache-arm64-v8a-android-24.yml b/taskcluster/android-cache-arm64-v8a-android-24.yml
index 35659584..d34bc190 100644
--- a/taskcluster/android-cache-arm64-v8a-android-24.yml
+++ b/taskcluster/android-cache-arm64-v8a-android-24.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.arm64_v8a.android_24.url}
     artifact_namespace: ${system.android_cache.arm64_v8a.android_24.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh arm64-v8a android-24"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-arm64-v8a-android-25.yml b/taskcluster/android-cache-arm64-v8a-android-25.yml
index e8f81091..aed747d1 100644
--- a/taskcluster/android-cache-arm64-v8a-android-25.yml
+++ b/taskcluster/android-cache-arm64-v8a-android-25.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.arm64_v8a.android_25.url}
     artifact_namespace: ${system.android_cache.arm64_v8a.android_25.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh arm64-v8a android-25"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-armeabi-v7a-android-24.yml b/taskcluster/android-cache-armeabi-v7a-android-24.yml
index b2232534..f146272e 100644
--- a/taskcluster/android-cache-armeabi-v7a-android-24.yml
+++ b/taskcluster/android-cache-armeabi-v7a-android-24.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.armeabi_v7a.android_24.url}
     artifact_namespace: ${system.android_cache.armeabi_v7a.android_24.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh armeabi-v7a android-24 default"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-armeabi-v7a-android-25.yml b/taskcluster/android-cache-armeabi-v7a-android-25.yml
index d35c9ab5..56ff6452 100644
--- a/taskcluster/android-cache-armeabi-v7a-android-25.yml
+++ b/taskcluster/android-cache-armeabi-v7a-android-25.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.armeabi_v7a.android_25.url}
     artifact_namespace: ${system.android_cache.armeabi_v7a.android_25.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh armeabi-v7a android-25"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-sdk-android-27.yml b/taskcluster/android-cache-sdk-android-27.yml
index 244592e2..d7b2c996 100644
--- a/taskcluster/android-cache-sdk-android-27.yml
+++ b/taskcluster/android-cache-sdk-android-27.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.sdk.android_27.url}
     artifact_namespace: ${system.android_cache.sdk.android_27.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh sdk android-27"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-x86_64-android-24.yml b/taskcluster/android-cache-x86_64-android-24.yml
index 95712b8a..2d336e71 100644
--- a/taskcluster/android-cache-x86_64-android-24.yml
+++ b/taskcluster/android-cache-x86_64-android-24.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.x86_64.android_24.url}
     artifact_namespace: ${system.android_cache.x86_64.android_24.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-24"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-x86_64-android-25.yml b/taskcluster/android-cache-x86_64-android-25.yml
index 3b49de87..50060d24 100644
--- a/taskcluster/android-cache-x86_64-android-25.yml
+++ b/taskcluster/android-cache-x86_64-android-25.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.x86_64.android_25.url}
     artifact_namespace: ${system.android_cache.x86_64.android_25.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-25"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-x86_64-android-26.yml b/taskcluster/android-cache-x86_64-android-26.yml
index d63298b4..4db61465 100644
--- a/taskcluster/android-cache-x86_64-android-26.yml
+++ b/taskcluster/android-cache-x86_64-android-26.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.x86_64.android_26.url}
     artifact_namespace: ${system.android_cache.x86_64.android_26.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-26"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-x86_64-android-28.yml b/taskcluster/android-cache-x86_64-android-28.yml
index 863620e2..58fb70c1 100644
--- a/taskcluster/android-cache-x86_64-android-28.yml
+++ b/taskcluster/android-cache-x86_64-android-28.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.x86_64.android_28.url}
     artifact_namespace: ${system.android_cache.x86_64.android_28.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-28"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-x86_64-android-29.yml b/taskcluster/android-cache-x86_64-android-29.yml
index 087cb7b8..e46f406b 100644
--- a/taskcluster/android-cache-x86_64-android-29.yml
+++ b/taskcluster/android-cache-x86_64-android-29.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.x86_64.android_29.url}
     artifact_namespace: ${system.android_cache.x86_64.android_29.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-29"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/android-cache-x86_64-android-30.yml b/taskcluster/android-cache-x86_64-android-30.yml
index a4b8221c..68ab7827 100644
--- a/taskcluster/android-cache-x86_64-android-30.yml
+++ b/taskcluster/android-cache-x86_64-android-30.yml
@@ -7,7 +7,7 @@ build:
     artifact_url: ${system.android_cache.x86_64.android_30.url}
     artifact_namespace: ${system.android_cache.x86_64.android_30.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/android_cache-build.sh x86_64 android-30"
     package: "taskcluster/android_cache-package.sh"
   metadata:
diff --git a/taskcluster/gradle-cache.yml b/taskcluster/gradle-cache.yml
index af1f66fa..fab5b101 100644
--- a/taskcluster/gradle-cache.yml
+++ b/taskcluster/gradle-cache.yml
@@ -7,7 +7,7 @@ build:
     >
       ${java.packages_xenial.apt}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/gradle-build.sh"
     package: "taskcluster/gradle-package.sh"
   metadata:
diff --git a/taskcluster/homebrew_builds-darwin-amd64.yml b/taskcluster/homebrew_builds-darwin-amd64.yml
index 8846a247..d2fe03f5 100644
--- a/taskcluster/homebrew_builds-darwin-amd64.yml
+++ b/taskcluster/homebrew_builds-darwin-amd64.yml
@@ -4,7 +4,7 @@ build:
     artifact_url: ${system.homebrew_builds.url}
     artifact_namespace: ${system.homebrew_builds.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/homebrew-build.sh --builds"
     package: "taskcluster/homebrew-package.sh --builds"
   metadata:
diff --git a/taskcluster/homebrew_tests-darwin-amd64.yml b/taskcluster/homebrew_tests-darwin-amd64.yml
index bbf45fdc..4d1e7765 100644
--- a/taskcluster/homebrew_tests-darwin-amd64.yml
+++ b/taskcluster/homebrew_tests-darwin-amd64.yml
@@ -4,7 +4,7 @@ build:
     artifact_url: ${system.homebrew_tests.url}
     artifact_namespace: ${system.homebrew_tests.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/homebrew-build.sh --tests"
     package: "taskcluster/homebrew-package.sh --tests"
   metadata:
diff --git a/taskcluster/linux-amd64-cpu-opt.yml b/taskcluster/linux-amd64-cpu-opt.yml
index b49c94b0..380242a1 100644
--- a/taskcluster/linux-amd64-cpu-opt.yml
+++ b/taskcluster/linux-amd64-cpu-opt.yml
@@ -15,7 +15,7 @@ build:
       && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
   tensorflow: ${system.tensorflow.linux_amd64_cpu.url}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/host-build.sh"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.amd64.cpu.linux.tar.xz"
diff --git a/taskcluster/linux-amd64-ctc-opt.yml b/taskcluster/linux-amd64-ctc-opt.yml
index e3af5509..1a3cb9b6 100644
--- a/taskcluster/linux-amd64-ctc-opt.yml
+++ b/taskcluster/linux-amd64-ctc-opt.yml
@@ -15,7 +15,7 @@ build:
       && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
   tensorflow: ${system.tensorflow.linux_amd64_cpu.url}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: 'taskcluster/decoder-build.sh'
     package: 'taskcluster/decoder-package.sh'
   metadata:
diff --git a/taskcluster/linux-amd64-gpu-opt.yml b/taskcluster/linux-amd64-gpu-opt.yml
index dc9e46be..df7d49ac 100644
--- a/taskcluster/linux-amd64-gpu-opt.yml
+++ b/taskcluster/linux-amd64-gpu-opt.yml
@@ -16,7 +16,7 @@ build:
   tensorflow: ${system.tensorflow.linux_amd64_cuda.url}
   maxRunTime: 14400
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/cuda-build.sh"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.amd64.cuda.linux.tar.xz"
diff --git a/taskcluster/linux-amd64-tflite-opt.yml b/taskcluster/linux-amd64-tflite-opt.yml
index 10bcbc46..a6b8e547 100644
--- a/taskcluster/linux-amd64-tflite-opt.yml
+++ b/taskcluster/linux-amd64-tflite-opt.yml
@@ -15,7 +15,7 @@ build:
       && apt-get -qq update && apt-get -qq -y install nodejs python-yaml
   tensorflow: ${system.tensorflow.linux_amd64_cpu.url}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/host-build.sh tflite"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.amd64.tflite.linux.tar.xz"
diff --git a/taskcluster/linux-arm64-cpu-opt.yml b/taskcluster/linux-arm64-cpu-opt.yml
index 0cfc3fae..0d42b573 100644
--- a/taskcluster/linux-arm64-cpu-opt.yml
+++ b/taskcluster/linux-arm64-cpu-opt.yml
@@ -22,7 +22,7 @@ build:
       multistrap -d /tmp/multistrap-armbian64-buster/ -f ${system.homedir.linux}/DeepSpeech/ds/native_client/multistrap_armbian64_buster.conf
   tensorflow: ${system.tensorflow.linux_arm64.url}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/arm64-build.sh"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.arm64.cpu.linux.tar.xz"
diff --git a/taskcluster/linux-rpi3-cpu-opt.yml b/taskcluster/linux-rpi3-cpu-opt.yml
index 07293ea0..b919c04e 100644
--- a/taskcluster/linux-rpi3-cpu-opt.yml
+++ b/taskcluster/linux-rpi3-cpu-opt.yml
@@ -22,7 +22,7 @@ build:
       multistrap -d /tmp/multistrap-raspbian-buster/ -f ${system.homedir.linux}/DeepSpeech/ds/native_client/multistrap_raspbian_buster.conf
   tensorflow: ${system.tensorflow.linux_armv7.url}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/rpi3-build.sh"
     package: "taskcluster/package.sh"
   nc_asset_name: "native_client.rpi3.cpu.linux.tar.xz"
diff --git a/taskcluster/node-gyp-cache.yml b/taskcluster/node-gyp-cache.yml
index e0e4d62f..219dd935 100644
--- a/taskcluster/node-gyp-cache.yml
+++ b/taskcluster/node-gyp-cache.yml
@@ -8,7 +8,7 @@ build:
     >
       (apt-get -qq -y install sudo || true)
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/node-gyp-populate.sh"
     package: "taskcluster/node-gyp-package.sh"
   metadata:
diff --git a/taskcluster/pyenv-darwin-amd64.yml b/taskcluster/pyenv-darwin-amd64.yml
index eeebc414..c3dfd55a 100644
--- a/taskcluster/pyenv-darwin-amd64.yml
+++ b/taskcluster/pyenv-darwin-amd64.yml
@@ -4,7 +4,7 @@ build:
     artifact_url: ${system.pyenv.osx.url}
     artifact_namespace: ${system.pyenv.osx.namespace}
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/pyenv-build.sh"
     package: "taskcluster/pyenv-package.sh"
   metadata:
diff --git a/taskcluster/pyenv-linux-amd64.yml b/taskcluster/pyenv-linux-amd64.yml
index 25e1a27e..ddf81ef8 100644
--- a/taskcluster/pyenv-linux-amd64.yml
+++ b/taskcluster/pyenv-linux-amd64.yml
@@ -7,7 +7,7 @@ build:
     >
       apt-get -qq update && apt-get -qq -y install python-yaml ${python.packages_xenial.apt} wget
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/pyenv-build.sh"
     package: "taskcluster/pyenv-package.sh"
   metadata:
diff --git a/taskcluster/pyenv-win-amd64.yml b/taskcluster/pyenv-win-amd64.yml
index 1a19d9d4..19d16c8b 100644
--- a/taskcluster/pyenv-win-amd64.yml
+++ b/taskcluster/pyenv-win-amd64.yml
@@ -4,7 +4,7 @@ build:
     artifact_url: "${system.pyenv.win.url}"
     artifact_namespace: "${system.pyenv.win.namespace}"
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/pyenv-build.sh"
     package: "taskcluster/pyenv-package.sh"
   metadata:
diff --git a/taskcluster/swig-darwin-amd64.yml b/taskcluster/swig-darwin-amd64.yml
index c904c4a7..ecf5954e 100644
--- a/taskcluster/swig-darwin-amd64.yml
+++ b/taskcluster/swig-darwin-amd64.yml
@@ -8,7 +8,7 @@ build:
     artifact_url: "${system.swig_build.osx.url}"
     artifact_namespace: "${system.swig_build.osx.namespace}"
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/build.sh"
     package: "taskcluster/package.sh"
   metadata:
diff --git a/taskcluster/swig-linux-amd64.yml b/taskcluster/swig-linux-amd64.yml
index d2e7bc0f..c3abe79a 100644
--- a/taskcluster/swig-linux-amd64.yml
+++ b/taskcluster/swig-linux-amd64.yml
@@ -12,7 +12,7 @@ build:
     >
       apt-get -qq -y install autoconf automake bison build-essential
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/build.sh"
     package: "taskcluster/package.sh"
   metadata:
diff --git a/taskcluster/swig-win-amd64.yml b/taskcluster/swig-win-amd64.yml
index 6648febd..e77a2971 100644
--- a/taskcluster/swig-win-amd64.yml
+++ b/taskcluster/swig-win-amd64.yml
@@ -13,7 +13,7 @@ build:
       apt-get -qq -y install autoconf automake bison build-essential mingw-w64 &&
       (apt-get -qq -y install sudo || true)
   scripts:
-    setup: ""
+    setup: "taskcluster/tc-true.sh"
     build: "taskcluster/build.sh x86_64-w64-mingw32"
     package: "taskcluster/package.sh"
   metadata:
diff --git a/taskcluster/tc-all-vars.sh b/taskcluster/tc-all-vars.sh
index 0fae9d3c..f2281faf 100755
--- a/taskcluster/tc-all-vars.sh
+++ b/taskcluster/tc-all-vars.sh
@@ -89,4 +89,4 @@ SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-3.5.8:ucs2 3.6.10:ucs2 3.
 SUPPORTED_NODEJS_BUILD_VERSIONS=${SUPPORTED_NODEJS_BUILD_VERSIONS:-10.0.0 11.0.0 12.7.0 13.0.0 14.0.0}
 SUPPORTED_NODEJS_TESTS_VERSIONS=${SUPPORTED_NODEJS_TESTS_VERSIONS:-10.20.1 11.15.0 12.17.0 13.14.0 14.3.0}
 
-SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-5.0.13 6.0.12 6.1.7 7.0.1 7.1.8 8.0.1 9.0.1}
+SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-5.0.13 6.0.12 6.1.7 7.0.1 7.1.8 8.0.1 9.0.1 9.1.0}
diff --git a/taskcluster/tc-true.sh b/taskcluster/tc-true.sh
new file mode 100755
index 00000000..af3a4e4b
--- /dev/null
+++ b/taskcluster/tc-true.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+true
diff --git a/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml
new file mode 100644
index 00000000..3a1a7b29
--- /dev/null
+++ b/taskcluster/test-electronjs_v9.1-darwin-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-darwin-opt-base.tyml
+  dependencies:
+    - "darwin-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+    - "homebrew_tests-darwin-amd64"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.brew.prep_12}
+  args:
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 9.0.1 16k"
+  metadata:
+    name: "DeepSpeech OSX AMD64 CPU ElectronJS v9.1 tests"
+    description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v9.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v9.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v9.1-win-amd64-opt.yml
new file mode 100644
index 00000000..be83c3b3
--- /dev/null
+++ b/taskcluster/test-electronjs_v9.1-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 9.0.1 16k"
+  metadata:
+    name: "DeepSpeech Windows AMD64 CPU ElectronJS v9.1 tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v9.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..fdc01dc6
--- /dev/null
+++ b/taskcluster/test-electronjs_v9.1_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 9.0.1 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.1, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..c8684c3a
--- /dev/null
+++ b/taskcluster/test-electronjs_v9.1_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 9.0.1 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v9.1 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v9.1, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v9.1_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-amd64-opt.yml
new file mode 100644
index 00000000..3a547a7f
--- /dev/null
+++ b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "node-package-cpu"
+    - "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 9.0.1 16k"
+  metadata:
+    name: "DeepSpeech Windows AMD64 CPU ElectronJS MultiArch Package v9.1 tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v9.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml
new file mode 100644
index 00000000..e9ab02da
--- /dev/null
+++ b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-cuda-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-win-cuda-opt-base.tyml
+  dependencies:
+    - "node-package-gpu"
+    - "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 9.0.1 16k cuda"
+  metadata:
+    name: "DeepSpeech Windows AMD64 CUDA ElectronJS MultiArch Package v9.1 tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v9.1, CUDA, optimized version"
diff --git a/taskcluster/test-electronjs_v9.1_multiarchpkg-win-tflite-opt.yml b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-tflite-opt.yml
new file mode 100644
index 00000000..e2521f4b
--- /dev/null
+++ b/taskcluster/test-electronjs_v9.1_multiarchpkg-win-tflite-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "node-package-tflite"
+    - "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_tflite-tests.sh 12.x 9.0.1 16k"
+  metadata:
+    name: "DeepSpeech Windows AMD64 TFLite ElectronJS MultiArch Package v9.1 tests"
+    description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS MultiArch Package v9.1, TFLite only, optimized version"