Fix integration test support