Fix failing 10.6 image-related tests.