diff --git a/src/main/org/apache/tools/ant/taskdefs/defaults.properties b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
index ef114d881..43d4bce3f 100644
--- a/src/main/org/apache/tools/ant/taskdefs/defaults.properties
+++ b/src/main/org/apache/tools/ant/taskdefs/defaults.properties
@@ -50,7 +50,7 @@ exec=org.apache.tools.ant.taskdefs.ExecTask
 fail=org.apache.tools.ant.taskdefs.Exit
 filter=org.apache.tools.ant.taskdefs.Filter
 fixcrlf=org.apache.tools.ant.taskdefs.FixCRLF
-funtest=org.apache.tools.ant.taskdefs.optional.testing.Funtest
+#funtest=org.apache.tools.ant.taskdefs.optional.testing.Funtest
 genkey=org.apache.tools.ant.taskdefs.GenerateKey
 get=org.apache.tools.ant.taskdefs.Get
 gunzip=org.apache.tools.ant.taskdefs.GUnzip
diff --git a/src/tests/antunit/taskdefs/optional/funtest-test.xml b/src/tests/antunit/taskdefs/optional/funtest-test.xml
index 9bf9fcfde..6baa4f7e2 100644
--- a/src/tests/antunit/taskdefs/optional/funtest-test.xml
+++ b/src/tests/antunit/taskdefs/optional/funtest-test.xml
@@ -51,6 +51,10 @@
     <au:assertPropertySet name="p5"/>
   </presetdef>
 
+  <target name="setUp">
+    <taskdef name="funtest"
+             classname="org.apache.tools.ant.taskdefs.optional.testing.Funtest"/>
+  </target>
 
   <target name="testPresets"
           description="test the presets behave">