@juliabackports just the test part of this, the "better fix" later was already backported but not these tests