Add a timeout for #8431