--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt.yml
@@ -10,16 +10,16 @@ task:
     description: Mochitest devtools-chrome run {{chunk}}
   payload:
     capabilities:
       devices:
         loopbackVideo: true
         loopbackAudio: true
   extra:
     chunks:
-      total: 8
+      total: 10
     suite:
       name: mochitest
       flavor: mochitest-devtools-chrome
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M
       symbol: dt{{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_dt_e10s.yml
@@ -13,16 +13,16 @@ task:
     description: Mochitest devtools-chrome e10s run {{chunk}}
   payload:
     capabilities:
       devices:
         loopbackVideo: true
         loopbackAudio: true
   extra:
     chunks:
-      total: 8
+      total: 10
     suite:
       name: mochitest
       flavor: mochitest-devtools-chrome
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M-e10s
       symbol: dt{{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain.yml
@@ -10,16 +10,16 @@ task:
     description: Mochitest plain run {{chunk}}
   payload:
     capabilities:
       devices:
         loopbackVideo: true
         loopbackAudio: true
   extra:
     chunks:
-      total: 8
+      total: 10
     suite:
       name: mochitest
       flavor: plain-chunked
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M
       symbol: {{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_mochitest_plain_e10s.yml
@@ -13,16 +13,16 @@ task:
     description: Mochitest plain e10s run {{chunk}}
   payload:
     capabilities:
       devices:
         loopbackVideo: true
         loopbackAudio: true
   extra:
     chunks:
-      total: 8
+      total: 10
     suite:
       name: mochitest
       flavor: plain-chunked
     treeherder:
       groupName: Desktop mochitests
       groupSymbol: tc-M-e10s
       symbol: {{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_reftest.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest.yml
@@ -2,16 +2,16 @@
 $inherits:
   from: 'tasks/tests/fx_desktop_unittest.yml'
 task:
   metadata:
     name: '[TC] Linux64 reftest {{chunk}}'
     description: Reftest run {{chunk}}
   extra:
     chunks:
-      total: 4
+      total: 8
     suite:
       name: reftest
       flavor: reftest
     treeherder:
       groupName: Desktop reftest
       groupSymbol: tc-R
       symbol: R{{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_reftest_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_reftest_e10s.yml
@@ -5,16 +5,16 @@ task:
   payload:
     command:
       - --e10s
   metadata:
     name: '[TC] Linux64 reftest e10s {{chunk}}'
     description: Reftest e10s run {{chunk}}
   extra:
     chunks:
-      total: 2
+      total: 5
     suite:
       name: reftest
       flavor: reftest
     treeherder:
       groupName: Desktop reftest
       groupSymbol: tc-R-e10s
       symbol: R-e10s{{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests.yml
@@ -16,16 +16,16 @@ task:
         MOZHARNESS_CONFIG: >
           mozharness/configs/web_platform_tests/prod_config.py
           mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 web-platform-tests {{chunk}}'
     description: Web platform tests run {{chunk}}
   extra:
     chunks:
-      total: 8
+      total: 12
     suite:
       name: web-platform-tests
       flavor: web-platform-tests
     treeherder:
       groupName: Desktop web-platform-tests
       groupSymbol: tc-W
       symbol: {{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_e10s.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_web_platform_tests_e10s.yml
@@ -17,13 +17,13 @@ task:
         MOZHARNESS_CONFIG: >
           mozharness/configs/web_platform_tests/prod_config.py
           mozharness/configs/remove_executables.py
   metadata:
     name: '[TC] Linux64 web-platform-tests-e10s {{chunk}}'
     description: Web platform e10s tests run {{chunk}}
   extra:
     chunks:
-      total: 8
+      total: 12
     treeherder:
       groupName: Desktop web-platform-tests
       groupSymbol: tc-W-e10s
       symbol: {{chunk}}

--- a/testing/taskcluster/tasks/tests/fx_linux64_xpcshell.yml
+++ b/testing/taskcluster/tasks/tests/fx_linux64_xpcshell.yml
@@ -2,16 +2,16 @@
 $inherits:
   from: 'tasks/tests/fx_desktop_unittest.yml'
 task:
   metadata:
     name: '[TC] Linux64 xpcshell {{chunk}}'
     description: XPCShell run {{chunk}}
   extra:
     chunks:
-      total: 4 # NOTE: We're doubling the chunking to make them run under an hour
+      total: 5
     suite:
       name: xpcshell
       flavor: xpcshell
     treeherder:
       groupName: Desktop xpcshell tests
       groupSymbol: tc-X
       symbol: {{chunk}}