diff --git a/test/data/exiv2-pr317.exv b/test/data/exiv2-pr317.exv
new file mode 100644
index 00000000..301f2c9b
Binary files /dev/null and b/test/data/exiv2-pr317.exv differ
diff --git a/tests/bugfixes/github/test_pr_317.py b/tests/bugfixes/github/test_pr_317.py
new file mode 100644
index 00000000..53265342
--- /dev/null
+++ b/tests/bugfixes/github/test_pr_317.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+
+import system_tests
+
+
+class CanonEOSM100(metaclass=system_tests.CaseMeta):
+
+    filename = "$data_path/exiv2-pr317.exv"
+    commands = ["$exiv2 -pa --grep model/i $filename"]
+
+    stdout = ["""Exif.Image.Model                             Ascii      15  Canon EOS M100
+Exif.Canon.ModelID                           Long        1  EOS M100
+Exif.Photo.LensModel                         Ascii      29  EF-M15-45mm f/3.5-6.3 IS STM
+"""
+	]
+    stderr = [""]
+    retval = [0]