--- a/taskcluster/ci/build/linux.yml
+++ b/taskcluster/ci/build/linux.yml
@@ -1028,16 +1028,20 @@ linux64-asan/debug:
             - linux64-rust
             - linux64-rust-size
             - linux64-cbindgen
             - linux64-sccache
             - linux64-nasm
             - linux64-node
             - linux64-lucetc
             - wasi-sysroot
+            # `fix-stacks` is needed because xpcshell self tests run as part of
+            # the build step. Once bug 1614626 moves them to the xpcshell task,
+            # this dependency can be removed.
+            - linux64-fix-stacks
 
 linux64-shippable/opt:
     description: "Linux64 Shippable"
     use-pgo: true
     attributes:
         shippable: true
         enable-full-crashsymbols: true
     shipping-phase: build

--- a/taskcluster/ci/build/windows.yml
+++ b/taskcluster/ci/build/windows.yml
@@ -551,16 +551,20 @@ win64-noopt/debug:
         toolchain:
             - win64-clang-cl
             - win64-rust
             - win64-rust-size
             - win64-cbindgen
             - win64-sccache
             - win64-nasm
             - win64-node
+            # `fix-stacks` is needed because xpcshell self tests run as part of
+            # the build step. Once bug 1614626 moves them to the xpcshell task,
+            # this dependency can be removed.
+            - win32-fix-stacks
 
 win32-noopt/debug:
     description: "Win32 No-optimize Debug"
     index:
         product: firefox
         job-name: win32-noopt-debug
     treeherder:
         platform: windows2012-32-noopt/debug
@@ -586,16 +590,20 @@ win32-noopt/debug:
         toolchain:
             - win64-clang-cl
             - win64-rust
             - win64-rust-size
             - win64-cbindgen
             - win64-sccache
             - win64-nasm
             - win64-node
+            # `fix-stacks` is needed because xpcshell self tests run as part of
+            # the build step. Once bug 1614626 moves them to the xpcshell task,
+            # this dependency can be removed.
+            - win32-fix-stacks
 
 win32-rusttests/opt:
     description: "Win32 Rust Tests Opt"
     index:
         product: firefox
         job-name: win32-rusttests-opt
     treeherder:
         platform: windows2012-32/opt
@@ -815,16 +823,20 @@ win64-asan/debug:
         toolchain:
             - win64-clang-cl
             - win64-rust
             - win64-rust-size
             - win64-cbindgen
             - win64-sccache
             - win64-nasm
             - win64-node
+            # `fix-stacks` is needed because xpcshell self tests run as part of
+            # the build step. Once bug 1614626 moves them to the xpcshell task,
+            # this dependency can be removed.
+            - win32-fix-stacks
 
 win64-asan/opt:
     description: "Win64 Opt ASAN"
     index:
         product: firefox
         job-name: win64-asan-opt
     treeherder:
         platform: windows2012-64/asan

--- a/taskcluster/ci/test/kind.yml
+++ b/taskcluster/ci/test/kind.yml
@@ -55,12 +55,15 @@ job-defaults:
                     .*-devedition/.*: false
                     default: true
             default: false
     fetches:
         toolchain:
             by-test-platform:
                 win.*:
                     - win32-minidump-stackwalk
+                    - win32-fix-stacks
                 macosx.*:
                     - macosx64-minidump-stackwalk
+                    - macosx64-fix-stacks
                 default:
                     - linux64-minidump-stackwalk
+                    - linux64-fix-stacks