diff --git a/test/data/issue_1845_poc.jp2 b/test/data/issue_1845_poc.jp2
new file mode 100644
index 00000000..035d6296
Binary files /dev/null and b/test/data/issue_1845_poc.jp2 differ
diff --git a/tests/bugfixes/github/test_issue_1845.py b/tests/bugfixes/github/test_issue_1845.py
new file mode 100644
index 00000000..6332ab18
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_1845.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+from system_tests import CaseMeta, CopyTmpFiles, path
+@CopyTmpFiles("$data_path/issue_1845_poc.jp2")
+
+class TiffDirectoryWriteDirEntryAssert(metaclass=CaseMeta):
+    """
+    Regression test for the bug described in:
+    https://github.com/Exiv2/exiv2/issues/1845
+    """
+    url = "https://github.com/Exiv2/exiv2/issues/1845"
+
+    filename = path("$tmp_path/issue_1845_poc.jp2")
+    commands = ["$exiv2 -q -D +1 ad $filename"]
+    stderr = [""]
+    stdout = [""]
+    retval = [0]