Clean-up environment variables used by integration tests (#9287)

Clean-up environment variables used by integration tests (#9287) #5602