diff --git a/common/common-io/pom.xml b/common/common-io/pom.xml
index c057fcc3..532c4391 100644
--- a/common/common-io/pom.xml
+++ b/common/common-io/pom.xml
@@ -22,7 +22,7 @@
         <dependency>
             <groupId>${project.groupId}</groupId>
             <artifactId>common-lang</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
     </dependencies>
diff --git a/common/pom.xml b/common/pom.xml
index 638c21a4..5ee04eb3 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -32,7 +32,7 @@
                 <groupId>${project.groupId}</groupId>
                 <artifactId>common-lang</artifactId>
                 <version>${project.version}</version>
-                <classifier>tests</classifier>
+                <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
 
diff --git a/imageio/imageio-batik/pom.xml b/imageio/imageio-batik/pom.xml
index 8f2e40b2..90c3b918 100644
--- a/imageio/imageio-batik/pom.xml
+++ b/imageio/imageio-batik/pom.xml
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
 
         <dependency>
diff --git a/imageio/imageio-bmp/pom.xml b/imageio/imageio-bmp/pom.xml
index 4fe0c9a7..b6158573 100644
--- a/imageio/imageio-bmp/pom.xml
+++ b/imageio/imageio-bmp/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-clippath/pom.xml b/imageio/imageio-clippath/pom.xml
index 0fa5d23d..3be5f0f6 100755
--- a/imageio/imageio-clippath/pom.xml
+++ b/imageio/imageio-clippath/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-hdr/pom.xml b/imageio/imageio-hdr/pom.xml
index dae0b4fb..61a906a7 100644
--- a/imageio/imageio-hdr/pom.xml
+++ b/imageio/imageio-hdr/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-icns/pom.xml b/imageio/imageio-icns/pom.xml
index 30899941..c0fd9f0c 100644
--- a/imageio/imageio-icns/pom.xml
+++ b/imageio/imageio-icns/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-iff/pom.xml b/imageio/imageio-iff/pom.xml
index 5769f1ba..ce7d5267 100644
--- a/imageio/imageio-iff/pom.xml
+++ b/imageio/imageio-iff/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-jpeg/pom.xml b/imageio/imageio-jpeg/pom.xml
index e9e8e870..fc018425 100644
--- a/imageio/imageio-jpeg/pom.xml
+++ b/imageio/imageio-jpeg/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-metadata/pom.xml b/imageio/imageio-metadata/pom.xml
index 82337b2e..d2e08d87 100644
--- a/imageio/imageio-metadata/pom.xml
+++ b/imageio/imageio-metadata/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-pcx/pom.xml b/imageio/imageio-pcx/pom.xml
index 426793ea..19d38efd 100755
--- a/imageio/imageio-pcx/pom.xml
+++ b/imageio/imageio-pcx/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-pdf/pom.xml b/imageio/imageio-pdf/pom.xml
index 277b52e3..7d45c3a5 100644
--- a/imageio/imageio-pdf/pom.xml
+++ b/imageio/imageio-pdf/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-pict/pom.xml b/imageio/imageio-pict/pom.xml
index 3104dec2..f68f9024 100644
--- a/imageio/imageio-pict/pom.xml
+++ b/imageio/imageio-pict/pom.xml
@@ -18,7 +18,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 
diff --git a/imageio/imageio-pnm/pom.xml b/imageio/imageio-pnm/pom.xml
index a4a2ec80..580d5dcd 100755
--- a/imageio/imageio-pnm/pom.xml
+++ b/imageio/imageio-pnm/pom.xml
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-psd/pom.xml b/imageio/imageio-psd/pom.xml
index daa1568d..16bfda20 100644
--- a/imageio/imageio-psd/pom.xml
+++ b/imageio/imageio-psd/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-reference/pom.xml b/imageio/imageio-reference/pom.xml
index 54044856..9b461840 100644
--- a/imageio/imageio-reference/pom.xml
+++ b/imageio/imageio-reference/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-sgi/pom.xml b/imageio/imageio-sgi/pom.xml
index 00c3d064..d45592f8 100755
--- a/imageio/imageio-sgi/pom.xml
+++ b/imageio/imageio-sgi/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-tga/pom.xml b/imageio/imageio-tga/pom.xml
index b2b3087b..26b90143 100755
--- a/imageio/imageio-tga/pom.xml
+++ b/imageio/imageio-tga/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/imageio-thumbsdb/pom.xml b/imageio/imageio-thumbsdb/pom.xml
index 23369a8e..cc1ae51a 100644
--- a/imageio/imageio-thumbsdb/pom.xml
+++ b/imageio/imageio-thumbsdb/pom.xml
@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies> 
 </project>
diff --git a/imageio/imageio-tiff/pom.xml b/imageio/imageio-tiff/pom.xml
index b34fc99e..40fd45dc 100644
--- a/imageio/imageio-tiff/pom.xml
+++ b/imageio/imageio-tiff/pom.xml
@@ -24,7 +24,7 @@
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
             <artifactId>imageio-core</artifactId>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 </project>
diff --git a/imageio/pom.xml b/imageio/pom.xml
index 1e58b424..a766fe82 100644
--- a/imageio/pom.xml
+++ b/imageio/pom.xml
@@ -26,6 +26,7 @@
         <!-- Support -->
         <module>imageio-core</module>
         <module>imageio-metadata</module>
+        <module>imageio-stream</module>
         <module>imageio-clippath</module>
 
         <!-- Stand-alone readers/writers -->
@@ -76,14 +77,14 @@
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-lang</artifactId>
             <version>${project.version}</version>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-io</artifactId>
             <version>${project.version}</version>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
 
@@ -138,7 +139,7 @@
                 <groupId>${project.groupId}</groupId>
                 <artifactId>imageio-core</artifactId>
                 <version>${project.version}</version>
-                <classifier>tests</classifier>
+                <type>test-jar</type>
                 <scope>test</scope>
             </dependency>
         </dependencies>
diff --git a/sandbox/pom.xml b/sandbox/pom.xml
index a8f332cd..cdcb591f 100644
--- a/sandbox/pom.xml
+++ b/sandbox/pom.xml
@@ -91,14 +91,14 @@
                 <artifactId>common-io</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
-                <classifier>tests</classifier>
+                <type>test-jar</type>
             </dependency>
             <dependency>
                 <groupId>com.twelvemonkeys.common</groupId>
                 <artifactId>common-lang</artifactId>
                 <version>${project.version}</version>
                 <scope>test</scope>
-                <classifier>tests</classifier>
+                <type>test-jar</type>
             </dependency>
 
             <dependency>
diff --git a/sandbox/sandbox-common/pom.xml b/sandbox/sandbox-common/pom.xml
index 596e8a41..31f6b315 100644
--- a/sandbox/sandbox-common/pom.xml
+++ b/sandbox/sandbox-common/pom.xml
@@ -44,14 +44,14 @@
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-io</artifactId>
             <scope>test</scope>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
 
         <dependency>
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-lang</artifactId>
             <scope>test</scope>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 
diff --git a/sandbox/sandbox-imageio/pom.xml b/sandbox/sandbox-imageio/pom.xml
index a7b23040..0d831a2f 100644
--- a/sandbox/sandbox-imageio/pom.xml
+++ b/sandbox/sandbox-imageio/pom.xml
@@ -72,14 +72,14 @@
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-io</artifactId>
             <scope>test</scope>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
 
         <dependency>
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-lang</artifactId>
             <scope>test</scope>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
         </dependency>
     </dependencies>
 
diff --git a/servlet/pom.xml b/servlet/pom.xml
index a1b5f931..fe4b7697 100644
--- a/servlet/pom.xml
+++ b/servlet/pom.xml
@@ -32,14 +32,14 @@
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-lang</artifactId>
             <version>${project.version}</version>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.common</groupId>
             <artifactId>common-io</artifactId>
             <version>${project.version}</version>
-            <classifier>tests</classifier>
+            <type>test-jar</type>
             <scope>test</scope>
         </dependency>