diff --git a/test/bugfixes-test.sh b/test/bugfixes-test.sh
index ed47c985..69a54854 100755
--- a/test/bugfixes-test.sh
+++ b/test/bugfixes-test.sh
@@ -800,6 +800,27 @@ source ./functions.source
     copyTestFile                      $filename
     runTest exiv2                     $filename
 
+    num=g138
+    printf "$num " >&3
+    filename=007-heap-buffer-over
+    echo '------>' Bug $filename '<-------' >&2
+    copyTestFile                      $filename
+    runTest exiv2                     $filename
+
+    num=g139
+    printf "$num " >&3
+    filename=009-stack-over
+    echo '------>' Bug $filename '<-------' >&2
+    copyTestFile                      $filename
+    runTest exiv2                     $filename
+
+    num=g140
+    printf "$num " >&3
+    filename=006-heap-buffer-over
+    echo '------>' Bug $filename '<-------' >&2
+    copyTestFile                      $filename
+    runTest exiv2                     $filename
+
 ) 3>&1 > $results 2>&1
 
 printf "\n"
diff --git a/test/data/006-heap-buffer-over b/test/data/006-heap-buffer-over
new file mode 100644
index 00000000..879acbee
Binary files /dev/null and b/test/data/006-heap-buffer-over differ
diff --git a/test/data/007-heap-buffer-over b/test/data/007-heap-buffer-over
new file mode 100644
index 00000000..4e057bc4
Binary files /dev/null and b/test/data/007-heap-buffer-over differ
diff --git a/test/data/009-stack-over b/test/data/009-stack-over
new file mode 100644
index 00000000..e26e8d96
Binary files /dev/null and b/test/data/009-stack-over differ