diff --git a/core/modules/contact/src/Tests/ContactStorageTest.php b/core/modules/contact/src/Tests/ContactStorageTest.php
index 0e2804a..4d1b73b 100644
--- a/core/modules/contact/src/Tests/ContactStorageTest.php
+++ b/core/modules/contact/src/Tests/ContactStorageTest.php
@@ -7,6 +7,7 @@
 
 namespace Drupal\contact\Tests;
 
+use Drupal\config\Tests\SchemaCheckTestTrait;
 use Drupal\contact\Entity\Message;
 
 /**
@@ -14,6 +15,8 @@
  */
 class ContactStorageTest extends ContactSitewideTest {
 
+  use SchemaCheckTestTrait;
+
   /**
    * Modules to enable.
    *
@@ -71,6 +74,10 @@ public function testContactStorage() {
     $this->assertEqual($message->getSenderName(), $name);
     $this->assertEqual($message->getSubject(), $subject);
     $this->assertEqual($message->getSenderMail(), $mail);
+
+    $config = \Drupal::config("contact.form.$id");
+    $this->assertEqual($config->get('id'), $id);
+    $this->assertConfigSchema(\Drupal::service('config.typed'), $config->getName(), $config->get());
   }
 
 }
diff --git a/core/modules/contact/tests/modules/contact_storage_test/config/schema/contact_storage_test.schema.yml b/core/modules/contact/tests/modules/contact_storage_test/config/schema/contact_storage_test.schema.yml
index 9d18c8a..e421214 100644
--- a/core/modules/contact/tests/modules/contact_storage_test/config/schema/contact_storage_test.schema.yml
+++ b/core/modules/contact/tests/modules/contact_storage_test/config/schema/contact_storage_test.schema.yml
@@ -1,5 +1,9 @@
 # Schema for configuration files of the Contact Storage Test module.
 
-contact_form.third_party.send_a_pony:
-  type: boolean
-  label: 'Send a Pony'
+contact_form.third_party.contact_storage_test:
+  type: mapping
+  label: 'Per-contact form storage settings'
+  mapping:
+    send_a_pony:
+      type: boolean
+      label: 'Send a Pony'