diff --git a/test/data/test_issue_1471.exv b/test/data/test_issue_1471.exv
new file mode 100644
index 00000000..92389917
Binary files /dev/null and b/test/data/test_issue_1471.exv differ
diff --git a/test/data/test_issue_1472.jpg b/test/data/test_issue_1472.jpg
new file mode 100644
index 00000000..92389917
Binary files /dev/null and b/test/data/test_issue_1472.jpg differ
diff --git a/tests/bugfixes/github/test_issue_1471.py b/tests/bugfixes/github/test_issue_1471.py
new file mode 100644
index 00000000..593865a9
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_1471.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+from system_tests import CaseMeta, CopyTmpFiles, path
+@CopyTmpFiles("$data_path/test_issue_1471.exv")
+
+class test_issue_1471Test(metaclass=CaseMeta):
+
+    filename  = path("$tmp_path/test_issue_1471.exv")
+    commands  = [  "$exiv2 -K Exif.Sony2010e.WB_RGBLevels              $filename"
+                ,  "$exiv2 -M\"set Exif.Image.ImageID foobar\"         $filename"
+                ,  "$exiv2 -K Exif.Sony2010e.WB_RGBLevels              $filename"
+                ]
+    stdout   =  ["Exif.Sony2010e.WB_RGBLevels                  Short       3  598 256 442\n"
+                ,""
+                ,"Exif.Sony2010e.WB_RGBLevels                  Short       3  598 256 442\n"
+                ]
+    stderr = [""]*len(commands)
+    retval = [ 0]*len(commands)
diff --git a/tests/bugfixes/github/test_issue_1472.py b/tests/bugfixes/github/test_issue_1472.py
new file mode 100644
index 00000000..8ada3383
--- /dev/null
+++ b/tests/bugfixes/github/test_issue_1472.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+from system_tests import CaseMeta, CopyTmpFiles, path
+@CopyTmpFiles("$data_path/test_issue_1472.jpg")
+
+class test_issue_1472Test(metaclass=CaseMeta):
+
+    filename  = path("$tmp_path/test_issue_1472.jpg")
+    exvfile   = path("$tmp_path/test_issue_1472.exv")
+    commands  = [ "rm     -rf                    $exvfile" 
+                , "$exiv2 -pa --grep LensType2   $filename"
+                , "$exiv2  ex                    $filename"
+                , "$exiv2 -pa --grep LensType2   $exvfile"
+                , "$exiv2  rm                    $filename"
+                , "$exiv2 -pa --grep LensType2   $filename"
+                , "$exiv2  in                    $filename"
+                , "$exiv2 -pa --grep LensType2   $filename"
+                ]
+    stdout   =  [""
+                ,"Exif.Sony2010e.LensType2                     Short       1  1024\n"
+                ,""
+                ,"Exif.Sony2010e.LensType2                     Short       1  1024\n"
+                ,""
+                ,""
+                ,""
+                ,"Exif.Sony2010e.LensType2                     Short       1  1024\n"
+                ]
+    stderr = [""]*len(commands)
+    retval = [ 0,0,0,0,0,1,0,0]