diff --git a/test/data/test_issue_2126.exv b/test/data/test_issue_2126.exv
new file mode 100644
index 0000000000..fca9b4967b
Binary files /dev/null and b/test/data/test_issue_2126.exv differ
diff --git a/tests/bugfixes/github/test_issue_2126.py b/tests/bugfixes/github/test_issue_2126.py
new file mode 100644
index 0000000000..4832319139
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_2126.py
@@ -0,0 +1,15 @@
+from system_tests import CaseMeta, path
+
+class OMSystemMakerNote(metaclass=CaseMeta):
+    """
+    Regression test for the bug described in:
+    https://github.com/Exiv2/exiv2/issues/2126
+    """
+    url = "https://github.com/Exiv2/exiv2/issues/2126"
+
+    filename = path("$data_path/test_issue_2126.exv")
+    commands = ["$exiv2 -q -K Exif.Olympus2.CameraID $filename"]
+    stdout = ["""Exif.Olympus2.CameraID                       Undefined  32  OM SYSTEM CAMERA               
+"""]
+    stderr = [""]
+    retval = [0]