Fix the build!

These small changes fix the Travis build - they've been throwing errors for about a month.

@olgabot: Don't want to step on any toes, but I'm happy to add some more automation for test discovery, environment setup, etc. Any objections?