diff --git a/test/command/8513.md b/test/command/8513.md
new file mode 100644
index 000000000..e1ed2c362
--- /dev/null
+++ b/test/command/8513.md
@@ -0,0 +1,27 @@
+# Round-tripping tags in org
+```
+% pandoc --from org --to org --columns=72
+* Header with tag   :tag:
+^D
+* Header with tag                                                  :tag:
+:PROPERTIES:
+:CUSTOM_ID: header-with-tag
+:END:
+```
+
+Multiple tags
+```
+% pandoc --from org-auto_identifiers --to org --columns=78
+* Header with two tags                                           :first:second:
+^D
+* Header with two tags                                          :first:second:
+```
+
+Check that long headings work with tags
+
+```
+% pandoc --from org-auto_identifiers --to org --columns=40
+* Header with tag and more words which are not that interesting   :tag:
+^D
+* Header with tag and more words which are not that interesting :tag:
+```