diff --git a/test/data/issue_400_poc1 b/test/data/issue_400_poc1
new file mode 100644
index 00000000..8c8491c0
Binary files /dev/null and b/test/data/issue_400_poc1 differ
diff --git a/test/data/issue_400_poc2 b/test/data/issue_400_poc2
new file mode 100644
index 00000000..479d0207
Binary files /dev/null and b/test/data/issue_400_poc2 differ
diff --git a/tests/bugfixes/github/test_issue_400.py b/tests/bugfixes/github/test_issue_400.py
new file mode 100644
index 00000000..9e87977a
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_400.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+
+
+class parseTXTChunkOutOfBoundsRead(metaclass=system_tests.CaseMeta):
+
+    url = "https://github.com/Exiv2/exiv2/issues/400"
+
+    filenames = [
+        system_tests.path("$data_path/issue_400_poc" + str(i)) for i in (1, 2)
+    ]
+
+    commands = ["$exiv2 " + fname for fname in filenames]
+    stdout = [""] * 2
+    stderr = [
+        """$exiv2_exception_message """ + fname + """:
+$kerCorruptedMetadata
+"""
+        for fname in filenames
+    ]
+    retval = [1] * 2