This should do the right thing wrt travis-ci