Fix integration tests which were breaking in non-clean builds

Resolves: https://www.pivotaltracker.com/story/show/69740244