diff --git a/doc/data/messages/s/self-assigning-variable/bad.py b/doc/data/messages/s/self-assigning-variable/bad.py
new file mode 100644
index 0000000000..91c0c58b9f
--- /dev/null
+++ b/doc/data/messages/s/self-assigning-variable/bad.py
@@ -0,0 +1,2 @@
+year = 2000
+year = year  # [self-assigning-variable]
diff --git a/doc/data/messages/s/self-assigning-variable/good.py b/doc/data/messages/s/self-assigning-variable/good.py
new file mode 100644
index 0000000000..dc75526c93
--- /dev/null
+++ b/doc/data/messages/s/self-assigning-variable/good.py
@@ -0,0 +1 @@
+year = 2000
diff --git a/doc/data/messages/s/self-assigning-variable/related.rst b/doc/data/messages/s/self-assigning-variable/related.rst
new file mode 100644
index 0000000000..b7352c5230
--- /dev/null
+++ b/doc/data/messages/s/self-assigning-variable/related.rst
@@ -0,0 +1 @@
+* `Python assignment statement <https://docs.python.org/3/reference/simple_stmts.html#assignment-statements>`_