diff --git a/test/Makefile b/test/Makefile
index 5856def9..cec213dd 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -67,6 +67,7 @@ TESTS = addmoddel.sh      \
         iptctest.sh       \
         modify-test.sh    \
         path-test.sh      \
+        preview-test.sh   \
         stringto-test.sh  \
         tiff-test.sh      \
         write-test.sh     \
diff --git a/test/data/eps/eps-test.out b/test/data/eps/eps-test.out
index 9a369dba..acedbc4d 100644
--- a/test/data/eps/eps-test.out
+++ b/test/data/eps/eps-test.out
@@ -4,12 +4,6 @@
 Command: exiv2 -u -pa eps-flat_empty-eof-noeol.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_empty-eof-noeol.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_empty-eof-noeol.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_empty-eof-noeol.eps
 Exit code: 0
 
@@ -27,12 +21,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_empty-eof.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_empty-eof.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_empty-eof.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_empty-eof.eps
 Exit code: 0
 
@@ -50,12 +38,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_empty-noeol.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_empty-noeol.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_empty-noeol.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_empty-noeol.eps
 Exit code: 0
 
@@ -74,12 +56,6 @@ Command: exiv2 -u -pa eps-flat_empty-xmp.eps
 Xmp.test.test                                XmpText     4  TEST
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_empty-xmp.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_empty-xmp.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_empty-xmp.eps
 Exit code: 0
 
@@ -97,12 +73,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_empty.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_empty.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_empty.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_empty.eps
 Exit code: 0
 
@@ -127,12 +97,6 @@ Exit code: 1
 Command: exiv2 -u -pa eps-flat_inkscape.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_inkscape.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_inkscape.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_inkscape.eps
 Exit code: 0
 
@@ -158,12 +122,6 @@ Exit code: 1
 Command: exiv2 -u -pa eps-flat_minimal-eof.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal-eof.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal-eof.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal-eof.eps
 Exit code: 0
 
@@ -181,12 +139,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_minimal-noeol.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal-noeol.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal-noeol.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal-noeol.eps
 Exit code: 0
 
@@ -204,12 +156,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_minimal.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal.eps
 Exit code: 0
 
@@ -228,12 +174,6 @@ Command: exiv2 -u -pa eps-flat_minimal_exiftool-8.56.eps
 Xmp.dc.title                                 LangAlt     1  lang="x-default" TEST-Exiftool
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal_exiftool-8.56.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal_exiftool-8.56.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal_exiftool-8.56.eps
 Exit code: 0
 
@@ -260,12 +200,6 @@ Command: exiv2 -u -pa eps-flat_minimal_xmp-singlequote-begin.eps
 Xmp.test.test                                XmpText     4  TEST
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal_xmp-singlequote-begin.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal_xmp-singlequote-begin.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal_xmp-singlequote-begin.eps
 Exit code: 0
 
@@ -284,12 +218,6 @@ Command: exiv2 -u -pa eps-flat_minimal_xmp-singlequote-end.eps
 Xmp.test.test                                XmpText     4  TEST
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal_xmp-singlequote-end.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal_xmp-singlequote-end.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal_xmp-singlequote-end.eps
 Exit code: 0
 
@@ -308,12 +236,6 @@ Command: exiv2 -u -pa eps-flat_minimal_xmp-singlequote-id.eps
 Xmp.test.test                                XmpText     4  TEST
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal_xmp-singlequote-id.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal_xmp-singlequote-id.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal_xmp-singlequote-id.eps
 Exit code: 0
 
@@ -332,12 +254,6 @@ Command: exiv2 -u -pa eps-flat_minimal_xmp.eps
 Xmp.test.test                                XmpText     4  TEST
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal_xmp.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal_xmp.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal_xmp.eps
 Exit code: 0
 
@@ -365,14 +281,6 @@ Warning: Second XMP metadata block interferes at position: 849
 Xmp.dc.title                                 LangAlt     1  lang="x-default" TEST-Exiftool
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_minimal_xmp_exiftool-8.56_fixed.eps
-Warning: Second XMP metadata block interferes at position: 849
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_minimal_xmp_exiftool-8.56_fixed.eps
-Warning: Second XMP metadata block interferes at position: 849
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_minimal_xmp_exiftool-8.56_fixed.eps
 Warning: Second XMP metadata block interferes at position: 849
 Exit code: 0
@@ -388,12 +296,6 @@ Exit code: 1
 Command: exiv2 -u -pa eps-flat_oodraw-lev1.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw-lev1.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw-lev1.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw-lev1.eps
 Exit code: 0
 
@@ -411,12 +313,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_oodraw-lev2.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw-lev2.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw-lev2.eps
 Exit code: 0
 
@@ -434,12 +330,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_oodraw-lev2_eps2eps.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw-lev2_eps2eps.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw-lev2_eps2eps.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw-lev2_eps2eps.eps
 Exit code: 0
 
@@ -591,13 +481,6 @@ Xmp.xmpMM.History[8]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[8]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-10-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-10-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-10-lev2.eps
 Exit code: 0
 
@@ -615,12 +498,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_oodraw_ai-3-lev2.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-3-lev2.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-3-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-3-lev2.eps
 Exit code: 0
 
@@ -638,12 +515,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_oodraw_ai-3-lev3.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-3-lev3.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-3-lev3.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-3-lev3.eps
 Exit code: 0
 
@@ -807,13 +678,6 @@ Xmp.xmpMM.History[10]/stEvt:softwareAgent    XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[10]/stEvt:changed          XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-8-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-8-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-8-lev2.eps
 Exit code: 0
 
@@ -831,12 +695,6 @@ Exit code: 0
 Command: exiv2 -u -pa eps-flat_oodraw_ai-8-lev3.eps
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-8-lev3.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-8-lev3.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-8-lev3.eps
 Exit code: 0
 
@@ -994,13 +852,6 @@ Xmp.xmpMM.History[9]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[9]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-9-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-9-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-9-lev2.eps
 Exit code: 0
 
@@ -1146,13 +997,6 @@ Xmp.xmpMM.History[7]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[7]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs-lev2.eps
 Exit code: 0
 
@@ -1292,13 +1136,6 @@ Xmp.xmpMM.History[6]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[6]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs2-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs2-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs2-lev2.eps
 Exit code: 0
 
@@ -1432,13 +1269,6 @@ Xmp.xmpMM.History[5]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[5]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs3-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs3-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs3-lev2.eps
 Exit code: 0
 
@@ -1566,13 +1396,6 @@ Xmp.xmpMM.History[4]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[4]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs4-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs4-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs4-lev2.eps
 Exit code: 0
 
@@ -1666,13 +1489,6 @@ Xmp.xmpTPg.SwatchGroups[1]/xmpG:groupType    XmpText     1  0
 Xmp.dc.format                                XmpText    22  application/postscript
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev2.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev2.eps
 Exit code: 0
 
@@ -1788,13 +1604,6 @@ Xmp.xmpMM.History[2]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[2]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
 Exit code: 0
 
@@ -1916,14 +1725,6 @@ Xmp.xmpMM.History[3]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[3]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-preview.eps
-Preview 1: image/tiff, 213x170 pixels, 37902 bytes
-Preview 2: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-preview.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev3-preview.eps
 Exit code: 0
 
@@ -2030,13 +1831,6 @@ Xmp.xmpMM.History[1]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[1]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev3.eps
 Exit code: 0
 
@@ -2143,13 +1937,6 @@ Xmp.xmpMM.History[1]/stEvt:softwareAgent     XmpText    21  Adobe Illustrator CS
 Xmp.xmpMM.History[1]/stEvt:changed           XmpText     1  /
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
-Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
 Exit code: 0
 
@@ -2195,12 +1982,6 @@ Xmp.photoshop.ColorMode                      XmpText     1  3
 Xmp.photoshop.ICCProfile                     XmpText    17  sRGB IEC61966-2.1
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-ascii-colorprofile.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii-colorprofile.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii-colorprofile.eps
 Exit code: 0
 
@@ -2269,12 +2050,6 @@ Xmp.xmpMM.History[7]/stEvt:changed           XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-ascii-preview.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii-preview.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii-preview.eps
 Exit code: 0
 
@@ -2331,12 +2106,6 @@ Xmp.xmpMM.History[5]/stEvt:changed           XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-ascii.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii.eps
 Exit code: 0
 
@@ -2453,12 +2222,6 @@ Xmp.xmpMM.History[15]/stEvt:changed          XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-ascii85-preview.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii85-preview.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii85-preview.eps
 Exit code: 0
 
@@ -2563,12 +2326,6 @@ Xmp.xmpMM.History[13]/stEvt:changed          XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-ascii85.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-ascii85.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-ascii85.eps
 Exit code: 0
 
@@ -2669,12 +2426,6 @@ Xmp.xmpMM.History[11]/stEvt:changed          XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-binary-preview.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary-preview.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-binary-preview.eps
 Exit code: 0
 
@@ -2755,12 +2506,6 @@ Xmp.xmpMM.History[9]/stEvt:changed           XmpText     1  /
 Xmp.photoshop.ColorMode                      XmpText     1  3
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-binary.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-binary.eps
 Exit code: 0
 
@@ -2779,12 +2524,6 @@ Command: exiv2 -u -pa eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
 Xmp.test.test                                XmpText   65536  BEGIN________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________________END
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-binary_exiv2-bigxmp.eps
 Exit code: 0
 
@@ -2803,12 +2542,6 @@ Command: exiv2 -u -pa eps-flat_photoshop-cs5-binary_exiv2.eps
 Xmp.test.test                                XmpText    20  TEST-Photoshop-Exiv2
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-binary_exiv2.eps
 Exit code: 0
 
@@ -2828,14 +2561,6 @@ Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560
 Xmp.test.test                                XmpText    20  TEST-Photoshop-Exiv2
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
-Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
-Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-cs5-binary_exiv2_missing-begin-xml-packet.eps
 Warning: Missing %begin_xml_packet in Photoshop EPS at position: 8560
 Exit code: 0
@@ -2882,13 +2607,6 @@ Xmp.photoshop.ColorMode                      XmpText     1  3
 Xmp.photoshop.ICCProfile                     XmpText    17  sRGB IEC61966-2.1
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-e9-win-doseps.eps
-Preview 1: image/tiff, 454x340 pixels, 23782 bytes
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-e9-win-doseps.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-e9-win-doseps.eps
 Exit code: 0
 
@@ -2937,12 +2655,6 @@ Xmp.photoshop.ColorMode                      XmpText     1  3
 Xmp.photoshop.ICCProfile                     XmpText    17  sRGB IEC61966-2.1
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-e9-win.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-e9-win.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-e9-win.eps
 Exit code: 0
 
@@ -2961,12 +2673,6 @@ Command: exiv2 -u -pa eps-flat_photoshop-e9-win_exiv2.eps
 Xmp.test.test                                XmpText    20  TEST-Photoshop-Exiv2
 Exit code: 253
 
-Command: exiv2 -pp eps-flat_photoshop-e9-win_exiv2.eps
-Exit code: 0
-
-Command: exiv2 -f -ep eps-flat_photoshop-e9-win_exiv2.eps
-Exit code: 0
-
 Command: exiv2 -f -eX eps-flat_photoshop-e9-win_exiv2.eps
 Exit code: 0
 
diff --git a/test/data/exiv2-photoshop.psd b/test/data/exiv2-photoshop.psd
new file mode 100644
index 00000000..964b352b
Binary files /dev/null and b/test/data/exiv2-photoshop.psd differ
diff --git a/test/data/eps/eps-flat_oodraw_ai-10-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-10-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-10-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-10-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-8-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-8-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-8-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-8-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-9-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-9-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-9-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-9-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs2-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs2-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs2-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs2-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs3-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs3-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs3-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs3-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs4-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs4-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs4-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs4-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev2-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs5-lev2-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev2-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev2-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-nodocthumb-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-nodocthumb-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-nodocthumb-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev3-nodocthumb-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview-preview1.tif b/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview1.tif
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview-preview1.tif
rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview1.tif
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview-preview2.jpg b/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview2.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview-preview2.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview-preview2.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev3-preview1.jpg
diff --git a/test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg-preview1.jpg b/test/data/preview/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg-preview1.jpg
similarity index 100%
rename from test/data/eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg-preview1.jpg
rename to test/data/preview/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg-preview1.jpg
diff --git a/test/data/eps/eps-flat_photoshop-e9-win-doseps-preview1.tif b/test/data/preview/eps-flat_photoshop-e9-win-doseps-preview1.tif
similarity index 100%
rename from test/data/eps/eps-flat_photoshop-e9-win-doseps-preview1.tif
rename to test/data/preview/eps-flat_photoshop-e9-win-doseps-preview1.tif
diff --git a/test/data/preview/exiv2-bug443-preview1.jpg b/test/data/preview/exiv2-bug443-preview1.jpg
new file mode 100644
index 00000000..ab23540a
Binary files /dev/null and b/test/data/preview/exiv2-bug443-preview1.jpg differ
diff --git a/test/data/preview/exiv2-bug444-preview1.jpg b/test/data/preview/exiv2-bug444-preview1.jpg
new file mode 100644
index 00000000..1840fe14
Binary files /dev/null and b/test/data/preview/exiv2-bug444-preview1.jpg differ
diff --git a/test/data/preview/exiv2-bug444-preview2.jpg b/test/data/preview/exiv2-bug444-preview2.jpg
new file mode 100644
index 00000000..377998d3
Binary files /dev/null and b/test/data/preview/exiv2-bug444-preview2.jpg differ
diff --git a/test/data/preview/exiv2-bug445-preview1.jpg b/test/data/preview/exiv2-bug445-preview1.jpg
new file mode 100644
index 00000000..61a24dbb
Binary files /dev/null and b/test/data/preview/exiv2-bug445-preview1.jpg differ
diff --git a/test/data/preview/exiv2-bug447-preview1.jpg b/test/data/preview/exiv2-bug447-preview1.jpg
new file mode 100644
index 00000000..1347baf2
Binary files /dev/null and b/test/data/preview/exiv2-bug447-preview1.jpg differ
diff --git a/test/data/preview/exiv2-bug501-preview1.jpg b/test/data/preview/exiv2-bug501-preview1.jpg
new file mode 100644
index 00000000..bef02d2b
Binary files /dev/null and b/test/data/preview/exiv2-bug501-preview1.jpg differ
diff --git a/test/data/preview/exiv2-bug528-preview1.jpg b/test/data/preview/exiv2-bug528-preview1.jpg
new file mode 100644
index 00000000..d1e39ec1
Binary files /dev/null and b/test/data/preview/exiv2-bug528-preview1.jpg differ
diff --git a/test/data/preview/exiv2-canon-eos-20d-preview1.jpg b/test/data/preview/exiv2-canon-eos-20d-preview1.jpg
new file mode 100644
index 00000000..a9b58dfc
Binary files /dev/null and b/test/data/preview/exiv2-canon-eos-20d-preview1.jpg differ
diff --git a/test/data/preview/exiv2-canon-eos-300d-preview1.jpg b/test/data/preview/exiv2-canon-eos-300d-preview1.jpg
new file mode 100644
index 00000000..e96fedbe
Binary files /dev/null and b/test/data/preview/exiv2-canon-eos-300d-preview1.jpg differ
diff --git a/test/data/preview/exiv2-canon-eos-d30-preview1.jpg b/test/data/preview/exiv2-canon-eos-d30-preview1.jpg
new file mode 100644
index 00000000..2a91f197
Binary files /dev/null and b/test/data/preview/exiv2-canon-eos-d30-preview1.jpg differ
diff --git a/test/data/preview/exiv2-canon-powershot-a520-preview1.jpg b/test/data/preview/exiv2-canon-powershot-a520-preview1.jpg
new file mode 100644
index 00000000..7e1ba099
Binary files /dev/null and b/test/data/preview/exiv2-canon-powershot-a520-preview1.jpg differ
diff --git a/test/data/preview/exiv2-canon-powershot-s40-preview1.jpg b/test/data/preview/exiv2-canon-powershot-s40-preview1.jpg
new file mode 100644
index 00000000..a142034d
Binary files /dev/null and b/test/data/preview/exiv2-canon-powershot-s40-preview1.jpg differ
diff --git a/test/data/preview/exiv2-fujifilm-finepix-s2pro-preview1.jpg b/test/data/preview/exiv2-fujifilm-finepix-s2pro-preview1.jpg
new file mode 100644
index 00000000..96596f6a
Binary files /dev/null and b/test/data/preview/exiv2-fujifilm-finepix-s2pro-preview1.jpg differ
diff --git a/test/data/preview/exiv2-gc-preview1.jpg b/test/data/preview/exiv2-gc-preview1.jpg
new file mode 100644
index 00000000..f1061311
Binary files /dev/null and b/test/data/preview/exiv2-gc-preview1.jpg differ
diff --git a/test/data/preview/exiv2-kodak-dc210-preview1.tif b/test/data/preview/exiv2-kodak-dc210-preview1.tif
new file mode 100644
index 00000000..0afa6150
Binary files /dev/null and b/test/data/preview/exiv2-kodak-dc210-preview1.tif differ
diff --git a/test/data/preview/exiv2-nikon-d70-preview1.jpg b/test/data/preview/exiv2-nikon-d70-preview1.jpg
new file mode 100644
index 00000000..a8a79514
Binary files /dev/null and b/test/data/preview/exiv2-nikon-d70-preview1.jpg differ
diff --git a/test/data/preview/exiv2-nikon-d70-preview2.jpg b/test/data/preview/exiv2-nikon-d70-preview2.jpg
new file mode 100644
index 00000000..37eb5c36
Binary files /dev/null and b/test/data/preview/exiv2-nikon-d70-preview2.jpg differ
diff --git a/test/data/preview/exiv2-nikon-e950-preview1.jpg b/test/data/preview/exiv2-nikon-e950-preview1.jpg
new file mode 100644
index 00000000..99b9539c
Binary files /dev/null and b/test/data/preview/exiv2-nikon-e950-preview1.jpg differ
diff --git a/test/data/preview/exiv2-nikon-e990-preview1.jpg b/test/data/preview/exiv2-nikon-e990-preview1.jpg
new file mode 100644
index 00000000..9699ebe4
Binary files /dev/null and b/test/data/preview/exiv2-nikon-e990-preview1.jpg differ
diff --git a/test/data/preview/exiv2-olympus-c8080wz-preview1.jpg b/test/data/preview/exiv2-olympus-c8080wz-preview1.jpg
new file mode 100644
index 00000000..891e0b96
Binary files /dev/null and b/test/data/preview/exiv2-olympus-c8080wz-preview1.jpg differ
diff --git a/test/data/preview/exiv2-panasonic-dmc-fz5-preview1.jpg b/test/data/preview/exiv2-panasonic-dmc-fz5-preview1.jpg
new file mode 100644
index 00000000..2984e7b2
Binary files /dev/null and b/test/data/preview/exiv2-panasonic-dmc-fz5-preview1.jpg differ
diff --git a/test/data/preview/exiv2-photoshop-preview1.jpg b/test/data/preview/exiv2-photoshop-preview1.jpg
new file mode 100644
index 00000000..342f4767
Binary files /dev/null and b/test/data/preview/exiv2-photoshop-preview1.jpg differ
diff --git a/test/data/preview/exiv2-sigma-d10-preview1.jpg b/test/data/preview/exiv2-sigma-d10-preview1.jpg
new file mode 100644
index 00000000..6becccff
Binary files /dev/null and b/test/data/preview/exiv2-sigma-d10-preview1.jpg differ
diff --git a/test/data/preview/exiv2-sony-dsc-w7-preview1.jpg b/test/data/preview/exiv2-sony-dsc-w7-preview1.jpg
new file mode 100644
index 00000000..8ee145b6
Binary files /dev/null and b/test/data/preview/exiv2-sony-dsc-w7-preview1.jpg differ
diff --git a/test/data/preview/glider-preview1.jpg b/test/data/preview/glider-preview1.jpg
new file mode 100644
index 00000000..39a0fff1
Binary files /dev/null and b/test/data/preview/glider-preview1.jpg differ
diff --git a/test/data/preview/imagemagick-preview1.jpg b/test/data/preview/imagemagick-preview1.jpg
new file mode 100644
index 00000000..7b6c88f6
Binary files /dev/null and b/test/data/preview/imagemagick-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-noIPTC-preview1.jpg b/test/data/preview/iptc-psAPP13-noIPTC-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-noIPTC-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-noIPTC-psAPP13-wIPTC-preview1.jpg b/test/data/preview/iptc-psAPP13-noIPTC-psAPP13-wIPTC-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-noIPTC-psAPP13-wIPTC-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTC-psAPP13-noIPTC-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTC-psAPP13-noIPTC-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTC-psAPP13-noIPTC-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTC1-psAPP13-wIPTC2-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTC1-psAPP13-wIPTC2-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTC1-psAPP13-wIPTC2-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTCbeg-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTCbeg-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTCbeg-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTCempty-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTCempty-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTCempty-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTCempty-psAPP13-wIPTC-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTCempty-psAPP13-wIPTC-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTCempty-psAPP13-wIPTC-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTCend-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTCend-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTCend-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTCmid-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTCmid-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTCmid-preview1.jpg differ
diff --git a/test/data/preview/iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2-preview1.jpg b/test/data/preview/iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2-preview1.jpg
new file mode 100644
index 00000000..cd164b4e
Binary files /dev/null and b/test/data/preview/iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2-preview1.jpg differ
diff --git a/test/data/preview/preview-test.out b/test/data/preview/preview-test.out
new file mode 100644
index 00000000..f212ca03
--- /dev/null
+++ b/test/data/preview/preview-test.out
@@ -0,0 +1,474 @@
+
+-----> eps-flat_oodraw_ai-10-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-10-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-10-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-8-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-8-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-8-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-9-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-9-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-9-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs2-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs2-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs2-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs3-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs3-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs3-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs4-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs4-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs4-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev2.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs5-lev3-preview.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Preview 1: image/tiff, 213x170 pixels, 37902 bytes
+Preview 2: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs5-lev3-preview.eps
+Exit code: 0
+
+-----> eps-flat_oodraw_ai-cs-lev2.eps <-----
+
+Command: exiv2 -pp eps-flat_oodraw_ai-cs-lev2.eps
+Preview 1: image/jpeg, 256x208 pixels, 3166 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_oodraw_ai-cs-lev2.eps
+Exit code: 0
+
+-----> eps-flat_photoshop-e9-win-doseps.eps <-----
+
+Command: exiv2 -pp eps-flat_photoshop-e9-win-doseps.eps
+Preview 1: image/tiff, 454x340 pixels, 23782 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep eps-flat_photoshop-e9-win-doseps.eps
+Exit code: 0
+
+-----> exiv2-bug443.jpg <-----
+
+Command: exiv2 -pp exiv2-bug443.jpg
+Error: Directory Iop with 5233 entries considered invalid; not read.
+Preview 1: image/jpeg, 288x192 pixels, 33779 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug443.jpg
+Error: Directory Iop with 5233 entries considered invalid; not read.
+Exit code: 0
+
+-----> exiv2-bug444.jpg <-----
+
+Command: exiv2 -pp exiv2-bug444.jpg
+Preview 1: image/jpeg, 160x120 pixels, 4158 bytes
+Preview 2: image/jpeg, 320x240 pixels, 16993 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug444.jpg
+Exit code: 0
+
+-----> exiv2-bug445.jpg <-----
+
+Command: exiv2 -pp exiv2-bug445.jpg
+Preview 1: image/jpeg, 160x120 pixels, 5448 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug445.jpg
+Exit code: 0
+
+-----> exiv2-bug447.jpg <-----
+
+Command: exiv2 -pp exiv2-bug447.jpg
+Error: Directory NikonPreview with 8224 entries considered invalid; not read.
+Warning: Directory Photo, entry 0x9286 has unknown Exif (TIFF) type 14; setting type size 1.
+Preview 1: image/jpeg, 160x120 pixels, 4093 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug447.jpg
+Error: Directory NikonPreview with 8224 entries considered invalid; not read.
+Warning: Directory Photo, entry 0x9286 has unknown Exif (TIFF) type 14; setting type size 1.
+Exit code: 0
+
+-----> exiv2-bug501.jpg <-----
+
+Command: exiv2 -pp exiv2-bug501.jpg
+Warning: Unsupported time format
+Preview 1: image/jpeg, 120x160 pixels, 6179 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug501.jpg
+Warning: Unsupported time format
+Exit code: 0
+
+-----> exiv2-bug528.jpg <-----
+
+Command: exiv2 -pp exiv2-bug528.jpg
+Warning: Directory Canon, entry 0x0200 has unknown Exif (TIFF) type 768; setting type size 1.
+Preview 1: image/jpeg, 160x94 pixels, 4492 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-bug528.jpg
+Warning: Directory Canon, entry 0x0200 has unknown Exif (TIFF) type 768; setting type size 1.
+Exit code: 0
+
+-----> exiv2-canon-eos-20d.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-eos-20d.jpg
+Error: Directory Canon: Next pointer is out of bounds; ignored.
+Preview 1: image/jpeg, 160x120 pixels, 6260 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-eos-20d.jpg
+Error: Directory Canon: Next pointer is out of bounds; ignored.
+Exit code: 0
+
+-----> exiv2-canon-eos-300d.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-eos-300d.jpg
+Preview 1: image/jpeg, 160x120 pixels, 9728 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-eos-300d.jpg
+Exit code: 0
+
+-----> exiv2-canon-eos-d30.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-eos-d30.jpg
+Preview 1: image/jpeg, 160x120 pixels, 13824 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-eos-d30.jpg
+Exit code: 0
+
+-----> exiv2-canon-powershot-a520.jpg <-----
+
+Command: exiv2 -pp exiv2-canon-powershot-a520.jpg
+Preview 1: image/jpeg, 160x120 pixels, 6137 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-powershot-a520.jpg
+Exit code: 0
+
+-----> exiv2-canon-powershot-s40.crw <-----
+
+Command: exiv2 -pp exiv2-canon-powershot-s40.crw
+Preview 1: image/jpeg, 160x120 pixels, 4418 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-canon-powershot-s40.crw
+Exit code: 0
+
+-----> exiv2-fujifilm-finepix-s2pro.jpg <-----
+
+Command: exiv2 -pp exiv2-fujifilm-finepix-s2pro.jpg
+Preview 1: image/jpeg, 160x120 pixels, 9573 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-fujifilm-finepix-s2pro.jpg
+Exit code: 0
+
+-----> exiv2-gc.jpg <-----
+
+Command: exiv2 -pp exiv2-gc.jpg
+Preview 1: image/jpeg, 133x200 pixels, 6144 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-gc.jpg
+Exit code: 0
+
+-----> exiv2-kodak-dc210.jpg <-----
+
+Command: exiv2 -pp exiv2-kodak-dc210.jpg
+Preview 1: image/tiff, 96x72 pixels, 20736 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-kodak-dc210.jpg
+Exit code: 0
+
+-----> exiv2-nikon-d70.jpg <-----
+
+Command: exiv2 -pp exiv2-nikon-d70.jpg
+Preview 1: image/jpeg, 160x120 pixels, 8930 bytes
+Preview 2: image/jpeg, 564x372 pixels, 27773 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-nikon-d70.jpg
+Exit code: 0
+
+-----> exiv2-nikon-e950.jpg <-----
+
+Command: exiv2 -pp exiv2-nikon-e950.jpg
+Preview 1: image/jpeg, 160x120 pixels, 4662 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-nikon-e950.jpg
+Exit code: 0
+
+-----> exiv2-nikon-e990.jpg <-----
+
+Command: exiv2 -pp exiv2-nikon-e990.jpg
+Preview 1: image/jpeg, 160x120 pixels, 7829 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-nikon-e990.jpg
+Exit code: 0
+
+-----> exiv2-olympus-c8080wz.jpg <-----
+
+Command: exiv2 -pp exiv2-olympus-c8080wz.jpg
+Preview 1: image/jpeg, 160x120 pixels, 7306 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-olympus-c8080wz.jpg
+Exit code: 0
+
+-----> exiv2-panasonic-dmc-fz5.jpg <-----
+
+Command: exiv2 -pp exiv2-panasonic-dmc-fz5.jpg
+Preview 1: image/jpeg, 160x120 pixels, 10308 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-panasonic-dmc-fz5.jpg
+Exit code: 0
+
+-----> exiv2-photoshop.psd <-----
+
+Command: exiv2 -pp exiv2-photoshop.psd
+Preview 1: image/jpeg, 150x91 pixels, 4669 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-photoshop.psd
+Exit code: 0
+
+-----> exiv2-sigma-d10.jpg <-----
+
+Command: exiv2 -pp exiv2-sigma-d10.jpg
+Preview 1: image/jpeg, 160x106 pixels, 11998 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-sigma-d10.jpg
+Exit code: 0
+
+-----> exiv2-sony-dsc-w7.jpg <-----
+
+Command: exiv2 -pp exiv2-sony-dsc-w7.jpg
+Preview 1: image/jpeg, 160x120 pixels, 15605 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep exiv2-sony-dsc-w7.jpg
+Exit code: 0
+
+-----> glider.exv <-----
+
+Command: exiv2 -pp glider.exv
+Preview 1: image/jpeg, 160x120 pixels, 5333 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep glider.exv
+Exit code: 0
+
+-----> imagemagick.pgf <-----
+
+Command: exiv2 -pp imagemagick.pgf
+Preview 1: image/jpeg, 160x105 pixels, 4363 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep imagemagick.pgf
+Exit code: 0
+
+-----> iptc-psAPP13-noIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-noIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCbeg.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCbeg.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCbeg.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCempty.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCempty.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCend.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCend.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCend.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTCmid.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTCmid.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTCmid.jpg
+Exit code: 0
+
+-----> iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg <-----
+
+Command: exiv2 -pp iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
+Preview 1: image/jpeg, 160x114 pixels, 938 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg
+Exit code: 0
+
+-----> smiley2.jpg <-----
+
+Command: exiv2 -pp smiley2.jpg
+Preview 1: image/jpeg, 160x120 pixels, 7289 bytes
+Exit code: 0
+
+Command: exiv2 -f -ep smiley2.jpg
+Exit code: 0
diff --git a/test/data/preview/smiley2-preview1.jpg b/test/data/preview/smiley2-preview1.jpg
new file mode 100644
index 00000000..dec7a1d6
Binary files /dev/null and b/test/data/preview/smiley2-preview1.jpg differ
diff --git a/test/eps-test.sh b/test/eps-test.sh
index 996ca863..c3c0af08 100755
--- a/test/eps-test.sh
+++ b/test/eps-test.sh
@@ -51,22 +51,6 @@ done
             continue
         fi
 
-        rm -f "$image-preview"*
-
-        echo
-        echo "Command: exiv2 -pp $image.eps"
-        $bin/exiv2 -pp "$image.eps"
-        echo "Exit code: $?"
-
-        echo
-        echo "Command: exiv2 -f -ep $image.eps"
-        $bin/exiv2 -f -ep "$image.eps"
-        echo "Exit code: $?"
-
-        $bin/exiv2 -pp "$image.eps" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do
-            diff -q "../data/eps/$image-preview$preview."* "$image-preview$preview."*
-        done
-
         echo
         echo "Command: exiv2 -f -eX $image.eps"
         $bin/exiv2 -f -eX "$image.eps"
diff --git a/test/preview-test.sh b/test/preview-test.sh
new file mode 100755
index 00000000..ac020aa1
--- /dev/null
+++ b/test/preview-test.sh
@@ -0,0 +1,112 @@
+#! /bin/sh
+# Test driver for previews
+
+# ----------------------------------------------------------------------
+# Setup
+export LC_ALL=C
+cd tmp/
+if [ -z "$EXIV2_BINDIR" ] ; then
+    bin="$VALGRIND ../../src"
+    samples="$VALGRIND ../../samples"
+else
+    bin="$VALGRIND $EXIV2_BINDIR"
+    samples="$VALGRIND $EXIV2_BINDIR"
+fi
+diffargs="--strip-trailing-cr"
+if ! diff -q $diffargs /dev/null /dev/null 2>/dev/null ; then
+    diffargs=""
+fi
+
+# ----------------------------------------------------------------------
+# Tests
+images="eps/eps-flat_oodraw_ai-10-lev2.eps \
+        eps/eps-flat_oodraw_ai-8-lev2.eps \
+        eps/eps-flat_oodraw_ai-9-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs2-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs3-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs4-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev2.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3-nodocthumb.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3_preview-ns-xapGImg.eps \
+        eps/eps-flat_oodraw_ai-cs5-lev3-preview.eps \
+        eps/eps-flat_oodraw_ai-cs-lev2.eps \
+        eps/eps-flat_photoshop-e9-win-doseps.eps \
+        exiv2-bug443.jpg \
+        exiv2-bug444.jpg \
+        exiv2-bug445.jpg \
+        exiv2-bug447.jpg \
+        exiv2-bug501.jpg \
+        exiv2-bug528.jpg \
+        exiv2-canon-eos-20d.jpg \
+        exiv2-canon-eos-300d.jpg \
+        exiv2-canon-eos-d30.jpg \
+        exiv2-canon-powershot-a520.jpg \
+        exiv2-canon-powershot-s40.crw \
+        exiv2-fujifilm-finepix-s2pro.jpg \
+        exiv2-gc.jpg \
+        exiv2-kodak-dc210.jpg \
+        exiv2-nikon-d70.jpg \
+        exiv2-nikon-e950.jpg \
+        exiv2-nikon-e990.jpg \
+        exiv2-olympus-c8080wz.jpg \
+        exiv2-panasonic-dmc-fz5.jpg \
+        exiv2-photoshop.psd \
+        exiv2-sigma-d10.jpg \
+        exiv2-sony-dsc-w7.jpg \
+        glider.exv \
+        imagemagick.pgf \
+        iptc-psAPP13-noIPTC.jpg \
+        iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-noIPTC-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-wIPTC1-psAPP13-wIPTC2.jpg \
+        iptc-psAPP13-wIPTCbeg.jpg \
+        iptc-psAPP13-wIPTCempty.jpg \
+        iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-wIPTCempty-psAPP13-wIPTC.jpg \
+        iptc-psAPP13-wIPTCend.jpg \
+        iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg \
+        iptc-psAPP13-wIPTCmid1-wIPTCempty-wIPTCmid2.jpg \
+        iptc-psAPP13-wIPTCmid.jpg \
+        iptc-psAPP13-wIPTC-psAPP13-noIPTC.jpg \
+        smiley2.jpg"
+(
+    for filepath in $images; do
+        filename=`basename "$filepath"`
+        image=`echo "$filename" | sed 's,\.[^.]*$,,'`
+
+        printf "." >&3
+
+        echo
+        echo "-----> $filename <-----"
+
+        cp "../data/$filepath" ./
+
+        echo
+        echo "Command: exiv2 -pp $filename"
+        $bin/exiv2 -pp "$filename"
+        exitcode=$?
+        echo "Exit code: $exitcode"
+
+        rm -f "$image-preview"*
+
+        echo
+        echo "Command: exiv2 -f -ep $filename"
+        $bin/exiv2 -f -ep "$filename"
+        echo "Exit code: $?"
+
+        $bin/exiv2 -pp "$filename" 2>/dev/null | sed -n 's,^Preview \([0-9]\+\):.*,\1,p' | while read preview; do
+            diff -q "../data/preview/$image-preview$preview."* "$image-preview$preview."*
+        done
+    done
+) 3>&1 > "preview-test.out" 2>&1
+
+echo "."
+
+# ----------------------------------------------------------------------
+# Result
+if ! diff -q $diffargs "../data/preview/preview-test.out" "preview-test.out" ; then
+    diff -u $diffargs "../data/preview/preview-test.out" "preview-test.out"
+    exit 1
+fi
+echo "All testcases passed."