diff --git a/test/TestRunner.sh b/test/TestRunner.sh
index c5b8b2fa078..ad05128594a 100755
--- a/test/TestRunner.sh
+++ b/test/TestRunner.sh
@@ -30,7 +30,7 @@ fi
 ulimit -t 40
 
 SCRIPT=$OUTPUT.script
-grep 'RUN:' $FILENAME | sed "s|^.*RUN:\(.*\)$|\1|g;s|%s|$SUBST|g;s|%llvmgcc|llvmgcc|g" > $SCRIPT
+grep 'RUN:' $FILENAME | sed "s|^.*RUN:\(.*\)$|\1|g;s|%s|$SUBST|g;s|%llvmgcc|llvmgcc|g;s|%llvmgxx|llvmg++|g" > $SCRIPT
 
 
 /bin/sh $SCRIPT > $OUTPUT 2>&1 || (