From 022f80188c20fc630d5267dcd206df3b66e1835f Mon Sep 17 00:00:00 2001
From: Alexandre Lissy <lissyx@lissyx.dyndns.org>
Date: Thu, 1 Mar 2018 11:53:55 +0100
Subject: [PATCH] Add Python2.7 ucs2+ucs4 variants

Fixes #1276
---
 taskcluster/darwin-opt-base.tyml              |  2 +-
 taskcluster/linux-amd64-cpu-aot_test-opt.yml  |  2 +-
 taskcluster/linux-opt-base.tyml               |  2 +-
 taskcluster/rpi3-build.sh                     |  2 +-
 ...est-benchmark-linux-amd64-aot_test-opt.yml |  2 +-
 .../test-benchmark-linux-amd64-opt.yml        |  2 +-
 taskcluster/test-cpp-darwin-amd64-opt.yml     |  2 +-
 .../test-cpp-linux-amd64-aot_test-opt.yml     |  2 +-
 taskcluster/test-cpp-linux-amd64-opt.yml      |  2 +-
 .../test-cpp-linux-amd64-prod_pbmodel-opt.yml |  2 +-
 taskcluster/test-darwin-opt-base.tyml         |  2 +-
 taskcluster/test-linux-opt-base.tyml          |  2 +-
 .../test-nodejs_4x-darwin-amd64-opt.yml       |  2 +-
 ...est-nodejs_4x-linux-amd64-aot_test-opt.yml |  2 +-
 .../test-nodejs_4x-linux-amd64-opt.yml        |  2 +-
 ...nodejs_4x-linux-amd64-prod_pbmodel-opt.yml |  2 +-
 .../test-nodejs_5x-darwin-amd64-opt.yml       |  2 +-
 ...est-nodejs_5x-linux-amd64-aot_test-opt.yml |  2 +-
 .../test-nodejs_5x-linux-amd64-opt.yml        |  2 +-
 ...nodejs_5x-linux-amd64-prod_pbmodel-opt.yml |  2 +-
 .../test-nodejs_6x-darwin-amd64-opt.yml       |  2 +-
 ...est-nodejs_6x-linux-amd64-aot_test-opt.yml |  2 +-
 .../test-nodejs_6x-linux-amd64-opt.yml        |  2 +-
 ...nodejs_6x-linux-amd64-prod_pbmodel-opt.yml |  2 +-
 .../test-nodejs_7x-darwin-amd64-opt.yml       |  2 +-
 ...est-nodejs_7x-linux-amd64-aot_test-opt.yml |  2 +-
 .../test-nodejs_7x-linux-amd64-opt.yml        |  2 +-
 ...nodejs_7x-linux-amd64-prod_pbmodel-opt.yml |  2 +-
 .../test-nodejs_8x-darwin-amd64-opt.yml       |  2 +-
 ...est-nodejs_8x-linux-amd64-aot_test-opt.yml |  2 +-
 .../test-nodejs_8x-linux-amd64-opt.yml        |  2 +-
 ...nodejs_8x-linux-amd64-prod_pbmodel-opt.yml |  2 +-
 .../test-nodejs_9x-darwin-amd64-opt.yml       |  2 +-
 ...est-nodejs_9x-linux-amd64-aot_test-opt.yml |  2 +-
 .../test-nodejs_9x-linux-amd64-opt.yml        |  2 +-
 ...nodejs_9x-linux-amd64-prod_pbmodel-opt.yml |  2 +-
 ...l => test-python_27m-darwin-amd64-opt.yml} |  4 ++--
 ...t-python_27m-linux-amd64-aot_test-opt.yml} |  4 ++--
 ...ml => test-python_27m-linux-amd64-opt.yml} |  4 ++--
 ...thon_27m-linux-amd64-prod_pbmodel-opt.yml} |  4 ++--
 .../test-python_27mu-darwin-amd64-opt.yml     | 13 ++++++++++
 ...t-python_27mu-linux-amd64-aot_test-opt.yml | 13 ++++++++++
 .../test-python_27mu-linux-amd64-opt.yml      | 13 ++++++++++
 ...thon_27mu-linux-amd64-prod_pbmodel-opt.yml | 13 ++++++++++
 ...l => test-python_34m-darwin-amd64-opt.yml} |  4 ++--
 ...t-python_34m-linux-amd64-aot_test-opt.yml} |  4 ++--
 ...ml => test-python_34m-linux-amd64-opt.yml} |  4 ++--
 ...thon_34m-linux-amd64-prod_pbmodel-opt.yml} |  4 ++--
 .../test-python_35-darwin-amd64-opt.yml       |  4 ++--
 ...est-python_35-linux-amd64-aot_test-opt.yml |  4 ++--
 .../test-python_35-linux-amd64-opt.yml        |  4 ++--
 ...python_35-linux-amd64-prod_pbmodel-opt.yml |  4 ++--
 .../test-python_36-darwin-amd64-opt.yml       |  6 ++---
 ...est-python_36-linux-amd64-aot_test-opt.yml |  4 ++--
 .../test-python_36-linux-amd64-opt.yml        |  4 ++--
 ...python_36-linux-amd64-prod_pbmodel-opt.yml |  4 ++--
 ...speech-linux-amd64-py27m-opt.yml-disabled} |  2 +-
 ...speech-linux-amd64-py27mu-opt.yml-disabled | 14 +++++++++++
 ...speech-linux-amd64-py36m-opt.yml-disabled} |  2 +-
 ...aining-linux-amd64-py27m-opt.yml-disabled} |  2 +-
 ...aining-linux-amd64-py27mu-opt.yml-disabled | 12 ++++++++++
 ...aining-linux-amd64-py34m-opt.yml-disabled} |  2 +-
 ...aining-linux-amd64-py35m-opt.yml-disabled} |  2 +-
 ...aining-linux-amd64-py36m-opt.yml-disabled} |  2 +-
 ...ream+deepspeech-linux-amd64-py27m-opt.yml} |  2 +-
 ...ream+deepspeech-linux-amd64-py27mu-opt.yml | 14 +++++++++++
 ...ream+deepspeech-linux-amd64-py36m-opt.yml} |  2 +-
 ...aining_upstream-linux-amd64-py27m-opt.yml} |  2 +-
 ...aining_upstream-linux-amd64-py27mu-opt.yml | 13 ++++++++++
 ...aining_upstream-linux-amd64-py34m-opt.yml} |  2 +-
 ...aining_upstream-linux-amd64-py35m-opt.yml} |  2 +-
 ...aining_upstream-linux-amd64-py36m-opt.yml} |  2 +-
 tc-python-tests-prod.sh                       | 24 +++++++++++--------
 tc-python-tests.sh                            | 24 +++++++++++--------
 tc-tests-utils.sh                             | 19 ++++++++-------
 75 files changed, 225 insertions(+), 109 deletions(-)
 rename taskcluster/{test-python_27-darwin-amd64-opt.yml => test-python_27m-darwin-amd64-opt.yml} (84%)
 rename taskcluster/{test-python_27-linux-amd64-aot_test-opt.yml => test-python_27m-linux-amd64-aot_test-opt.yml} (84%)
 rename taskcluster/{test-python_27-linux-amd64-opt.yml => test-python_27m-linux-amd64-opt.yml} (84%)
 rename taskcluster/{test-python_27-linux-amd64-prod_pbmodel-opt.yml => test-python_27m-linux-amd64-prod_pbmodel-opt.yml} (83%)
 create mode 100644 taskcluster/test-python_27mu-darwin-amd64-opt.yml
 create mode 100644 taskcluster/test-python_27mu-linux-amd64-aot_test-opt.yml
 create mode 100644 taskcluster/test-python_27mu-linux-amd64-opt.yml
 create mode 100644 taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml
 rename taskcluster/{test-python_34-darwin-amd64-opt.yml => test-python_34m-darwin-amd64-opt.yml} (84%)
 rename taskcluster/{test-python_34-linux-amd64-aot_test-opt.yml => test-python_34m-linux-amd64-aot_test-opt.yml} (84%)
 rename taskcluster/{test-python_34-linux-amd64-opt.yml => test-python_34m-linux-amd64-opt.yml} (84%)
 rename taskcluster/{test-python_34-linux-amd64-prod_pbmodel-opt.yml => test-python_34m-linux-amd64-prod_pbmodel-opt.yml} (83%)
 rename taskcluster/{test-training+deepspeech-linux-amd64-py27-opt.yml-disabled => test-training+deepspeech-linux-amd64-py27m-opt.yml-disabled} (93%)
 create mode 100644 taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled
 rename taskcluster/{test-training+deepspeech-linux-amd64-py36-opt.yml-disabled => test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled} (93%)
 rename taskcluster/{test-training-linux-amd64-py27-opt.yml-disabled => test-training-linux-amd64-py27m-opt.yml-disabled} (93%)
 create mode 100644 taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled
 rename taskcluster/{test-training-linux-amd64-py34-opt.yml-disabled => test-training-linux-amd64-py34m-opt.yml-disabled} (93%)
 rename taskcluster/{test-training-linux-amd64-py35-opt.yml-disabled => test-training-linux-amd64-py35m-opt.yml-disabled} (93%)
 rename taskcluster/{test-training-linux-amd64-py36-opt.yml-disabled => test-training-linux-amd64-py36m-opt.yml-disabled} (93%)
 rename taskcluster/{test-training_upstream+deepspeech-linux-amd64-py27-opt.yml => test-training_upstream+deepspeech-linux-amd64-py27m-opt.yml} (93%)
 create mode 100644 taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml
 rename taskcluster/{test-training_upstream+deepspeech-linux-amd64-py36-opt.yml => test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml} (93%)
 rename taskcluster/{test-training_upstream-linux-amd64-py27-opt.yml => test-training_upstream-linux-amd64-py27m-opt.yml} (95%)
 create mode 100644 taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
 rename taskcluster/{test-training_upstream-linux-amd64-py34-opt.yml => test-training_upstream-linux-amd64-py34m-opt.yml} (93%)
 rename taskcluster/{test-training_upstream-linux-amd64-py35-opt.yml => test-training_upstream-linux-amd64-py35m-opt.yml} (93%)
 rename taskcluster/{test-training_upstream-linux-amd64-py36-opt.yml => test-training_upstream-linux-amd64-py36m-opt.yml} (93%)

diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml
index caf07f1abd..1ecaf7243f 100644
--- a/taskcluster/darwin-opt-base.tyml
+++ b/taskcluster/darwin-opt-base.tyml
@@ -36,7 +36,7 @@ payload:
 
   env:
     $let:
-      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
+      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
     in:
       TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
       SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
diff --git a/taskcluster/linux-amd64-cpu-aot_test-opt.yml b/taskcluster/linux-amd64-cpu-aot_test-opt.yml
index f68ebbf9b2..b928bcb177 100644
--- a/taskcluster/linux-amd64-cpu-aot_test-opt.yml
+++ b/taskcluster/linux-amd64-cpu-aot_test-opt.yml
@@ -5,7 +5,7 @@ build:
     - "pull_request.reopened"
   template_file: linux-opt-base.tyml
   dependencies:
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.5.ad8f785459e80823a2ff4456eeb9d7220c33b9c6.cpu/artifacts/public/home.tar.xz"
   summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.5.ad8f785459e80823a2ff4456eeb9d7220c33b9c6.cpu/artifacts/public/summarize_graph"
   system_setup:
diff --git a/taskcluster/linux-opt-base.tyml b/taskcluster/linux-opt-base.tyml
index bc827dce03..5325a07ab2 100644
--- a/taskcluster/linux-opt-base.tyml
+++ b/taskcluster/linux-opt-base.tyml
@@ -33,7 +33,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
       in:
         TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
         SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
