Apply last patch also to --create-testdir.