diff --git a/jaxb-ri/xjc/src/test/java/com/sun/tools/xjc/CodeGenTest.java b/jaxb-ri/xjc/src/test/java/com/sun/tools/xjc/CodeGenTest.java
index c5d374a..c49e23e 100644
--- a/jaxb-ri/xjc/src/test/java/com/sun/tools/xjc/CodeGenTest.java
+++ b/jaxb-ri/xjc/src/test/java/com/sun/tools/xjc/CodeGenTest.java
@@ -57,7 +57,7 @@
         URL url = CodeGenTest.class.getResource(systemId);
         File f = new File(url.toURI());
         InputSource is = new InputSource(new FileInputStream(f));
-        is.setSystemId(f.getAbsolutePath());
+        is.setSystemId(f.toURI().toString());
         return is;
     }
 
diff --git a/jaxb-ri/xjc/src/test/java/META-INF/services/com.sun.tools.xjc.Plugin b/jaxb-ri/xjc/src/test/resources/META-INF/services/com.sun.tools.xjc.Plugin
similarity index 100%
rename from jaxb-ri/xjc/src/test/java/META-INF/services/com.sun.tools.xjc.Plugin
rename to jaxb-ri/xjc/src/test/resources/META-INF/services/com.sun.tools.xjc.Plugin