diff --git a/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java b/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java
index 50312a5..08fbf0a 100644
--- a/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java
+++ b/pluto-testsuite/src/main/java/org/apache/pluto/testsuite/TestConfigFactory.java
@@ -44,6 +44,7 @@
      */
     public TestConfigFactory() {
         digester = new Digester();
+        digester.setClassLoader(Thread.currentThread().getContextClassLoader());
         digester.addObjectCreate("testportlet-config", ArrayList.class);
 
 
diff --git a/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java b/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
index 9345466..968167b 100644
--- a/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
+++ b/pluto-util/src/main/java/org/apache/pluto/util/install/file/tomcat5/Tomcat5FileSystemInstaller.java
@@ -135,7 +135,7 @@
     private String getConfigContents(String war, String contextPath) {
         StringBuffer contents = new StringBuffer();
         contents.append("<Context ")
-                .append("path=\"").append(contextPath).append("\" ")
+                .append("path=\"/").append(contextPath).append("\" ")
                 .append("docBase=\"").append(war).append("\" ")
                 .append("crossContext=\"true\">").append("</Context>");
        return contents.toString();