diff --git a/src/testcases/org/apache/tools/ant/PropertyExpansionTest.java b/src/testcases/org/apache/tools/ant/PropertyExpansionTest.java
new file mode 100644
index 000000000..be2f460e3
--- /dev/null
+++ b/src/testcases/org/apache/tools/ant/PropertyExpansionTest.java
@@ -0,0 +1,104 @@
+/*
+ * 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;
+
+/**
+ * class to look at how we expand properties
+ */
+public class PropertyExpansionTest extends BuildFileTest {
+
+
+    public PropertyExpansionTest(String name) {
+        super(name);
+    }
+
+    /**
+     * we bind to an existing test file because we are too lazy to write our
+     * own, and we don't really care what it is
+     */
+    public void setUp() {
+        configureProject("src/etc/testcases/core/immutable.xml");
+    }
+
+    /**
+     * run through the test cases of expansion
+     */
+    public void testPropertyExpansion() {
+        assertExpandsTo("","");
+        assertExpandsTo("$","$");
+        assertExpandsTo("$$-","$-");
+        assertExpandsTo("$$","$");
+        project.setProperty("expanded","EXPANDED");
+        assertExpandsTo("a${expanded}b","aEXPANDEDb");
+        assertExpandsTo("${expanded}${expanded}","EXPANDEDEXPANDED");
+        assertExpandsTo("a$b","ab");
+        assertExpandsTo("$}}","}}");
+        assertExpandsTo("$$$-","$-");
+        assertExpandsTo("$$$","$$");
+        assertExpandsTo("$$$$-","$$-");
+        assertExpandsTo("","");
+    }
+
+    /**
+     * little helper method to validate stuff
+     */
+    private void assertExpandsTo(String source,String expected) {
+        String actual=project.replaceProperties(source);
+        assertEquals(source,expected,actual);
+    }
+
+//end class
+}