diff --git a/build.xml b/build.xml
index ec72b9a0e..e0da0f59a 100644
--- a/build.xml
+++ b/build.xml
@@ -1230,6 +1230,12 @@
           so until the defect is actually fixed it is taken
           out of the test list -->
           <exclude name="${ant.package}/taskdefs/JavaTest.java" />
+
+          <!-- can only run if cvs is installed on your machine
+               enable by setting the property have.cvs
+          -->
+          <exclude name="${ant.package}/taskdefs/AbstractCvsTaskTest.java" 
+                   unless="have.cvs" />
         </fileset>
       </batchtest>
 
diff --git a/src/etc/testcases/taskdefs/abstractcvstask.xml b/src/etc/testcases/taskdefs/abstractcvstask.xml
new file mode 100644
index 000000000..b9a2c2119
--- /dev/null
+++ b/src/etc/testcases/taskdefs/abstractcvstask.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0"?>
+
+<project name="abstractcvstask-test" basedir="../../../../" 
+         default="all">
+
+  <property name="file" value="ant.properties.sample" />
+  <target name="all">
+    <cvs failonerror="true" command="status ${file}"/>
+    <!--
+    <cvs failonerror="true">
+      <commandline>
+        <argument value="up"/>
+        <argument value="-r"/>
+        <argument value="1.1"/>
+        <argument value="${file}"/>
+      </commandline>
+    </cvs>
+    <cvs failonerror="true" command="status ${file}"/>
+    <cvs failonerror="true">up -r HEAD ${file}</cvs>
+    <cvs failonerror="true" command="status ${file}"/>
+    -->
+  </target>
+</project>
diff --git a/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java b/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java
new file mode 100644
index 000000000..25da4cc9b
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/taskdefs/AbstractCvsTaskTest.java
@@ -0,0 +1,86 @@
+/*
+ * The Apache Software License, Version 1.1
+ *
+ * Copyright (c) 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.taskdefs;
+ 
+import java.io.File;
+import org.apache.tools.ant.BuildFileTest;
+import org.apache.tools.ant.util.FileUtils;
+
+/**
+ * @author Nico Seessle <nico@seessle.de>
+ * @author <a href="mailto:stefan.bodewig@epost.de">Stefan Bodewig</a>
+ * @author stephan <stephan@wanderinghorse.net>
+ * @version $Revision$
+ */
+public class AbstractCvsTaskTest extends BuildFileTest {
+
+    public AbstractCvsTaskTest() {
+        this( "AbstractCvsTaskTest" );
+    }
+
+    public AbstractCvsTaskTest(String name) {
+        super(name);
+    }
+
+    public void setUp() {
+        configureProject("src/etc/testcases/taskdefs/abstractcvstask.xml");
+    }
+
+    public void tearDown() {
+    }
+
+    public void testAbstractCvsTask() {
+        executeTarget( "all" );
+    }
+}