Move additional test requirements to the testenv.

(Moved from buildenv)