diff --git a/pyproject.toml b/pyproject.toml
index de2563e..bdfede7 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -46,21 +46,6 @@ dependencies = [
   "filelock>=3.15.4",
   "platformdirs<5,>=4.3.6",
 ]
-optional-dependencies.docs = [
-  "furo>=2025.12.19",
-  "sphinx>=9.1",
-  "sphinx-autodoc-typehints>=3.6.3",
-  "sphinxcontrib-mermaid>=2",
-  "sphinxcontrib-towncrier>=0.4",
-  "towncrier>=25.8",
-]
-optional-dependencies.testing = [
-  "covdefaults>=2.3",
-  "coverage>=7.5.4",
-  "pytest>=8.3.5",
-  "pytest-mock>=3.14",
-  "setuptools>=75.1",
-]
 urls.Changelog = "https://github.com/tox-dev/python-discovery/releases"
 urls.Documentation = "https://python-discovery.readthedocs.io"
 urls.Homepage = "https://github.com/tox-dev/python-discovery"
@@ -68,6 +53,21 @@ urls.Source = "https://github.com/tox-dev/python-discovery"
 urls.Tracker = "https://github.com/tox-dev/python-discovery/issues"
 
 [dependency-groups]
+test = [
+  "covdefaults>=2.3",
+  "coverage>=7.5.4",
+  "pytest>=8.3.5",
+  "pytest-mock>=3.14",
+  "setuptools>=75.1",
+]
+docs = [
+  "furo>=2025.12.19",
+  "sphinx>=9.1",
+  "sphinx-autodoc-typehints>=3.6.3",
+  "sphinxcontrib-mermaid>=2",
+  "sphinxcontrib-towncrier>=0.4",
+  "towncrier>=25.8",
+]
 release = [
   "gitpython>=3.1.46",
   "packaging>=26",
diff --git a/tox.toml b/tox.toml
index 6e5781c..20f6da5 100644
--- a/tox.toml
+++ b/tox.toml
@@ -6,7 +6,7 @@ skip_missing_interpreters = true
 description = "run the tests with pytest"
 package = "wheel"
 wheel_build_env = ".pkg"
-extras = ["testing"]
+dependency_groups = ["test"]
 pass_env = ["DIFF_AGAINST", "PYTEST_*"]
 set_env.COVERAGE_FILE = "{work_dir}{/}.coverage.{env_name}"
 commands = [
@@ -46,7 +46,7 @@ commands = [["ty", "check", "--output-format", "concise", "--error-on-warning",
 
 [env.docs]
 description = "build documentation"
-extras = ["docs"]
+dependency_groups = ["docs"]
 commands = [
   [
     "sphinx-build",
@@ -81,5 +81,5 @@ commands = [["python", "{tox_root}/tasks/release.py", "--version", "{posargs}"]]
 [env.dev]
 description = "generate a DEV environment"
 package = "editable"
-extras = ["testing"]
+dependency_groups = ["test"]
 commands = [["uv", "pip", "tree"], ["python", "-c", "import sys; print(sys.executable)"]]