diff --git a/core/modules/config/src/Tests/ConfigEntityTest.php b/core/modules/config/src/Tests/ConfigEntityTest.php
index c0dc97b..6fd56fa 100644
--- a/core/modules/config/src/Tests/ConfigEntityTest.php
+++ b/core/modules/config/src/Tests/ConfigEntityTest.php
@@ -35,7 +35,7 @@ class ConfigEntityTest extends WebTestBase {
   public function testCRUD() {
     $default_langcode = \Drupal::languageManager()->getDefaultLanguage()->getId();
     // Verify default properties on a newly created empty entity.
-    $empty = entity_create('config_test');
+    $storage = \Drupal::entityTypeManager()->getStorage('config_test');
     $this->assertTrue($empty->uuid());
     $this->assertIdentical($empty->label, NULL);
     $this->assertIdentical($empty->style, NULL);
@@ -76,7 +76,7 @@ public function testCRUD() {
     }
 
     // Verify that an entity with an empty ID string is considered empty, too.
-    $empty_id = entity_create('config_test', [
+    $empty_id = $storage->create([
       'id' => '',
     ]);
     $this->assertIdentical($empty_id->isNew(), TRUE);
@@ -89,7 +89,7 @@ public function testCRUD() {
     }
 
     // Verify properties on a newly created entity.
-    $config_test = entity_create('config_test', $expected = [
+    $config_test = $storage->create($expected = [
       'id' => $this->randomMachineName(),
       'label' => $this->randomString(),
       'style' => $this->randomMachineName(),
@@ -141,7 +141,7 @@ public function testCRUD() {
     // maximum allowed length, but not longer.
 
     // Test with a short ID.
-    $id_length_config_test = entity_create('config_test', [
+    $id_length_config_test = $storage->create([
       'id' => $this->randomMachineName(8),
     ]);
     try {
@@ -155,7 +155,7 @@ public function testCRUD() {
     }
 
     // Test with an ID of the maximum allowed length.
-    $id_length_config_test = entity_create('config_test', [
+    $id_length_config_test = $storage->create([
       'id' => $this->randomMachineName(static::MAX_ID_LENGTH),
     ]);
     try {
@@ -169,7 +169,7 @@ public function testCRUD() {
     }
 
     // Test with an ID exceeding the maximum allowed length.
-    $id_length_config_test = entity_create('config_test', [
+    $id_length_config_test = $storage->create([
       'id' => $this->randomMachineName(static::MAX_ID_LENGTH + 1),
     ]);
     try {
@@ -188,7 +188,7 @@ public function testCRUD() {
 
     // Ensure that creating an entity with the same id as an existing one is not
     // possible.
-    $same_id = entity_create('config_test', [
+    $same_id = $storage->create([
       'id' => $config_test->id(),
     ]);
     $this->assertIdentical($same_id->isNew(), TRUE);
@@ -223,7 +223,7 @@ public function testCRUD() {
 
     // Test config entity prepopulation.
     \Drupal::state()->set('config_test.prepopulate', TRUE);
-    $config_test = entity_create('config_test', ['foo' => 'bar']);
+    $config_test = $storage->create(['foo' => 'bar']);
     $this->assertEqual($config_test->get('foo'), 'baz', 'Initial value correctly populated');
   }
 
diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
index d593a69..e315dc6 100644
--- a/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
+++ b/core/modules/config_translation/src/Tests/ConfigTranslationOverviewTest.php
@@ -90,7 +90,7 @@ public function testMapperListPage() {
     ];
 
     foreach ($labels as $label) {
-      $test_entity = entity_create('config_test', [
+      $test_entity = \Drupal::entityTypeManager()->getStorage('config_test')->create([
         'id' => $this->randomMachineName(),
         'label' => $label,
       ]);
diff --git a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
index 5648470..c3b5ff8 100644
--- a/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
+++ b/core/modules/field/tests/src/Functional/EntityReference/EntityReferenceIntegrationTest.php
@@ -197,9 +197,9 @@ protected function assertFieldValues($entity_name, $referenced_entities) {
    *   An array of entity objects.
    */
   protected function getTestEntities() {
-    $config_entity_1 = entity_create('config_test', ['id' => $this->randomMachineName(), 'label' => $this->randomMachineName()]);
+    $config_entity_1 = \Drupal::entityTypeManager()->getStorage('config_test')->create(['id' => $this->randomMachineName(), 'label' => $this->randomMachineName()]);
     $config_entity_1->save();
-    $config_entity_2 = entity_create('config_test', ['id' => $this->randomMachineName(), 'label' => $this->randomMachineName()]);
+    $config_entity_2 = \Drupal::entityTypeManager()->getStorage('config_test')->create(['id' => $this->randomMachineName(), 'label' => $this->randomMachineName()]);
     $config_entity_2->save();
 
     $content_entity_1 = EntityTest::create(['name' => $this->randomMachineName()]);
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
index b69735e..f29b88a 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigDiffTest.php
@@ -75,7 +75,7 @@ public function testDiff() {
 
     // Test diffing a renamed config entity.
     $test_entity_id = $this->randomMachineName();
-    $test_entity = entity_create('config_test', [
+    $test_entity = \Drupal::entityTypeManager()->getStorage('config_test')->create([
       'id' => $test_entity_id,
       'label' => $this->randomMachineName(),
     ]);
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
index 5a137b9..4cbc16a 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityNormalizeTest.php
@@ -24,7 +24,7 @@ protected function setUp() {
   }
 
   public function testNormalize() {
-    $config_entity = entity_create('config_test', ['id' => 'system', 'label' => 'foobar', 'weight' => 1]);
+    $config_entity = \Drupal::entityTypeManager()->getStorage('config_test')->create(['id' => 'system', 'label' => 'foobar', 'weight' => 1]);
     $config_entity->save();
 
     // Modify stored config entity, this is comparable with a schema change.
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
index 021136d..20ceef4 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigEntityStatusTest.php
@@ -22,7 +22,7 @@ class ConfigEntityStatusTest extends KernelTestBase {
    * Tests the enabling/disabling of entities.
    */
   public function testCRUD() {
-    $entity = entity_create('config_test', [
+    $entity = \Drupal::entityTypeManager()->getStorage('config_test')->create([
       'id' => strtolower($this->randomMachineName()),
     ]);
     $this->assertTrue($entity->status(), 'Default status is enabled.');
diff --git a/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php b/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
index e755d5f..9946407 100644
--- a/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Config/ConfigImportRenameValidationTest.php
@@ -67,7 +67,7 @@ protected function setUp() {
   public function testRenameValidation() {
     // Create a test entity.
     $test_entity_id = $this->randomMachineName();
-    $test_entity = entity_create('config_test', [
+    $test_entity = \Drupal::entityTypeManager()->getStorage('config_test')->create([
       'id' => $test_entity_id,
       'label' => $this->randomMachineName(),
     ]);
diff --git a/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php b/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
index 87ba104..0830376 100644
--- a/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Entity/ConfigEntityQueryTest.php
@@ -599,7 +599,8 @@ public function testLookupKeys() {
     $key_value = $this->container->get('keyvalue')->get(QueryFactory::CONFIG_LOOKUP_PREFIX . 'config_test');
 
     $test_entities = [];
-    $entity = entity_create('config_test', [
+    $storage = \Drupal::entityTypeManager()->getStorage('config_test');
+    $entity = $storage->create([
       'label' => $this->randomMachineName(),
       'id' => '1',
       'style' => 'test',
@@ -612,7 +613,7 @@ public function testLookupKeys() {
     $expected[] = $entity->getConfigDependencyName();
     $this->assertEqual($expected, $key_value->get('style:test'));
 
-    $entity = entity_create('config_test', [
+    $entity = $storage->create([
       'label' => $this->randomMachineName(),
       'id' => '2',
       'style' => 'test',
@@ -623,7 +624,7 @@ public function testLookupKeys() {
     $expected[] = $entity->getConfigDependencyName();
     $this->assertEqual($expected, $key_value->get('style:test'));
 
-    $entity = entity_create('config_test', [
+    $entity = $storage->create([
       'label' => $this->randomMachineName(),
       'id' => '3',
       'style' => 'blah',