[BZ 1095000] Fix test failures.