Try harder to make installed tests pass