diff --git a/test/data/pocIssue511 b/test/data/pocIssue511
new file mode 100644
index 00000000..15da76a7
Binary files /dev/null and b/test/data/pocIssue511 differ
diff --git a/tests/bugfixes/github/test_issue_511.py b/tests/bugfixes/github/test_issue_511.py
new file mode 100644
index 00000000..89239b53
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_511.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+
+
+class ThrowsWhenIFDsAreMalformed(metaclass=system_tests.CaseMeta):
+    url = "https://github.com/Exiv2/exiv2/issues/511"
+
+    filename = system_tests.path("$data_path/pocIssue511")
+    commands = ["$exiv2 -pR " + filename]
+    retval = [1]
+    stdout = ["""STRUCTURE OF TIFF FILE (II): """ + filename + """
+"""]
+    stderr = ["""$exiv2_exception_message """ + filename + """:
+$kerCorruptedMetadata
+"""]