diff --git a/taskcluster/rpi3-build.sh b/taskcluster/rpi3-build.sh
index 1d3e0e1d80..dc40f13ef2 100755
--- a/taskcluster/rpi3-build.sh
+++ b/taskcluster/rpi3-build.sh
@@ -31,7 +31,7 @@ do_bazel_build
 
 do_deepspeech_binary_build
 
-export SUPPORTED_PYTHON_VERSIONS="2.7.13 3.4.6"
+export SUPPORTED_PYTHON_VERSIONS="2.7.14:'ucs2' 3.4.8:'ucs4'"
 do_deepspeech_python_build
 
 do_deepspeech_nodejs_build
diff --git a/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml b/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
index 012d396fed..7d254c993e 100644
--- a/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt} zip
diff --git a/taskcluster/test-benchmark-linux-amd64-opt.yml b/taskcluster/test-benchmark-linux-amd64-opt.yml
index 333532c45b..5af0a34a3b 100644
--- a/taskcluster/test-benchmark-linux-amd64-opt.yml
+++ b/taskcluster/test-benchmark-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt} zip
diff --git a/taskcluster/test-cpp-darwin-amd64-opt.yml b/taskcluster/test-cpp-darwin-amd64-opt.yml
index af9bab7632..3633112a4c 100644
--- a/taskcluster/test-cpp-darwin-amd64-opt.yml
+++ b/taskcluster/test-cpp-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
diff --git a/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml b/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
index a83db68720..e9393ef089 100644
--- a/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh --aot"
   metadata:
diff --git a/taskcluster/test-cpp-linux-amd64-opt.yml b/taskcluster/test-cpp-linux-amd64-opt.yml
index 520999bd0b..280714c996 100644
--- a/taskcluster/test-cpp-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh"
   metadata:
diff --git a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
index 5695bbe641..d1b4ce564e 100644
--- a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests-prod.sh"
   metadata:
diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml
index ff852d9952..6502fe78bc 100644
--- a/taskcluster/test-darwin-opt-base.tyml
+++ b/taskcluster/test-darwin-opt-base.tyml
@@ -30,7 +30,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
         node_package: { $eval: as_slugid("node-package") }
       in:
diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
index f118185d08..b48bfe89f0 100644
--- a/taskcluster/test-linux-opt-base.tyml
+++ b/taskcluster/test-linux-opt-base.tyml
@@ -31,7 +31,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
+        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
         linux_amd64_aot_test: { $eval: as_slugid("linux-amd64-cpu-aot_test-opt") }
         linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
         linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
