Integration test enhancements for BuildHive

This pull request is intended to help fix/work around BuildHive's problems with running our integration tests.