diff --git a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
index cb3e7b5..d609671 100644
--- a/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
+++ b/core/modules/ckeditor/src/Plugin/Editor/CKEditor.php
@@ -13,6 +13,7 @@
 use Drupal\Core\Language\LanguageManagerInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\RendererInterface;
+use Drupal\editor\Entity\Editor;
 use Drupal\editor\Plugin\EditorBase;
 use Drupal\Core\Plugin\ContainerFactoryPluginInterface;
 use Drupal\editor\Entity\Editor;
@@ -204,7 +205,7 @@ public function settingsForm(array $form, FormStateInterface $form_state, Editor
     }, array());
     // Build a fake Editor object, which we'll use to generate JavaScript
     // settings for this fake Editor instance.
-    $fake_editor = entity_create('editor', array(
+    $fake_editor = Editor::create(array(
       'format' => $editor->id(),
       'editor' => 'ckeditor',
       'settings' => array(
diff --git a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
index 1081eb9..f516385 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorLoadingTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\ckeditor\Tests;
 
 use Drupal\simpletest\WebTestBase;
+use Drupal\editor\Entity\Editor;
 
 /**
  * Tests loading of CKEditor.
@@ -48,7 +49,7 @@ protected function setUp() {
       'filters' => array(),
     ));
     $filtered_html_format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'filtered_html',
       'editor' => 'ckeditor',
     ));
diff --git a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
index aec8dbb..e2a59d7 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorPluginManagerTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\ckeditor\Tests;
 
 use Drupal\simpletest\KernelTestBase;
+use Drupal\editor\Entity\Editor;
 
 /**
  * Tests different ways of enabling CKEditor plugins.
@@ -44,7 +45,7 @@ protected function setUp() {
       'filters' => array(),
     ));
     $filtered_html_format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'filtered_html',
       'editor' => 'ckeditor',
     ));
diff --git a/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php
index 708f091..78c0229 100644
--- a/core/modules/ckeditor/src/Tests/CKEditorTest.php
+++ b/core/modules/ckeditor/src/Tests/CKEditorTest.php
@@ -60,7 +60,7 @@ protected function setUp() {
       ),
     ));
     $filtered_html_format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'filtered_html',
       'editor' => 'ckeditor',
     ));
diff --git a/core/modules/editor/editor.module b/core/modules/editor/editor.module
index 8468caa..304c6a6 100644
--- a/core/modules/editor/editor.module
+++ b/core/modules/editor/editor.module
@@ -178,7 +178,7 @@ function editor_form_filter_admin_format_editor_configure($form, FormStateInterf
     }
     elseif (empty($editor) || $editor_value !== $editor->getEditor()) {
       $format = $form_state->getFormObject()->getEntity();
-      $editor = entity_create('editor', array(
+      $editor = Editor::create(array(
         'format' => $format->isNew() ? NULL : $format->id(),
         'editor' => $editor_value,
       ));
diff --git a/core/modules/editor/src/Tests/EditorFileUsageTest.php b/core/modules/editor/src/Tests/EditorFileUsageTest.php
index 6e291d4..bcb1157 100644
--- a/core/modules/editor/src/Tests/EditorFileUsageTest.php
+++ b/core/modules/editor/src/Tests/EditorFileUsageTest.php
@@ -10,6 +10,7 @@
 use Drupal\system\Tests\Entity\EntityUnitTestBase;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\Core\Field\FieldStorageDefinitionInterface;
+use Drupal\editor\Entity\Editor;
 
 /**
  * Tests tracking of file usage by the Text Editor module.
@@ -47,7 +48,7 @@ protected function setUp() {
       ->save();
 
     // Set up text editor.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'filtered_html',
       'editor' => 'unicorn',
     ));
diff --git a/core/modules/editor/src/Tests/EditorLoadingTest.php b/core/modules/editor/src/Tests/EditorLoadingTest.php
index 002ccd3..f5889d0 100644
--- a/core/modules/editor/src/Tests/EditorLoadingTest.php
+++ b/core/modules/editor/src/Tests/EditorLoadingTest.php
@@ -11,6 +11,7 @@
 use Drupal\field\Entity\FieldConfig;
 use Drupal\field\Entity\FieldStorageConfig;
 use Drupal\simpletest\WebTestBase;
+use Drupal\editor\Entity\Editor;
 
 /**
  * Tests loading of text editors.
@@ -113,7 +114,7 @@ protected function setUp() {
    */
   public function testLoading() {
     // Only associate a text editor with the "Full HTML" text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'full_html',
       'editor' => 'unicorn',
       'image_upload' => array(
@@ -166,7 +167,7 @@ public function testLoading() {
     $this->drupalLogout($this->privilegedUser);
 
     // Also associate a text editor with the "Plain Text" text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'plain_text',
       'editor' => 'unicorn',
     ));
@@ -221,7 +222,7 @@ public function testLoading() {
    */
   public function testSupportedElementTypes() {
     // Associate the unicorn text editor with the "Full HTML" text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'full_html',
       'editor' => 'unicorn',
       'image_upload' => array(
@@ -255,7 +256,7 @@ public function testSupportedElementTypes() {
 
     // Associate the trex text editor with the "Full HTML" text format.
     $editor->delete();
-    entity_create('editor', array(
+    Editor::create(array(
       'format' => 'full_html',
       'editor' => 'trex',
     ))->save();
diff --git a/core/modules/editor/src/Tests/EditorManagerTest.php b/core/modules/editor/src/Tests/EditorManagerTest.php
index 9bb7a67..a9ab9a6 100644
--- a/core/modules/editor/src/Tests/EditorManagerTest.php
+++ b/core/modules/editor/src/Tests/EditorManagerTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\editor\Tests;
 
 use Drupal\simpletest\KernelTestBase;
+use Drupal\editor\Entity\Editor;
 
 /**
  * Tests detection of text editors and correct generation of attachments.
@@ -79,7 +80,7 @@ public function testManager() {
     // Case 3: a text editor available & associated (but associated only with
     // the 'Full HTML' text format).
     $unicorn_plugin = $this->editorManager->createInstance('unicorn');
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'full_html',
       'editor' => 'unicorn',
     ));
diff --git a/core/modules/editor/src/Tests/EditorSecurityTest.php b/core/modules/editor/src/Tests/EditorSecurityTest.php
index bb39450..9fc51a1 100644
--- a/core/modules/editor/src/Tests/EditorSecurityTest.php
+++ b/core/modules/editor/src/Tests/EditorSecurityTest.php
@@ -9,6 +9,7 @@
 
 use Drupal\Component\Serialization\Json;
 use Drupal\simpletest\WebTestBase;
+use Drupal\editor\Entity\Editor;
 
 /**
  * Tests XSS protection for content creators when using text editors.
@@ -116,7 +117,7 @@ protected function setUp() {
       ),
     ));
     $format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'restricted_with_editor',
       'editor' => 'unicorn',
     ));
@@ -136,7 +137,7 @@ protected function setUp() {
       ),
     ));
     $format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'restricted_plus_dangerous_tag_with_editor',
       'editor' => 'unicorn',
     ));
@@ -155,7 +156,7 @@ protected function setUp() {
       'filters' => array(),
     ));
     $format->save();
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => 'unrestricted_with_editor',
       'editor' => 'unicorn',
     ));
diff --git a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
index 188a38b..e170822 100644
--- a/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
+++ b/core/modules/editor/src/Tests/QuickEditIntegrationTest.php
@@ -7,6 +7,8 @@
 
 namespace Drupal\editor\Tests;
 
+use Drupal\editor\Entity\Editor;
+
 use Drupal\Component\Serialization\Json;
 use Drupal\Core\EventSubscriber\AjaxResponseSubscriber;
 use Drupal\Core\Language\LanguageInterface;
@@ -95,7 +97,7 @@ protected function setUp() {
     $full_html_format->save();
 
     // Associate text editor with text format.
-    $editor = entity_create('editor', array(
+    $editor = Editor::create(array(
       'format' => $full_html_format->id(),
       'editor' => 'unicorn',
     ));