Testsuite friendlier packaging.