Test Trac #8002