diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 254ed637d8159..2f4aea74ae9c3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,16 +23,16 @@ repos:
         exclude_types: [csv, json]
         exclude: ^tests/fixtures/
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.0
     hooks:
       - id: flake8
         additional_dependencies:
-          - flake8-docstrings==1.5.0
-          # Temporarily every now and then for noqa cleanup; not done by
-          # default yet due to https://github.com/plinss/flake8-noqa/issues/1
-          # - flake8-noqa==1.1.0
-          - pydocstyle==5.1.1
+          - pycodestyle==2.7.0
+          - pyflakes==2.3.1
+          - flake8-docstrings==1.6.0
+          - pydocstyle==6.0.0
           - flake8-comprehensions==3.4.0
+          - flake8-noqa==1.1.0
         files: ^(homeassistant|script|tests)/.+\.py$
   - repo: https://github.com/PyCQA/bandit
     rev: 1.7.0
diff --git a/homeassistant/components/http/web_runner.py b/homeassistant/components/http/web_runner.py
index 87468d40954f1..f3dd59bf9d78b 100644
--- a/homeassistant/components/http/web_runner.py
+++ b/homeassistant/components/http/web_runner.py
@@ -23,7 +23,7 @@ class HomeAssistantTCPSite(web.BaseSite):
 
     __slots__ = ("_host", "_port", "_reuse_address", "_reuse_port", "_hosturl")
 
-    def __init__(
+    def __init__(  # noqa: D107
         self,
         runner: web.BaseRunner,
         host: None | str | list[str],
@@ -34,7 +34,7 @@ def __init__(
         backlog: int = 128,
         reuse_address: bool | None = None,
         reuse_port: bool | None = None,
-    ) -> None:  # noqa: D107
+    ) -> None:
         super().__init__(
             runner,
             shutdown_timeout=shutdown_timeout,
diff --git a/requirements_test_pre_commit.txt b/requirements_test_pre_commit.txt
index 6a5768d34a11e..06e87a5c51c51 100644
--- a/requirements_test_pre_commit.txt
+++ b/requirements_test_pre_commit.txt
@@ -4,9 +4,12 @@ bandit==1.7.0
 black==20.8b1
 codespell==2.0.0
 flake8-comprehensions==3.4.0
-flake8-docstrings==1.5.0
-flake8==3.8.4
+flake8-docstrings==1.6.0
+flake8-noqa==1.1.0
+flake8==3.9.0
 isort==5.7.0
-pydocstyle==5.1.1
+pycodestyle==2.7.0
+pydocstyle==6.0.0
+pyflakes==2.3.1
 pyupgrade==2.11.0
 yamllint==1.24.2
diff --git a/tests/components/seventeentrack/test_sensor.py b/tests/components/seventeentrack/test_sensor.py
index d40d2cd499b16..5ad904530b9d3 100644
--- a/tests/components/seventeentrack/test_sensor.py
+++ b/tests/components/seventeentrack/test_sensor.py
@@ -106,7 +106,7 @@ async def packages(
         show_archived: bool = False,
         tz: str = "UTC",
     ) -> list:
-        """Packages mock."""
+        """Packages mock."""  # noqa: D401
         return self.__class__.package_list[:]
 
     async def summary(self, show_archived: bool = False) -> dict: