diff --git a/twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java b/twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java
old mode 100755
new mode 100644
index 498eb398..5d8f25c3
--- a/twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java
+++ b/twelvemonkeys-imageio/psd/src/test/java/com/twelvemonkeys/imageio/plugins/psd/PSDImageReaderTestCase.java
@@ -1,11 +1,16 @@
 package com.twelvemonkeys.imageio.plugins.psd;
 
 import com.twelvemonkeys.imageio.util.ImageReaderAbstractTestCase;
+import com.twelvemonkeys.imageio.util.ProgressListenerBase;
 
 import javax.imageio.spi.ImageReaderSpi;
+import javax.imageio.ImageReader;
 import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.util.Arrays;
 import java.util.List;
+import java.util.ArrayList;
+import java.io.IOException;
 
 /**
  * PSDImageReaderTestCase
@@ -31,11 +36,13 @@ public class PSDImageReaderTestCase extends ImageReaderAbstractTestCase<PSDImage
                 // 3 channel RGB, old data, no layer info/mask 
                 new TestData(getClassLoaderResource("/psd/MARBLES.PSD"), new Dimension(1419, 1001)),
                 // 1 channel, indexed color
-                new TestData(getClassLoaderResource("/psd/coral_fish.psd"), new Dimension(800, 800))
+                new TestData(getClassLoaderResource("/psd/coral_fish.psd"), new Dimension(800, 800)),
                 // 1 channel, bitmap, 1 bit samples
-//                new TestData(getClassLoaderResource("/psd/test_bitmap.psd"), new Dimension(800, 600))
+                new TestData(getClassLoaderResource("/psd/test_bitmap.psd"), new Dimension(710, 512)),
                 // 1 channel, gray, 16 bit samples
-//                new TestData(getClassLoaderResource("/psd/test_gray16.psd"), new Dimension(800, 600))
+                new TestData(getClassLoaderResource("/psd/test_gray16.psd"), new Dimension(710, 512)),
+                // 4 channel, CMYK, 16 bit samples
+                new TestData(getClassLoaderResource("/psd/cmyk_16bits.psd"), new Dimension(1000, 275))
                 // TODO: Need uncompressed PSD
                 // TODO: Need more recent ZIP compressed PSD files from CS2/CS3+
         );
@@ -65,4 +72,144 @@ public class PSDImageReaderTestCase extends ImageReaderAbstractTestCase<PSDImage
     protected List<String> getMIMETypes() {
         return Arrays.asList("image/x-psd");
     }
+
+    public void testSupportsThumbnail() {
+        PSDImageReader imageReader = createReader();
+        assertTrue(imageReader.readerSupportsThumbnails());
+    }
+
+    public void testThumbnailReading() throws IOException {
+        PSDImageReader imageReader = createReader();
+
+        imageReader.setInput(getTestData().get(0).getInputStream());
+
+        assertEquals(1, imageReader.getNumThumbnails(0));
+
+        BufferedImage thumbnail = imageReader.readThumbnail(0, 0);
+        assertNotNull(thumbnail);
+
+        assertEquals(128, thumbnail.getWidth());
+        assertEquals(96, thumbnail.getHeight());
+    }
+
+    public void testThumbnailReadingNoInput() throws IOException {
+        PSDImageReader imageReader = createReader();
+
+        try {
+            imageReader.getNumThumbnails(0);
+            fail("Expected IllegalStateException");
+        }
+        catch (IllegalStateException expected) {
+            assertTrue(expected.getMessage().toLowerCase().contains("input"));
+        }
+
+        try {
+            imageReader.getThumbnailWidth(0, 0);
+            fail("Expected IllegalStateException");
+        }
+        catch (IllegalStateException expected) {
+            assertTrue(expected.getMessage().toLowerCase().contains("input"));
+        }
+
+        try {
+            imageReader.getThumbnailHeight(0, 0);
+            fail("Expected IllegalStateException");
+        }
+        catch (IllegalStateException expected) {
+            assertTrue(expected.getMessage().toLowerCase().contains("input"));
+        }
+
+        try {
+            imageReader.readThumbnail(0, 0);
+            fail("Expected IllegalStateException");
+        }
+        catch (IllegalStateException expected) {
+            assertTrue(expected.getMessage().toLowerCase().contains("input"));
+        }
+    }
+
+    public void testThumbnailReadingOutOfBounds() throws IOException {
+        PSDImageReader imageReader = createReader();
+
+        imageReader.setInput(getTestData().get(0).getInputStream());
+
+        try {
+            imageReader.getNumThumbnails(2);
+            fail("Expected IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException expected) {
+            assertTrue(expected.getMessage(), expected.getMessage().toLowerCase().contains("index"));
+        }
+
+        try {
+            imageReader.getThumbnailWidth(-1, 0);
+            fail("Expected IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException expected) {
+            assertTrue(expected.getMessage(), expected.getMessage().toLowerCase().contains("index"));
+        }
+
+        try {
+            imageReader.getThumbnailHeight(0, -2);
+            fail("Expected IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException expected) {
+            // Sloppy...
+            assertTrue(expected.getMessage(), expected.getMessage().toLowerCase().contains("-2"));
+        }
+
+        try {
+            imageReader.readThumbnail(99, 42);
+            fail("Expected IndexOutOfBoundsException");
+        }
+        catch (IndexOutOfBoundsException expected) {
+            assertTrue(expected.getMessage(), expected.getMessage().toLowerCase().contains("index"));
+        }
+    }
+
+    public void testThumbnailDimensions() throws IOException {
+        PSDImageReader imageReader = createReader();
+
+        imageReader.setInput(getTestData().get(0).getInputStream());
+
+        assertEquals(1, imageReader.getNumThumbnails(0));
+
+        assertEquals(128, imageReader.getThumbnailWidth(0, 0));
+        assertEquals(96, imageReader.getThumbnailHeight(0, 0));
+    }
+
+    public void testThumbnailReadListeners() throws IOException {
+        PSDImageReader imageReader = createReader();
+
+        imageReader.setInput(getTestData().get(0).getInputStream());
+
+        final List<Object> sequnce = new ArrayList<Object>();
+        imageReader.addIIOReadProgressListener(new ProgressListenerBase() {
+            private float mLastPercentageDone = 0;
+
+            @Override
+            public void thumbnailStarted(final ImageReader pSource, final int pImageIndex, final int pThumbnailIndex) {
+                sequnce.add("started");
+            }
+
+            @Override
+            public void thumbnailComplete(final ImageReader pSource) {
+                sequnce.add("complete");
+            }
+
+            @Override
+            public void thumbnailProgress(final ImageReader pSource, final float pPercentageDone) {
+                // Optional
+                assertTrue("Listener invoked out of sequence", sequnce.size() == 1);
+                assertTrue(pPercentageDone >= mLastPercentageDone);
+            }
+        });
+
+        BufferedImage thumbnail = imageReader.readThumbnail(0, 0);
+        assertNotNull(thumbnail);
+
+        assertEquals("Listeners not invoked", 2, sequnce.size());
+        assertEquals("started", sequnce.get(0));
+        assertEquals("complete", sequnce.get(1));
+    }
 }
\ No newline at end of file