Attempt to get tests passing on Travis-CI.