Making it work for continuous integration