diff --git a/src/etc/testcases/taskdefs/optional/depend/depend.xml b/src/etc/testcases/taskdefs/optional/depend/depend.xml
index 7e3a962af..9d1ab355e 100644
--- a/src/etc/testcases/taskdefs/optional/depend/depend.xml
+++ b/src/etc/testcases/taskdefs/optional/depend/depend.xml
@@ -52,4 +52,14 @@
       <include name="**/C.class"/>
     </classfileset>
   </target>
+  
+  <target name="testbyreference" depends="compile">
+    <classfileset id="classSet" dir="${classes.dir}" rootclass="A">
+      <include name="**/C.class"/>
+    </classfileset>
+    <jar destfile="${tempsrc.dir}/test.jar">
+      <fileset refid="classSet"/>
+    </jar>
+  </target>
+  
 </project>
diff --git a/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java b/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
new file mode 100644
index 000000000..eded10aa8
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/types/optional/depend/ClassFileSetTest.java
@@ -0,0 +1,161 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 2001-2002 The Apache Software Foundation.  All rights
+ * reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. The end-user documentation included with the redistribution, if
+ *    any, must include the following acknowlegement:
+ *       "This product includes software developed by the
+ *        Apache Software Foundation (http://www.apache.org/)."
+ *    Alternately, this acknowlegement may appear in the software itself,
+ *    if and wherever such third-party acknowlegements normally appear.
+ *
+ * 4. The names "The Jakarta Project", "Ant", and "Apache Software
+ *    Foundation" must not be used to endorse or promote products derived
+ *    from this software without prior written permission. For written
+ *    permission, please contact apache@apache.org.
+ *
+ * 5. Products derived from this software may not be called "Apache"
+ *    nor may "Apache" appear in their names without prior written
+ *    permission of the Apache Group.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
+ * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+ * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This software consists of voluntary contributions made by many
+ * individuals on behalf of the Apache Software Foundation.  For more
+ * information on the Apache Software Foundation, please see
+ * <http://www.apache.org/>.
+ */
+
+package org.apache.tools.ant.types.optional.depend;
+
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.Date;
+import java.util.Vector;
+import java.util.Enumeration;
+import java.util.Hashtable;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.types.FileSet;
+import org.apache.tools.ant.DirectoryScanner;
+
+/**
+ * Testcase for the Classfileset optional type. 
+ * 
+ * @author Conor MacNeill
+ */
+public class ClassFileSetTest extends BuildFileTest {
+    public static final String RESULT_FILESET = "result";
+    
+    public ClassFileSetTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        // share the setup for testing the depend task
+        configureProject("src/etc/testcases/taskdefs/optional/depend/depend.xml");
+    }
+
+    public void tearDown() {
+        executeTarget("clean");
+    }
+
+    /**
+     * Test basic clasfileset
+     */
+    public void testBasicSet() {
+        Project project = getProject();
+        executeTarget("testbasicset");
+        FileSet resultFileSet = (FileSet)project.getReference(RESULT_FILESET);
+        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(project);
+        String[] scannedFiles = scanner.getIncludedFiles();
+        Hashtable files = new Hashtable();
+        for (int i = 0; i < scannedFiles.length; ++i) {
+            files.put(scannedFiles[i], scannedFiles[i]);
+        }
+        assertEquals("Classfileset did not pick up expected number of " 
+            + "class files", 4, files.size());
+        assertTrue("Result did not contain A.class", 
+            files.containsKey("A.class"));
+        assertTrue("Result did not contain B.class", 
+            files.containsKey("B.class"));
+        assertTrue("Result did not contain C.class", 
+            files.containsKey("C.class"));
+        assertTrue("Result did not contain D.class", 
+            files.containsKey("D.class"));
+    }
+    
+    /**
+     * Test small classfileset
+     */
+    public void testSmallSet() {
+        Project project = getProject();
+        executeTarget("testsmallset");
+        FileSet resultFileSet = (FileSet)project.getReference(RESULT_FILESET);
+        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(project);
+        String[] scannedFiles = scanner.getIncludedFiles();
+        Hashtable files = new Hashtable();
+        for (int i = 0; i < scannedFiles.length; ++i) {
+            files.put(scannedFiles[i], scannedFiles[i]);
+        }
+        assertEquals("Classfileset did not pick up expected number of " 
+            + "class files", 2, files.size());
+        assertTrue("Result did not contain B.class", 
+            files.containsKey("B.class"));
+        assertTrue("Result did not contain C.class", 
+            files.containsKey("C.class"));
+    }
+
+    /**
+     * Test conbo classfileset
+     */
+    public void testComboSet() {
+        Project project = getProject();
+        executeTarget("testcomboset");
+        FileSet resultFileSet = (FileSet)project.getReference(RESULT_FILESET);
+        DirectoryScanner scanner = resultFileSet.getDirectoryScanner(project);
+        String[] scannedFiles = scanner.getIncludedFiles();
+        Hashtable files = new Hashtable();
+        for (int i = 0; i < scannedFiles.length; ++i) {
+            files.put(scannedFiles[i], scannedFiles[i]);
+        }
+        assertEquals("Classfileset did not pick up expected number of " 
+            + "class files", 1, files.size());
+        assertTrue("Result did not contain C.class", 
+            files.containsKey("C.class"));
+    }
+    
+    /**
+     * Test that you can pass a classfileset by reference to a fileset.
+     */
+    public void testByReference() {
+        executeTarget("testbyreference");
+    }
+}