diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
index b04ff9de..5b174b31 100644
--- a/taskcluster/.shared.yml
+++ b/taskcluster/.shared.yml
@@ -99,6 +99,9 @@ system:
       android_29:
         url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-29.0/artifacts/public/android_cache.tar.gz'
         namespace: 'project.deepspeech.android_cache.x86_64.android-29.0'
+      android_30:
+        url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.x86_64.android-30.0/artifacts/public/android_cache.tar.gz'
+        namespace: 'project.deepspeech.android_cache.x86_64.android-30.0'
     sdk:
       android_27:
         url: 'https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.android_cache.sdk.android-27.4/artifacts/public/android_cache.tar.gz'
diff --git a/taskcluster/android-cache-x86_64-android-30.yml b/taskcluster/android-cache-x86_64-android-30.yml
new file mode 100644
index 00000000..217459aa
--- /dev/null
+++ b/taskcluster/android-cache-x86_64-android-30.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  system_setup:
+    >
+      ${java.packages_trusty.apt}
+  cache:
+    artifact_url: ${system.android_cache.x86_64.android_30.url}
+    artifact_namespace: ${system.android_cache.x86_64.android_30.namespace}
+  scripts:
+    build: "taskcluster/android_cache-build.sh x86_64 android-30"
+    package: "taskcluster/android_cache-package.sh"
+  metadata:
+    name: "Builds Android cache x86_64 / android-30"
+    description: "Setup an Android SDK / emulator cache for Android / x86_64 android-30"
diff --git a/taskcluster/test-apk-android-30-x86_64-opt.yml b/taskcluster/test-apk-android-30-x86_64-opt.yml
new file mode 100644
index 00000000..c3ee8265
--- /dev/null
+++ b/taskcluster/test-apk-android-30-x86_64-opt.yml
@@ -0,0 +1,23 @@
+build:
+  template_file: test-android-opt-base.tyml
+  dependencies:
+    - "android-x86_64-cpu-opt"
+    - "test-training_16k-linux-amd64-py36m-opt"
+    - "swig-linux-amd64"
+    - "gradle-cache"
+    - "android-cache-x86_64-android-30"
+  test_model_task: "test-training_16k-linux-amd64-py36m-opt"
+  system_setup:
+    >
+      apt-get -qq -y install curl make python
+  cache:
+    url: ${system.android_cache.x86_64.android_30.url}
+    namespace: ${system.android_cache.x86_64.android_30.namespace}
+  gradle_cache:
+    url: ${system.gradle_cache.url}
+    namespace: ${system.gradle_cache.namespace}
+  args:
+    tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-30"
+  metadata:
+    name: "DeepSpeech Android 11.0 x86_64 Google Pixel APK/Java tests"
+    description: "Testing DeepSpeech APK/Java for Android 11.0 x86_64 Google Pixel, optimized version"