diff --git a/pyproject.toml b/pyproject.toml
index bfcef4e4..1cf8c552 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -57,6 +57,7 @@ dev-dependencies = [
   "pytest",
   "pytest-mock",
   "pytest-taskgraph",
+  "pytest-xdist",
   "responses",
   "sphinx",
   "sphinx-autobuild",
diff --git a/taskcluster/kinds/test/kind.yml b/taskcluster/kinds/test/kind.yml
index 8118e078..df136a81 100644
--- a/taskcluster/kinds/test/kind.yml
+++ b/taskcluster/kinds/test/kind.yml
@@ -54,4 +54,4 @@ tasks:
             symbol: unit(py{matrix[python]})
         run:
             command: >-
-                uv run coverage run --data-file /builds/worker/artifacts/coverage --context=py{matrix[python]} -m pytest -vv
+                uv run coverage run --data-file /builds/worker/artifacts/coverage --context=py{matrix[python]} -m pytest -vv -n auto --dist=loadfile
diff --git a/uv.lock b/uv.lock
index 440e443a..4b7de6f9 100644
--- a/uv.lock
+++ b/uv.lock
@@ -415,6 +415,15 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/02/cc/b7e31358aac6ed1ef2bb790a9746ac2c69bcb3c8588b41616914eb106eaf/exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b", size = 16453 },
 ]
 
+[[package]]
+name = "execnet"
+version = "2.1.1"
+source = { registry = "https://pypi.org/simple" }
+sdist = { url = "https://files.pythonhosted.org/packages/bb/ff/b4c0dc78fbe20c3e59c0c7334de0c27eb4001a2b2017999af398bf730817/execnet-2.1.1.tar.gz", hash = "sha256:5189b52c6121c24feae288166ab41b32549c7e2348652736540b9e6e7d4e72e3", size = 166524 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/43/09/2aea36ff60d16dd8879bdb2f5b3ee0ba8d08cbbdcdfe870e695ce3784385/execnet-2.1.1-py3-none-any.whl", hash = "sha256:26dee51f1b80cebd6d0ca8e74dd8745419761d3bef34163928cbebbdc4749fdc", size = 40612 },
+]
+
 [[package]]
 name = "filelock"
 version = "3.15.4"
@@ -759,6 +768,19 @@ requires-dist = [
     { name = "taskcluster-taskgraph", specifier = ">=12.1.0" },
 ]
 
+[[package]]
+name = "pytest-xdist"
+version = "3.6.1"
+source = { registry = "https://pypi.org/simple" }
+dependencies = [
+    { name = "execnet" },
+    { name = "pytest" },
+]
+sdist = { url = "https://files.pythonhosted.org/packages/41/c4/3c310a19bc1f1e9ef50075582652673ef2bfc8cd62afef9585683821902f/pytest_xdist-3.6.1.tar.gz", hash = "sha256:ead156a4db231eec769737f57668ef58a2084a34b2e55c4a8fa20d861107300d", size = 84060 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/6d/82/1d96bf03ee4c0fdc3c0cbe61470070e659ca78dc0086fb88b66c185e2449/pytest_xdist-3.6.1-py3-none-any.whl", hash = "sha256:9ed4adfb68a016610848639bb7e02c9352d5d9f03d04809919e2dafc3be4cca7", size = 46108 },
+]
+
 [[package]]
 name = "python-dateutil"
 version = "2.9.0.post0"
@@ -1100,6 +1122,7 @@ dev = [
     { name = "pytest" },
     { name = "pytest-mock" },
     { name = "pytest-taskgraph" },
+    { name = "pytest-xdist" },
     { name = "responses" },
     { name = "sphinx" },
     { name = "sphinx-argparse" },
@@ -1134,6 +1157,7 @@ dev = [
     { name = "pytest" },
     { name = "pytest-mock" },
     { name = "pytest-taskgraph", directory = "packages/pytest-taskgraph" },
+    { name = "pytest-xdist" },
     { name = "responses" },
     { name = "sphinx" },
     { name = "sphinx-argparse" },