Make autotest work