Make test compatible with -r2