diff --git a/core/modules/filter/filter.install b/core/modules/filter/filter.install
index 4470e19..4dff8be 100644
--- a/core/modules/filter/filter.install
+++ b/core/modules/filter/filter.install
@@ -77,14 +77,6 @@ function filter_update_8001() {
 }
 
 /**
- * Drop the {filter} and {filter_format} tables.
- */
-function filter_update_8002() {
-  db_drop_table('filter');
-  db_drop_table('filter_format');
-}
-
-/**
  * @} End of "defgroup updates-7.x-to-8.x".
  * The next series of updates should start at 9000.
  */
diff --git a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php b/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php
index c80495a..bff7d70 100644
--- a/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php
+++ b/core/modules/simpletest/lib/Drupal/simpletest/Tests/DrupalUnitTestBaseTest.php
@@ -74,7 +74,7 @@ function testEnableModulesLoad() {
    * Tests expected installation behavior of enableModules().
    */
   function testEnableModulesInstall() {
-    $module = 'filter';
+    $module = 'field';
 
     // @todo Remove after configuration system conversion.
     $this->enableModules(array('system'), FALSE);
diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php
index 6ee8296..0f0d9ad 100644
--- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/Views/TaxonomyTestBase.php
@@ -125,11 +125,13 @@ protected function mockStandardInstall() {
    *   The created taxonomy term.
    */
   protected function createTerm() {
+    $filter_formats = filter_formats();
+    $format = array_pop($filter_formats);
     $term = entity_create('taxonomy_term', array(
       'name' => $this->randomName(),
       'description' => $this->randomName(),
       // Use the first available text format.
-      'format' => db_query_range('SELECT format FROM {filter_format}', 0, 1)->fetchField(),
+      'format' => $format->format,
       'vid' => $this->vocabulary->vid,
       'langcode' => LANGUAGE_NOT_SPECIFIED,
     ));
diff --git a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
index 43b807e..312f0c4 100644
--- a/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
+++ b/core/modules/views/lib/Drupal/views/Tests/Handler/AreaTextTest.php
@@ -34,8 +34,7 @@ public static function getInfo() {
   protected function setUp() {
     parent::setUp();
 
-    $this->enableModules(array('system'));
-    $this->enableModules(array('filter'));
+    $this->enableModules(array('system', 'user', 'filter'));
   }
 
   public function testAreaText() {