--- a/taskcluster/ci/android-stuff/kind.yml
+++ b/taskcluster/ci/android-stuff/kind.yml
@@ -18,17 +18,17 @@ jobs:
         attributes:
             build_platform: android-api-15-gradle-dependencies
             build_type: opt
         index:
             product: mobile
             job-name: android-api-15-gradle-dependencies-opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
-            kind: build
+            kind: other
             tier: 2
             symbol: tc(Deps)
         worker-type: aws-provisioner-v1/gecko-{level}-b-android
         worker:
             implementation: docker-worker
             docker-image: {in-tree: android-gradle-build}
             env:
                 GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle-online"
@@ -69,17 +69,17 @@ jobs:
 
     android-test:
         description: "Android armv7 unit tests"
         attributes:
             build_platform: android-test
             build_type: opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
-            kind: build
+            kind: test
             tier: 2
             symbol: tc(test)
         worker-type: aws-provisioner-v1/gecko-{level}-b-android
         worker:
             implementation: docker-worker
             docker-image: {in-tree: desktop-build}
             env:
                 GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"
@@ -120,17 +120,17 @@ jobs:
 
     android-lint:
         description: "Android lint"
         attributes:
             build_platform: android-lint
             build_type: opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
-            kind: build
+            kind: test
             tier: 2
             symbol: tc(lint)
         worker-type: aws-provisioner-v1/gecko-{level}-b-android
         worker:
             implementation: docker-worker
             docker-image: {in-tree: desktop-build}
             env:
                 GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"
@@ -182,17 +182,17 @@ jobs:
 
     android-checkstyle:
         description: "Android checkstyle"
         attributes:
             build_platform: android-checkstyle
             build_type: opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
-            kind: build
+            kind: test
             tier: 2
             symbol: tc(checkstyle)
         worker-type: aws-provisioner-v1/gecko-{level}-b-android
         worker:
             implementation: docker-worker
             docker-image: {in-tree: desktop-build}
             env:
                 GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"
@@ -234,17 +234,17 @@ jobs:
 
     android-findbugs:
         description: "Android findbugs"
         attributes:
             build_platform: android-findbugs
             build_type: opt
         treeherder:
             platform: android-4-0-armv7-api15/opt
-            kind: build
+            kind: test
             tier: 2
             symbol: tc(findbugs)
         worker-type: aws-provisioner-v1/gecko-{level}-b-android
         worker:
             implementation: docker-worker
             docker-image: {in-tree: desktop-build}
             env:
                 GRADLE_USER_HOME: "/home/worker/workspace/build/src/dotgradle"