diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php
index e355f2d..0647759 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterAPITest.php
@@ -26,7 +26,7 @@ function setUp() {
     parent::setUp();
 
     // Create Filtered HTML format.
-    $filtered_html_format = array(
+    $filtered_html_format_config = array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'filters' => array(
@@ -41,11 +41,11 @@ function setUp() {
         ),
       )
     );
-    $filtered_html_format = (object) $filtered_html_format;
+    $filtered_html_format = entity_create('filter_format', $filtered_html_format_config);
     filter_format_save($filtered_html_format);
 
     // Create Full HTML format.
-    $full_html_format = array(
+    $full_html_format_config = array(
       'format' => 'full_html',
       'name' => 'Full HTML',
       'weight' => 1,
@@ -56,7 +56,7 @@ function setUp() {
         ),
       ),
     );
-    $full_html_format = (object) $full_html_format;
+    $full_html_format = entity_create('filter_format', $full_html_format_config);
     filter_format_save($full_html_format);
   }
 
diff --git a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php b/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
index a7e38ac..dca6ad6 100644
--- a/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
+++ b/core/modules/filter/lib/Drupal/filter/Tests/FilterHtmlImageSecureTest.php
@@ -33,7 +33,7 @@ function setUp() {
     parent::setUp();
 
     // Setup Filtered HTML text format.
-    $filtered_html_format = array(
+    $filtered_html_format_config = array(
       'format' => 'filtered_html',
       'name' => 'Filtered HTML',
       'filters' => array(
@@ -51,7 +51,7 @@ function setUp() {
         ),
       ),
     );
-    $filtered_html_format = (object) $filtered_html_format;
+    $filtered_html_format = entity_create('filter_format', $filtered_html_format_config);
     filter_format_save($filtered_html_format);
 
     // Setup users.