diff --git a/changelog/1830.feature.rst b/changelog/1830.feature.rst
new file mode 100644
index 000000000..7a157abc3
--- /dev/null
+++ b/changelog/1830.feature.rst
@@ -0,0 +1 @@
+A context manager ``does_not_raise`` is added to complement ``raises`` in parametrized tests with conditional raises.
diff --git a/changelog/4324.doc.rst b/changelog/4324.doc.rst
new file mode 100644
index 000000000..5e37a91aa
--- /dev/null
+++ b/changelog/4324.doc.rst
@@ -0,0 +1 @@
+Document how to use ``raises`` and ``does_not_raise`` to write parametrized tests with conditional raises.