This should simplify test setup and make environment variable management easier.

See context: #15694 (comment)

Might want to look at this issue as well as there might be some overlap: #14541