Partially reverts 1a56b3515b Also make the patch comments clearly mention that they are for *installed* tests.
1a56b3515b