Re #8334. Fixing the tests and the redhat build.