I think we probably want these to be explicit in test-wrapper rather than done at the make level. That would cover more obscure cases, such as cross-test-ssh when default hooey on the remote side sets some of those variables.