diff --git a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
index a93eadd217..836511c78a 100644
--- a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_4} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
index d26850ed3e..2940c5a322 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
index 7bcc8ebd3a..72e4aafcc1 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
index cbd44ab89d..ecb801819c 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
index 51dedd5784..ad12aeb75c 100644
--- a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_5} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
index 87b1041edd..b7d986a839 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
index d73dff3e50..7382eb0096 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
index 51f73b671b..6ffcd118b8 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
index 0fc8bd9e72..c5341c7ac1 100644
--- a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_6} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
index 0392e59710..2aba2b81bf 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
index dcc39fe367..1559b5d658 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
index 42f92f7cf1..879a028605 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
index 2ac6d8b6c3..2627f37265 100644
--- a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_7} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
index e14a3f35ab..015f3baf35 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
index 58e577fac8..1fac617bd6 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
index b06cc7050a..8d579cb704 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
index 32917eb2c3..22be809785 100644
--- a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_8} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
index 9c9c400f69..1dac03e583 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
index 70a697ad8c..dffef7043d 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
index cec79f5c83..e09d66b48e 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
index ad4a311223..cd056f3659 100644
--- a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_9} && ${nodejs.brew.env}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
index ad83e475f1..49838480db 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
index 0ba6d98a1b..0638dfafe9 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
index cdfc64c5f9..0823417c2c 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
@@ -2,7 +2,7 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "node-package"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
diff --git a/taskcluster/test-python_27-darwin-amd64-opt.yml b/taskcluster/test-python_27m-darwin-amd64-opt.yml
similarity index 84%
rename from taskcluster/test-python_27-darwin-amd64-opt.yml
rename to taskcluster/test-python_27m-darwin-amd64-opt.yml
index 41f5402cce..3a0ed51c51 100644
--- a/taskcluster/test-python_27-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_27m-darwin-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.13"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.14:m"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v2.7 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on Python v2.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_27m-linux-amd64-aot_test-opt.yml
similarity index 84%
rename from taskcluster/test-python_27-linux-amd64-aot_test-opt.yml
rename to taskcluster/test-python_27m-linux-amd64-aot_test-opt.yml
index f882fddde8..6419a86223 100644
--- a/taskcluster/test-python_27-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_27m-linux-amd64-aot_test-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.13 --aot"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.14:m --aot"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v2.7 tests AOT (test)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7, AOT Model (test), CPU only, optimized version"
diff --git a/taskcluster/test-python_27-linux-amd64-opt.yml b/taskcluster/test-python_27m-linux-amd64-opt.yml
similarity index 84%
rename from taskcluster/test-python_27-linux-amd64-opt.yml
rename to taskcluster/test-python_27m-linux-amd64-opt.yml
index 2bce3c01ce..1befc52218 100644
--- a/taskcluster/test-python_27-linux-amd64-opt.yml
+++ b/taskcluster/test-python_27m-linux-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.13"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.14:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v2.7 tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml
similarity index 83%
rename from taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml
index b5f77c8044..0f0c4cfcb6 100644
--- a/taskcluster/test-python_27-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 2.7.13"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 2.7.14:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v2.7 prod tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-python_27mu-darwin-amd64-opt.yml b/taskcluster/test-python_27mu-darwin-amd64-opt.yml
new file mode 100644
index 0000000000..5f66bc82a5
--- /dev/null
+++ b/taskcluster/test-python_27mu-darwin-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-darwin-opt-base.tyml
+  dependencies:
+    - "darwin-amd64-cpu-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
+  system_setup:
+    >
+      ${python.brew.setup} && ${python.brew.env}
+  args:
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.14:mu"
+  metadata:
+    name: "DeepSpeech OSX AMD64 CPU Python v2.7 tests"
+    description: "Testing DeepSpeech for OSX/AMD64 on Python v2.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_27mu-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_27mu-linux-amd64-aot_test-opt.yml
new file mode 100644
index 0000000000..eac27adf64
--- /dev/null
+++ b/taskcluster/test-python_27mu-linux-amd64-aot_test-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-aot_test-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.14:mu --aot"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 tests AOT (test)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7, AOT Model (test), CPU only, optimized version"
diff --git a/taskcluster/test-python_27mu-linux-amd64-opt.yml b/taskcluster/test-python_27mu-linux-amd64-opt.yml
new file mode 100644
index 0000000000..4d0e6b18ea
--- /dev/null
+++ b/taskcluster/test-python_27mu-linux-amd64-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.14:mu"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 tests"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 0000000000..695d8a59c1
--- /dev/null
+++ b/taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 2.7.14:mu"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 prod tests"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-python_34-darwin-amd64-opt.yml b/taskcluster/test-python_34m-darwin-amd64-opt.yml
similarity index 84%
rename from taskcluster/test-python_34-darwin-amd64-opt.yml
rename to taskcluster/test-python_34m-darwin-amd64-opt.yml
index 8d17cfe30d..c6d7390947 100644
--- a/taskcluster/test-python_34-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_34m-darwin-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.4.6"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.4.8:m"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v3.4 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on Python v3.4, CPU only, optimized version"
diff --git a/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_34m-linux-amd64-aot_test-opt.yml
similarity index 84%
rename from taskcluster/test-python_34-linux-amd64-aot_test-opt.yml
rename to taskcluster/test-python_34m-linux-amd64-aot_test-opt.yml
index a72c786c1f..048dd1347b 100644
--- a/taskcluster/test-python_34-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_34m-linux-amd64-aot_test-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.4.6 --aot"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.4.8:m --aot"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.4 tests AOT (test)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.4, AOT Model (test), CPU only, optimized version"
diff --git a/taskcluster/test-python_34-linux-amd64-opt.yml b/taskcluster/test-python_34m-linux-amd64-opt.yml
similarity index 84%
rename from taskcluster/test-python_34-linux-amd64-opt.yml
rename to taskcluster/test-python_34m-linux-amd64-opt.yml
index c1cca899b8..8d2b682459 100644
--- a/taskcluster/test-python_34-linux-amd64-opt.yml
+++ b/taskcluster/test-python_34m-linux-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.4.6"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.4.8:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.4 tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.4, CPU only, optimized version"
diff --git a/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_34m-linux-amd64-prod_pbmodel-opt.yml
similarity index 83%
rename from taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-python_34m-linux-amd64-prod_pbmodel-opt.yml
index fda1572bbc..2f253d70de 100644
--- a/taskcluster/test-python_34-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_34m-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 3.4.6"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 3.4.8:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.4 prod tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.4 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-python_35-darwin-amd64-opt.yml b/taskcluster/test-python_35-darwin-amd64-opt.yml
index 61caa45267..6fb261efe1 100644
--- a/taskcluster/test-python_35-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_35-darwin-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.5.3"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.5.5:m"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v3.5 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on Python v3.5, CPU only, optimized version"
diff --git a/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml
index 72cc025dc4..d4280a6ad4 100644
--- a/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_35-linux-amd64-aot_test-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.5.3 --aot"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.5.5:m --aot"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests AOT (test)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, AOT Model (test), CPU only, optimized version"
diff --git a/taskcluster/test-python_35-linux-amd64-opt.yml b/taskcluster/test-python_35-linux-amd64-opt.yml
index 23bcea04d2..a3932a2a11 100644
--- a/taskcluster/test-python_35-linux-amd64-opt.yml
+++ b/taskcluster/test-python_35-linux-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.5.3"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.5.5:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version"
diff --git a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
index 43346cdf63..a52d33875d 100644
--- a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 3.5.3"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 3.5.5:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-python_36-darwin-amd64-opt.yml b/taskcluster/test-python_36-darwin-amd64-opt.yml
index cd909f0532..e0f364df33 100644
--- a/taskcluster/test-python_36-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_36-darwin-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.6.2"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 3.6.4:m"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v3.6 tests"
-    description: "Testing DeepSpeech for OSX/AMD64 on Python v3.6.2, CPU only, optimized version"
+    description: "Testing DeepSpeech for OSX/AMD64 on Python v3.6.4:m, CPU only, optimized version"
diff --git a/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml b/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml
index 9b4be1884a..3b02cc8b74 100644
--- a/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml
+++ b/taskcluster/test-python_36-linux-amd64-aot_test-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-aot_test-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.6.2 --aot"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.6.4:m --aot"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests AOT (test)"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, AOT Model (test), CPU only, optimized version"
diff --git a/taskcluster/test-python_36-linux-amd64-opt.yml b/taskcluster/test-python_36-linux-amd64-opt.yml
index a893707b3e..11fb5b375d 100644
--- a/taskcluster/test-python_36-linux-amd64-opt.yml
+++ b/taskcluster/test-python_36-linux-amd64-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
        apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.6.2"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 3.6.4:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version"
