diff --git a/taskcluster/ci/build/android.yml b/taskcluster/ci/build/android.yml
index 7e56e50e66a0..7c37b2680f01 100644
--- a/taskcluster/ci/build/android.yml
+++ b/taskcluster/ci/build/android.yml
@@ -98,6 +98,7 @@ android-x86/opt:
     worker:
         env:
             TOOLTOOL_MANIFEST: "mobile/android/config/tooltool-manifests/android-x86/releng.manifest"
+            MOZ_AUTOMATION_PACKAGE_TESTS: "1"
     run:
         actions: [get-secrets, build]
         config: ["builds/releng_base_android_64_builds.py"]
diff --git a/taskcluster/ci/test/test-platforms.yml b/taskcluster/ci/test/test-platforms.yml
index 0633d2638d2e..e0451aafd7c8 100644
--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -438,6 +438,11 @@ android-em-7.0-x86_64-qr/debug-isolated-process:
     test-sets:
         - android-x86_64-tests
 
+android-em-7.0-x86-qr/opt:
+    build-platform: android-x86/opt
+    test-sets:
+        - android-x86-tests
+
 # android-hw test platforms execute on real devices attached to Autophone hosts.
 
 # android-hw-a51-11-0 Samsung Galaxy A51 Android 11.0
diff --git a/taskcluster/ci/test/test-sets.yml b/taskcluster/ci/test/test-sets.yml
index 087d91ddc2fc..032a91604dfb 100644
--- a/taskcluster/ci/test/test-sets.yml
+++ b/taskcluster/ci/test/test-sets.yml
@@ -454,6 +454,9 @@ android-x86_64-tests:
     - web-platform-tests-wdspec
     - xpcshell
 
+android-x86-tests:
+    - cppunittest
+
 android-hw-aarch64-opt-unittests:
     - jittest
 
diff --git a/taskcluster/gecko_taskgraph/transforms/test/other.py b/taskcluster/gecko_taskgraph/transforms/test/other.py
index 9f9e7c6cbbca..beea226734c1 100644
--- a/taskcluster/gecko_taskgraph/transforms/test/other.py
+++ b/taskcluster/gecko_taskgraph/transforms/test/other.py
@@ -169,6 +169,10 @@ def set_treeherder_machine_platform(config, tasks):
             task["treeherder-machine-platform"] = task["test-platform"].replace(
                 ".", "-"
             )
+        elif "android-em-7.0-x86-qr" in task["test-platform"]:
+            task["treeherder-machine-platform"] = task["test-platform"].replace(
+                ".", "-"
+            )
         elif "-qr" in task["test-platform"]:
             task["treeherder-machine-platform"] = task["test-platform"]
         elif "android-hw" in task["test-platform"]:
@@ -755,7 +759,7 @@ test_setting_description_schema = Schema(
     {
         Required("_hash"): str,
         "platform": {
-            Required("arch"): Any("32", "64", "aarch64", "arm7", "x86_64"),
+            Required("arch"): Any("32", "64", "aarch64", "arm7", "x86", "x86_64"),
             Required("os"): {
                 Required("name"): Any("android", "linux", "macosx", "windows"),
                 Required("version"): str,