Fix for tests based on https://drupal.org/node/2087433.