Improve autotest

1 job for release/21.12 in 13 minutes and 25 seconds (queued for 56 minutes and 16 seconds)