--- a/taskcluster/ci/test/test-platforms.yml
+++ b/taskcluster/ci/test/test-platforms.yml
@@ -74,25 +74,25 @@ linux64-pgo/opt:
 
 linux64-asan/opt:
     build-platform: linux64-asan/opt
     test-sets:
         - common-tests
 
 # Stylo builds only run a subset of tests for the moment. So give them
 # their own test set.
-# Stylo doesn't work on 32-bit Linux yet (bug 1385025)
-# linux32-stylo/debug:
-#     build-platform: linux/debug
-#     test-sets:
-#         - stylo-tests
-# linux32-stylo/opt:
-#     build-platform: linux/opt
-#     test-sets:
-#         - stylo-tests
+linux32-stylo/debug:
+    build-platform: linux/debug
+    test-sets:
+        - stylo-tests
+linux32-stylo/opt:
+    build-platform: linux/opt
+    test-sets:
+        - awsy-stylo
+        - stylo-tests
 linux64-stylo/debug:
     build-platform: linux64/debug
     test-sets:
         - stylo-tests
         - devtools-tests
 linux64-stylo/opt:
     build-platform: linux64/opt
     test-sets:

--- a/taskcluster/ci/test/tests.yml
+++ b/taskcluster/ci/test/tests.yml
@@ -109,17 +109,17 @@ crashtest:
     suite: reftest/crashtest
     treeherder-symbol: tc-R(C)
     instance-size:
         by-test-platform:
             android.*: xlarge
             default: default
     run-on-projects:
         by-test-platform:
-            macosx64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            .*-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     chunks:
         by-test-platform:
             android-4.3-arm7-api-15/debug: 10
             android.*: 4
             default: 1
     e10s:
         by-test-platform:
@@ -424,31 +424,32 @@ mochitest:
             default: legacy # Bug 1281241: migrating to m3.large instances
     chunks:
         by-test-platform:
             android-4.3-arm7-api-15/debug: 48
             android.*: 20
             macosx.*: 5
             windows.*: 5
             linux32/debug: 16
+            linux32-stylo/debug: 16
             linux.*: 10
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             windows7-32/debug: both
             default: true
     max-run-time:
         by-test-platform:
             android-4.3-arm7-api-15/debug: 10800
             linux64-jsdcov/opt: 10800
             default: 5400
     allow-software-gl-layers: false
     run-on-projects:
         by-test-platform:
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     tier:
         by-test-platform:
             macosx64-stylo/.*: 2
             default: default
     mozharness:
