Backport test fix from master for chunked specs