diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
index f36a4db0c..648e6440e 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/TraXLiaisonTest.java
@@ -65,6 +65,14 @@ public class TraXLiaisonTest extends AbstractXSLTLiaisonTest
         } catch (Exception exc) {
             Assume.assumeNoException("xalan redirect is not on the classpath", exc);
         }
+        try {
+            String factoryName = TransformerFactory.newInstance().getClass().getName();
+            Assume.assumeFalse("TraxFactory is Xalan",
+                              "org.apache.xalan.processor.TransformerFactoryImpl"
+                              .equals(factoryName));
+        } catch (TransformerFactoryConfigurationError exc) {
+            throw new RuntimeException(exc);
+        }
         File xsl = getFile("/taskdefs/optional/xalan-redirect-in.xsl");
         liaison.setStylesheet(xsl);
         ((TraXLiaison) liaison)
diff --git a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
index 470d8bc64..9787aabae 100644
--- a/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
+++ b/src/tests/junit/org/apache/tools/ant/taskdefs/optional/junit/JUnitTaskTest.java
@@ -485,7 +485,9 @@ public class JUnitTaskTest {
                 }
             }
             assertTrue("No exports", resExports.isEmpty());
-            assertEquals("Expected classpath", cp.toString(), resCp);
+            if (System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
+                assertEquals("Expected classpath", cp.toString(), resCp);
+            }
             assertEquals("Expected modulepath", mp.toString(), resMp);
         } finally {
             delete(workDir);
@@ -539,7 +541,9 @@ public class JUnitTaskTest {
                 }
             }
             assertTrue("No exports", resExports.isEmpty());
-            assertNull("No classpath", resCp);
+            if (System.getProperty(MagicNames.BUILD_SYSCLASSPATH) == null) {
+                assertNull("No classpath", resCp);
+            }
             assertEquals("Expected modulepath", mp.toString(), resMp);
         } finally {
             delete(workDir);