diff --git a/Makefile b/Makefile
index 0b05ec7cf..48160bc36 100644
--- a/Makefile
+++ b/Makefile
@@ -19,7 +19,7 @@ coverage:
 		--cov-report term-missing:skip-covered
 
 tests:
-	poetry run pytest tests
+	poetry run pytest tests -n auto
 
 format:
 	poetry run black .
diff --git a/poetry.lock b/poetry.lock
index bb5f2ee8d..8e470206b 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -1312,6 +1312,20 @@ files = [
 [package.extras]
 test = ["pytest (>=6)"]
 
+[[package]]
+name = "execnet"
+version = "2.0.2"
+description = "execnet: rapid multi-Python deployment"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "execnet-2.0.2-py3-none-any.whl", hash = "sha256:88256416ae766bc9e8895c76a87928c0012183da3cc4fc18016e6f050e025f41"},
+    {file = "execnet-2.0.2.tar.gz", hash = "sha256:cc59bc4423742fd71ad227122eb0dd44db51efb3dc4095b45ac9a08c770096af"},
+]
+
+[package.extras]
+testing = ["hatch", "pre-commit", "pytest", "tox"]
+
 [[package]]
 name = "executing"
 version = "1.2.0"
@@ -5283,6 +5297,26 @@ pytest = ">=5.0"
 [package.extras]
 dev = ["pre-commit", "pytest-asyncio", "tox"]
 
+[[package]]
+name = "pytest-xdist"
+version = "3.3.1"
+description = "pytest xdist plugin for distributed testing, most importantly across multiple CPUs"
+optional = false
+python-versions = ">=3.7"
+files = [
+    {file = "pytest-xdist-3.3.1.tar.gz", hash = "sha256:d5ee0520eb1b7bcca50a60a518ab7a7707992812c578198f8b44fdfac78e8c93"},
+    {file = "pytest_xdist-3.3.1-py3-none-any.whl", hash = "sha256:ff9daa7793569e6a68544850fd3927cd257cc03a7ef76c95e86915355e82b5f2"},
+]
+
+[package.dependencies]
+execnet = ">=1.1"
+pytest = ">=6.2.0"
+
+[package.extras]
+psutil = ["psutil (>=3.0)"]
+setproctitle = ["setproctitle"]
+testing = ["filelock"]
+
 [[package]]
 name = "python-dateutil"
 version = "2.8.2"
@@ -7759,4 +7793,4 @@ local = ["ctransformers", "llama-cpp-python", "sentence-transformers"]
 [metadata]
 lock-version = "2.0"
 python-versions = ">=3.9,<3.11"
-content-hash = "961605f52070d8e5e7e79addb1c231eeeb21dd7ad6860f350f382672b75e271f"
+content-hash = "19abaa0918e610d7530b78417a8b17bc854131d527aedc940b671cf119f2cbfb"
diff --git a/pyproject.toml b/pyproject.toml
index c8730d72a..aa08e4e1f 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -101,6 +101,7 @@ types-pyyaml = "^6.0.12.8"
 types-python-jose = "^3.3.4.8"
 types-passlib = "^1.7.7.13"
 pytest-mock = "^3.11.1"
+pytest-xdist = "^3.3.1"
 
 
 [tool.poetry.extras]