diff --git a/test/data/issue_547.poc b/test/data/issue_547.poc
new file mode 100644
index 00000000..1427e8ee
Binary files /dev/null and b/test/data/issue_547.poc differ
diff --git a/tests/bugfixes/github/test_issue_547.py b/tests/bugfixes/github/test_issue_547.py
new file mode 100644
index 00000000..4713a9d9
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_547.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+from system_tests import CaseMeta, path
+
+class test_issue_547(metaclass=CaseMeta):
+    """
+    Regression test for the bug described in:
+    https://github.com/Exiv2/exiv2/pull/960
+    """
+    url = "https://github.com/Exiv2/exiv2/issues/547"
+
+    filename = path("$data_path/issue_547.poc")
+    commands = ["$exiv2 -pR $filename"]
+    stdout = ["""STRUCTURE OF TIFF FILE (II): $filename
+ address |    tag                              |      type |    count |    offset | value
+      12 | 0x0001 Version                      |    SSHORT |        0 |           | 
+"""]
+    stderr = [
+"""Exiv2 exception in print action for file $filename:
+$kerCorruptedMetadata
+"""
+]
+    retval = [1]