tests fail when -g (debug) option used

In the current 2.2 trunk, some tests fail when run with the -g (debug) option. They generally fail with something like:
innobackupex: Error: Too many command line arguments

After adding in some extra reporting/logging code in it looks like the extra verbosity of the -g flag is confusing some tests that are attempting to parse the innobackupex output. For example, bug1062684 fails because it is starting innobackupex with:
"innobackupex --defaults-file=/home/glorch/dev/xb-2.2/storage/innobase/xtrabackup/test/var/w8/var1/my.cnf --ibbackup=/home/glorch/dev/xb-2.2/storage/innobase/xtrabackup/src/xtrabackup --no-version-check --incremental --incremental-basedir=/home/glorch/dev/xb-2.2/storage/innobase/xtrabackup/test/var/w8/var1/backup/2013-12-20_10-03-00 innobackupex: Backup created in directory innobackupex: Backup created in directory innobackupex: Backup created in directory /home/glorch/dev/xb-2.2/storage/innobase/xtrabackup/test/var/w8/var1/backup"

I suspect that any test that contains the following type of operation may fail due to the fact that with debug on, $OUTFILE may contain multiple instances of "innobackupex: Backup created in directory" due to the extra verbosity:
backup_dir=`grep "innobackupex: Backup created in directory" $OUTFILE | awk -F\' '{ print $2}'`