Fix tests compilation against 8.1.x