Test Trac #8506