diff --git a/modules/search_api_db/search_api_db.info.yml b/modules/search_api_db/search_api_db.info.yml
index f23f610c..eac60c01 100644
--- a/modules/search_api_db/search_api_db.info.yml
+++ b/modules/search_api_db/search_api_db.info.yml
@@ -2,6 +2,6 @@ type: module
 name: Database Search
 description: Offers an implementation of the Search API that uses database tables for indexing content.
 package: Search
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 dependencies:
   - search_api:search_api
diff --git a/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml b/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml
index 6d1f8052..fb0c1727 100644
--- a/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml
+++ b/modules/search_api_db/search_api_db_defaults/search_api_db_defaults.info.yml
@@ -2,7 +2,7 @@ type: module
 name: Database Search Defaults
 description: Enable this module for a best-practice default setup of Search API with the Database backend. After installation it is recommended to uninstall this module again for performance reasons. The provided configuration will not be removed.
 package: Search
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 dependencies:
   - drupal:comment
   - drupal:field
diff --git a/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml b/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml
index 311539a6..5266cf1b 100644
--- a/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml
+++ b/modules/search_api_db/tests/search_api_db_test_autocomplete/search_api_db_test_autocomplete.info.yml
@@ -5,5 +5,5 @@ package: Testing
 dependencies:
   - search_api:search_api_test_views
   - search_api_autocomplete:search_api_autocomplete
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/search_api.drush.inc b/search_api.drush.inc
deleted file mode 100644
index 808e373e..00000000
--- a/search_api.drush.inc
+++ /dev/null
@@ -1,449 +0,0 @@
-<?php
-
-/**
- * @file
- * Drush commands for Search API.
- */
-
-use Drupal\search_api\ConsoleException;
-use Drupal\search_api\Utility\CommandHelper;
-
-/**
- * Implements hook_drush_command().
- */
-function search_api_drush_command() {
-  $items = [];
-
-  $index['index_id'] = dt('The machine name of an index');
-  $server['server_id'] = dt('The machine name of a server');
-
-  $items['search-api-list'] = [
-    'description' => 'List all search indexes.',
-    'examples' => [
-      'drush search-api-list' => dt('List all search indexes.'),
-      'drush sapi-l' => dt('Alias to list all search indexes.'),
-    ],
-    'aliases' => ['sapi-l'],
-  ];
-
-  $items['search-api-enable'] = [
-    'description' => 'Enable one or more disabled search indexes.',
-    'examples' => [
-      'drush search-api-enable node_index' => dt('Enable the search index with the ID @name.', ['@name' => 'node_index']),
-      'drush sapi-en node_index' => dt('Alias to enable the search index with the ID @name.', ['@name' => 'node_index']),
-    ],
-    'arguments' => $index,
-    'aliases' => ['sapi-en'],
-  ];
-
-  $items['search-api-enable-all'] = [
-    'description' => 'Enable all disabled search indexes.',
-    'examples' => [
-      'drush search-api-enable-all' => dt('Enable all disabled indexes.'),
-      'drush sapi-ena' => dt('Alias to enable all disabled indexes.'),
-    ],
-    'arguments' => [],
-    'aliases' => ['sapi-ena'],
-  ];
-
-  $items['search-api-disable'] = [
-    'description' => 'Disable one or more enabled search indexes.',
-    'examples' => [
-      'drush search-api-disable node_index' => dt('Disable the search index with the ID @name.', ['@name' => 'node_index']),
-      'drush sapi-dis node_index' => dt('Alias to disable the search index with the ID @name.', ['@name' => 'node_index']),
-    ],
-    'arguments' => $index,
-    'aliases' => ['sapi-dis'],
-  ];
-
-  $items['search-api-disable-all'] = [
-    'description' => 'Disable all enabled search indexes.',
-    'examples' => [
-      'drush search-api-disable-all' => dt('Disable all enabled indexes.'),
-      'drush sapi-disa' => dt('Alias to disable all enabled indexes.'),
-    ],
-    'arguments' => [],
-    'aliases' => ['sapi-disa'],
-  ];
-
-  $items['search-api-status'] = [
-    'description' => 'Show the status of one or all search indexes.',
-    'examples' => [
-      'drush search-api-status' => dt('Show the status of all search indexes.'),
-      'drush sapi-s' => dt('Alias to show the status of all search indexes.'),
-      'drush sapi-s node_index' => dt('Show the status of the search index with the ID @name.', ['@name' => 'node_index']),
-    ],
-    'arguments' => $index,
-    'aliases' => ['sapi-s'],
-  ];
-
-  $items['search-api-index'] = [
-    'description' => 'Index items for one or all enabled search indexes.',
-    'examples' => [
-      'drush search-api-index' => dt('Index all items for all enabled indexes.'),
-      'drush sapi-i' => dt('Alias to index all items for all enabled indexes.'),
-      'drush sapi-i node_index' => dt('Index all items for the index with the ID @name.', ['@name' => 'node_index']),
-      'drush sapi-i node_index 100' => dt('Index a maximum number of @limit items for the index with the ID @name.', ['@limit' => 100, '@name' => 'node_index']),
-      'drush sapi-i node_index 100 10' => dt('Index a maximum number of @limit items (@batch_size items per batch run) for the index with the ID @name.', ['@limit' => 100, '@batch_size' => 10, '@name' => 'node_index']),
-    ],
-    'options' => [
-      'limit' => dt('The number of items to index. Set to 0 to index all items. Defaults to 0 (index all).'),
-      'batch-size' => dt('The number of items to index per batch run. Set to 0 to index all items at once. Defaults to the "!batch_size_label" setting of the index.', ['!batch_size_label' => dt('Cron batch size')]),
-    ],
-    'arguments' => $index,
-    'aliases' => ['sapi-i'],
-  ];
-
-  $items['search-api-reset-tracker'] = [
-    'description' => 'Force reindexing of one or all search indexes, without deleting existing index data.',
-    'examples' => [
-      'drush search-api-reindex' => dt('Schedule all search indexes for reindexing.'),
-      'drush sapi-r' => dt('Alias to schedule all search indexes for reindexing .'),
-      'drush sapi-r node_index' => dt('Schedule the search index with the ID @name for reindexing.', ['@name' => 'node_index']),
-    ],
-    'options' => [
-      'entity-types' => [
-        'description' => dt('List of entity type ids to reset tracker for.'),
-        'example_value' => 'user,node',
-      ],
-    ],
-    'arguments' => $index,
-    'aliases' => [
-      'search-api-mark-all',
-      'search-api-reindex',
-      'sapi-r',
-    ],
-  ];
-
-  $items['search-api-clear'] = [
-    'description' => 'Clear one or all search indexes and mark them for reindexing.',
-    'examples' => [
-      'drush search-api-clear' => dt('Clear all search indexes.'),
-      'drush sapi-c' => dt('Alias to clear all search indexes.'),
-      'drush sapi-c node_index' => dt('Clear the search index with the ID @name.', ['@name' => 'node_index']),
-    ],
-    'arguments' => $index,
-    'aliases' => ['sapi-c'],
-  ];
-
-  $items['search-api-search'] = [
-    'description' => 'Search for a keyword or phrase in a given index.',
-    'examples' => [
-      'drush search-api-search node_index title' => dt('Search for "title" inside the "node_index" index.'),
-      'drush sapi-search node_index title' => dt('Alias to search for "title" inside the "node_index" index.'),
-    ],
-    'arguments' => $index + [
-      'keyword' => dt('The keyword to look for.'),
-    ],
-    'aliases' => ['sapi-search'],
-  ];
-
-  $items['search-api-server-list'] = [
-    'description' => 'List all search servers.',
-    'examples' => [
-      'drush search-api-server-list' => dt('List all search servers.'),
-      'drush sapi-sl' => dt('Alias to list all search servers.'),
-    ],
-    'aliases' => ['sapi-sl'],
-  ];
-
-  $items['search-api-server-enable'] = [
-    'description' => 'Enable a search server.',
-    'examples' => [
-      'drush search-api-server-e my_solr_server' => dt('Enable the @server search server.', ['@server' => 'my_solr_server']),
-      'drush sapi-se my_solr_server' => dt('Alias to enable the @server search server.', ['@server' => 'my_solr_server']),
-    ],
-    'arguments' => $server,
-    'aliases' => ['sapi-se'],
-  ];
-
-  $items['search-api-server-disable'] = [
-    'description' => 'Disable a search server.',
-    'examples' => [
-      'drush search-api-server-disable' => dt('Disable the @server search server.', ['@server' => 'my_solr_server']),
-      'drush sapi-sd' => dt('Alias to disable the @server search server.', ['@server' => 'my_solr_server']),
-    ],
-    'arguments' => $server,
-    'aliases' => ['sapi-sd'],
-  ];
-
-  $items['search-api-server-clear'] = [
-    'description' => 'Clear all search indexes on the search server and mark them for reindexing.',
-    'examples' => [
-      'drush search-api-server-clear' => dt('Clear all search indexes on the search server @server.', ['@server' => 'my_solr_server']),
-      'drush sapi-sc' => dt('Alias to clear all search indexes on the search server @server.', ['@server' => 'my_solr_server']),
-    ],
-    'arguments' => $server,
-    'aliases' => ['sapi-sc'],
-  ];
-
-  $items['search-api-set-index-server'] = [
-    'description' => 'Set the search server used by a given index.',
-    'examples' => [
-      'drush search-api-set-index-server default_node_index my_solr_server' => dt('Set the @index index to used the @server server.', ['@index' => 'default_node_index', '@server' => 'my_solr_server']),
-      'drush sapi-sis default_node_index my_solr_server' => dt('Alias to set the @index index to used the @server server.', ['@index' => 'default_node_index', '@server' => 'my_solr_server']),
-    ],
-    'arguments' => $index + $server,
-    'aliases' => ['sapi-sis'],
-  ];
-
-  return $items;
-}
-
-/**
- * Prints a list of all search indexes.
- */
-function drush_search_api_list() {
-  $command_helper = _search_api_drush_command_helper();
-  $rows[] = [
-    dt('ID'),
-    dt('Name'),
-    dt('Server'),
-    dt('Type'),
-    dt('Status'),
-    dt('Limit'),
-  ];
-  $rows += $command_helper->indexListCommand();
-  foreach ($rows as &$row) {
-    $row['types'] = is_array($row['types']) ? implode(', ', $row['types']) : $row['types'];
-    $row['typeNames'] = is_array($row['types']) ? implode(', ', $row['typeNames']) : $row['types'];
-  }
-  drush_print_table($rows);
-}
-
-/**
- * Enables one or more search indexes.
- *
- * @param string|null $index_id
- *   The ID of a search index to enable. Or NULL (only used internally) to
- *   enable all disabled indexes.
- */
-function drush_search_api_enable($index_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->enableIndexCommand([$index_id]);
-  }
-  catch (ConsoleException $exception) {
-    drush_set_error($exception->getMessage());
-  }
-}
-
-/**
- * Enables all search indexes.
- */
-function drush_search_api_enable_all() {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->enableIndexCommand();
-  }
-  catch (ConsoleException $exception) {
-    drush_set_error($exception->getMessage());
-  }
-}
-
-/**
- * Disables one or more search indexes.
- *
- * @param string|null $index_id
- *   The ID of a search index to disable. Or NULL (only used internally) to
- *   disable all enabled indexes.
- */
-function drush_search_api_disable($index_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->disableIndexCommand([$index_id]);
-  }
-  catch (ConsoleException $exception) {
-    drush_set_error($exception->getMessage());
-  }
-}
-
-/**
- * Disables all search indexes.
- */
-function drush_search_api_disable_all() {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->disableIndexCommand();
-  }
-  catch (ConsoleException $exception) {
-    drush_set_error($exception->getMessage());
-  }
-}
-
-/**
- * Displays the status of one or all search indexes.
- *
- * @param string|null $index_id
- *   (optional) The ID of the search index whose status should be displayed, or
- *   NULL to display the status of all search indexes.
- */
-function drush_search_api_status($index_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  $rows[] = [
-    dt('ID'),
-    dt('Name'),
-    dt('% Complete'),
-    dt('Indexed'),
-    dt('Total'),
-  ];
-  $rows += $command_helper->indexStatusCommand([$index_id]);
-
-  drush_print_table($rows);
-}
-
-/**
- * Indexes items.
- *
- * @param string|null $index_id
- *   (optional) The index ID for which items should be indexed, or NULL to index
- *   items on all indexes.
- */
-function drush_search_api_index($index_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  $limit = drush_get_option('limit');
-  $batch_size = drush_get_option('batch-size');
-
-  $batch_set = $command_helper->indexItemsToIndexCommand([$index_id], $limit, $batch_size);
-  if ($batch_set) {
-    drush_backend_batch_process();
-  }
-}
-
-/**
- * Schedules a search index for reindexing.
- *
- * @param string|null $index_id
- *   (optional) The index ID for which items should be reindexed, or NULL to
- *   reindex all search indexes.
- */
-function drush_search_api_reset_tracker($index_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  $entity_types = drush_get_option_list('entity-types');
-  $command_helper->resetTrackerCommand([$index_id], $entity_types);
-}
-
-/**
- * Clears a search index.
- *
- * @param string|null $index_id
- *   (optional) The ID of the search index which should be cleared, or NULL to
- *   clear all search indexes.
- */
-function drush_search_api_clear($index_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  $command_helper->clearIndexCommand([$index_id]);
-}
-
-/**
- * Executes a simple keyword search and displays the results in a table.
- *
- * @param string $index_id
- *   The ID of the index being searched.
- * @param string $keyword
- *   The search keyword.
- */
-function drush_search_api_search($index_id, $keyword) {
-  $command_helper = _search_api_drush_command_helper();
-  $rows = $command_helper->searchIndexCommand($index_id, $keyword);
-  drush_print_table($rows);
-}
-
-/**
- * Lists all available search servers.
- */
-function drush_search_api_server_list() {
-  $command_helper = _search_api_drush_command_helper();
-  $rows[] = [
-    dt('ID'),
-    dt('Name'),
-    dt('Status'),
-  ];
-
-  try {
-    $rows += $command_helper->serverListCommand();
-  }
-  catch (ConsoleException $exception) {
-    drush_print($exception->getMessage());
-  }
-
-  drush_print_table($rows);
-}
-
-/**
- * Enables a search server.
- *
- * @param string $server_id
- *   The ID of the server to enable.
- */
-function drush_search_api_server_enable($server_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->enableServerCommand($server_id);
-  }
-  catch (ConsoleException $exception) {
-    drush_print($exception->getMessage());
-  }
-}
-
-/**
- * Disables a search server.
- *
- * @param string $server_id
- *   The ID of the server to disable.
- */
-function drush_search_api_server_disable($server_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->disableServerCommand($server_id);
-  }
-  catch (ConsoleException $exception) {
-    drush_print($exception->getMessage());
-  }
-}
-
-/**
- * Clears all search indexes on the server and marks them for reindexing.
- *
- * @param string $server_id
- *   The ID of the server to clear all search indexes.
- */
-function drush_search_api_server_clear($server_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->clearServerCommand($server_id);
-  }
-  catch (ConsoleException $exception) {
-    drush_print($exception->getMessage());
-  }
-}
-
-/**
- * Sets the server for a given index.
- *
- * @param string $index_id
- *   The ID of the index whose server should be changed.
- * @param string $server_id
- *   The ID of the new server for the index.
- */
-function drush_search_api_set_index_server($index_id = NULL, $server_id = NULL) {
-  $command_helper = _search_api_drush_command_helper();
-  try {
-    $command_helper->setIndexServerCommand($index_id, $server_id);
-  }
-  catch (ConsoleException $exception) {
-    drush_print($exception->getMessage());
-  }
-}
-
-/**
- * Returns an instance of the command helper.
- *
- * @return \Drupal\search_api\Utility\CommandHelper
- *   An instance of the command helper class.
- */
-function _search_api_drush_command_helper() {
-  $command_helper = new CommandHelper(\Drupal::entityTypeManager(), \Drupal::moduleHandler(), \Drupal::service('event_dispatcher'), 'dt');
-  $command_helper->setLogger(\Drupal::logger('search_api'));
-  return $command_helper;
-}
diff --git a/search_api.info.yml b/search_api.info.yml
index 2cfb9aab..dc4a7c4c 100644
--- a/search_api.info.yml
+++ b/search_api.info.yml
@@ -2,7 +2,5 @@ type: module
 name: 'Search API'
 description: 'Provides a generic framework for modules offering search capabilities.'
 package: Search
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 configure: search_api.overview
-dependencies:
-  - drupal:system (>=8.7.4)
diff --git a/src/Plugin/PluginFormTrait.php b/src/Plugin/PluginFormTrait.php
index 7ccd7a23..e9bb8ec8 100644
--- a/src/Plugin/PluginFormTrait.php
+++ b/src/Plugin/PluginFormTrait.php
@@ -3,6 +3,7 @@
 namespace Drupal\search_api\Plugin;
 
 use Drupal\Component\Plugin\ConfigurableInterface;
