Bug 879597: fix test failures. r=dao