[1.6.x] Fixed tests breakage from last commit.