diff --git a/config/schema/search_api_solr.backend.schema.yml b/config/schema/search_api_solr.backend.schema.yml
index 1e8f080..07876b1 100644
--- a/config/schema/search_api_solr.backend.schema.yml
+++ b/config/schema/search_api_solr.backend.schema.yml
@@ -1,5 +1,5 @@
 search_api.backend.plugin.search_api_solr:
-  type: mapping
+  type: config_object
   label: 'Search API Solr settings'
   mapping:
     scheme:
diff --git a/config/schema/search_api_solr.schema.yml b/config/schema/search_api_solr.schema.yml
index e8c52ad..adc2d43 100644
--- a/config/schema/search_api_solr.schema.yml
+++ b/config/schema/search_api_solr.schema.yml
@@ -1,7 +1,7 @@
 # Schema for configuration files of the Search API Solr module.
 
 search_api_solr.settings:
-  type: mapping
+  type: config_object
   label: 'Search API Solr settings'
   mapping:
     last_optimize:
diff --git a/src/Tests/SearchApiSolrTest.php b/src/Tests/SearchApiSolrTest.php
index 9535aaf..f6bf338 100644
--- a/src/Tests/SearchApiSolrTest.php
+++ b/src/Tests/SearchApiSolrTest.php
@@ -78,6 +78,20 @@ class SearchApiSolrTest extends BackendTest {
   }
 
   /**
+   * {@inheritdoc}
+   *
+   * Need to install search_api_solr_test config.
+   */
+  protected function installConfig(array $modules) {
+    // This gets called multiple times, so only add the test module once it
+    // is called by BackendTest::setUp().
+    if ($modules == ['search_api_test_db']) {
+      $modules[] = 'search_api_test_solr';
+      parent::installConfig($modules);
+    }
+  }
+
+  /**
    * Tests various indexing scenarios for the Solr search backend.
    */
   public function testFramework() {