diff --git a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
index 87ba007af1..5e55267a13 100644
--- a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,12 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py27-opt"
+    - "test-training_upstream-linux-amd64-py27mu-opt"
   system_setup:
     >
        apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 3.6.2"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 3.6.4:m"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests"
     description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled b/taskcluster/test-training+deepspeech-linux-amd64-py27m-opt.yml-disabled
similarity index 93%
rename from taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled
rename to taskcluster/test-training+deepspeech-linux-amd64-py27m-opt.yml-disabled
index 524e64be36..508be9a9d0 100644
--- a/taskcluster/test-training+deepspeech-linux-amd64-py27-opt.yml-disabled
+++ b/taskcluster/test-training+deepspeech-linux-amd64-py27m-opt.yml-disabled
@@ -7,7 +7,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.13 mozilla deepspeech"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:m mozilla deepspeech"
   deepspeech_pkg_name: 'deepspeech-0.1.1-cp27-cp27mu-manylinux1_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py2.7 (DS)"
diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled b/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled
new file mode 100644
index 0000000000..ac1b546898
--- /dev/null
+++ b/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-ctc-opt"
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu mozilla deepspeech"
+  deepspeech_pkg_name: 'deepspeech-0.1.1-cp27-cp27mu-manylinux1_x86_64.whl'
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU training Py2.7 mu (DS)"
+    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 2.7 mu with DeepSpeech package installed, CPU only, optimized version"
diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled b/taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled
similarity index 93%
rename from taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled
rename to taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled
index 478e14c7ce..787bddc2cd 100644
--- a/taskcluster/test-training+deepspeech-linux-amd64-py36-opt.yml-disabled
+++ b/taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled
@@ -7,7 +7,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.2 mozilla deepspeech"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m mozilla deepspeech"
   deepspeech_pkg_name: 'deepspeech-0.1.1-cp36-cp36m-manylinux1_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.6 (DS)"
diff --git a/taskcluster/test-training-linux-amd64-py27-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py27m-opt.yml-disabled
similarity index 93%
rename from taskcluster/test-training-linux-amd64-py27-opt.yml-disabled
rename to taskcluster/test-training-linux-amd64-py27m-opt.yml-disabled
index dea9c8f1f4..d8e732b433 100644
--- a/taskcluster/test-training-linux-amd64-py27-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py27m-opt.yml-disabled
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.13 mozilla"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:m mozilla"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py2.7"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 2.7, CPU only, optimized version"
diff --git a/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled
new file mode 100644
index 0000000000..e234c44df9
--- /dev/null
+++ b/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-ctc-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu mozilla"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU training Py2.7 mu"
+    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 2.7 mu, CPU only, optimized version"
diff --git a/taskcluster/test-training-linux-amd64-py34-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled
similarity index 93%
rename from taskcluster/test-training-linux-amd64-py34-opt.yml-disabled
rename to taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled
index d49e654c36..085b2f8d81 100644
--- a/taskcluster/test-training-linux-amd64-py34-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.4.6 mozilla"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.4.8:m mozilla"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.4"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.4, CPU only, optimized version"
diff --git a/taskcluster/test-training-linux-amd64-py35-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled
similarity index 93%
rename from taskcluster/test-training-linux-amd64-py35-opt.yml-disabled
rename to taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled
index 14d00571f1..a110f7d59e 100644
--- a/taskcluster/test-training-linux-amd64-py35-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.5.3 mozilla"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.5.5:m mozilla"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.5"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.5, CPU only, optimized version"
diff --git a/taskcluster/test-training-linux-amd64-py36-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled
similarity index 93%
rename from taskcluster/test-training-linux-amd64-py36-opt.yml-disabled
rename to taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled
index 36ea2c42e5..64a452b5f0 100644
--- a/taskcluster/test-training-linux-amd64-py36-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.2 mozilla"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m mozilla"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU training Py3.6"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27-opt.yml b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27m-opt.yml
similarity index 93%
rename from taskcluster/test-training_upstream+deepspeech-linux-amd64-py27-opt.yml
rename to taskcluster/test-training_upstream+deepspeech-linux-amd64-py27m-opt.yml
index ab90f6b1c4..5263d5c0f2 100644
--- a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27-opt.yml
+++ b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27m-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.13 upstream deepspeech"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:m upstream deepspeech"
   deepspeech_pkg_name: 'deepspeech-0.1.1-cp27-cp27mu-manylinux1_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 (DS)"
diff --git a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml
new file mode 100644
index 0000000000..2a64af6b73
--- /dev/null
+++ b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-ctc-opt"
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu upstream deepspeech"
+  deepspeech_pkg_name: 'deepspeech-0.1.1-cp27-cp27mu-manylinux1_x86_64.whl'
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 mu (DS)"
+    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 2.7 mu with DeepSpeech package installed, CPU only, optimized version"
diff --git a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36-opt.yml b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml
similarity index 93%
rename from taskcluster/test-training_upstream+deepspeech-linux-amd64-py36-opt.yml
rename to taskcluster/test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml
index 5c5dc09ee1..74043eaf70 100644
--- a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36-opt.yml
+++ b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.2 upstream deepspeech"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m upstream deepspeech"
   deepspeech_pkg_name: 'deepspeech-0.1.1-cp36-cp36m-manylinux1_x86_64.whl'
   metadata:
     name: "DeepSpeech Linux AMD64 CPU upstream training Py3.6 (DS)"
