envsetup: Make bashtest smarter

Change-Id: I7f51c36d6fd85440747c10ba3f20b42044f6102c