diff --git a/taskcluster/ci/test/misc.yml b/taskcluster/ci/test/misc.yml
index 42014ce8b5e2..55ab9d690439 100644
--- a/taskcluster/ci/test/misc.yml
+++ b/taskcluster/ci/test/misc.yml
@@ -112,12 +112,12 @@ test-verify:
                 default: desktop_unittest.py
         config:
             by-test-platform:
-                android-em.*:
-                    - android/android_common.py
-                    - android/androidarm_4_3.py
                 android-em-7.0-x86/opt:
                     - android/android_common.py
                     - android/androidx86_7_0.py
+                android-em.*:
+                    - android/android_common.py
+                    - android/androidarm_4_3.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
@@ -156,12 +156,12 @@ test-verify-gpu:
                 default: desktop_unittest.py
         config:
             by-test-platform:
-                android-em.*:
-                    - android/android_common.py
-                    - android/androidarm_4_3.py
                 android-em-7.0-x86/opt:
                     - android/android_common.py
                     - android/androidx86_7_0.py
+                android-em.*:
+                    - android/android_common.py
+                    - android/androidarm_4_3.py
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
@@ -193,6 +193,9 @@ test-coverage:
                 default: desktop_unittest.py
         config:
             by-test-platform:
+                android-em-7.0-x86/opt:
+                    - android/android_common.py
+                    - android/androidx86_7_0.py
                 android-em.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
@@ -231,6 +234,9 @@ test-coverage-gpu:
                 default: desktop_unittest.py
         config:
             by-test-platform:
+                android-em-7.0-x86/opt:
+                    - android/android_common.py
+                    - android/androidx86_7_0.py
                 android-em.*:
                     - android/android_common.py
                     - android/androidarm_4_3.py
diff --git a/testing/mozharness/configs/android/androidx86_7_0.py b/testing/mozharness/configs/android/androidx86_7_0.py
index 2bb0ac9b7827..547449b386dd 100644
--- a/testing/mozharness/configs/android/androidx86_7_0.py
+++ b/testing/mozharness/configs/android/androidx86_7_0.py
@@ -5,13 +5,14 @@
 
 config = {
     "tooltool_manifest_path": "testing/config/tooltool-manifests/androidx86_7_0/releng.manifest",
+    "tooltool_servers": ['http://taskcluster/relengapi/tooltool/'],
     "emulator_manifest": """
         [
         {
-        "size": "237849484",
-        "digest": "596db3063758aea49f441ed3dccc5429408e037ba953ab8ea676969c12ed267416a7b1f7d61ad5a06fd2c0fe234131843bd9c57a33b8dd8677aa0b25bbb799d7",
+        "size": 135064025,
+        "digest": "125678c5b0d93ead8bbf01ba94253e532909417b40637460624cfca34e92f431534fc77a0225e9c4728dcbcf2884a8f7fa1ee059efdfa82d827ca20477d41705",
         "algorithm": "sha512",
-        "filename": "android-sdk_r26b-linux.tar.gz",
+        "filename": "android-sdk_r27.1.12-linux-x86emu.tar.gz",
         "unpack": "True"
         }
         ] """,