Fix env var subscription tests
Merge pull request #3504 from pmorie/dev/fix_tests

Merged by openshift-bot