Fixes test failure when running all functional tests.
Authored by: jplang 2011-07-03
Parent: [r6173]
Child: [r6175]