Moved envioremnt variable setting from makefile to test scripts