Test Trac #7276 (part 2)