Actually, I'm not sure about this renaming and the change to the variable name. Once again, this whole test suite is tailored to mimic a TeamCity context. Beside this, are we sure that the detection of a CI host will always depend on an environment variable?

I'd be in favor of reverting the changes in this file and make it explicit that those tests *currently* target TeamCity.