Fix bug 875180-related test failures by fixing the test, rs=jaws over IRC