diff --git a/bin/run-tc-ldc93s1_new.sh b/bin/run-tc-ldc93s1_new.sh
index 29f833d7..ff8751ed 100755
--- a/bin/run-tc-ldc93s1_new.sh
+++ b/bin/run-tc-ldc93s1_new.sh
@@ -6,6 +6,7 @@ ldc93s1_dir="./data/smoke_test"
 ldc93s1_csv="${ldc93s1_dir}/ldc93s1.csv"
 
 epoch_count=$1
+audio_sample_rate=$2
 
 if [ ! -f "${ldc93s1_dir}/ldc93s1.csv" ]; then
     echo "Downloading and preprocessing LDC93S1 example data, saving in ${ldc93s1_dir}."
@@ -25,4 +26,5 @@ python -u DeepSpeech.py --noshow_progressbar --noearly_stop \
   --max_to_keep 1 --checkpoint_dir '/tmp/ckpt' \
   --learning_rate 0.001 --dropout_rate 0.05  --export_dir '/tmp/train' \
   --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \
-  --lm_trie_path 'data/smoke_test/vocab.trie'
+  --lm_trie_path 'data/smoke_test/vocab.trie' \
+  --audio_sample_rate ${audio_sample_rate}
diff --git a/bin/run-tc-ldc93s1_tflite.sh b/bin/run-tc-ldc93s1_tflite.sh
index 6012e1c5..b5a7772c 100755
--- a/bin/run-tc-ldc93s1_tflite.sh
+++ b/bin/run-tc-ldc93s1_tflite.sh
@@ -5,6 +5,8 @@ set -xe
 ldc93s1_dir="./data/smoke_test"
 ldc93s1_csv="${ldc93s1_dir}/ldc93s1.csv"
 
+audio_sample_rate=$1
+
 if [ ! -f "${ldc93s1_dir}/ldc93s1.csv" ]; then
     echo "Downloading and preprocessing LDC93S1 example data, saving in ${ldc93s1_dir}."
     python -u bin/import_ldc93s1.py ${ldc93s1_dir}
@@ -20,6 +22,7 @@ python -u DeepSpeech.py --noshow_progressbar \
   --export_dir '/tmp/train_tflite' \
   --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \
   --lm_trie_path 'data/smoke_test/vocab.trie' \
+  --audio_sample_rate ${audio_sample_rate} \
   --export_tflite
 
 mkdir /tmp/train_tflite/en-us
@@ -30,5 +33,6 @@ python -u DeepSpeech.py --noshow_progressbar \
   --export_dir '/tmp/train_tflite/en-us' \
   --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \
   --lm_trie_path 'data/smoke_test/vocab.trie' \
+  --audio_sample_rate ${audio_sample_rate} \
   --export_language 'Fake English (fk-FK)' \
   --export_zip
diff --git a/data/smoke_test/LDC93S1_pcms16le_1_16000.wav b/data/smoke_test/LDC93S1_pcms16le_1_16000.wav
new file mode 100644
index 00000000..62b65f8f
Binary files /dev/null and b/data/smoke_test/LDC93S1_pcms16le_1_16000.wav differ
diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml
index 96ba300c..ab79475b 100644
--- a/taskcluster/.build.yml
+++ b/taskcluster/.build.yml
@@ -24,3 +24,4 @@ build:
   convert_graphdef: ''
   benchmark_model_bin: ''
   tensorflow_git_desc: 'TensorFlow: v1.14.0-21-ge77504a'
+  test_model_task: ''
diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml
index ff405121..7210ed10 100644
--- a/taskcluster/darwin-opt-base.tyml
+++ b/taskcluster/darwin-opt-base.tyml
@@ -37,11 +37,7 @@ payload:
   maxRunTime: { $eval: to_int(build.maxRunTime) }
 
   env:
-    $let:
-      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
-    in:
-      TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
-      DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
+    TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
 
   # There is no VM yet running tasks on OSX
   # so one should install by hand:
diff --git a/taskcluster/linux-opt-base.tyml b/taskcluster/linux-opt-base.tyml
index e4c86ae5..4f7c5fa3 100644
--- a/taskcluster/linux-opt-base.tyml
+++ b/taskcluster/linux-opt-base.tyml
@@ -33,11 +33,7 @@ then:
     image: "ubuntu:14.04"
 
     env:
-      $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
-      in:
-        TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
-        DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
+      TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
 
     command:
       - "/bin/bash"
diff --git a/taskcluster/tc-android-apk-tests.sh b/taskcluster/tc-android-apk-tests.sh
index c2a00afb..fec910bd 100644
--- a/taskcluster/tc-android-apk-tests.sh
+++ b/taskcluster/tc-android-apk-tests.sh
@@ -7,6 +7,9 @@ api_level=$2
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+# Android test code only supports 16kHz and hard-coded filename
+ldc93s1_sample_filename='LDC93S1.wav'
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 
diff --git a/taskcluster/tc-android-ds-tests.sh b/taskcluster/tc-android-ds-tests.sh
index 0f5e289c..ec96dbf1 100755
--- a/taskcluster/tc-android-ds-tests.sh
+++ b/taskcluster/tc-android-ds-tests.sh
@@ -7,6 +7,9 @@ api_level=$2
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$3
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 export DATA_TMP_DIR=${ANDROID_TMP_DIR}/ds
diff --git a/taskcluster/tc-cpp-ds-tests-prod.sh b/taskcluster/tc-cpp-ds-tests-prod.sh
index 40384849..d3e1db2e 100644
--- a/taskcluster/tc-cpp-ds-tests-prod.sh
+++ b/taskcluster/tc-cpp-ds-tests-prod.sh
@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL}
 model_name=$(basename "${model_source}")
 
@@ -16,4 +19,4 @@ export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
 check_tensorflow_version
 
-run_prod_inference_tests
+run_prod_inference_tests "${bitrate}"
diff --git a/taskcluster/tc-cpp-ds-tests.sh b/taskcluster/tc-cpp-ds-tests.sh
index 194abc41..cea0674c 100644
--- a/taskcluster/tc-cpp-ds-tests.sh
+++ b/taskcluster/tc-cpp-ds-tests.sh
@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
diff --git a/taskcluster/tc-cpp_tflite-ds-tests.sh b/taskcluster/tc-cpp_tflite-ds-tests.sh
index 38a65677..f442dda7 100644
--- a/taskcluster/tc-cpp_tflite-ds-tests.sh
+++ b/taskcluster/tc-cpp_tflite-ds-tests.sh
@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")
diff --git a/taskcluster/tc-cpp_tflite-tests-prod.sh b/taskcluster/tc-cpp_tflite-tests-prod.sh
index 2d0b969a..4c66ae9e 100644
--- a/taskcluster/tc-cpp_tflite-tests-prod.sh
+++ b/taskcluster/tc-cpp_tflite-tests-prod.sh
@@ -8,6 +8,9 @@ export DEEPSPEECH_PROD_MODEL_MMAP=https://github.com/lissyx/DeepSpeech/releases/
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")
@@ -21,4 +24,4 @@ export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 
 check_tensorflow_version
 
-run_prodtflite_inference_tests
+run_prodtflite_inference_tests "${bitrate}"
diff --git a/taskcluster/tc-cpp_tflite_basic-ds-tests.sh b/taskcluster/tc-cpp_tflite_basic-ds-tests.sh
index 549befcc..be539933 100644
--- a/taskcluster/tc-cpp_tflite_basic-ds-tests.sh
+++ b/taskcluster/tc-cpp_tflite_basic-ds-tests.sh
@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 export DEEPSPEECH_ARTIFACTS_ROOT=${DEEPSPEECH_ARTIFACTS_TFLITE_ROOT}
diff --git a/taskcluster/tc-cppwin-ds-tests.sh b/taskcluster/tc-cppwin-ds-tests.sh
index 018be828..671ae3ef 100644
--- a/taskcluster/tc-cppwin-ds-tests.sh
+++ b/taskcluster/tc-cppwin-ds-tests.sh
@@ -4,6 +4,9 @@ set -xe
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 download_material "${TASKCLUSTER_TMP_DIR}/ds"
 
 export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
diff --git a/taskcluster/tc-electron-tests.sh b/taskcluster/tc-electron-tests.sh
index 8318a522..566775f4 100755
--- a/taskcluster/tc-electron-tests.sh
+++ b/taskcluster/tc-electron-tests.sh
@@ -17,6 +17,9 @@ if [ -z "${electronver}" ]; then
     exit 1
 fi;
 
+bitrate=$3
+set_ldc_sample_filename "${bitrate}"
+
 download_data
 
 node --version
diff --git a/taskcluster/tc-netframework-ds-tests.sh b/taskcluster/tc-netframework-ds-tests.sh
index 5e56e642..3e48bf25 100644
--- a/taskcluster/tc-netframework-ds-tests.sh
+++ b/taskcluster/tc-netframework-ds-tests.sh
@@ -6,6 +6,9 @@ cuda=$1
 
 source $(dirname "$0")/tc-tests-utils.sh
 
