diff --git a/.travis/prepare-test-env.sh b/.travis/prepare-test-env.sh
index 8c52a7178..84c97d31d 100755
--- a/.travis/prepare-test-env.sh
+++ b/.travis/prepare-test-env.sh
@@ -37,7 +37,7 @@ composer update ${COMPOSER_GLOBAL_OPTIONS}
 
 # Allow to run tests with a specific Drupal core version (ex.: latest dev).
 if [[ -n "${DRUPAL_CORE}" ]]; then
-  composer require drupal/core:${DRUPAL_CORE} webflo/drupal-core-require-dev:${DRUPAL_CORE} ${COMPOSER_GLOBAL_OPTIONS};
+  composer require drupal/core:${DRUPAL_CORE} drupal/core-dev:${DRUPAL_CORE} ${COMPOSER_GLOBAL_OPTIONS};
 fi
 
 # Downgrade dependencies if needed.
diff --git a/composer.json b/composer.json
index 423ad320e..051886385 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
         "php": ">=7.1",
         "apigee/apigee-client-php": "^2.0.4",
         "cweagans/composer-patches": "^1.6.5",
-        "drupal/core": "~8.7.0",
+        "drupal/core": "~8.7",
         "drupal/entity": "^1.0",
         "drupal/key": "^1.8",
         "php-http/guzzle6-adapter": "^1.1.1"
@@ -16,7 +16,7 @@
         "behat/mink" : "dev-master#9ea1cebe",
         "drush/drush": "^9.0",
         "phpunit/phpunit": "^6.5",
-        "webflo/drupal-core-require-dev": "^8.7.0"
+        "drupal/core-dev": "^8.7"
     },
     "config": {
         "sort-packages": true
diff --git a/src/Entity/EdgeEntityBase.php b/src/Entity/EdgeEntityBase.php
index eee10183e..c46c2ebc9 100644
--- a/src/Entity/EdgeEntityBase.php
+++ b/src/Entity/EdgeEntityBase.php
@@ -23,12 +23,12 @@
 use Apigee\Edge\Entity\EntityInterface;
 use Apigee\Edge\Entity\Property\DisplayNamePropertyInterface;
 use Drupal\apigee_edge\Exception\InvalidArgumentException;
-use Drupal\Core\Entity\Entity;
+use Drupal\Core\Entity\EntityBase;
 
 /**
  * Base class for Apigee Edge entities in Drupal.
  */
-abstract class EdgeEntityBase extends Entity implements EdgeEntityInterface {
+abstract class EdgeEntityBase extends EntityBase implements EdgeEntityInterface {
 
   /**
    * The decorated SDK entity.
@@ -154,4 +154,11 @@ public function label() {
     return $label;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function isTranslatable() {
+    return FALSE;
+  }
+
 }
diff --git a/src/Entity/Storage/FieldableEdgeEntityStorageBase.php b/src/Entity/Storage/FieldableEdgeEntityStorageBase.php
index 7b6f3f9b6..cfac289e6 100644
--- a/src/Entity/Storage/FieldableEdgeEntityStorageBase.php
+++ b/src/Entity/Storage/FieldableEdgeEntityStorageBase.php
@@ -72,6 +72,12 @@ public function onEntityTypeCreate(EntityTypeInterface $entity_type) {
   public function onEntityTypeUpdate(EntityTypeInterface $entity_type, EntityTypeInterface $original) {
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public function onFieldableEntityTypeCreate(EntityTypeInterface $entity_type, array $field_storage_definitions) {
+  }
+
   /**
    * {@inheritdoc}
    */