diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 623e661ac07..c153746b621 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -39,7 +39,7 @@ repos:
         exclude: ^src/blib2to3/
 
   - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.5.1
+    rev: v1.6.1
     hooks:
       - id: mypy
         exclude: ^docs/conf.py
diff --git a/CHANGES.md b/CHANGES.md
index 9446927b8d1..13b6c7bdb21 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -20,7 +20,7 @@
 
 ### Packaging
 
-<!-- Changes to how Black is packaged, such as dependency requirements -->
+- Upgrade to mypy 1.6.1 (#4049)
 
 ### Parser
 
diff --git a/pyproject.toml b/pyproject.toml
index bea8e77ba04..f8f5155e898 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -121,7 +121,7 @@ macos-max-compat = true
 enable-by-default = false
 dependencies = [
   "hatch-mypyc>=0.16.0",
-  "mypy==1.5.1",
+  "mypy==1.6.1",
   "click==8.1.3",  # avoid https://github.com/pallets/click/issues/2558
 ]
 require-runtime-dependencies = true
@@ -187,7 +187,7 @@ CC = "clang"
 build-frontend = { name = "build", args = ["--no-isolation"] }
 # Unfortunately, hatch doesn't respect MACOSX_DEPLOYMENT_TARGET
 before-build = [
-    "python -m pip install 'hatchling==1.18.0' hatch-vcs hatch-fancy-pypi-readme 'hatch-mypyc>=0.16.0' 'mypy==1.5.1' 'click==8.1.3'",
+    "python -m pip install 'hatchling==1.18.0' hatch-vcs hatch-fancy-pypi-readme 'hatch-mypyc>=0.16.0' 'mypy==1.6.1' 'click==8.1.3'",
     """sed -i '' -e "600,700s/'10_16'/os.environ['MACOSX_DEPLOYMENT_TARGET'].replace('.', '_')/" $(python -c 'import hatchling.builders.wheel as h; print(h.__file__)') """,
 ]
 
diff --git a/scripts/check_pre_commit_rev_in_example.py b/scripts/check_pre_commit_rev_in_example.py
index 107c6444dca..cc45a31e1ed 100644
--- a/scripts/check_pre_commit_rev_in_example.py
+++ b/scripts/check_pre_commit_rev_in_example.py
@@ -14,7 +14,7 @@
 
 import commonmark
 import yaml
-from bs4 import BeautifulSoup  # type: ignore[import]
+from bs4 import BeautifulSoup  # type: ignore[import-untyped]
 
 
 def main(changes: str, source_version_control: str) -> None:
diff --git a/scripts/check_version_in_basics_example.py b/scripts/check_version_in_basics_example.py
index 0f42bafe334..c90fdb43da5 100644
--- a/scripts/check_version_in_basics_example.py
+++ b/scripts/check_version_in_basics_example.py
@@ -8,7 +8,7 @@
 import sys
 
 import commonmark
-from bs4 import BeautifulSoup  # type: ignore[import]
+from bs4 import BeautifulSoup  # type: ignore[import-untyped]
 
 
 def main(changes: str, the_basics: str) -> None:
diff --git a/scripts/diff_shades_gha_helper.py b/scripts/diff_shades_gha_helper.py
index 895516deb51..8cd8ba155ce 100644
--- a/scripts/diff_shades_gha_helper.py
+++ b/scripts/diff_shades_gha_helper.py
@@ -119,7 +119,7 @@ def main() -> None:
 @main.command("config", help="Acquire run configuration and metadata.")
 @click.argument("event", type=click.Choice(["push", "pull_request"]))
 def config(event: Literal["push", "pull_request"]) -> None:
-    import diff_shades  # type: ignore[import]
+    import diff_shades  # type: ignore[import-not-found]
 
     if event == "push":
         jobs = [{"mode": "preview-changes", "force-flag": "--force-preview-style"}]
diff --git a/scripts/fuzz.py b/scripts/fuzz.py
index 929d3eac4f5..018b66e0ea2 100644
--- a/scripts/fuzz.py
+++ b/scripts/fuzz.py
@@ -80,7 +80,7 @@ def test_idempotent_any_syntatically_valid_python(
     try:
         import sys
 
-        import atheris  # type: ignore[import]
+        import atheris  # type: ignore[import-not-found]
     except ImportError:
         pass
     else:
diff --git a/scripts/make_width_table.py b/scripts/make_width_table.py
index 3c7cae60f7f..1b53c1b2cc9 100644
--- a/scripts/make_width_table.py
+++ b/scripts/make_width_table.py
@@ -20,7 +20,7 @@
 from os.path import basename, dirname, join
 from typing import Iterable, Tuple
 
-import wcwidth  # type: ignore[import]
+import wcwidth  # type: ignore[import-not-found]
 
 
 def make_width_table() -> Iterable[Tuple[int, int, int]]:
diff --git a/src/blackd/__init__.py b/src/blackd/__init__.py
index 972f24181cb..6b0f3d33295 100644
--- a/src/blackd/__init__.py
+++ b/src/blackd/__init__.py
@@ -74,9 +74,7 @@ def main(bind_host: str, bind_port: int) -> None:
     app = make_app()
     ver = black.__version__
     black.out(f"blackd version {ver} listening on {bind_host} port {bind_port}")
-    # TODO: aiohttp had an incorrect annotation for `print` argument,
-    #  It'll be fixed once aiohttp releases that code
-    web.run_app(app, host=bind_host, port=bind_port, handle_signals=True, print=None)  # type: ignore[arg-type]
+    web.run_app(app, host=bind_host, port=bind_port, handle_signals=True, print=None)
 
 
 def make_app() -> web.Application:
diff --git a/tests/optional.py b/tests/optional.py
index 3f5277b6b03..70ee823e316 100644
--- a/tests/optional.py
+++ b/tests/optional.py
@@ -26,7 +26,15 @@
     from pytest import StashKey
 except ImportError:
     # pytest < 7
-    from _pytest.store import StoreKey as StashKey  # type: ignore[import, no-redef]
+    #
+    # "isort: skip" is needed or it moves the "type: ignore" to the following line
+    # because of the line length, and then mypy complains.
+    # Of course, adding the "isort: skip" means that
+    # flake8-bugbear then also complains about the line length,
+    # so we *also* need a "noqa" comment for good measure :)
+    from _pytest.store import (  # type: ignore[import-not-found, no-redef]  # isort: skip  # noqa: B950
+        StoreKey as StashKey,
+    )
 
 log = logging.getLogger(__name__)