--- a/configs/android/androidx86.py
+++ b/configs/android/androidx86.py
@@ -70,166 +70,70 @@ config = {
         }
     ],
     "emulator_components": {
         "kernel_path": "/home/cltbld/.android/avd/kernel-qemu",
         "system_image_path": "/home/cltbld/.android/avd/system.img",
         "ramdisk_path": "/home/cltbld/.android/avd/ramdisk.img"
     },
     "test_suite_definitions": {
+        "jsreftest": {
+            "category": "reftest",
+            "extra_args": ["../jsreftest/tests/jstests.list",
+                "--extra-profile-file=jsreftest/tests/user.js"]
+        },
         "mochitest-1": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "1", "--run-only-tests", "androidx86.json"],
+            "extra_args": ["--total-chunks", "2", "--this-chunk", "1", "--run-only-tests", "androidx86.json"],
         },
         "mochitest-2": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "2", "--run-only-tests", "androidx86.json"],
-        },
-        "mochitest-3": {
-            "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "3", "--run-only-tests", "androidx86.json"],
-        },
-        "mochitest-4": {
-            "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "4", "--run-only-tests", "androidx86.json"],
-        },
-        "mochitest-5": {
-            "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "5", "--run-only-tests", "androidx86.json"],
-        },
-        "mochitest-6": {
-            "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "6", "--run-only-tests", "androidx86.json"],
-        },
-        "mochitest-7": {
-            "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "7", "--run-only-tests", "androidx86.json"],
-        },
-        "mochitest-8": {
-            "category": "mochitest",
-            "extra_args": ["--total-chunks", "8", "--this-chunk", "8", "--run-only-tests", "androidx86.json"],
+            "extra_args": ["--total-chunks", "2", "--this-chunk", "2", "--run-only-tests", "androidx86.json"],
         },
         "mochitest-gl": {
             "category": "mochitest",
             "extra_args": ["--test-path", "content/canvas/test/webgl"],
         },
         "reftest-1": {
             "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "1",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "1",
                 "tests/layout/reftests/reftest.list"]
         },
         "reftest-2": {
             "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "2",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "2",
                 "tests/layout/reftests/reftest.list"]
         },
         "reftest-3": {
             "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "3",
-                "tests/layout/reftests/reftest.list"]
-        },
-        "reftest-4": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "4",
-                "tests/layout/reftests/reftest.list"]
-        },
-        "reftest-5": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "5",
-                "tests/layout/reftests/reftest.list"]
-        },
-        "reftest-6": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "6",
-                "tests/layout/reftests/reftest.list"]
-        },
-        "reftest-7": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "7",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "3",
                 "tests/layout/reftests/reftest.list"]
         },
-        "reftest-8": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "8",
-                "tests/layout/reftests/reftest.list"]
-        },
-        "reftest-9": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "9",
-                "tests/layout/reftests/reftest.list"]
-        },
-        "reftest-10": {
+        "crashtest": {
             "category": "reftest",
-            "extra_args": ["--total-chunks", "10", "--this-chunk", "10",
-                "tests/layout/reftests/reftest.list"]
-        },
-        "crashtest-1": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "3", "--this-chunk", "1",
-                "tests/testing/crashtest/crashtests.list"]
-        },
-        "crashtest-2": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "3", "--this-chunk", "2",
-                "tests/testing/crashtest/crashtests.list"]
-        },
-        "crashtest-3": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "3", "--this-chunk", "3",
-                "tests/testing/crashtest/crashtests.list"]
+            "extra_args": ["tests/testing/crashtest/crashtests.list"]
         },
         "xpcshell": {
             "category": "xpcshell",
             "extra_args": ["--manifest", "tests/xpcshell_android.ini"]
         },
         "robocop-1": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "2", "--this-chunk", "1", "--robocop-path=../..",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "1", "--robocop-path=../..",
                 "--robocop-ids=fennec_ids.txt", "--robocop=robocop.ini"],
         },
         "robocop-2": {
             "category": "mochitest",
-            "extra_args": ["--total-chunks", "2", "--this-chunk", "2", "--robocop-path=../..",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "2", "--robocop-path=../..",
                 "--robocop-ids=fennec_ids.txt", "--robocop=robocop.ini"],
         },
-        "jsreftest-1": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "6", "--this-chunk", "1",
-                "../jsreftest/tests/jstests.list",
-                "--extra-profile-file=jsreftest/tests/user.js"]
-        },
-        "jsreftest-2": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "6", "--this-chunk", "2",
-                "../jsreftest/tests/jstests.list",
-                "--extra-profile-file=jsreftest/tests/user.js"]
-        },
-        "jsreftest-3": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "6", "--this-chunk", "3",
-                "../jsreftest/tests/jstests.list",
-                "--extra-profile-file=jsreftest/tests/user.js"]
-        },
-        "jsreftest-4": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "6", "--this-chunk", "4",
-                "../jsreftest/tests/jstests.list",
-                "--extra-profile-file=jsreftest/tests/user.js"]
-        },
-        "jsreftest-5": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "6", "--this-chunk", "5",
-                "../jsreftest/tests/jstests.list",
-                "--extra-profile-file=jsreftest/tests/user.js"]
-        },
-        "jsreftest-6": {
-            "category": "reftest",
-            "extra_args": ["--total-chunks", "6", "--this-chunk", "6",
-                "../jsreftest/tests/jstests.list",
-                "--extra-profile-file=jsreftest/tests/user.js"]
+        "robocop-3": {
+            "category": "mochitest",
+            "extra_args": ["--total-chunks", "3", "--this-chunk", "3", "--robocop-path=../..",
+                "--robocop-ids=fennec_ids.txt", "--robocop=robocop.ini"],
         },
     }, # end of "test_definitions"
     "suite_definitions": {
         "mochitest": {
             "run_filename": "runtestsremote.py",
             "options": ["--autorun", "--close-when-done", "--dm_trans=sut",
                 "--console-level=INFO", "--app=%(app)s", "--remote-webserver=%(remote_webserver)s",
                 "--xre-path=%(xre_path)s", "--utility-path=%(utility_path)s",