An attempt at getting tests passing again in Travis-CI.