diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index b471035b..6b331efc 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -228,6 +228,16 @@ source ./functions.source
         runTest exiv2 -pa --grep Lens $filename
     done
 
+    num=825 # Panasonic Manometer Tag
+    printf "$num " >&3
+    echo '------>' Bug $num '<-------' >&2
+    for X in a b; do
+        filename=exiv2-bug${num}${X}.exv
+        copyTestFile $filename
+        runTest exiv2 -pv --grep mano/i $filename
+        runTest exiv2 -pa --grep mano/i $filename
+    done
+
     num=831
     filename=exiv2-bug$num.tif
     printf "$num " >&3
diff --git a/test/data/bugfixes-test.out b/test/data/bugfixes-test.out
index 30d61766..5d86c21d 100644
Binary files a/test/data/bugfixes-test.out and b/test/data/bugfixes-test.out differ
diff --git a/test/data/exiv2-bug825a.exv b/test/data/exiv2-bug825a.exv
new file mode 100644
index 00000000..65673f2a
Binary files /dev/null and b/test/data/exiv2-bug825a.exv differ
diff --git a/test/data/exiv2-bug825b.exv b/test/data/exiv2-bug825b.exv
new file mode 100644
index 00000000..8d842dfe
Binary files /dev/null and b/test/data/exiv2-bug825b.exv differ