Fix msautotest support