[1.7.x] Fix test breakage from previous state fix