Improve autotest

2 jobs for master in 54 minutes and 54 seconds (queued for 383 minutes and 42 seconds)