killbill-aplcache

diff --git a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
index a09bf1a..8713e8d 100644
--- a/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
+++ b/server/src/test/java/com/ning/billing/jaxrs/TestJaxrsBase.java
@@ -30,6 +30,7 @@ import java.util.concurrent.TimeUnit;
 
 import javax.ws.rs.core.Response.Status;
 
+import com.google.common.io.Resources;
 import com.ning.billing.jaxrs.resources.JaxrsResource;
 import com.ning.billing.util.email.EmailModule;
 import com.ning.billing.util.email.templates.TemplateModule;
@@ -124,6 +125,15 @@ public class TestJaxrsBase {
         } catch (IOException e) {
             throw new RuntimeException(e);
         }
+
+        // Use the full path for the catalog
+        final String catalogURI = System.getProperty("killbill.catalog.uri");
+        if (catalogURI != null) {
+            try {
+                System.setProperty("killbill.catalog.uri", Resources.getResource(catalogURI).toExternalForm());
+            } catch (IllegalArgumentException ignored) {
+            }
+        }
     }
 
     public static class TestKillbillGuiceListener extends KillbillGuiceListener {

diff --git a/server/src/test/resources/killbill.properties b/server/src/test/resources/killbill.properties
index 9aa3e66..d00e1dd 100644
--- a/server/src/test/resources/killbill.properties
+++ b/server/src/test/resources/killbill.properties
@@ -1,7 +1,7 @@
 # Use killbill util test properties (DbiProvider/MysqltestingHelper) on the test side configured with killbill
 com.ning.billing.dbi.jdbc.url=jdbc:mysql://127.0.0.1:3306/killbill
 
-killbill.catalog.uri=file:src/test/resources/catalog-weapons.xml
+killbill.catalog.uri=catalog-weapons.xml
 
 killbill.payment.engine.events.off=false
 killbill.payment.retry.days=8,8,8