diff --git a/build.xml b/build.xml
index c134bc5dd..fe13d7225 100644
--- a/build.xml
+++ b/build.xml
@@ -131,7 +131,7 @@
              unless="jdk1.2+" />
     <!-- uses the context classloader -->
     <exclude name="${optional.package}/junit/JUnitClassLoaderTest.java"
-             />
+             unless="jdk1.2+" />
   </patternset>
   <patternset id="needs.jdk1.3+">
     <exclude name="${ant.package}/taskdefs/TestProcess.java"
diff --git a/src/main/org/apache/tools/ant/AntClassLoader.java b/src/main/org/apache/tools/ant/AntClassLoader.java
index 621f7c578..893decbb8 100644
--- a/src/main/org/apache/tools/ant/AntClassLoader.java
+++ b/src/main/org/apache/tools/ant/AntClassLoader.java
@@ -402,7 +402,12 @@ public class AntClassLoader extends ClassLoader implements BuildListener {
             try {
                 savedContextLoader
                     = (ClassLoader)getContextClassLoader.invoke(Thread.currentThread(), new Object[0]);
-                Object[] args = new Object[] {this};
+                Object[] args = null;
+                if ("only".equals(project.getProperty("build.sysclasspath"))) {
+                    args = new Object[] {this.getClass().getClassLoader()};
+                } else {
+                    args = new Object[] {this};
+                }
                 setContextClassLoader.invoke(Thread.currentThread(), args);
                 isContextLoaderSaved = true;
             }
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
index 27c5529f9..043f1a3ba 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/TraXLiaison.java
@@ -226,6 +226,10 @@ public class TraXLiaison implements XSLTLiaison, ErrorListener, XSLTLoggerAware
     }
     
     private void logError(TransformerException e, String type) {
+        if (logger == null) {
+            return;
+        }
+        
         StringBuffer msg = new StringBuffer();
         if(e.getLocator() != null) {
             if(e.getLocator().getSystemId() != null) {
diff --git a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
index d9672e1ac..9cbfc9d1c 100644
--- a/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
+++ b/src/main/org/apache/tools/ant/taskdefs/optional/junit/JUnitTask.java
@@ -642,7 +642,7 @@ public class JUnitTask extends Task {
                 cl.addSystemPackageRoot("junit");
                 // will cause trouble in JDK 1.1 if omitted
                 cl.addSystemPackageRoot("org.apache.tools.ant");
-                //cl.setThreadContextLoader();
+                cl.setThreadContextLoader();
             }
             runner = new JUnitTestRunner(test, test.getHaltonerror(), test.getFiltertrace(), test.getHaltonfailure(), cl);
             if (summary) {
@@ -673,7 +673,7 @@ public class JUnitTask extends Task {
             if (sysProperties != null) {
                 sysProperties.restoreSystem();
             }
-            //cl.resetThreadContextLoader();
+            cl.resetThreadContextLoader();
         }
     }
 
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java b/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
index 0de6aec4a..865602087 100644
--- a/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
+++ b/src/testcases/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
@@ -1,11 +1,14 @@
 package org.apache.tools.ant.taskdefs.optional;
 
 import org.apache.tools.ant.taskdefs.XSLTLiaison;
+import org.apache.tools.ant.taskdefs.XSLTLogger;
 import org.apache.tools.ant.taskdefs.condition.Os;
 import org.apache.tools.ant.BuildException;
 
 import java.io.File;
 
+import junit.framework.AssertionFailedError;
+
 /* 
  * The Apache Software License, Version 1.1
  *
@@ -65,7 +68,9 @@ import java.io.File;
  * TraX XSLTLiaison testcase
  * @author <a href="mailto:sbailliez@apache.org">Stephane Bailliez</a>
  */
-public class TraXLiaisonTest extends AbstractXSLTLiaisonTest {
+public class TraXLiaisonTest extends AbstractXSLTLiaisonTest 
+    implements XSLTLogger {
+
     public TraXLiaisonTest(String name){
         super(name);
     }
@@ -78,7 +83,9 @@ public class TraXLiaisonTest extends AbstractXSLTLiaisonTest {
     }
 
     public XSLTLiaison createLiaison() throws Exception {
-        return new TraXLiaison();
+        TraXLiaison l = new TraXLiaison();
+        l.setLogger(this);
+        return l;
     }
 
     public void testXalan2Redirect() throws Exception {
@@ -124,4 +131,8 @@ public class TraXLiaisonTest extends AbstractXSLTLiaisonTest {
         assertTrue("SystemIDs should not start with file:////", !systemid.startsWith("file:////"));
     }
 
+    public void log(String message) {
+        throw new AssertionFailedError("Liaison sent message: "+message);
+    }
+
 }