rename from testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_frontend.py
rename to testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
--- a/testing/mozharness/configs/builds/releng_sub_android_configs/64_api_15_frontend.py
+++ b/testing/mozharness/configs/builds/releng_sub_android_configs/64_test.py
@@ -1,11 +1,11 @@
 config = {
-    'base_name': 'Android armv7 API 15+ frontend %(branch)s',
-    'stage_platform': 'android-api-15-frontend',
+    'base_name': 'Android armv7 unit tests %(branch)s',
+    'stage_platform': 'android-test',
     'build_type': 'api-15-opt',
     'src_mozconfig': 'mobile/android/config/mozconfigs/android-api-15-frontend/nightly',
     'tooltool_manifest_src': 'mobile/android/config/tooltool-manifests/android-frontend/releng.manifest',
     'multi_locale_config_platform': 'android',
     'postflight_build_mach_commands': [
         ['gradle', 'app:testAutomationDebugUnitTest'],
     ],
 }

--- a/testing/mozharness/mozharness/mozilla/building/buildbase.py
+++ b/testing/mozharness/mozharness/mozilla/building/buildbase.py
@@ -351,25 +351,25 @@ class BuildOptionParser(object):
         'stat-and-debug': 'builds/releng_sub_%s_configs/%s_stat_and_debug.py',
         'mulet': 'builds/releng_sub_%s_configs/%s_mulet.py',
         'code-coverage': 'builds/releng_sub_%s_configs/%s_code_coverage.py',
         'graphene': 'builds/releng_sub_%s_configs/%s_graphene.py',
         'horizon': 'builds/releng_sub_%s_configs/%s_horizon.py',
         'source': 'builds/releng_sub_%s_configs/%s_source.py',
         'api-9': 'builds/releng_sub_%s_configs/%s_api_9.py',
         'api-11': 'builds/releng_sub_%s_configs/%s_api_11.py',
-        'api-15-frontend': 'builds/releng_sub_%s_configs/%s_api_15_frontend.py',
         'api-15-gradle-dependencies': 'builds/releng_sub_%s_configs/%s_api_15_gradle_dependencies.py',
         'api-15': 'builds/releng_sub_%s_configs/%s_api_15.py',
         'api-9-debug': 'builds/releng_sub_%s_configs/%s_api_9_debug.py',
         'api-11-debug': 'builds/releng_sub_%s_configs/%s_api_11_debug.py',
         'api-15-debug': 'builds/releng_sub_%s_configs/%s_api_15_debug.py',
         'x86': 'builds/releng_sub_%s_configs/%s_x86.py',
         'api-11-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_11_partner_sample1.py',
         'api-15-partner-sample1': 'builds/releng_sub_%s_configs/%s_api_15_partner_sample1.py',
+        'android-test': 'builds/releng_sub_%s_configs/%s_test.py',
         'android-checkstyle': 'builds/releng_sub_%s_configs/%s_checkstyle.py',
         'android-lint': 'builds/releng_sub_%s_configs/%s_lint.py',
     }
     build_pool_cfg_file = 'builds/build_pool_specifics.py'
     branch_cfg_file = 'builds/branch_specifics.py'
 
     @classmethod
     def _query_pltfrm_and_bits(cls, target_option, options):

--- a/testing/taskcluster/tasks/branches/base_jobs.yml
+++ b/testing/taskcluster/tasks/branches/base_jobs.yml
@@ -92,22 +92,16 @@ builds:
       debug:
         task: tasks/builds/dbg_macosx64.yml
   macosx64-st-an:
     platforms:
       - MacOSX64 Static Analysis
     types:
       opt:
         task: tasks/builds/opt_macosx64_st-an.yml
-  android-api-15-frontend:
-    platforms:
-      - Android
-    types:
-      opt:
-        task: tasks/builds/android_api_15_frontend.yml
   linux64-mulet-haz:
     platforms:
       - Mulet Linux
     types:
       debug:
         task: tasks/builds/mulet_haz_linux.yml
   sm-plain:
     platforms:
@@ -418,16 +412,23 @@ tasks:
     task: tasks/builds/android_api_15_gradle_dependencies.yml
     root: true
     when:
       file_patterns:
         - 'mobile/android/config/**'
         - 'testing/docker/android-gradle-build/**'
         - 'testing/mozharness/configs/builds/releng_sub_android_configs/*gradle_dependencies.py'
         - '**/*.gradle'
+  android-test:
+    task: tasks/builds/android_test.yml
+    root: true
+    when:
+      file_patterns:
+        - 'mobile/android/base/**'
+        - 'mobile/android/tests/background/junit4/**'
   android-checkstyle:
     task: tasks/builds/android_checkstyle.yml
     root: true
     when:
       file_patterns:
         - 'mobile/android/**/checkstyle.xml'
         - 'mobile/android/**/*.gradle'
         - 'mobile/android/**/*.java'

rename from testing/taskcluster/tasks/builds/android_api_15_frontend.yml
rename to testing/taskcluster/tasks/builds/android_test.yml
--- a/testing/taskcluster/tasks/builds/android_api_15_frontend.yml
+++ b/testing/taskcluster/tasks/builds/android_test.yml
@@ -1,48 +1,48 @@
 $inherits:
   from: 'tasks/builds/mobile_base.yml'
   variables:
-    build_name: 'android-api-15-frontend'
+    build_name: 'android-test'
     build_type: 'opt'
 task:
   metadata:
-      name: '[TC] Android armv7 API 15+ frontend'
-      description: 'Android armv7 API 15+ frontend'
+      name: '[TC] Android armv7 test'
+      description: 'Android armv7 unit tests'
 
   workerType: android-api-15
 
   routes:
-    - 'index.buildbot.branches.{{project}}.android-api-15-frontend'
-    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-api-15-frontend'
+    - 'index.buildbot.branches.{{project}}.android-test'
+    - 'index.buildbot.revisions.{{head_rev}}.{{project}}.android-test'
 
   scopes:
-    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-api-15-frontend-workspace'
+    - 'docker-worker:cache:level-{{level}}-{{project}}-build-android-test-workspace'
     - 'docker-worker:cache:tooltool-cache'
     - 'docker-worker:relengapi-proxy:tooltool.download.internal'
     - 'docker-worker:relengapi-proxy:tooltool.download.public'
 
   payload:
     cache:
-      level-{{level}}-{{project}}-build-android-api-15-frontend-workspace: '/home/worker/workspace'
+      level-{{level}}-{{project}}-build-android-test-workspace: '/home/worker/workspace'
       tooltool-cache: '/home/worker/tooltool-cache'
 
     features:
       relengAPIProxy: true
 
     env:
       # inputs to mozharness
       MOZHARNESS_SCRIPT: 'mozharness/scripts/fx_desktop_build.py'
       # TODO: make these additional configuration files go away
       MOZHARNESS_CONFIG: >
           builds/releng_base_android_64_builds.py
           disable_signing.py
           platform_supports_post_upload_to_latest.py
       MOZHARNESS_ACTIONS: "get-secrets build multi-l10n update"
-      MH_CUSTOM_BUILD_VARIANT_CFG: api-15-frontend
+      MH_CUSTOM_BUILD_VARIANT_CFG: android-test
       MH_BRANCH: {{project}}
       MH_BUILD_POOL: taskcluster
       GRADLE_USER_HOME: '/home/worker/workspace/build/src/dotgradle'
 
     maxRunTime: 36000
 
     command: ["/bin/bash", "bin/build.sh"]