diff --git a/imageio/imageio-jpeg-jai-interop/pom.xml b/imageio/imageio-jpeg-jai-interop/pom.xml
index 883f8815..4abfb1a9 100644
--- a/imageio/imageio-jpeg-jai-interop/pom.xml
+++ b/imageio/imageio-jpeg-jai-interop/pom.xml
@@ -13,7 +13,7 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jaiinterop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jaiinterop</project.jpms.module.name>
     </properties>
 
     <build>
@@ -33,6 +33,7 @@
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-core</artifactId>
             <version>1.4.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-jpeg-jep262-interop/pom.xml b/imageio/imageio-jpeg-jep262-interop/pom.xml
index 6f7dcefd..1653bb16 100644
--- a/imageio/imageio-jpeg-jep262-interop/pom.xml
+++ b/imageio/imageio-jpeg-jep262-interop/pom.xml
@@ -13,7 +13,7 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jep262interop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.jpeg.jep262interop</project.jpms.module.name>
     </properties>
 
     <build>
diff --git a/imageio/imageio-tiff-jai-interop/pom.xml b/imageio/imageio-tiff-jai-interop/pom.xml
index 29037ff9..4ed523e7 100644
--- a/imageio/imageio-tiff-jai-interop/pom.xml
+++ b/imageio/imageio-tiff-jai-interop/pom.xml
@@ -13,7 +13,7 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jaiinterop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.tiff.jaiinterop</project.jpms.module.name>
     </properties>
 
     <build>
@@ -33,6 +33,7 @@
             <groupId>com.github.jai-imageio</groupId>
             <artifactId>jai-imageio-core</artifactId>
             <version>1.4.0</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>com.twelvemonkeys.imageio</groupId>
diff --git a/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java b/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java
index 31cdce2c..b3daac92 100644
--- a/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java
+++ b/imageio/imageio-tiff-jai-interop/src/test/java/com/twelvemonkeys/imageio/plugins/tiff/jaiinterop/TIFFImageMetadataJAInteroperabilityTest.java
@@ -30,12 +30,12 @@
 
 package com.twelvemonkeys.imageio.plugins.tiff.jaiinterop;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
+import com.twelvemonkeys.imageio.metadata.tiff.Rational;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
+import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
+import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata;
 
-import java.awt.image.BufferedImage;
-import java.util.Arrays;
-import java.util.Iterator;
+import org.junit.Test;
 
 import javax.imageio.ImageIO;
 import javax.imageio.ImageTypeSpecifier;
@@ -43,13 +43,12 @@ import javax.imageio.ImageWriter;
 import javax.imageio.metadata.IIOMetadata;
 import javax.imageio.metadata.IIOMetadataFormatImpl;
 import javax.imageio.metadata.IIOMetadataNode;
+import java.awt.image.BufferedImage;
+import java.util.Arrays;
+import java.util.Iterator;
 
-import org.junit.Test;
-
-import com.twelvemonkeys.imageio.metadata.tiff.Rational;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFF;
-import com.twelvemonkeys.imageio.metadata.tiff.TIFFEntry;
-import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
 
 /**
  * Tests our TIFFImageMetadata works with JAI TIFFImageWriter.
@@ -61,10 +60,10 @@ import com.twelvemonkeys.imageio.plugins.tiff.TIFFImageMetadata;
 public class TIFFImageMetadataJAInteroperabilityTest {
     private static final String JAI_TIFF_PROVIDER_CLASS_NAME = "com.github.jaiimageio.impl.plugins.tiff.TIFFImageWriterSpi";
 
-    private ImageWriter getJAIImageWriter() {
+    private ImageWriter createImageWriter() {
         Iterator<ImageWriter> writers = ImageIO.getImageWritersByFormatName("TIFF");
 
-        if (writers.hasNext()) {
+        while (writers.hasNext()) {
             ImageWriter writer = writers.next();
 
             if (JAI_TIFF_PROVIDER_CLASS_NAME.equals(writer.getOriginatingProvider().getClass().getName())) {
@@ -84,7 +83,7 @@ public class TIFFImageMetadataJAInteroperabilityTest {
                                                                       new TIFFEntry(TIFF.TAG_Y_RESOLUTION, new Rational(200))));
 
         ImageTypeSpecifier type = ImageTypeSpecifier.createFromBufferedImageType(BufferedImage.TYPE_BYTE_GRAY);
-        ImageWriter writer = getJAIImageWriter();
+        ImageWriter writer = createImageWriter();
         IIOMetadata converted = writer.convertImageMetadata(ourMetadata, type, null);
 
         assertNotNull(converted);
diff --git a/imageio/imageio-tiff-jdk-interop/pom.xml b/imageio/imageio-tiff-jdk-interop/pom.xml
index cabb6397..d2cc2ef1 100644
--- a/imageio/imageio-tiff-jdk-interop/pom.xml
+++ b/imageio/imageio-tiff-jdk-interop/pom.xml
@@ -13,7 +13,7 @@
     </description>
 
     <properties>
-        <project.jpms.module.name>com.twelvemonkeys.imageio.jdkinterop</project.jpms.module.name>
+        <project.jpms.module.name>com.twelvemonkeys.imageio.tiff.jdkinterop</project.jpms.module.name>
     </properties>
 
     <build>