diff --git a/changelog.d/3594.change.rst b/changelog.d/3594.change.rst
deleted file mode 100644
index acb74c47b37..00000000000
--- a/changelog.d/3594.change.rst
+++ /dev/null
@@ -1 +0,0 @@
-Added ``htmlcov`` to FlatLayoutPackageFinder.DEFAULT_EXCLUDE -- by :user:`yukihiko-shinoda`
diff --git a/changelog.d/3836.misc.rst b/changelog.d/3836.misc.rst
new file mode 100644
index 00000000000..cfe5bb1c704
--- /dev/null
+++ b/changelog.d/3836.misc.rst
@@ -0,0 +1,9 @@
+Fixed interaction between ``setuptools``' auto-package discovery and
+auto-generated ``htmlcov`` files.
+
+Previously, the ``htmlcov`` name was ignored when searching for single-file
+modules, however the correct behaviour is to ignore it when searching for
+packages (since it is supposed to be a directory, see `coverage config`_)
+-- by :user:`yukihiko-shinoda`.
+
+.. _coverage config: https://coverage.readthedocs.io/en/stable/config.html#html-directory