+bitrate=$1
+set_ldc_sample_filename "${bitrate}"
+
 if [ "${cuda}" = "--cuda" ]; then
     PROJECT_NAME="DeepSpeech-GPU"
 else
diff --git a/taskcluster/tc-node-tests-prod.sh b/taskcluster/tc-node-tests-prod.sh
index b03f7e91..0b812699 100644
--- a/taskcluster/tc-node-tests-prod.sh
+++ b/taskcluster/tc-node-tests-prod.sh
@@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL}
 model_name=$(basename "${model_source}")
 
@@ -32,4 +35,4 @@ npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 
-run_prod_inference_tests
+run_prod_inference_tests "${bitrate}"
diff --git a/taskcluster/tc-node-tests.sh b/taskcluster/tc-node-tests.sh
index b53002e8..17548022 100644
--- a/taskcluster/tc-node-tests.sh
+++ b/taskcluster/tc-node-tests.sh
@@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 download_data
 
 node --version
diff --git a/taskcluster/tc-node_tflite-tests-prod.sh b/taskcluster/tc-node_tflite-tests-prod.sh
index aef3b48e..e813a16c 100644
--- a/taskcluster/tc-node_tflite-tests-prod.sh
+++ b/taskcluster/tc-node_tflite-tests-prod.sh
@@ -15,6 +15,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_PROD_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")
@@ -36,4 +39,4 @@ npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url}
 
 check_runtime_nodejs
 
-run_prodtflite_inference_tests
+run_prodtflite_inference_tests "${bitrate}"
diff --git a/taskcluster/tc-node_tflite-tests.sh b/taskcluster/tc-node_tflite-tests.sh
index c5a27c21..45907c11 100644
--- a/taskcluster/tc-node_tflite-tests.sh
+++ b/taskcluster/tc-node_tflite-tests.sh
@@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then
     exit 1
 fi;
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite}
 model_name=$(basename "${model_source}")
 model_name_mmap=$(basename "${model_source}")
diff --git a/taskcluster/tc-python-tests-prod.sh b/taskcluster/tc-python-tests-prod.sh
index 76961b52..2b5fe848 100644
--- a/taskcluster/tc-python-tests-prod.sh
+++ b/taskcluster/tc-python-tests-prod.sh
@@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 
@@ -43,8 +46,8 @@ virtualenv_activate "${pyalias}" "${PYENV_NAME}"
 deepspeech_pkg_url=$(get_python_pkg_url ${pyver_pkg} ${py_unicode_type})
 LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-binary :all: ${PY37_SOURCE_PACKAGE} --upgrade ${deepspeech_pkg_url} | cat
 
-run_prod_inference_tests
+run_prod_inference_tests "${bitrate}"
 
-run_prod_concurrent_stream_tests
+run_prod_concurrent_stream_tests "${bitrate}"
 
 virtualenv_deactivate "${pyalias}" "${PYENV_NAME}"
diff --git a/taskcluster/tc-python-tests.sh b/taskcluster/tc-python-tests.sh
index 18756be8..6f101389 100644
--- a/taskcluster/tc-python-tests.sh
+++ b/taskcluster/tc-python-tests.sh
@@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 
diff --git a/taskcluster/tc-python_tflite-tests-prod.sh b/taskcluster/tc-python_tflite-tests-prod.sh
index 6b6ae765..92b46409 100644
--- a/taskcluster/tc-python_tflite-tests-prod.sh
+++ b/taskcluster/tc-python_tflite-tests-prod.sh
@@ -10,6 +10,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 
@@ -50,6 +53,6 @@ LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-bin
 which deepspeech
 deepspeech --version
 
-run_prodtflite_inference_tests
+run_prodtflite_inference_tests "${bitrate}"
 
 virtualenv_deactivate "${pyalias}" "${PYENV_NAME}"
diff --git a/taskcluster/tc-python_tflite-tests.sh b/taskcluster/tc-python_tflite-tests.sh
index 6a419485..b2759aa6 100644
--- a/taskcluster/tc-python_tflite-tests.sh
+++ b/taskcluster/tc-python_tflite-tests.sh
@@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh
 
 extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias"
 
+bitrate=$2
+set_ldc_sample_filename "${bitrate}"
+
 unset PYTHON_BIN_PATH
 unset PYTHONPATH
 
diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh
index 5cc71e0c..49ab0fb5 100755
--- a/taskcluster/tc-tests-utils.sh
+++ b/taskcluster/tc-tests-utils.sh
@@ -56,6 +56,8 @@ model_name="$(basename "${model_source}")"
 model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm"
 model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}"
 
+ldc93s1_sample_filename=''
+
 SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4}
 SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0 13.0.1}
 SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1 7.1.2}
@@ -245,7 +247,7 @@ assert_working_ldc93s1_lm()
 
 assert_correct_multi_ldc93s1()
 {
-  assert_shows_something "$1" "/LDC93S1.wav%she had your dark suit in greasy wash water all year%" "$?"
+  assert_shows_something "$1" "/${ldc93s1_sample_filename}%she had your dark suit in greasy wash water all year%" "$?"
   assert_shows_something "$1" "/LDC93S1_pcms16le_2_44100.wav%she had your dark suit in greasy wash water all year%" "$?"
   ## 8k will output garbage anyway ...
   # assert_shows_something "$1" "/LDC93S1_pcms16le_1_8000.wav%she hayorasryrtl lyreasy asr watal w water all year%"
@@ -253,22 +255,46 @@ assert_correct_multi_ldc93s1()
 
 assert_correct_ldc93s1_prodmodel()
 {
-  assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_ldc93s1_prodtflitemodel()
 {
-  assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_ldc93s1_prodmodel_stereo_44k()
 {
-  assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_ldc93s1_prodtflitemodel_stereo_44k()
 {
-  assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  if [ -z "$3" -o "$3" = "16k" ]; then
+    assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2"
+  fi;
+
+  if [ -o "$3" = "8k" ]; then
+    assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2"
+  fi;
 }
 
 assert_correct_warning_upsampling()
@@ -320,12 +346,12 @@ check_runtime_electronjs()
 run_tflite_basic_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 }
@@ -333,22 +359,22 @@ run_tflite_basic_inference_tests()
 run_netframework_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended yes 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended yes 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_withlm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1_lm "${phrase_pbmodel_withlm}" "$?"
 }
@@ -356,22 +382,22 @@ run_netframework_inference_tests()
 run_electronjs_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?"
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   set -e
   assert_working_ldc93s1_lm "${phrase_pbmodel_withlm}" "$?"
 }
@@ -379,25 +405,25 @@ run_electronjs_inference_tests()
 run_basic_inference_tests()
 {
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status"
 
   set +e
-  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status"
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
   assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm}" "$status"
@@ -419,25 +445,30 @@ run_all_inference_tests()
   set -e
   assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm_stereo_44k}" "$status"
 
-  set +e
-  phrase_pbmodel_nolm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
-  set -e
-  assert_correct_warning_upsampling "${phrase_pbmodel_nolm_mono_8k}"
+  # Run down-sampling warning test only when we actually perform downsampling
+  if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then
+    set +e
+    phrase_pbmodel_nolm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    set -e
+    assert_correct_warning_upsampling "${phrase_pbmodel_nolm_mono_8k}"
 
-  set +e
-  phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
-  set -e
-  assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+    set +e
+    phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    set -e
+    assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  fi;
 }
 
 run_prod_concurrent_stream_tests()
 {
+  local _bitrate=$1
+
   set +e
   output=$(python ${TASKCLUSTER_TMP_DIR}/test_sources/concurrent_streams.py \
              --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} \
              --lm ${TASKCLUSTER_TMP_DIR}/lm.binary \
              --trie ${TASKCLUSTER_TMP_DIR}/trie \
-             --audio1 ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \
+             --audio1 ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \
              --audio2 ${TASKCLUSTER_TMP_DIR}/new-home-in-the-stars-16k.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
@@ -445,60 +476,70 @@ run_prod_concurrent_stream_tests()
   output1=$(echo "${output}" | head -n 1)
   output2=$(echo "${output}" | tail -n 1)
 
-  assert_correct_ldc93s1_prodmodel "${output1}" "${status}"
+  assert_correct_ldc93s1_prodmodel "${output1}" "${status}" "${_bitrate}"
   assert_correct_inference "${output2}" "we must find a new home in the stars" "${status}"
 }
 
 run_prod_inference_tests()
 {
-  set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
-  status=$?
-  set -e
-  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status"
+  local _bitrate=$1
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status"
+  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
+
+  set +e
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  status=$?
+  set -e
+  assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
 
   set +e
   phrase_pbmodel_withlm_stereo_44k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_2_44100.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodmodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status"
+  assert_correct_ldc93s1_prodmodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" "${_bitrate}"
 
-  set +e
-  phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
-  set -e
-  assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  # Run down-sampling warning test only when we actually perform downsampling
+  if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then
+    set +e
+    phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    set -e
+    assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  fi;
 }
 
 run_prodtflite_inference_tests()
 {
-  set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
-  status=$?
-  set -e
-  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status"
+  local _bitrate=$1
 
   set +e
-  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status"
+  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
+
+  set +e
+  phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr)
+  status=$?
+  set -e
+  assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}"
 
   set +e
   phrase_pbmodel_withlm_stereo_44k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_2_44100.wav 2>${TASKCLUSTER_TMP_DIR}/stderr)
   status=$?
   set -e
-  assert_correct_ldc93s1_prodtflitemodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status"
+  assert_correct_ldc93s1_prodtflitemodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" "${_bitrate}"
 
-  set +e
-  phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
-  set -e
-  assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  # Run down-sampling warning test only when we actually perform downsampling
+  if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then
+    set +e
+    phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null)
+    set -e
+    assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}"
+  fi;
 }
 
 run_multi_inference_tests()
@@ -519,7 +560,7 @@ run_multi_inference_tests()
 run_cpp_only_inference_tests()
 {
   set +e
-  phrase_pbmodel_withlm_intermediate_decode=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --stream 1280 2>${TASKCLUSTER_TMP_DIR}/stderr | tail -n 1)
+  phrase_pbmodel_withlm_intermediate_decode=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --stream 1280 2>${TASKCLUSTER_TMP_DIR}/stderr | tail -n 1)
   status=$?
   set -e
   assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm_intermediate_decode}" "$status"
@@ -597,6 +638,25 @@ install_nuget()
   export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH
 }
 
+set_ldc_sample_filename()
+{
+  local _bitrate=$1
+
+  if [ -z "${_bitrate}" ]; then
+    echo "Bitrate should not be empty"
+    exit 1
+  fi;
+
+  case "${_bitrate}" in
+    8k)
+      ldc93s1_sample_filename='LDC93S1_pcms16le_1_8000.wav'
+    ;;
+    16k)
+      ldc93s1_sample_filename='LDC93S1_pcms16le_1_16000.wav'
+    ;;
+  esac
+}
+
 download_data()
 {
   ${WGET} -P "${TASKCLUSTER_TMP_DIR}" "${model_source}"
@@ -1664,7 +1724,7 @@ android_setup_ndk_data()
 
   adb push \
     ${TASKCLUSTER_TMP_DIR}/${model_name} \
-    ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \
+    ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \
     ${ANDROID_TMP_DIR}/ds/
 }
 
@@ -1674,7 +1734,7 @@ android_setup_apk_data()
 
   adb push \
     ${TASKCLUSTER_TMP_DIR}/${model_name} \
-    ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \
+    ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \
     ${TASKCLUSTER_TMP_DIR}/lm.binary \
     ${TASKCLUSTER_TMP_DIR}/trie \
     ${ANDROID_TMP_DIR}/test/
diff --git a/taskcluster/tc-train-tests.sh b/taskcluster/tc-train-tests.sh
index a782fa18..4c0448fb 100644
--- a/taskcluster/tc-train-tests.sh
+++ b/taskcluster/tc-train-tests.sh
@@ -5,7 +5,7 @@ set -xe
 source $(dirname "$0")/tc-tests-utils.sh
 
 pyver_full=$1
-ds=$2
+bitrate=$2
 
 if [ -z "${pyver_full}" ]; then
     echo "No python version given, aborting."
@@ -56,11 +56,28 @@ decoder_pkg_url=${DECODER_ARTIFACTS_ROOT}/${decoder_pkg}
 
 LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-binary :all: ${PY37_SOURCE_PACKAGE} ${decoder_pkg_url} | cat
 
+# Prepare correct arguments for training
+case "${bitrate}" in
+    8k)
+        sample_rate=8000
+        sample_name='LDC93S1_pcms16le_1_8000.wav'
+    ;;
+    16k)
+        sample_rate=16000
+        sample_name='LDC93S1_pcms16le_1_16000.wav'
+    ;;
+esac
+
+# Easier to rename to that we can exercize the LDC93S1 importer code to
+# generate the CSV file.
+echo "Moving ${sample_name} to LDC93S1.wav"
+mv "${DS_ROOT_TASK}/DeepSpeech/ds/data/smoke_test/${sample_name}" "${DS_ROOT_TASK}/DeepSpeech/ds/data/smoke_test/LDC93S1.wav"
+
 pushd ${HOME}/DeepSpeech/ds/
     # Run twice to test preprocessed features
-    time ./bin/run-tc-ldc93s1_new.sh 219
-    time ./bin/run-tc-ldc93s1_new.sh 1
-    time ./bin/run-tc-ldc93s1_tflite.sh
+    time ./bin/run-tc-ldc93s1_new.sh 219 "${sample_rate}"
+    time ./bin/run-tc-ldc93s1_new.sh 1 "${sample_rate}"
+    time ./bin/run-tc-ldc93s1_tflite.sh "${sample_rate}"
 popd
 
 cp /tmp/train/output_graph.pb ${TASKCLUSTER_ARTIFACTS}
diff --git a/taskcluster/test-android-opt-base.tyml b/taskcluster/test-android-opt-base.tyml
index 4cdf7ccd..92765ebd 100644
--- a/taskcluster/test-android-opt-base.tyml
+++ b/taskcluster/test-android-opt-base.tyml
@@ -31,7 +31,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         android_arm64_build: { $eval: as_slugid("android-arm64-cpu-opt") }
         android_armv7_build: { $eval: as_slugid("android-armv7-cpu-opt") }
       in:
diff --git a/taskcluster/test-apk-android-24-x86_64-opt.yml b/taskcluster/test-apk-android-24-x86_64-opt.yml
index dad056f5..9faae2e8 100644
--- a/taskcluster/test-apk-android-24-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-24-x86_64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-24"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-24 16k"
   metadata:
     name: "DeepSpeech Android 7.0 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 7.0 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-apk-android-25-x86_64-opt.yml b/taskcluster/test-apk-android-25-x86_64-opt.yml
index 1864d226..6cc134f4 100644
--- a/taskcluster/test-apk-android-25-x86_64-opt.yml
+++ b/taskcluster/test-apk-android-25-x86_64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-25"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-25 16k"
   metadata:
     name: "DeepSpeech Android 7.1 x86_64 Google Pixel APK/Java tests"
     description: "Testing DeepSpeech APK/Java for Android 7.1 x86_64 Google Pixel, optimized version"
diff --git a/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled b/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled
index 24efe825..d5b399db 100644
--- a/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled
+++ b/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled
@@ -3,7 +3,7 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}
diff --git a/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled b/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled
index f149cb49..d50b9369 100644
--- a/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled
+++ b/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled
@@ -3,7 +3,7 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-x86_64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install curl make python && ${swig.packages.install_script}
diff --git a/taskcluster/test-armbian-opt-base.tyml b/taskcluster/test-armbian-opt-base.tyml
index 76733c02..21159472 100644
--- a/taskcluster/test-armbian-opt-base.tyml
+++ b/taskcluster/test-armbian-opt-base.tyml
@@ -31,7 +31,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         linux_arm64_build: { $eval: as_slugid("linux-arm64-cpu-opt") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_arm64_build}/artifacts/public
diff --git a/taskcluster/test-benchmark-linux-amd64-opt.yml b/taskcluster/test-benchmark-linux-amd64-opt.yml
index 9f6e6d42..5b3f53f4 100644
--- a/taskcluster/test-benchmark-linux-amd64-opt.yml
+++ b/taskcluster/test-benchmark-linux-amd64-opt.yml
@@ -2,7 +2,8 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages_trusty.apt} zip
diff --git a/taskcluster/test-cpp-android-24-arm64-opt.yml b/taskcluster/test-cpp-android-24-arm64-opt.yml
index 1ef22210..abd21dc9 100644
--- a/taskcluster/test-cpp-android-24-arm64-opt.yml
+++ b/taskcluster/test-cpp-android-24-arm64-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-24"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-24 16k"
   metadata:
     name: "DeepSpeech Android 7.0 ARM64 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.0 ARM64 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-android-24-armv7-opt.yml b/taskcluster/test-cpp-android-24-armv7-opt.yml
index f3e5f3db..af5b1c6e 100644
--- a/taskcluster/test-cpp-android-24-armv7-opt.yml
+++ b/taskcluster/test-cpp-android-24-armv7-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-armv7-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-24"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-24 16k"
   metadata:
     name: "DeepSpeech Android 7.0 ARMv7 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.0 ARMv7 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-android-25-arm64-opt.yml b/taskcluster/test-cpp-android-25-arm64-opt.yml
index e90e2171..7183105e 100644
--- a/taskcluster/test-cpp-android-25-arm64-opt.yml
+++ b/taskcluster/test-cpp-android-25-arm64-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-25"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-25 16k"
   metadata:
     name: "DeepSpeech Android 7.1 ARM64 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.1 ARM64 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-android-25-armv7-opt.yml b/taskcluster/test-cpp-android-25-armv7-opt.yml
index d8a32b07..8bb1c8f1 100644
--- a/taskcluster/test-cpp-android-25-armv7-opt.yml
+++ b/taskcluster/test-cpp-android-25-armv7-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-android-opt-base.tyml
   dependencies:
     - "android-armv7-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-25"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-25 16k"
   metadata:
     name: "DeepSpeech Android 7.1 ARMv7 Google Pixel C++ tests"
     description: "Testing DeepSpeech C++ for Android 7.1 ARMv7 Google Pixel, optimized version"
diff --git a/taskcluster/test-cpp-armbian-arm64-opt.yml b/taskcluster/test-cpp-armbian-arm64-opt.yml
deleted file mode 100644
index daa1e4c4..00000000
--- a/taskcluster/test-cpp-armbian-arm64-opt.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-build:
-  template_file: test-armbian-opt-base.tyml
-  dependencies:
-    - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh"
-  metadata:
-    name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU C++ tests"
-    description: "Testing DeepSpeech C++ for ARMbian ARM64 Cortex-A53, CPU only, optimized version"
diff --git a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
index 39fd800f..13a95924 100644
--- a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
@@ -3,7 +3,7 @@ build:
   dependencies:
     - "linux-amd64-cpu-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests-prod.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests-prod.sh 16k"
   metadata:
     name: "DeepSpeech Linux AMD64 CPU C++ prod tests"
     description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-cpp-raspbian-rpi3-opt.yml b/taskcluster/test-cpp-raspbian-rpi3-opt.yml
deleted file mode 100644
index c90f72c1..00000000
--- a/taskcluster/test-cpp-raspbian-rpi3-opt.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-build:
-  template_file: test-raspbian-opt-base.tyml
-  dependencies:
-    - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh"
-  metadata:
-    name: "DeepSpeech Raspbian RPi3/ARMv7 CPU C++ tests"
-    description: "Testing DeepSpeech C++ for Raspbian RPi3/ARMv7, CPU only, optimized version"
diff --git a/taskcluster/test-cpp_16k-armbian-arm64-opt.yml b/taskcluster/test-cpp_16k-armbian-arm64-opt.yml
new file mode 100644
index 00000000..3b8246d6
--- /dev/null
+++ b/taskcluster/test-cpp_16k-armbian-arm64-opt.yml
@@ -0,0 +1,11 @@
+build:
+  template_file: test-armbian-opt-base.tyml
+  dependencies:
+    - "linux-arm64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for ARMbian ARM64 Cortex-A53, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp-darwin-amd64-opt.yml b/taskcluster/test-cpp_16k-darwin-amd64-opt.yml
similarity index 60%
rename from taskcluster/test-cpp-darwin-amd64-opt.yml
rename to taskcluster/test-cpp_16k-darwin-amd64-opt.yml
index fc4af0d4..6bc20596 100644
--- a/taskcluster/test-cpp-darwin-amd64-opt.yml
+++ b/taskcluster/test-cpp_16k-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k"
   metadata:
-    name: "DeepSpeech OSX AMD64 CPU C++ tests"
-    description: "Testing DeepSpeech C++ for OSX/AMD64, CPU only, optimized version"
+    name: "DeepSpeech OSX AMD64 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for OSX/AMD64, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_16k-linux-amd64-opt.yml b/taskcluster/test-cpp_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..3d9f9810
--- /dev/null
+++ b/taskcluster/test-cpp_16k-linux-amd64-opt.yml
@@ -0,0 +1,11 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml b/taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml
new file mode 100644
index 00000000..1c0cf156
--- /dev/null
+++ b/taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml
@@ -0,0 +1,11 @@
+build:
+  template_file: test-raspbian-opt-base.tyml
+  dependencies:
+    - "linux-rpi3-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Raspbian RPi3/ARMv7 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Raspbian RPi3/ARMv7, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp-win-amd64-opt.yml b/taskcluster/test-cpp_16k-win-amd64-opt.yml
similarity index 50%
rename from taskcluster/test-cpp-win-amd64-opt.yml
rename to taskcluster/test-cpp_16k-win-amd64-opt.yml
index 33629e07..7a2c89fb 100644
--- a/taskcluster/test-cpp-win-amd64-opt.yml
+++ b/taskcluster/test-cpp_16k-win-amd64-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cppwin-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cppwin-ds-tests.sh 16k"
   metadata:
-    name: "DeepSpeech Windows AMD64 CPU C++ tests"
-    description: "Testing DeepSpeech C++ for Windows/AMD64, CPU only, optimized version"
+    name: "DeepSpeech Windows AMD64 CPU C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Windows/AMD64, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml b/taskcluster/test-cpp_16k_tflite-darwin-amd64-opt.yml
similarity index 58%
rename from taskcluster/test-cpp_tflite-darwin-amd64-opt.yml
rename to taskcluster/test-cpp_16k_tflite-darwin-amd64-opt.yml
index 8e27b1d6..44c362f8 100644
--- a/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml
+++ b/taskcluster/test-cpp_16k_tflite-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-tflite-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k"
   metadata:
-    name: "DeepSpeech OSX AMD64 TFlite C++ tests"
-    description: "Testing DeepSpeech C++ for OSX/AMD64, TFLite, optimized version"
+    name: "DeepSpeech OSX AMD64 TFlite C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for OSX/AMD64, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml b/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml
new file mode 100755
index 00000000..0faa46d4
--- /dev/null
+++ b/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml
@@ -0,0 +1,11 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml b/taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml
new file mode 100644
index 00000000..15abcf3b
--- /dev/null
+++ b/taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml
@@ -0,0 +1,11 @@
+build:
+  template_file: test-win-opt-base.tyml
+  dependencies:
+    - "win-amd64-tflite-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  args:
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k"
+  metadata:
+    name: "DeepSpeech Windows AMD64 TFLite C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Windows/AMD64, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp-linux-amd64-opt.yml b/taskcluster/test-cpp_8k-linux-amd64-opt.yml
similarity index 52%
rename from taskcluster/test-cpp-linux-amd64-opt.yml
rename to taskcluster/test-cpp_8k-linux-amd64-opt.yml
index 122c33bc..29e52fbc 100644
--- a/taskcluster/test-cpp-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp_8k-linux-amd64-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU C++ tests"
-    description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU C++ tests (8kHz)"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-cpp_tflite-linux-amd64-opt.yml b/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml
similarity index 50%
rename from taskcluster/test-cpp_tflite-linux-amd64-opt.yml
rename to taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml
index 28462270..9a1acce8 100755
--- a/taskcluster/test-cpp_tflite-linux-amd64-opt.yml
+++ b/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-tflite-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite C++ tests"
-    description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)"
+    description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml
index 3ddf7c9b..5ff4a6c6 100755
--- a/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml
@@ -3,7 +3,7 @@ build:
   dependencies:
     - "linux-amd64-tflite-opt"
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-tests-prod.sh"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-tests-prod.sh 16k"
   metadata:
     name: "DeepSpeech Linux AMD64 TFLite C++ prod tests"
     description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, TFLite, optimized version"
diff --git a/taskcluster/test-cpp_tflite-win-amd64-opt.yml b/taskcluster/test-cpp_tflite-win-amd64-opt.yml
deleted file mode 100644
index 02864bd3..00000000
--- a/taskcluster/test-cpp_tflite-win-amd64-opt.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-build:
-  template_file: test-win-opt-base.tyml
-  dependencies:
-    - "win-amd64-tflite-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh"
-  metadata:
-    name: "DeepSpeech Windows AMD64 TFLite C++ tests"
-    description: "Testing DeepSpeech C++ for Windows/AMD64, TFLite, optimized version"
diff --git a/taskcluster/test-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml
index 6206a22e..6f50fc63 100644
--- a/taskcluster/test-darwin-opt-base.tyml
+++ b/taskcluster/test-darwin-opt-base.tyml
@@ -34,7 +34,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
         darwin_amd64_tflite: { $eval: as_slugid("darwin-amd64-tflite-opt") }
       in:
diff --git a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
index 7d7690d7..c1b020fb 100644
--- a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v3.1 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v3.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
index 9b859a89..d48a245f 100644
--- a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v3.1 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v3.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v3.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v3.1_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..e8b92a88
--- /dev/null
+++ b/taskcluster/test-electronjs_v3.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_10} && ${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 10.x 3.1.11 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v3.1_8k-linux-amd64-opt.yml
similarity index 64%
rename from taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v3.1_8k-linux-amd64-opt.yml
index 9f451581..a73200fd 100644
--- a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v3.1_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${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 10.x 4.0.3"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
index a37a2772..07195ce6 100644
--- a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
index 6dd8d9dd..c124c031 100644
--- a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..1e9935f3
--- /dev/null
+++ b/taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${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 10.x 4.0.3 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.0_8k-linux-amd64-opt.yml
similarity index 65%
rename from taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v4.0_8k-linux-amd64-opt.yml
index 9e64dd8c..74ae3943 100644
--- a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.0_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${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 10.x 3.1.11"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
index 1bef15c7..c211d146 100644
--- a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.1 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
index 0bc4363f..0acc1f34 100644
--- a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.1 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v4.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.1_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..8024e510
--- /dev/null
+++ b/taskcluster/test-electronjs_v4.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_10} && ${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 10.x 4.1.5 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.1_8k-linux-amd64-opt.yml
similarity index 65%
rename from taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v4.1_8k-linux-amd64-opt.yml
index ca434d92..00f6ac9a 100644
--- a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.1_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${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 10.x 4.1.5"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml
index 628fae3a..b58c2355 100644
--- a/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.2 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.2, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml
index c668fe59..a3e15b61 100644
--- a/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.2 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.2, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v4.2_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.2_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..2f2346ea
--- /dev/null
+++ b/taskcluster/test-electronjs_v4.2_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_10} && ${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 10.x 4.2.5 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.2_8k-linux-amd64-opt.yml
similarity index 65%
rename from taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v4.2_8k-linux-amd64-opt.yml
index 76a5239b..a5754dc7 100644
--- a/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v4.2_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${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 10.x 4.2.5"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
index 48d0c0f9..911eaeaf 100644
--- a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v5.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v5.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
index b8b102f5..dca60813 100644
--- a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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 5.0.6"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v5.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v5.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..eeee2228
--- /dev/null
+++ b/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml
similarity index 65%
rename from taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml
index 2328d041..f730719f 100644
--- a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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 5.0.6"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml
index 084280cf..02fee1c0 100644
--- a/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v6.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v6.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml
index 8bc4d556..7219903e 100644
--- a/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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 6.0.11"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v6.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v6.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..6638cc8e
--- /dev/null
+++ b/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml
similarity index 64%
rename from taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml
index 27a6a994..027c3fa2 100644
--- a/taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-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 7.1.2"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml
index 5fc12199..f28c5af1 100644
--- a/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v7.0 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v7.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml
index a9fa5b7f..e0a8ccbe 100644
--- a/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-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 7.0.1"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v7.0 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v7.0, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..c058ef71
--- /dev/null
+++ b/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml
similarity index 65%
rename from taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml
index 1d1c8fad..b20971c2 100644
--- a/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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 6.0.11"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml
index 1d876489..d0a29a07 100644
--- a/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU ElectronJS v7.1 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v7.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml
index 72e0cad0..da3c5586 100644
--- a/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-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 7.1.2"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU ElectronJS v7.1 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v7.1, CPU only, optimized version"
diff --git a/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..4bd254df
--- /dev/null
+++ b/taskcluster/test-electronjs_v7.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 7.1.2 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml
similarity index 65%
rename from taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml
rename to taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml
index f04c7f1b..da038090 100644
--- a/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml
+++ b/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml
@@ -3,12 +3,13 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py35m-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 7.0.1"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml
index f3de6fc9..89f02c31 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-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
         linux_amd64_tflite: { $eval: as_slugid("linux-amd64-tflite-opt") }
         linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
diff --git a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
index 62d7d8d5..b10337f9 100644
--- a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
+++ b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml
@@ -1,7 +1,8 @@
 build:
   template_file: test-linux-opt-base.tyml
   dependencies:
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
     tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-lite_benchmark_model-ds-tests.sh"
   benchmark_model_bin: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r1.14.e77504ac6b941fd2af495b49a0bcd56f25ca0e1e.cpu/artifacts/public/lite_benchmark_model"
diff --git a/taskcluster/test-netframework-win-amd64-opt.yml b/taskcluster/test-netframework-win-amd64-opt.yml
index 6f116ef0..df789683 100644
--- a/taskcluster/test-netframework-win-amd64-opt.yml
+++ b/taskcluster/test-netframework-win-amd64-opt.yml
@@ -2,9 +2,10 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-netframework-ds-tests.sh"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-netframework-ds-tests.sh 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU .Net Framework tests"
     description: "Testing DeepSpeech .Net Framework for Windows/AMD64, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
index 26f6370c..363acc98 100644
--- a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v10.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
index 9142b2b3..028655ff 100644
--- a/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v10.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
index 105645a7..d1867591 100644
--- a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v10.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_10x-win-amd64-opt.yml b/taskcluster/test-nodejs_10x-win-amd64-opt.yml
index 9f69677b..b1b03b0d 100644
--- a/taskcluster/test-nodejs_10x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_10}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 10.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v10.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..f5a6bba6
--- /dev/null
+++ b/taskcluster/test-nodejs_10x_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_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_10x-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_10x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml
index 58c18ea3..b0ba032e 100644
--- a/taskcluster/test-nodejs_10x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -3,12 +3,11 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..084d1a4e
--- /dev/null
+++ b/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..d8e572a8
--- /dev/null
+++ b/taskcluster/test-nodejs_10x_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_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 73%
rename from taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml
index 27546de4..d243a8bf 100644
--- a/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_10x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_10x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml
index f5bddcdc..caf92571 100644
--- a/taskcluster/test-nodejs_10x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
index 40f69c1d..0cc9a1b1 100644
--- a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 11.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v11.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
index 7be86b9e..900f9b1e 100644
--- a/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_11} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 11.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v11.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
index bb539555..570f1300 100644
--- a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 11.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 11.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 11.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v11.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_11x-win-amd64-opt.yml b/taskcluster/test-nodejs_11x-win-amd64-opt.yml
index 6e0e6869..049609a9 100644
--- a/taskcluster/test-nodejs_11x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_11}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 11.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v11.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..c737f973
--- /dev/null
+++ b/taskcluster/test-nodejs_11x_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_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_11x-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_11x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml
index ab276400..e4aa5133 100644
--- a/taskcluster/test-nodejs_11x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -3,12 +3,11 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 11.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..d3828c29
--- /dev/null
+++ b/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..caf87066
--- /dev/null
+++ b/taskcluster/test-nodejs_11x_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_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 73%
rename from taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml
index 27e7fe0e..ae9a56e2 100644
--- a/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 11.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 11.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_11x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_11x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml
index a2395458..30400533 100644
--- a/taskcluster/test-nodejs_11x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
index 09b8e7fd..d311e82f 100644
--- a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_12} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 12.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v12.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
index a7ee6457..c00c22f1 100644
--- a/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 12.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v12.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
index 136ab5c2..f49dceac 100644
--- a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_12} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 12.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 12.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 12.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v12.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_12x-win-amd64-opt.yml b/taskcluster/test-nodejs_12x-win-amd64-opt.yml
index cc1b84b5..12baaa17 100644
--- a/taskcluster/test-nodejs_12x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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-node-tests.sh 12.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 12.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v12.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..70dccd10
--- /dev/null
+++ b/taskcluster/test-nodejs_12x_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}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_12x-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_12x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml
index df7255b5..2fde9023 100644
--- a/taskcluster/test-nodejs_12x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -3,12 +3,11 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-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}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 12.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..7fab7c58
--- /dev/null
+++ b/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-tflite-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}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..02226e4f
--- /dev/null
+++ b/taskcluster/test-nodejs_12x_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}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 73%
rename from taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml
index 97013655..cee53070 100644
--- a/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 12.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 12.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_12x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_12x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml
index 9f9543f6..782b189a 100644
--- a/taskcluster/test-nodejs_12x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml
index 17729c25..bad38447 100644
--- a/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_13} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 13.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
index 5558cff1..2c675613 100644
--- a/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_13} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 13.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
index 55b47274..37a6a7ec 100644
--- a/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_13} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 13.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x-win-amd64-opt.yml b/taskcluster/test-nodejs_13x-win-amd64-opt.yml
index 56164dbe..b40d8904 100644
--- a/taskcluster/test-nodejs_13x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_13}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 13.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..d5247f8d
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_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_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_13x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml
index fb581065..ceb5ac8e 100644
--- a/taskcluster/test-nodejs_13x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -3,12 +3,11 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml
new file mode 100644
index 00000000..d16b502a
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "node-package-cpu"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
similarity index 77%
rename from taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
index ee1b0315..e1829499 100644
--- a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
@@ -3,12 +3,11 @@ build:
   docker_image: "ubuntu:16.04"
   dependencies:
     - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..761aad35
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,13 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..ef2536ac
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_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_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 73%
rename from taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml
index b0b02e9c..73578a55 100644
--- a/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml
new file mode 100644
index 00000000..a5adcb77
--- /dev/null
+++ b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml
@@ -0,0 +1,15 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  docker_image: "ubuntu:16.04"
+  dependencies:
+    - "node-package-cpu"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
similarity index 89%
rename from taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
index 6089b016..3f66bdaa 100644
--- a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_13x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml
index d32a7f95..8689522a 100644
--- a/taskcluster/test-nodejs_13x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml
index fdda9b79..44eb0722 100644
--- a/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_13} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS MultiArch Package 13.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml
index 9f65a700..729d329d 100644
--- a/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_13} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS MultiArch Package 13.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml
index 5f259faa..c88bf2ac 100644
--- a/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_13} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS MultiArch Package 13.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml
index 52ed8ecb..f7822560 100644
--- a/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "node-package-cpu"
-    - "test-training_upstream-linux-amd64-py36m-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_13}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS MultiArch Package 13.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
index c505d33f..7d9f795c 100644
--- a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_4} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 4.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v4.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
index d27cdd00..bf438e4d 100644
--- a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_4} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 4.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v4.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
index 8e587ef5..ff0053ef 100644
--- a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_4} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 4.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 4.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 4.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v4.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_4x-win-amd64-opt.yml b/taskcluster/test-nodejs_4x-win-amd64-opt.yml
index ce98586f..7f03b8f9 100644
--- a/taskcluster/test-nodejs_4x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_4}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 4.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v4.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_4x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..dfb7a9bf
--- /dev/null
+++ b/taskcluster/test-nodejs_4x_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_4x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_4x_16k-linux-amd64-prod_pbmodel-opt.yml
index 2fb698b8..81994ca7 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_4x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,11 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 4.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_4x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_4x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..1f31ea0b
--- /dev/null
+++ b/taskcluster/test-nodejs_4x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 4.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 4.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_4x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..78e4f1e2
--- /dev/null
+++ b/taskcluster/test-nodejs_4x_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_4x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_4x_8k-linux-amd64-prod_pbmodel-opt.yml
index 96cb2a4b..29814b39 100644
--- a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_4x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 4.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 4.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_4x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_4x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_4x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_4x_8k_tflite-linux-amd64-prod-opt.yml
index 34f7f323..86af2d16 100644
--- a/taskcluster/test-nodejs_4x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_4x_8k_tflite-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 4.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 4.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 4.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 4.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
index 1871888f..f1203f47 100644
--- a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_5} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 5.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v5.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_5x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..52a247d3
--- /dev/null
+++ b/taskcluster/test-nodejs_5x_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_5x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_5x_16k-linux-amd64-prod_pbmodel-opt.yml
index 8ce05024..7f467317 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_5x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,11 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 5.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_5x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_5x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..ae9069e1
--- /dev/null
+++ b/taskcluster/test-nodejs_5x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 5.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 5.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_5x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..efb74db3
--- /dev/null
+++ b/taskcluster/test-nodejs_5x_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_5x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_5x_8k-linux-amd64-prod_pbmodel-opt.yml
index c6353ef9..33279c3b 100644
--- a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_5x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 5.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 5.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_5x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_5x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_5x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_5x_8k_tflite-linux-amd64-prod-opt.yml
index e566f3b7..bc40ba80 100644
--- a/taskcluster/test-nodejs_5x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_5x_8k_tflite-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 5.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 5.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 5.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 5.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
index 7dede288..f55ccd87 100644
--- a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_6} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 6.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v6.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
index 3bf7a049..8ea10f73 100644
--- a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_6} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 6.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v6.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
index cd422ed4..ad1f71e9 100644
--- a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_6} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 6.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 6.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 6.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v6.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_6x-win-amd64-opt.yml b/taskcluster/test-nodejs_6x-win-amd64-opt.yml
index 20124be4..deb7d3b0 100644
--- a/taskcluster/test-nodejs_6x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_6}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 6.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v6.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_6x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..35ef16a2
--- /dev/null
+++ b/taskcluster/test-nodejs_6x_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_6x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_6x_16k-linux-amd64-prod_pbmodel-opt.yml
index 6d3b5cef..c1e0c788 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_6x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,11 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 6.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_6x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_6x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..9d25816a
--- /dev/null
+++ b/taskcluster/test-nodejs_6x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 6.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 6.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_6x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..6d3cb252
--- /dev/null
+++ b/taskcluster/test-nodejs_6x_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_6x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_6x_8k-linux-amd64-prod_pbmodel-opt.yml
index 70ab2539..a81f592f 100644
--- a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_6x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 6.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 6.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_6x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_6x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_6x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_6x_8k_tflite-linux-amd64-prod-opt.yml
index 45fad3ec..91f6f330 100644
--- a/taskcluster/test-nodejs_6x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_6x_8k_tflite-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 6.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 6.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 6.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 6.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
index ec565d5d..74e4d101 100644
--- a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_7} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 7.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v7.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
index e03494d2..318527ac 100644
--- a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_7} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 7.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v7.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
index 0a9856bc..780e713f 100644
--- a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_7} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 7.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 7.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 7.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v7.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_7x-win-amd64-opt.yml b/taskcluster/test-nodejs_7x-win-amd64-opt.yml
index b9cf1be9..d4b57a6e 100644
--- a/taskcluster/test-nodejs_7x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_7}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 7.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v7.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_7x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..cf81e4d5
--- /dev/null
+++ b/taskcluster/test-nodejs_7x_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_7x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_7x_16k-linux-amd64-prod_pbmodel-opt.yml
index c473cf80..11bb3136 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_7x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,11 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 7.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_7x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_7x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..71f65ffb
--- /dev/null
+++ b/taskcluster/test-nodejs_7x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 7.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 7.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_7x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..bdeb23cf
--- /dev/null
+++ b/taskcluster/test-nodejs_7x_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_7x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_7x_8k-linux-amd64-prod_pbmodel-opt.yml
index 84cbcdf0..a57dff92 100644
--- a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_7x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 7.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 7.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_7x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_7x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_7x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_7x_8k_tflite-linux-amd64-prod-opt.yml
index fde875cd..c3ec1b2b 100644
--- a/taskcluster/test-nodejs_7x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_7x_8k_tflite-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 7.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 7.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 7.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 7.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
index 446fc3c0..f94eeb85 100644
--- a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_8} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 8.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v8.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
index ccd77ef5..1fdbb011 100644
--- a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_8} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 8.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v8.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
index 1d9ed4ce..ddf759c9 100644
--- a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_8} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 8.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 8.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 8.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v8.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_8x-win-amd64-opt.yml b/taskcluster/test-nodejs_8x-win-amd64-opt.yml
index 61083841..07bbe67e 100644
--- a/taskcluster/test-nodejs_8x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_8}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 8.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v8.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_8x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..95bfa9bd
--- /dev/null
+++ b/taskcluster/test-nodejs_8x_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_8x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_8x_16k-linux-amd64-prod_pbmodel-opt.yml
index c1b06aa3..892de8da 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_8x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,11 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 8.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_8x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_8x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..a3b45eb3
--- /dev/null
+++ b/taskcluster/test-nodejs_8x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 8.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 8.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_8x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..0bb30d11
--- /dev/null
+++ b/taskcluster/test-nodejs_8x_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_8x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_8x_8k-linux-amd64-prod_pbmodel-opt.yml
index 72e9473e..beb8735d 100644
--- a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_8x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 8.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 8.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_8x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_8x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_8x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_8x_8k_tflite-linux-amd64-prod-opt.yml
index a006ed5f..c648e1c5 100644
--- a/taskcluster/test-nodejs_8x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_8x_8k_tflite-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 8.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 8.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 8.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 8.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
index 98510059..00fa2109 100644
--- a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
+++ b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_9} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 9.x tests"
     description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v9.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
index 858c8aae..d7009cb5 100644
--- a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.brew.setup} && ${nodejs.brew.prep_9} && ${nodejs.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU NodeJS 9.x tests"
     description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v9.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
index d539fe0b..d8f9e098 100644
--- a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_buster.prep_9} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 9.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 9.x 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 9.x tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v9.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_9x-win-amd64-opt.yml b/taskcluster/test-nodejs_9x-win-amd64-opt.yml
index 872140f7..88e27352 100644
--- a/taskcluster/test-nodejs_9x-win-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-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_9}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU NodeJS 9.x tests"
     description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v9.x, CPU only, optimized version"
diff --git a/taskcluster/test-nodejs_9x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..314147fc
--- /dev/null
+++ b/taskcluster/test-nodejs_9x_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_9x-linux-amd64-opt.yml
rename to taskcluster/test-nodejs_9x_16k-linux-amd64-prod_pbmodel-opt.yml
index 1a05ee2c..ad47ce14 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml
+++ b/taskcluster/test-nodejs_9x_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,11 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
       ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 9.x 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_9x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_9x_16k_tflite-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..b3c4dcc9
--- /dev/null
+++ b/taskcluster/test-nodejs_9x_16k_tflite-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 9.x 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 9.x prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-nodejs_9x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..0e560338
--- /dev/null
+++ b/taskcluster/test-nodejs_9x_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  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_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_9x_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 72%
rename from taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-nodejs_9x_8k-linux-amd64-prod_pbmodel-opt.yml
index 5e37ed18..1ee55532 100644
--- a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-nodejs_9x_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 9.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 9.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-nodejs_9x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_9x_8k_tflite-linux-amd64-prod-opt.yml
similarity index 71%
rename from taskcluster/test-nodejs_9x_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-nodejs_9x_8k_tflite-linux-amd64-prod-opt.yml
index 63479024..c8bda556 100644
--- a/taskcluster/test-nodejs_9x_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-nodejs_9x_8k_tflite-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 9.x"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 9.x 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite NodeJS 9.x prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite NodeJS 9.x prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_27m-darwin-amd64-opt.yml b/taskcluster/test-python_27m-darwin-amd64-opt.yml
index 53cf9b6e..f4182aac 100644
--- a/taskcluster/test-python_27m-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_27m-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v2.7 m tests"
     description: "Testing DeepSpeech for OSX/AMD64 on Python v2.7 m, CPU only, optimized version"
diff --git a/taskcluster/test-python_27m_16k-linux-amd64-opt.yml b/taskcluster/test-python_27m_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..b6898e1c
--- /dev/null
+++ b/taskcluster/test-python_27m_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 00000000..94caf55e
--- /dev/null
+++ b/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27m_8k-linux-amd64-opt.yml b/taskcluster/test-python_27m_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..be082a27
--- /dev/null
+++ b/taskcluster/test-python_27m_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 00000000..c49f1dd3
--- /dev/null
+++ b/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:m 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..b9479703
--- /dev/null
+++ b/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27m_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml
similarity index 77%
rename from taskcluster/test-python_27m_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml
index eea77ff4..92c250ca 100644
--- a/taskcluster/test-python_27m_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml b/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..dfbf991e
--- /dev/null
+++ b/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:mu 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 00000000..ac553668
--- /dev/null
+++ b/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:mu 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml b/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..a346c71f
--- /dev/null
+++ b/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:mu 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 00000000..c584fddc
--- /dev/null
+++ b/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:mu 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..275e45a9
--- /dev/null
+++ b/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27mu_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml
similarity index 76%
rename from taskcluster/test-python_27mu_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml
index 022b0650..c22dbfb7 100644
--- a/taskcluster/test-python_27mu_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_35-darwin-amd64-opt.yml b/taskcluster/test-python_35-darwin-amd64-opt.yml
index a7350d1d..335bc732 100644
--- a/taskcluster/test-python_35-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_35-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m 16k"
   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-opt.yml b/taskcluster/test-python_35-linux-amd64-opt.yml
deleted file mode 100644
index 088bf6f3..00000000
--- a/taskcluster/test-python_35-linux-amd64-opt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/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-win-amd64-opt.yml b/taskcluster/test-python_35-win-amd64-opt.yml
index 17f1afb7..f5a0831f 100644
--- a/taskcluster/test-python_35-win-amd64-opt.yml
+++ b/taskcluster/test-python_35-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.4:m"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.4:m 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU Python v3.5 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on Python v3.5, CPU only, optimized version"
diff --git a/taskcluster/test-python_35_16k-linux-amd64-opt.yml b/taskcluster/test-python_35_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..80a32631
--- /dev/null
+++ b/taskcluster/test-python_35_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 00000000..c77056e8
--- /dev/null
+++ b/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.5:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27mu-linux-amd64-opt.yml b/taskcluster/test-python_35_8k-linux-amd64-opt.yml
similarity index 56%
rename from taskcluster/test-python_27mu-linux-amd64-opt.yml
rename to taskcluster/test-python_35_8k-linux-amd64-opt.yml
index 85ca31e0..02328919 100644
--- a/taskcluster/test-python_27mu-linux-amd64-opt.yml
+++ b/taskcluster/test-python_35_8k-linux-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:mu"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 65%
rename from taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml
index a342539d..8030801f 100644
--- a/taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.5:m 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..c10f02fa
--- /dev/null
+++ b/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.5:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml
similarity index 65%
rename from taskcluster/test-python_37_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml
index 4c527b32..82011dab 100644
--- a/taskcluster/test-python_37_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.0:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.5:m 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_36-darwin-amd64-opt.yml b/taskcluster/test-python_36-darwin-amd64-opt.yml
index eaab5d27..a59bfdfe 100644
--- a/taskcluster/test-python_36-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_36-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v3.6 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on Python v3.6.4:m, CPU only, optimized version"
diff --git a/taskcluster/test-python_36-win-amd64-opt.yml b/taskcluster/test-python_36-win-amd64-opt.yml
index 3fad9f89..15c485ca 100644
--- a/taskcluster/test-python_36-win-amd64-opt.yml
+++ b/taskcluster/test-python_36-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.7:m"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.7:m 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU Python v3.6 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on Python v3.6, CPU only, optimized version"
diff --git a/taskcluster/test-python_36_16k-linux-amd64-opt.yml b/taskcluster/test-python_36_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..67a7f566
--- /dev/null
+++ b/taskcluster/test-python_36_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+       apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_36-linux-amd64-opt.yml b/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 64%
rename from taskcluster/test-python_36-linux-amd64-opt.yml
rename to taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml
index 2a6c1774..44353fab 100644
--- a/taskcluster/test-python_36-linux-amd64-opt.yml
+++ b/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -2,12 +2,11 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
   system_setup:
     >
        apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.4:m 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_36_8k-linux-amd64-opt.yml b/taskcluster/test-python_36_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..d047a71c
--- /dev/null
+++ b/taskcluster/test-python_36_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+       apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 66%
rename from taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml
index 534b7831..6ea4b41b 100644
--- a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
        apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.4:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.4:m 8k"
   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"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..c002707c
--- /dev/null
+++ b/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+       apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.4:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_36_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml
similarity index 65%
rename from taskcluster/test-python_36_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml
index 55eb01c6..3f90116b 100644
--- a/taskcluster/test-python_36_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
        apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.4:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.4:m 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_37-darwin-amd64-opt.yml b/taskcluster/test-python_37-darwin-amd64-opt.yml
index 91ff9a14..d556ca69 100644
--- a/taskcluster/test-python_37-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_37-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v3.7 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on Python v3.7.0:m, CPU only, optimized version"
diff --git a/taskcluster/test-python_37-linux-amd64-opt.yml b/taskcluster/test-python_37-linux-amd64-opt.yml
deleted file mode 100644
index 3d39f2ed..00000000
--- a/taskcluster/test-python_37-linux-amd64-opt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m"
-  metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_37-win-amd64-opt.yml b/taskcluster/test-python_37-win-amd64-opt.yml
index 527870ec..1bc23335 100644
--- a/taskcluster/test-python_37-win-amd64-opt.yml
+++ b/taskcluster/test-python_37-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.1:m"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.1:m 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU Python v3.7 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on Python v3.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_37_16k-linux-amd64-opt.yml b/taskcluster/test-python_37_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..9c3cf9c2
--- /dev/null
+++ b/taskcluster/test-python_37_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml
new file mode 100644
index 00000000..2876396b
--- /dev/null
+++ b/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.0:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_8k-linux-amd64-opt.yml b/taskcluster/test-python_37_8k-linux-amd64-opt.yml
new file mode 100644
index 00000000..42afe77b
--- /dev/null
+++ b/taskcluster/test-python_37_8k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_37-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 65%
rename from taskcluster/test-python_37-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml
index 72f827d6..3a3971e7 100644
--- a/taskcluster/test-python_37-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.0:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.0:m 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..30c90339
--- /dev/null
+++ b/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.0:m 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..d32a8623
--- /dev/null
+++ b/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.0:m 8k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-python_37m-armbian-arm64-opt.yml b/taskcluster/test-python_37m-armbian-arm64-opt.yml
index da6fbf02..5b990c86 100644
--- a/taskcluster/test-python_37m-armbian-arm64-opt.yml
+++ b/taskcluster/test-python_37m-armbian-arm64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-armbian-opt-base.tyml
   dependencies:
     - "linux-arm64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.3:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.3:m 16k"
   metadata:
     name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU Python v3.7 tests"
     description: "Testing DeepSpeech for ARMbian ARM64 Cortex-A53 on Python v3.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_37m-raspbian-rpi3-opt.yml b/taskcluster/test-python_37m-raspbian-rpi3-opt.yml
index 38924697..7f898627 100644
--- a/taskcluster/test-python_37m-raspbian-rpi3-opt.yml
+++ b/taskcluster/test-python_37m-raspbian-rpi3-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-raspbian-opt-base.tyml
   dependencies:
     - "linux-rpi3-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages_buster.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.7.3:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.7.3:m 16k"
   metadata:
     name: "DeepSpeech Raspbian RPi3/ARMv7 CPU Python v3.7 tests"
     description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on Python v3.7, CPU only, optimized version"
diff --git a/taskcluster/test-python_38-darwin-amd64-opt.yml b/taskcluster/test-python_38-darwin-amd64-opt.yml
index b1ba8110..242e4f28 100644
--- a/taskcluster/test-python_38-darwin-amd64-opt.yml
+++ b/taskcluster/test-python_38-darwin-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-darwin-opt-base.tyml
   dependencies:
     - "darwin-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${python.brew.setup} && ${python.brew.env}
   args:
-    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0:"
+    tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 16k"
   metadata:
     name: "DeepSpeech OSX AMD64 CPU Python v3.8 tests"
     description: "Testing DeepSpeech for OSX/AMD64 on Python v3.8.0:m, CPU only, optimized version"
diff --git a/taskcluster/test-python_38-linux-amd64-opt.yml b/taskcluster/test-python_38-linux-amd64-opt.yml
deleted file mode 100644
index 6cb41e85..00000000
--- a/taskcluster/test-python_38-linux-amd64-opt.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0:"
-  metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version"
diff --git a/taskcluster/test-python_38-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38-linux-amd64-prod_pbmodel-opt.yml
deleted file mode 100644
index 1b767056..00000000
--- a/taskcluster/test-python_38-linux-amd64-prod_pbmodel-opt.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-cpu-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.0:"
-  metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version"
diff --git a/taskcluster/test-python_38-win-amd64-opt.yml b/taskcluster/test-python_38-win-amd64-opt.yml
index 5a8cc08b..1fb21922 100644
--- a/taskcluster/test-python_38-win-amd64-opt.yml
+++ b/taskcluster/test-python_38-win-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-win-opt-base.tyml
   dependencies:
     - "win-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
   system_setup:
     >
       ${system.sox_win}
   args:
-    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0:"
+    tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 16k"
   metadata:
     name: "DeepSpeech Windows AMD64 CPU Python v3.8 tests"
     description: "Testing DeepSpeech for Windows/AMD64 on Python v3.8, CPU only, optimized version"
diff --git a/taskcluster/test-python_38_16k-linux-amd64-opt.yml b/taskcluster/test-python_38_16k-linux-amd64-opt.yml
new file mode 100644
index 00000000..ebb5892d
--- /dev/null
+++ b/taskcluster/test-python_38_16k-linux-amd64-opt.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml
similarity index 65%
rename from taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml
index aa4b55b6..13ec7196 100644
--- a/taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:mu"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.0: 16k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version (16kHz)"
diff --git a/taskcluster/test-python_27m-linux-amd64-opt.yml b/taskcluster/test-python_38_8k-linux-amd64-opt.yml
similarity index 56%
rename from taskcluster/test-python_27m-linux-amd64-opt.yml
rename to taskcluster/test-python_38_8k-linux-amd64-opt.yml
index fdb05e7a..c147bac7 100644
--- a/taskcluster/test-python_27m-linux-amd64-opt.yml
+++ b/taskcluster/test-python_38_8k-linux-amd64-opt.yml
@@ -2,12 +2,13 @@ build:
   template_file: test-linux-opt-base.tyml
   dependencies:
     - "linux-amd64-cpu-opt"
-    - "test-training_upstream-linux-amd64-py36m-opt"
+    - "test-training_8k-linux-amd64-py36m-opt"
+  test_model_task: "test-training_8k-linux-amd64-py36m-opt"
   system_setup:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml
similarity index 66%
rename from taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
rename to taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml
index 9b9348dd..9f643a31 100644
--- a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml
+++ b/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.5:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.0: 8k"
   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"
+    name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version (8kHz)"
diff --git a/taskcluster/test-python_38_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite-linux-amd64-prod-opt.yml
deleted file mode 100644
index 18aad46b..00000000
--- a/taskcluster/test-python_38_tflite-linux-amd64-prod-opt.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-build:
-  template_file: test-linux-opt-base.tyml
-  dependencies:
-    - "linux-amd64-tflite-opt"
-  system_setup:
-    >
-      apt-get -qq -y install ${python.packages_trusty.apt}
-  args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.0:"
-  metadata:
-    name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version"
diff --git a/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml
new file mode 100644
index 00000000..ebddd8fb
--- /dev/null
+++ b/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml
@@ -0,0 +1,12 @@
+build:
+  template_file: test-linux-opt-base.tyml
+  dependencies:
+    - "linux-amd64-tflite-opt"
+  system_setup:
+    >
+      apt-get -qq -y install ${python.packages_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.0: 16k"
+  metadata:
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests (16kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version (16kHz)"
diff --git a/taskcluster/test-python_35_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml
similarity index 65%
rename from taskcluster/test-python_35_tflite-linux-amd64-prod-opt.yml
rename to taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml
index 28bec681..0505cda8 100644
--- a/taskcluster/test-python_35_tflite-linux-amd64-prod-opt.yml
+++ b/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml
@@ -6,7 +6,7 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.5:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.0: 8k"
   metadata:
-    name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests"
-    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version"
+    name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests (8kHz)"
+    description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version (8kHz)"
diff --git a/taskcluster/test-raspbian-opt-base.tyml b/taskcluster/test-raspbian-opt-base.tyml
index faf511a8..ef206a12 100644
--- a/taskcluster/test-raspbian-opt-base.tyml
+++ b/taskcluster/test-raspbian-opt-base.tyml
@@ -31,7 +31,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         linux_rpi3_build: { $eval: as_slugid("linux-rpi3-cpu-opt") }
       in:
         DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_rpi3_build}/artifacts/public
diff --git a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml b/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
similarity index 76%
rename from taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml
rename to taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
index 8d85d948..def5cc5b 100644
--- a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml
@@ -6,8 +6,8 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.5:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.5:m 16k"
   convert_graphdef: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r1.14.e77504ac6b941fd2af495b49a0bcd56f25ca0e1e.cpu/artifacts/public/convert_graphdef_memmapped_format"
   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"
+    name: "DeepSpeech Linux AMD64 CPU 16kHz training Py3.5"
+    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.5, CPU only, optimized version"
diff --git a/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml b/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
similarity index 75%
rename from taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml
rename to taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
index 1c5a932a..d8cb4613 100644
--- a/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml
+++ b/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml
@@ -6,8 +6,8 @@ build:
     >
       apt-get -qq -y install ${python.packages_trusty.apt}
   args:
-    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.4:m"
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.4:m 16k"
   convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/convert_graphdef_memmapped_format"
   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"
+    name: "DeepSpeech Linux AMD64 CPU 16kHz training Py3.6"
+    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml b/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml
new file mode 100644
index 00000000..8d5c6de4
--- /dev/null
+++ b/taskcluster/test-training_8k-linux-amd64-py36m-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_trusty.apt}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.4:m 8k"
+  convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/convert_graphdef_memmapped_format"
+  metadata:
+    name: "DeepSpeech Linux AMD64 CPU 8kHz training Py3.6"
+    description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.6, CPU only, optimized version"
diff --git a/taskcluster/test-win-opt-base.tyml b/taskcluster/test-win-opt-base.tyml
index 3ff211e6..5f9454cc 100644
--- a/taskcluster/test-win-opt-base.tyml
+++ b/taskcluster/test-win-opt-base.tyml
@@ -36,7 +36,7 @@ then:
 
     env:
       $let:
-        training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
+        training: { $eval: as_slugid(build.test_model_task) }
         win_amd64_build: { $eval: as_slugid("win-amd64-cpu-opt") }
         win_amd64_tflite: { $eval: as_slugid("win-amd64-tflite-opt") }
       in:
diff --git a/taskcluster/win-opt-base.tyml b/taskcluster/win-opt-base.tyml
index 081386ec..14ef60bb 100644
--- a/taskcluster/win-opt-base.tyml
+++ b/taskcluster/win-opt-base.tyml
@@ -36,15 +36,11 @@ payload:
           https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20180531.tar.xz/download
 
   env:
-    $let:
-      training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") }
-    in:
-      TC_MSYS_VERSION: 'MSYS_NT-6.3'
-      MSYS: 'winsymlinks:nativestrict'
-      TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
-      DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb
-      EXAMPLES_CLONE_URL: "https://github.com/mozilla/DeepSpeech-examples"
-      EXAMPLES_CHECKOUT_TARGET: "master"
+    TC_MSYS_VERSION: 'MSYS_NT-6.3'
+    MSYS: 'winsymlinks:nativestrict'
+    TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
+    EXAMPLES_CLONE_URL: "https://github.com/mozilla/DeepSpeech-examples"
+    EXAMPLES_CHECKOUT_TARGET: "master"
 
   command:
     - >-