diff --git a/core/modules/block/tests/lib/Drupal/block/Tests/BlockFormControllerTest.php b/core/modules/block/tests/lib/Drupal/block/Tests/BlockFormControllerTest.php
index 01bd449..d3d2146 100644
--- a/core/modules/block/tests/lib/Drupal/block/Tests/BlockFormControllerTest.php
+++ b/core/modules/block/tests/lib/Drupal/block/Tests/BlockFormControllerTest.php
@@ -10,6 +10,11 @@
 use Drupal\block\BlockFormController;
 use Drupal\Tests\UnitTestCase;
 
+// @todo Remove once the constants are replaced with constants on classes.
+if (!defined('BLOCK_REGION_NONE')) {
+  define('BLOCK_REGION_NONE', -1);
+}
+
 /**
  * Tests the block form controller.
  *
diff --git a/core/modules/field/field.views.inc b/core/modules/field/field.views.inc
index f13e832..d6d9e97 100644
--- a/core/modules/field/field.views.inc
+++ b/core/modules/field/field.views.inc
@@ -167,7 +167,7 @@ function field_views_field_default_views_data(FieldInterface $field) {
     ),
   );
   if ($supports_revisions) {
-    $table_alias = $field_tables[FIELD_LOAD_REVISION]['alias'];
+    $table_alias = $field_tables[EntityStorageControllerInterface::FIELD_LOAD_REVISION]['alias'];
     $data[$table_alias]['table']['join'][$entity_revision_table] = array(
       'left_field' => $entity_info['entity_keys']['revision'],
       'field' => 'revision_id',
@@ -256,7 +256,7 @@ function field_views_field_default_views_data(FieldInterface $field) {
       'entity_tables' => $entity_tables,
       // Default the element type to div, let the UI change it if necessary.
       'element type' => 'div',
-      'is revision' => $type == FIELD_LOAD_REVISION,
+      'is revision' => $type == EntityStorageControllerInterface::FIELD_LOAD_REVISION,
     );
   }