Require files in proper order

This (hopefully) fixes a problem with intermittent Travis-CI failures.