diff --git a/core/modules/field/field.install b/core/modules/field/field.install
index 0bb6d4a..1d18b4b 100644
--- a/core/modules/field/field.install
+++ b/core/modules/field/field.install
@@ -51,7 +51,7 @@ function field_update_8001(&$sandbox) {
       '@prefixes' => implode(', ', $adjusted_prefix) ?: 'none',
       '@suffixes' => implode(', ', $adjusted_suffix) ?: 'none',
     ];
-    $msg = 'Some of your prefix/suffix fields configured pipe symbols to format singular/plural form. This is no longer supported, so the fields where adjusted. See the change record https://www.drupal.org/node/2552871 for more information.';
+    $msg = 'Some of your prefix/suffix fields configured pipe symbols to format singular/plural form. This is no longer supported, so the fields were adjusted. See the change record https://www.drupal.org/node/2552871 for more information.';
     $msg .= '<br\>Prefix fields adjusted: @prefixes';
     $msg .= '<br\>Suffix fields adjusted: @suffixes';
     $message = \Drupal::translation()->translate($msg, $args);
diff --git a/core/modules/field/src/Tests/Update/FieldConfigUpdateTest.php b/core/modules/field/src/Tests/Update/FieldConfigUpdateTest.php
index 79a3ff9..d872410 100644
--- a/core/modules/field/src/Tests/Update/FieldConfigUpdateTest.php
+++ b/core/modules/field/src/Tests/Update/FieldConfigUpdateTest.php
@@ -24,6 +24,7 @@ class FieldConfigUpdateTest extends UpdatePathTestBase {
   protected function setUp() {
     $this->databaseDumpFiles = [
       __DIR__ . '/../../../../system/tests/fixtures/update/drupal-8.bare.standard.php.gz',
+      __DIR__ . '/../../../../system/tests/fixtures/update/2545730/drupal-8.field-field-config-data.php',
     ];
 
     parent::setUp();
@@ -33,9 +34,16 @@ protected function setUp() {
    * Tests that field configurations are updated properly.
    */
   public function testUpdateHookN() {
+    $active = $this->container->get('config.storage');
+    $field = $active->read('field.field.node.article.field_decimal_test');
+    $this->assertEqual($field['settings']['prefix'], 'p-singular|prefix-plural', 'Prefix field was found as expected.');
+    $this->assertEqual($field['settings']['suffix'], 's-singular|suffix-plural', 'Suffix field was found as expected.');
+
     $this->runUpdates();
 
-    // @TODO implement
+    $field = $active->read('field.field.node.article.field_decimal_test');
+    $this->assertEqual($field['settings']['prefix'], 'prefix-plural', 'Prefix field was updated correctly.');
+    $this->assertEqual($field['settings']['suffix'], 'suffix-plural', 'Suffix field was updated correctly.');
   }
 
 }
diff --git a/core/modules/system/tests/fixtures/update/2545730/drupal-8.field-field-config-data.php b/core/modules/system/tests/fixtures/update/2545730/drupal-8.field-field-config-data.php
new file mode 100644
index 0000000..46e9d54
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/2545730/drupal-8.field-field-config-data.php
@@ -0,0 +1,30 @@
+<?php
+
+/**
+ * @file
+ * Contains database additions to drupal-8.bare.standard.php.gz for testing the
+ * upgrade path of https://www.drupal.org/node/2545730.
+ */
+
+use Drupal\Core\Database\Database;
+
+$connection = Database::getConnection();
+
+// Structure of a field with a prefix and suffix configuration.
+$field_configs = [];
+$field_configs[] = \Drupal\Component\Serialization\Yaml::decode(file_get_contents(__DIR__ . '/field.field.2545730.yml'));
+
+foreach ($field_configs as $fields_config) {
+  $connection->insert('config')
+    ->fields(array(
+      'collection',
+      'name',
+      'data',
+    ))
+    ->values(array(
+      'collection' => '',
+      'name' => 'field.field.' . $fields_config['id'],
+      'data' => serialize($fields_config),
+    ))
+    ->execute();
+}
diff --git a/core/modules/system/tests/fixtures/update/2545730/field.field.2545730.yml b/core/modules/system/tests/fixtures/update/2545730/field.field.2545730.yml
new file mode 100644
index 0000000..fd628d5
--- /dev/null
+++ b/core/modules/system/tests/fixtures/update/2545730/field.field.2545730.yml
@@ -0,0 +1,23 @@
+uuid: 12cee519-c921-43f1-a400-c5b046ff56b4
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.node.field_decimal_test
+    - node.type.article
+id: node.article.field_decimal_test
+field_name: field_decimal_test
+entity_type: node
+bundle: article
+label: Decimal test
+description: ''
+required: false
+translatable: false
+default_value: {  }
+default_value_callback: ''
+settings:
+  min: null
+  max: null
+  prefix: p-singular|prefix-plural
+  suffix: s-singular|suffix-plural
+field_type: decimal