diff --git a/core/modules/search/src/Tests/SearchExcerptTest.php b/core/modules/search/src/Tests/SearchExcerptTest.php
index 9ed4403..ff85a1d 100644
--- a/core/modules/search/src/Tests/SearchExcerptTest.php
+++ b/core/modules/search/src/Tests/SearchExcerptTest.php
@@ -7,14 +7,14 @@
 
 namespace Drupal\search\Tests;
 
-use Drupal\simpletest\WebTestBase;
+use Drupal\simpletest\KernelTestBase;
 
 /**
  * Tests the search_excerpt() function.
  *
  * @group search
  */
-class SearchExcerptTest extends WebTestBase {
+class SearchExcerptTest extends KernelTestBase {
 
   /**
    * Modules to enable.
diff --git a/core/modules/search/src/Tests/SearchMatchTest.php b/core/modules/search/src/Tests/SearchMatchTest.php
index 8e78943..d5f5afb 100644
--- a/core/modules/search/src/Tests/SearchMatchTest.php
+++ b/core/modules/search/src/Tests/SearchMatchTest.php
@@ -8,6 +8,7 @@
 namespace Drupal\search\Tests;
 
 use Drupal\Core\Language\LanguageInterface;
+use Drupal\simpletest\KernelTestBase;
 
 // The search index can contain different types of content. Typically the type
 // is 'node'. Here we test with _test_ and _test2_ as the type.
@@ -20,7 +21,24 @@
  *
  * @group search
  */
-class SearchMatchTest extends SearchTestBase {
+class SearchMatchTest extends KernelTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('search');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    $this->installSchema('search', ['search_index', 'search_dataset', 'search_total']);
+    $this->installConfig(['search']);
+  }
+
   /**
    * Test search indexing.
    */