2346659 new core adapters break tests

PR for ticket https://www.drupal.org/node/2346659