Use the new env vars in the int tests