diff --git a/core/src/test/java/hudson/UtilTest.java b/core/src/test/java/hudson/UtilTest.java
index eab2f539e9..b0cb40dcac 100644
--- a/core/src/test/java/hudson/UtilTest.java
+++ b/core/src/test/java/hudson/UtilTest.java
@@ -20,5 +20,10 @@ public class UtilTest extends TestCase {
 
         // invalid keys are ignored
         assertEquals("$AAB",Util.replaceMacro("$AAB",m));
+
+	// test that more complex scenarios work
+	assertEquals("/a/B/aa", Util.replaceMacro("/$A/$B/$AA",m));
+        assertEquals("a-aa", Util.replaceMacro("$A-$AA",m));
+        assertEquals("/a/foo/can/B/you-believe_aa~it?", Util.replaceMacro("/$A/foo/can/$B/you-believe_$AA~it?",m));
     }
 }