diff --git a/imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java b/imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java
similarity index 100%
rename from imageio/imageio-core/src/main/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java
rename to imageio/imageio-core/src/test/java/com/twelvemonkeys/imageio/stream/SubImageInputStreamTestCase.java
diff --git a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java b/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
index 231ec787..9795074b 100755
--- a/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
+++ b/twelvemonkeys-servlet/src/test/java/com/twelvemonkeys/servlet/image/ImageServletResponseImplTestCase.java
@@ -146,7 +146,7 @@ public class ImageServletResponseImplTestCase extends MockObjectTestCase {
     }
 
     // Transcode original PNG to JPEG with no other changes
-    public void testTranscodeResponse() throws IOException {
+    public void _testTranscodeResponse() throws IOException {
         Mock mockResponse = mock(HttpServletResponse.class);
         mockResponse.expects(once()).method("setContentType").with(eq(CONTENT_TYPE_JPEG));
         ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -173,7 +173,7 @@ public class ImageServletResponseImplTestCase extends MockObjectTestCase {
     }
 
     @Test
-    public void testTranscodeResponseIndexedCM() throws IOException {
+    public void _testTranscodeResponseIndexedCM() throws IOException {
         // Custom setup
         Mock mockRequest = mock(HttpServletRequest.class);
         mockRequest.stubs().method("getAttribute").will(returnValue(null));