diff --git a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetDelete.php b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetDelete.php
index 7c03fa0..70e4e24 100644
--- a/core/modules/shortcut/lib/Drupal/shortcut/Form/SetDelete.php
+++ b/core/modules/shortcut/lib/Drupal/shortcut/Form/SetDelete.php
@@ -10,7 +10,7 @@
 use Symfony\Component\DependencyInjection\ContainerInterface;
 use Drupal\Core\ControllerInterface;
 use Drupal\Core\Form\ConfirmFormBase;
-use Drupal\Core\Database\Database;
+use Drupal\Core\Database\Connection;
 use Drupal\Core\Extension\ModuleHandlerInterface;
 use Drupal\shortcut\Plugin\Core\Entity\Shortcut;
 
@@ -22,7 +22,7 @@ class SetDelete extends ConfirmFormBase implements ControllerInterface {
   /**
    * The database connection.
    *
-   * @var \Drupal\Core\Database\Database
+   * @var \Drupal\Core\Database\Connection
    */
   protected $database;
 
@@ -43,7 +43,7 @@ class SetDelete extends ConfirmFormBase implements ControllerInterface {
   /**
    * Constructs a SetDelete object.
    */
-  public function __construct(Database $database, ModuleHandlerInterface $module_handler) {
+  public function __construct(Connection $database, ModuleHandlerInterface $module_handler) {
 
     $this->database = $database;
     $this->moduleHandler = $module_handler;
diff --git a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
index 895a198..a1604aa 100644
--- a/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
+++ b/core/tests/Drupal/Tests/Core/Entity/EntityAccessCheckTest.php
@@ -7,6 +7,14 @@
 
 namespace Drupal\Tests\Core\Entity;
 
+// @todo Remove once http://drupal.org/node/1620010 is committed.
+if (!defined('LANGUAGE_DEFAULT')) {
+  define('LANGUAGE_DEFAULT', 'und');
+}
+if (!defined('LANGUAGE_NOT_SPECIFIED')) {
+  define('LANGUAGE_NOT_SPECIFIED', 'und');
+}
+
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Routing\Route;
 use Drupal\Core\Entity\EntityAccessCheck;