Makes tests pass on on 3.x and 2.x