Revert "WIP - Are other tests using env variables working on Travis?"

This reverts commit 62add82ccf743e847ad9dc4e4a3b18666ffa0a8f.