diff --git a/taskcluster/test-training_upstream-linux-amd64-py27-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py27m-opt.yml
similarity index 95%
rename from taskcluster/test-training_upstream-linux-amd64-py27-opt.yml
rename to taskcluster/test-training_upstream-linux-amd64-py27m-opt.yml
index fea7202b7d..93d328b290 100644
--- a/taskcluster/test-training_upstream-linux-amd64-py27-opt.yml
+++ b/taskcluster/test-training_upstream-linux-amd64-py27m-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.13 upstream"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:m upstream"
   convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.5.ad8f785459e80823a2ff4456eeb9d7220c33b9c6.cpu/artifacts/public/convert_graphdef_memmapped_format"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7"
diff --git a/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
new file mode 100644
index 0000000000..75bae6e547
--- /dev/null
+++ b/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-ctc-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu upstream"
+  convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.5.ad8f785459e80823a2ff4456eeb9d7220c33b9c6.cpu/artifacts/public/convert_graphdef_memmapped_format"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 mu"
+    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 2.7 mu, CPU only, optimized version"
diff --git a/taskcluster/test-training_upstream-linux-amd64-py34-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py34m-opt.yml
similarity index 93%
rename from taskcluster/test-training_upstream-linux-amd64-py34-opt.yml
rename to taskcluster/test-training_upstream-linux-amd64-py34m-opt.yml
index 1e9d6d3d86..f20e52c1b6 100644
--- a/taskcluster/test-training_upstream-linux-amd64-py34-opt.yml
+++ b/taskcluster/test-training_upstream-linux-amd64-py34m-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.4.6 upstream"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.4.8:m upstream"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU upstream training Py3.4"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.4, CPU only, optimized version"
diff --git a/taskcluster/test-training_upstream-linux-amd64-py35-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml
similarity index 93%
rename from taskcluster/test-training_upstream-linux-amd64-py35-opt.yml
rename to taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml
index 79edb40c9b..a6fd2913b3 100644
--- a/taskcluster/test-training_upstream-linux-amd64-py35-opt.yml
+++ b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.5.3 upstream"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.5.5:m upstream"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU upstream training Py3.5"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.5, CPU only, optimized version"
diff --git a/taskcluster/test-training_upstream-linux-amd64-py36-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml
similarity index 93%
rename from taskcluster/test-training_upstream-linux-amd64-py36-opt.yml
rename to taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml
index 3aa6b3baf5..0dca912230 100644
--- a/taskcluster/test-training_upstream-linux-amd64-py36-opt.yml
+++ b/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.2 upstream"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m upstream"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU upstream training Py3.6"
     description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.6, CPU only, optimized version"
diff --git a/tc-python-tests-prod.sh b/tc-python-tests-prod.sh
index 74dd3b3cad..49c0d3cdce 100644
--- a/tc-python-tests-prod.sh
+++ b/tc-python-tests-prod.sh
@@ -4,21 +4,25 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
-pyver=$1
+pyver_full=$1
 
-if [ -z "${pyver}" ]; then
+if [ -z "${pyver_full}" ]; then
     echo "No python version given, aborting."
     exit 1
 fi;
 
-# 2.7.x => 27
-pyver_pkg=$(echo "${pyver}" | cut -d'.' --output-delimiter="" -f1,2)
+pyver=$(echo "${pyver_full}" | cut -d':' -f1)
 
-# mu => unicode, 2 bytes python 2.7
-# m  => unicode, 4 bytes python >+ 3
-py_unicode_type="m"
-if [ "${pyver_pkg}" = "27" ]; then
-    py_unicode_type="mu"
+# 2.7.x => 27
+pyver_pkg=$(echo "${pyver_full}" | cut -d':' -f1 | cut -d'.' -f1,2 | tr -d '.')
+
+# mu => unicode, 2 bytes python
+# m  => unicode, 4 bytes python
+py_unicode_type=$(echo "${pyver_full}" | cut -d':' -f2)
+if [ "${py_unicode_type}" = "m" ]; then
+  pyconf="ucs4"
+elif[ "${py_unicode_type}" = "mu" ]; then
+  pyconf="ucs2"
 fi;
 
 unset PYTHON_BIN_PATH
@@ -40,7 +44,7 @@ install_pyenv "${PYENV_ROOT}"
 install_pyenv_virtualenv "$(pyenv root)/plugins/pyenv-virtualenv"
 
 PYENV_NAME=deepspeech-test
-pyenv install ${pyver}
+PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf}" pyenv install ${pyver}
 pyenv virtualenv ${pyver} ${PYENV_NAME}
 source ${PYENV_ROOT}/versions/${pyver}/envs/${PYENV_NAME}/bin/activate
 
diff --git a/tc-python-tests.sh b/tc-python-tests.sh
index 8ffb082e04..392c626e85 100644
--- a/tc-python-tests.sh
+++ b/tc-python-tests.sh
@@ -4,22 +4,26 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
-pyver=$1
+pyver_full=$1
 aot_model=$2
 
