diff --git a/ext/exif/tests/001.phpt b/ext/exif/tests/001.phpt
new file mode 100644
index 00000000000..4fc885917be
--- /dev/null
+++ b/ext/exif/tests/001.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Check for exif_read_data
+--SKIPIF--
+<?php if (!extension_loaded("exif")) print "skip";?>
+--POST--
+--GET--
+--FILE--
+<?php
+/*
+  test1.jpg is a 1*1 image that does not contain any Exif/Comment information
+  test2.jpg is the same image but contains Exif/Comment information and a
+            copy of test1.jpg as a thumbnail.
+*/
+$image  = exif_read_data('test2.jpg','',true,false);
+$accept = '';
+foreach($image as $idx=>$section) {
+	$accept .= $section;
+	foreach($section as $name=>$value) {
+		$accept .= substr($name,0,2);
+		$accept .= $value;
+	}
+}
+echo $accept;
+?>
+--EXPECT--
+ArrayFitest2.jpgFi1015448798Fi1240SeCOMPUTED, ANY_TAG, IFD0, THUMBNAIL, COMMENT, EXIFArrayCoPhoto (c) M.BoergerCoEdited by M.Boerger.htwidth="1" height="1"He1Wi1Is1UsExif test image.UsASCIIArrayCoPhoto (c) M.BoergerUsASCIIArrayJP523Array0Comment #1.1Comment #2.2Comment #3end
\ No newline at end of file
diff --git a/ext/exif/tests/002.phpt b/ext/exif/tests/002.phpt
new file mode 100644
index 00000000000..687090e74ea
--- /dev/null
+++ b/ext/exif/tests/002.phpt
@@ -0,0 +1,26 @@
+--TEST--
+Check for exif_thumbnail
+--SKIPIF--
+<?php if (!extension_loaded("exif")) print "skip";?>
+--POST--
+--GET--
+--FILE--
+<?php
+/*
+  test1.jpg is a 1*1 image that does not contain any Exif/Comment information
+  test2.jpg is the same image but contains Exif/Comment information and a
+            copy of test1.jpg as a thumbnail.
+*/
+$istat= stat('test1.jpg');
+$fp    = fopen('test1.jpg','r');
+$image = fread($fp,$istat[7]);
+echo substr($image,490,5).'_'.$istat[7];
+fclose($fp);
+$thumb = exif_thumbnail('test2.jpg');
+echo strcmp($image,$thumb) ? 'different' : '_identical_';
+echo strlen($thumb);
+echo '_'.substr($thumb,490,5);
+/* 7GWgw_523_identical_523_7GWgw */
+?>
+--EXPECT--
+7GWgw_523_identical_523_7GWgw
\ No newline at end of file
diff --git a/ext/exif/tests/test1.jpg b/ext/exif/tests/test1.jpg
new file mode 100644
index 00000000000..121decb65ad
Binary files /dev/null and b/ext/exif/tests/test1.jpg differ
diff --git a/ext/exif/tests/test2.jpg b/ext/exif/tests/test2.jpg
new file mode 100644
index 00000000000..0d7018663a4
Binary files /dev/null and b/ext/exif/tests/test2.jpg differ