diff --git a/pyproject.toml b/pyproject.toml
index 5c9d1535..f86470ee 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,3 +1,35 @@
 [build-system]
 requires = ["setuptools>=42", "wheel", "cmake>=3.18", "ninja"]
 build-backend = "setuptools.build_meta"
+
+[tool.check-manifest]
+ignore = [
+    "tests/**",
+    "docs/**",
+    "tools/**",
+    "include/**",
+    ".*",
+    "pybind11/include/**",
+    "pybind11/share/**",
+    "CMakeLists.txt",
+    "noxfile.py",
+]
+
+[tool.mypy]
+files = "pybind11"
+python_version = "2.7"
+warn_unused_configs = true
+
+disallow_any_generics = true
+disallow_subclassing_any = true
+disallow_untyped_calls = true
+disallow_untyped_defs = true
+disallow_incomplete_defs = true
+check_untyped_defs = true
+disallow_untyped_decorators = true
+no_implicit_optional = true
+warn_redundant_casts = true
+warn_unused_ignores = true
+warn_return_any = true
+no_implicit_reexport = true
+strict_equality = true
diff --git a/setup.cfg b/setup.cfg
index 527d18aa..31038eb0 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -37,18 +37,6 @@ zip_safe = False
 [bdist_wheel]
 universal=1
 
-[check-manifest]
-ignore =
-    tests/**
-    docs/**
-    tools/**
-    include/**
-    .*
-    pybind11/include/**
-    pybind11/share/**
-    CMakeLists.txt
-    noxfile.py
-
 
 [flake8]
 max-line-length = 99
@@ -62,25 +50,6 @@ ignore =
     # Black conflict
     W503, E203
 
-[mypy]
-files = pybind11
-python_version = 2.7
-warn_unused_configs = True
-
-# Currently (0.800) identical to --strict
-disallow_any_generics = True
-disallow_subclassing_any = True
-disallow_untyped_calls = True
-disallow_untyped_defs = True
-disallow_incomplete_defs = True
-check_untyped_defs = True
-disallow_untyped_decorators = True
-no_implicit_optional = True
-warn_redundant_casts = True
-warn_unused_ignores = True
-warn_return_any = True
-no_implicit_reexport = True
-strict_equality = True
 
 [tool:pytest]
 timeout = 300