diff --git a/build.xml b/build.xml
index f07444bb..7bd03cb2 100644
--- a/build.xml
+++ b/build.xml
@@ -68,8 +68,10 @@
       <exclude name="com/samskivert/swing/**" unless="build.swing"/>
       <exclude name="com/samskivert/test/**" unless="build.test"/>
       <exclude name="com/samskivert/util/**" unless="build.util"/>
+      <exclude name="com/samskivert/util/FileUtil*" unless="build.fileutil"/>
       <exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
       <exclude name="com/samskivert/xml/**" unless="build.xml"/>
+      <exclude name="com/samskivert/**/tests/**" unless="build.tests"/>
       <compilerarg value="-Xlint"/>
       <compilerarg value="-Xlint:-serial"/>
     </javac>
@@ -92,8 +94,10 @@
         <exclude name="com/samskivert/swing/**" unless="build.swing"/>
         <exclude name="com/samskivert/test/**" unless="build.test"/>
         <exclude name="com/samskivert/util/**" unless="build.util"/>
+        <exclude name="com/samskivert/util/FileUtil*" unless="build.fileutil"/>
         <exclude name="com/samskivert/velocity/**" unless="build.velocity"/>
         <exclude name="com/samskivert/xml/**" unless="build.xml"/>
+        <exclude name="com/samskivert/**/tests/**" unless="build.tests"/>
       </packageset>
       <bottom>Copyright &#169; 2000-${year} ${copyright.holder}.
               All Rights Reserved.</bottom>
diff --git a/etc/depends-incl.xml b/etc/depends-incl.xml
index 76e9cc4a..8d47f0df 100644
--- a/etc/depends-incl.xml
+++ b/etc/depends-incl.xml
@@ -66,6 +66,10 @@
     <available property="ehcache.present" classpathref="classpath"
      classname="net.sf.ehcache.Element"/>
     <echo level="info">EH Cache: ${ehcache.present}</echo>
+
+    <available property="junit.present" classpathref="classpath"
+     classname="junit.framework.Test"/>
+    <echo level="info">JUnit: ${junit.present}</echo>
   </target>
 
   <!-- combines package availability into build controls -->
@@ -108,14 +112,6 @@
     </condition>
     <echo level="info">com.samskivert.jdbc.depot.tools: ${build.depot.tools}</echo>
 
-    <condition property="build.mail">
-      <and>
-        <isset property="build.io"/>
-        <isset property="mail.present"/>
-      </and>
-    </condition>
-    <echo level="info">com.samskivert.net.MailUtil: ${build.mail}</echo>
-
     <condition property="build.servlet">
       <and>
         <isset property="build.io"/>
@@ -156,6 +152,28 @@
       </and>
     </condition>
     <echo level="info">com.samskivert.xml: ${build.xml}</echo>
+
+    <condition property="build.tests">
+      <and>
+        <isset property="junit.present"/>
+      </and>
+    </condition>
+    <echo level="info">com.samskivert.*.tests: ${build.tests}</echo>
+
+    <condition property="build.fileutil">
+      <and>
+        <isset property="jakarta.commons-io.present"/>
+      </and>
+    </condition>
+    <echo level="info">com.samskivert.util.FileUtil: ${build.fileutil}</echo>
+
+    <condition property="build.mail">
+      <and>
+        <isset property="build.io"/>
+        <isset property="mail.present"/>
+      </and>
+    </condition>
+    <echo level="info">com.samskivert.net.MailUtil: ${build.mail}</echo>
   </target>
 
 </project>