(cherry-picked from the 71780965072b1271018f2cf360e82fbe31f4987e)

Picked up so tests from the 1.x-master would be more similar to this branch