+use Drupal\Component\Plugin\ConfigurablePluginInterface as DrupalConfigurablePluginInterface;
 use Drupal\Core\Form\FormStateInterface;
 
 /**
@@ -38,7 +39,8 @@ public function validateConfigurationForm(array &$form, FormStateInterface $form
    * @see \Drupal\Core\Plugin\PluginFormInterface::submitConfigurationForm()
    */
   public function submitConfigurationForm(array &$form, FormStateInterface $form_state) {
-    if ($this instanceof ConfigurableInterface) {
+    // @todo Clean this up once we depend on Drupal 9.0+.
+    if ($this instanceof ConfigurableInterface || $this instanceof DrupalConfigurablePluginInterface) {
       $this->setConfiguration($form_state->getValues());
     }
   }
diff --git a/src/Plugin/views/field/SearchApiEntity.php b/src/Plugin/views/field/SearchApiEntity.php
index 84b0bcee..812b2b4d 100644
--- a/src/Plugin/views/field/SearchApiEntity.php
+++ b/src/Plugin/views/field/SearchApiEntity.php
@@ -230,7 +230,7 @@ public function preRender(&$values) {
       return;
     }
 
-    $entities = $this->getEntityManager()
+    $entities = $this->getEntityTypeManager()
       ->getStorage($this->getTargetEntityTypeId())
       ->loadMultiple(array_keys($to_load));
     $account = $this->getQuery()->getAccessAccount();
@@ -316,7 +316,7 @@ protected function getItem(EntityInterface $entity) {
     }
 
     $view_mode = $this->options['display_methods'][$bundle]['view_mode'];
-    $build = $this->getEntityManager()
+    $build = $this->getEntityFieldManager()
       ->getViewBuilder($entity->getEntityTypeId())
       ->view($entity, $view_mode);
     return [
diff --git a/src/Processor/FieldsProcessorPluginBase.php b/src/Processor/FieldsProcessorPluginBase.php
index eb857fab..b06c1f7c 100644
--- a/src/Processor/FieldsProcessorPluginBase.php
+++ b/src/Processor/FieldsProcessorPluginBase.php
@@ -7,6 +7,7 @@
 use Drupal\Core\Plugin\PluginFormInterface;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\ElementInfoManagerInterface;
+use Drupal\Core\Security\TrustedCallbackInterface;
 use Drupal\search_api\Item\FieldInterface;
 use Drupal\search_api\Utility\DataTypeHelperInterface;
 use Drupal\search_api\Plugin\PluginFormTrait;
@@ -41,7 +42,7 @@
  * - preprocess_index
  * - preprocess_query
  */
-abstract class FieldsProcessorPluginBase extends ProcessorPluginBase implements PluginFormInterface {
+abstract class FieldsProcessorPluginBase extends ProcessorPluginBase implements PluginFormInterface, TrustedCallbackInterface {
 
   use PluginFormTrait;
 
@@ -118,6 +119,13 @@ public function setElementInfoManager(ElementInfoManagerInterface $element_info_
     return $this;
   }
 
+  /**
+   * {@inheritdoc}
+   */
+  public static function trustedCallbacks() {
+    return ['preRenderFieldsCheckboxes'];
+  }
+
   /**
    * {@inheritdoc}
    */
diff --git a/tests/search_api_test/search_api_test.info.yml b/tests/search_api_test/search_api_test.info.yml
index fa1580ac..739ebf8f 100644
--- a/tests/search_api_test/search_api_test.info.yml
+++ b/tests/search_api_test/search_api_test.info.yml
@@ -4,5 +4,5 @@ description: 'Support module for Search API tests'
 package: Testing
 dependencies:
   - search_api:search_api
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_db/search_api_test_db.info.yml b/tests/search_api_test_db/search_api_test_db.info.yml
index a02a1548..e9011ad5 100644
--- a/tests/search_api_test_db/search_api_test_db.info.yml
+++ b/tests/search_api_test_db/search_api_test_db.info.yml
@@ -5,5 +5,5 @@ package: Testing
 dependencies:
   - search_api:search_api_db
   - search_api:search_api_test_example_content
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_events/search_api_test_events.info.yml b/tests/search_api_test_events/search_api_test_events.info.yml
index 63360461..23a23ac7 100644
--- a/tests/search_api_test_events/search_api_test_events.info.yml
+++ b/tests/search_api_test_events/search_api_test_events.info.yml
@@ -4,5 +4,5 @@ description: 'Support module for Search API tests, tests all events.'
 package: Testing
 dependencies:
   - search_api:search_api
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_example_content/search_api_test_example_content.info.yml b/tests/search_api_test_example_content/search_api_test_example_content.info.yml
index a2134767..fe9696a4 100644
--- a/tests/search_api_test_example_content/search_api_test_example_content.info.yml
+++ b/tests/search_api_test_example_content/search_api_test_example_content.info.yml
@@ -4,5 +4,5 @@ description: 'Provides field definitions for example content.'
 package: Testing
 dependencies:
   - drupal:entity_test
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml b/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml
index 7c3cf4dd..ccb5fa99 100644
--- a/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml
+++ b/tests/search_api_test_excerpt_field/search_api_test_excerpt_field.info.yml
@@ -6,5 +6,5 @@ dependencies:
   - search_api:search_api
   - search_api:search_api_test_db
   - drupal:views
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_extraction/search_api_test_extraction.info.yml b/tests/search_api_test_extraction/search_api_test_extraction.info.yml
index 11a7cfad..fdef214c 100644
--- a/tests/search_api_test_extraction/search_api_test_extraction.info.yml
+++ b/tests/search_api_test_extraction/search_api_test_extraction.info.yml
@@ -4,5 +4,5 @@ description: 'Provides a setup for testing field values extraction.'
 package: Testing
 dependencies:
   - drupal:entity_test
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_hooks/search_api_test_hooks.info.yml b/tests/search_api_test_hooks/search_api_test_hooks.info.yml
index 55f64622..c556cd59 100644
--- a/tests/search_api_test_hooks/search_api_test_hooks.info.yml
+++ b/tests/search_api_test_hooks/search_api_test_hooks.info.yml
@@ -4,5 +4,5 @@ description: 'Support module for Search API tests, tests all the hooks.'
 package: Testing
 dependencies:
   - search_api:search_api
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml b/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml
index 70ab9767..ceee2f6c 100644
--- a/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml
+++ b/tests/search_api_test_inconsistent_config/search_api_test_inconsistent_config.info.yml
@@ -5,5 +5,5 @@ package: Testing
 dependencies:
   - search_api:search_api
   - search_api:search_api_test
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml b/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml
index 9d255d26..844d6549 100644
--- a/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml
+++ b/tests/search_api_test_language_fallback/search_api_test_language_fallback.info.yml
@@ -2,5 +2,5 @@ type: module
 name: 'Language Fallback Test'
 description: 'Provides a language fallback fr => es.'
 package: 'Search API'
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml b/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml
index ffce8020..4e730600 100644
--- a/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml
+++ b/tests/search_api_test_no_ui/search_api_test_no_ui.info.yml
@@ -4,5 +4,5 @@ description: 'Support module for Search API tests ("No UI" plugins)'
 package: Testing
 dependencies:
   - search_api:search_api
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml b/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml
index 10cdc56f..ee978fb2 100644
--- a/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml
+++ b/tests/search_api_test_node_indexing/search_api_test_node_indexing.info.yml
@@ -4,5 +4,5 @@ description: 'Test module for testing indexing of nodes in Search API.'
 package: 'Search API'
 dependencies:
   - search_api:search_api_db
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_tasks/search_api_test_tasks.info.yml b/tests/search_api_test_tasks/search_api_test_tasks.info.yml
index ac6cc1e6..a9727b6f 100644
--- a/tests/search_api_test_tasks/search_api_test_tasks.info.yml
+++ b/tests/search_api_test_tasks/search_api_test_tasks.info.yml
@@ -4,5 +4,5 @@ description: 'Support module for tests of the Search API tasks system.'
 package: Testing
 dependencies:
   - search_api:search_api
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/search_api_test_views/search_api_test_views.info.yml b/tests/search_api_test_views/search_api_test_views.info.yml
index 49e133b6..3c8c2283 100644
--- a/tests/search_api_test_views/search_api_test_views.info.yml
+++ b/tests/search_api_test_views/search_api_test_views.info.yml
@@ -8,5 +8,5 @@ dependencies:
   - drupal:node
   - drupal:rest
   - drupal:views
-core: 8.x
+core_version_requirement: ^8.8 || ^9
 hidden: true
diff --git a/tests/src/Kernel/Processor/AddHierarchyTest.php b/tests/src/Kernel/Processor/AddHierarchyTest.php
index e1adf791..86163f40 100644
--- a/tests/src/Kernel/Processor/AddHierarchyTest.php
+++ b/tests/src/Kernel/Processor/AddHierarchyTest.php
@@ -9,7 +9,7 @@
 use Drupal\search_api\Query\Query;
 use Drupal\Tests\node\Traits\NodeCreationTrait;
 use Drupal\Tests\search_api\Kernel\ResultsTrait;
-use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait;
+use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
 
 /**
  * Tests the "Hierarchy" processor.
diff --git a/tests/src/Kernel/Processor/RenderedItemTest.php b/tests/src/Kernel/Processor/RenderedItemTest.php
index 2af31ef3..abccafd5 100644
--- a/tests/src/Kernel/Processor/RenderedItemTest.php
+++ b/tests/src/Kernel/Processor/RenderedItemTest.php
@@ -57,13 +57,10 @@ class RenderedItemTest extends ProcessorTestBase {
   public function setUp($processor = NULL) {
     parent::setUp('rendered_item');
 
-    // Drupal 8.8 converted path aliases to entities, which means there will be
-    // one more entity type enabled by default (which we need to install for
-    // this test, to make sure the processor breaks for none of them).
-    // @todo Remove if once we depend on Drupal 8.8+.
-    if (\Drupal::entityTypeManager()->hasDefinition('path_alias')) {
-      $this->installEntitySchema('path_alias');
-    }
+    // Enable the optional "path_alias" entity type as well to make sure the
+    // processor doesn't break for any of the default types.
+    $this->installEntitySchema('path_alias');
+
     // Load additional configuration and needed schemas. (The necessary schemas
     // for using nodes are already installed by the parent method.)
     $this->installConfig(['system', 'filter', 'node', 'comment', 'user']);
diff --git a/tests/src/Kernel/System/CommandHelperTest.php b/tests/src/Kernel/System/CommandHelperTest.php
index 24399797..266ad9de 100644
--- a/tests/src/Kernel/System/CommandHelperTest.php
+++ b/tests/src/Kernel/System/CommandHelperTest.php
@@ -176,7 +176,7 @@ public function testEnableIndexCommand() {
     $index = Index::load('second_index');
     $this->assertTrue($index->status());
 
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->enableIndexCommand(['foo']);
   }
 
@@ -192,7 +192,7 @@ public function testEnableIndexWithNoIndexes() {
       $index->delete();
     }
 
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->enableIndexCommand(['second_index']);
   }
 
@@ -222,7 +222,7 @@ public function testDisableIndexCommand() {
     $index = Index::load('test_index');
     $this->assertFalse($index->status());
 
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->disableIndexCommand(['foo']);
   }
 
@@ -299,7 +299,7 @@ public function testServerListCommand() {
     $this->assertSame('disabled', (string) $result['test_server']['status']);
 
     $server->delete();
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->serverListCommand();
   }
 
@@ -318,7 +318,7 @@ public function testServerEnableCommand() {
     $server = Server::load('test_server');
     $this->assertTrue($server->status());
 
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->enableServerCommand('foo');
   }
 
@@ -333,7 +333,7 @@ public function testServerDisableCommand() {
     $server = Server::load('test_server');
     $this->assertFalse($server->status());
 
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->enableServerCommand('foo');
   }
 
@@ -376,7 +376,7 @@ public function testSetIndexServerCommand() {
    * @covers ::setIndexServerCommand
    */
   public function testSetIndexServerCommandWithInvalidIndex() {
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->setIndexServerCommand('foo', 'test_server');
   }
 
@@ -386,7 +386,7 @@ public function testSetIndexServerCommandWithInvalidIndex() {
    * @covers ::setIndexServerCommand
    */
   public function testSetIndexServerCommandWithInvalidServer() {
-    $this->setExpectedException(ConsoleException::class);
+    $this->expectException(ConsoleException::class);
     $this->systemUnderTest->setIndexServerCommand('test_index', 'bar');
   }
 
diff --git a/tests/src/Kernel/Views/TaxonomyTermArgumentTest.php b/tests/src/Kernel/Views/TaxonomyTermArgumentTest.php
index cdf26722..593f7aaf 100644
--- a/tests/src/Kernel/Views/TaxonomyTermArgumentTest.php
+++ b/tests/src/Kernel/Views/TaxonomyTermArgumentTest.php
@@ -4,7 +4,7 @@
 
 use Drupal\KernelTests\KernelTestBase;
 use Drupal\search_api\Plugin\views\argument\SearchApiTerm;
-use Drupal\Tests\taxonomy\Functional\TaxonomyTestTrait;
+use Drupal\Tests\taxonomy\Traits\TaxonomyTestTrait;
 
 /**
  * Tests whether the SearchApiTerm plugin works correctly.