Another fix for integratino test support