Fix for CMS acceptance tests.