Test Trac #8625