diff --git a/core/modules/config/src/Tests/ConfigImportUITest.php b/core/modules/config/src/Tests/ConfigImportUITest.php
index 34d3744..68f8b78 100644
--- a/core/modules/config/src/Tests/ConfigImportUITest.php
+++ b/core/modules/config/src/Tests/ConfigImportUITest.php
@@ -367,8 +367,8 @@ function testImportErrorLog() {
     $uuid = $this->container->get('uuid');
 
     $values_primary = array(
-      'uuid' => $uuid->generate(),
       'langcode' => 'en',
+      'uuid' => $uuid->generate(),
       'status' => TRUE,
       'dependencies' => array(),
       'id' => 'primary',
@@ -381,8 +381,8 @@ function testImportErrorLog() {
     );
     $staging->write($name_primary, $values_primary);
     $values_secondary = array(
-      'uuid' => $uuid->generate(),
       'langcode' => 'en',
+      'uuid' => $uuid->generate(),
       'status' => TRUE,
       // Add a dependency on primary, to ensure that is synced first.
       'dependencies' => array(
diff --git a/core/modules/field/config/schema/field.schema.yml b/core/modules/field/config/schema/field.schema.yml
index 9ea9b2e..55760a7 100644
--- a/core/modules/field/config/schema/field.schema.yml
+++ b/core/modules/field/config/schema/field.schema.yml
@@ -1,7 +1,7 @@
 # Schema for configuration files of the Field module.
 
 field.settings:
-  type: mapping
+  type: config_object
   label: 'Field settings'
   mapping:
     purge_batch_size: