Make Jenkins tests pass

Something apparently changed in core, and now we need some additional
autoload classes to make tests pass.

Change-Id: I1d4c764d3836b7207831cceca8daacd735288c38