Reintroduce some testsuite plumbing.