Test Trac #8474