-if [ -z "${pyver}" ]; then
+if [ -z "${pyver_full}" ]; then
     echo "No python version given, aborting."
     exit 1
 fi;
 
-# 2.7.x => 27
-pyver_pkg=$(echo "${pyver}" | cut -d'.' -f1,2 | tr -d '.')
+pyver=$(echo "${pyver_full}" | cut -d':' -f1)
 
-# mu => unicode, 2 bytes python 2.7
-# m  => unicode, 4 bytes python >+ 3
-py_unicode_type="m"
-if [ "${OS}" = "Linux" -a "${pyver_pkg}" = "27" ]; then
-    py_unicode_type="mu"
+# 2.7.x => 27
+pyver_pkg=$(echo "${pyver_full}" | cut -d':' -f1 | cut -d'.' -f1,2 | tr -d '.')
+
+# mu => unicode, 2 bytes python
+# m  => unicode, 4 bytes python
+py_unicode_type=$(echo "${pyver_full}" | cut -d':' -f2)
+if [ "${py_unicode_type}" = "m" ]; then
+  pyconf="ucs4"
+elif[ "${py_unicode_type}" = "mu" ]; then
+  pyconf="ucs2"
 fi;
 
 unset PYTHON_BIN_PATH
@@ -35,7 +39,7 @@ install_pyenv "${PYENV_ROOT}"
 install_pyenv_virtualenv "$(pyenv root)/plugins/pyenv-virtualenv"
 
 PYENV_NAME=deepspeech-test
-pyenv install ${pyver}
+PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf}" pyenv install ${pyver}
 pyenv virtualenv ${pyver} ${PYENV_NAME}
 source ${PYENV_ROOT}/versions/${pyver}/envs/${PYENV_NAME}/bin/activate
 
diff --git a/tc-tests-utils.sh b/tc-tests-utils.sh
index f774b07133..8d2a5e70cd 100755
--- a/tc-tests-utils.sh
+++ b/tc-tests-utils.sh
@@ -42,7 +42,7 @@ model_name="$(basename "${model_source}")"
 model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm"
 model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}"
 
-SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.13 3.4.6 3.5.3 3.6.2}
+SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.14:'ucs2' 2.7.14:'ucs4' 3.4.8:'ucs4' 3.5.5:'ucs4' 3.6.4:'ucs4'}
 SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.8.6 5.12.0 6.12.0 7.10.1 8.9.1 9.2.0}
 
 # This verify exact inference result
@@ -332,7 +332,7 @@ install_pyenv()
 
   git clone --quiet https://github.com/pyenv/pyenv.git ${PYENV_ROOT}
   pushd ${PYENV_ROOT}
-    git checkout --quiet 0c909f7457a027276a1d733d78bfbe70ba652047
+    git checkout --quiet a8e207f330509b12724454b1dd38dcc31193212f
   popd
   eval "$(pyenv init -)"
 }
@@ -348,7 +348,7 @@ install_pyenv_virtualenv()
 
   git clone --quiet https://github.com/pyenv/pyenv-virtualenv.git ${PYENV_VENV}
   pushd ${PYENV_VENV}
-      git checkout --quiet 27270877575fe8c3e7be5385b8b6a1e4089b39aa
+      git checkout --quiet 5419dc732066b035a28680475acd7b661c7c397d
   popd
   eval "$(pyenv virtualenv-init -)"
 }
@@ -482,10 +482,13 @@ do_deepspeech_python_build()
     SETUP_FLAGS="--project_name deepspeech-gpu"
   fi
 
-  for pyver in ${SUPPORTED_PYTHON_VERSIONS}; do
-    pyenv install ${pyver}
-    pyenv virtualenv ${pyver} deepspeech
-    source ${PYENV_ROOT}/versions/${pyver}/envs/deepspeech/bin/activate
+  for pyver_conf in ${SUPPORTED_PYTHON_VERSIONS}; do
+    pyver=$(echo "${pyver_conf}" | cut -d':' -f1)
+    pyconf=$(echo "${pyver_conf}" | cut -d':' -f2)
+
+    PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf}" pyenv install ${pyver}
+    pyenv virtualenv deepspeech
+    pyenv activate deepspeech
 
     EXTRA_CFLAGS="${EXTRA_LOCAL_CFLAGS}" EXTRA_LDFLAGS="${EXTRA_LOCAL_LDFLAGS}" EXTRA_LIBS="${EXTRA_LOCAL_LIBS}" make -C native_client/ \
       TARGET=${SYSTEM_TARGET} \
@@ -498,7 +501,7 @@ do_deepspeech_python_build()
 
     make -C native_client/ bindings-clean
 
-    deactivate
+    pyenv deactivate
     pyenv uninstall --force deepspeech
   done;
 }