fix autoload tests
Merge pull request #17184 from fillman/master

fix autoload tests