Bug 864775 - Fix for test failures.