@@ -486,17 +487,18 @@ mochitest-a11y:
     description: "Mochitest a11y run"
     suite: mochitest/a11y
     treeherder-symbol: tc-M(a11y)
     loopback-video: true
     e10s: false
     run-on-projects:
         by-test-platform:
             linux64-qr/.*: ['mozilla-central', 'try']
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux32-stylo/debug: ['try']
             linux64-stylo/debug: ['try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     mozharness:
         script: desktop_unittest.py
         no-read-buildbot-config: true
         chunked: false
@@ -510,53 +512,56 @@ mochitest-a11y:
                 linux.*:
                     - unittests/linux_unittest.py
                     - remove_executables.py
         extra-options:
             - --mochitest-suite=a11y
     tier:
         by-test-platform:
             .*-stylo.*: 2
+            linux32-stylo/debug: 3
             linux64-stylo/debug: 3
             default: default
 
 mochitest-browser-chrome:
     description: "Mochitest browser-chrome run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/browser-chrome-coverage
             default: mochitest/browser-chrome-chunked
     treeherder-symbol: tc-M(bc)
     loopback-video: true
     chunks:
         by-test-platform:
+            linux64/debug: 16
+            linux64-asan/opt: 16
             linux64-jsdcov/opt: 35
-            linux64/debug: 16
             linux32/debug: 16
-            linux64-asan/opt: 16
+            linux32-stylo/debug: 16
             default: 7
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             windows7-32/debug: both
             default: true
     max-run-time:
         by-test-platform:
             linux64-jsdcov/opt: 7200
             linux64-ccov/opt: 7200
             linux64/debug: 5400
             linux32/debug: 5400
+            linux32-stylo/debug: 5400
             default: 3600
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             linux64-stylo/debug: ['try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
@@ -639,18 +644,19 @@ mochitest-chrome:
             android-4.3-arm7-api-15/debug: 4
             android.*: 2
             default: 3
     max-run-time: 3600
     e10s: false
     run-on-projects:
         by-test-platform:
             windows7-32.*: ['try']
+            linux32-stylo/debug: ['try']
             linux64-stylo/debug: ['try']
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows7-32.*: buildbot-bridge/buildbot-bridge
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
@@ -683,30 +689,32 @@ mochitest-chrome:
                             - unittests/linux_unittest.py
                             - remove_executables.py
                 extra-options:
                     - --mochitest-suite=chrome
     tier:
         by-test-platform:
             windows7-32.*: 2
             macosx64-stylo/.*: 2
+            linux32-stylo/debug: 3
             linux64-stylo/debug: 3
             default: default
 
 mochitest-clipboard:
     description: "Mochitest clipboard run"
     suite: mochitest/clipboard
     treeherder-symbol: tc-M(cl)
     loopback-video: true
     virtualization: hardware
     instance-size: xlarge
     run-on-projects:
         by-test-platform:
+            linux32-stylo/debug: ['try']
             linux64-stylo/debug: ['try']
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows7-32.*: buildbot-bridge/buildbot-bridge
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     e10s:
@@ -739,16 +747,17 @@ mochitest-clipboard:
                         linux.*:
                             - unittests/linux_unittest.py
                             - remove_executables.py
                 extra-options:
                     - --mochitest-suite=plain-clipboard,chrome-clipboard,browser-chrome-clipboard
     tier:
         by-test-platform:
             macosx64-stylo/.*: 2
+            linux32-stylo/debug: 3
             linux64-stylo/debug: 3
             default: default
 
 mochitest-devtools-chrome:
     description: "Mochitest devtools-chrome run"
     suite:
         by-test-platform:
             linux64-jsdcov/opt: mochitest/mochitest-devtools-chrome-coverage
@@ -758,17 +767,17 @@ mochitest-devtools-chrome:
     max-run-time: 5400
     chunks:
         by-test-platform:
             windows.*: 8
             macosx.*: 8
             default: 10
     run-on-projects:
         by-test-platform:
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     e10s:
         by-test-platform:
             linux64-jsdcov/opt: false
             windows7-32/debug: both
             default: true
@@ -807,17 +816,17 @@ mochitest-gpu:
     loopback-video: true
     virtualization: virtual-with-gpu
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     e10s:
@@ -898,17 +907,17 @@ mochitest-media:
             windows8-64.*: 1
             default: 3
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     mozharness:
@@ -983,17 +992,17 @@ mochitest-webgl:
     treeherder-symbol: tc-M(gl)
     virtualization: virtual-with-gpu
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo/.*: ['mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     chunks:
@@ -1053,17 +1062,17 @@ reftest:
     suite: reftest/reftest
     treeherder-symbol: tc-R(R)
     run-on-projects:
         by-test-platform:
             # Deactivate try on Buildbot, by default. We don't have enough machines
             windows8-64.*: ['mozilla-release', 'mozilla-beta', 'mozilla-central', 'mozilla-inbound', 'autoland']
             windows8-64-devedition/opt: built-projects  # No dev edition outside of supported branches
             windows10.*: []
-            linux64-stylo.*: ['autoland', 'mozilla-central', 'try']
+            linux.*-stylo.*: ['autoland', 'mozilla-central', 'try']
             macosx64-stylo.*: ['autoland', 'mozilla-central', 'try']
             windows7-32-stylo.*: ['autoland', 'mozilla-central', 'try']
             default: built-projects
     worker-type:
         by-test-platform:
             windows8-64.*: buildbot-bridge/buildbot-bridge
             default: null
     instance-size: