diff --git a/build.xml b/build.xml
index 62db94c6f..699a1dd9b 100644
--- a/build.xml
+++ b/build.xml
@@ -597,10 +597,6 @@
                classname="com.jcraft.jsch.Session"
                classpathref="classpath"/>
 
-    <condition property="running.in.gump">
-      <isset property="gump.merge"/>
-    </condition>
-
     <condition property="build.compiler" value="classic">
       <not>
         <isset property="jdk1.3+"/>
@@ -1643,9 +1639,10 @@
           <!-- test needs special setup -->
           <exclude name="${optional.package}/ssh/ScpTest.java"/>
 
-          <!-- test fails in Gump -->
+          <!-- test fails if build/classes and ant.jar are using the same
+               classloader  -->
           <exclude name="${ant.package}/util/ClasspathUtilsTest.java"
-                   if="running.in.gump"/>
+                   if="tests.and.ant.share.classloader"/>
         </fileset>
       </batchtest>
     </junit>