diff --git a/core/modules/locale/locale.module b/core/modules/locale/locale.module
index 0b07f54..3e94416 100644
--- a/core/modules/locale/locale.module
+++ b/core/modules/locale/locale.module
@@ -680,7 +680,7 @@ function locale_form_system_file_system_settings_alter(&$form, FormStateInterfac
   $form['translation_path'] = array(
     '#type' => 'textfield',
     '#title' => t('Interface translations directory'),
-    '#default_value' => \Drupal::config('locale.settings')->get('translation.path'),
+    '#default_value' => \Drupal::configFactory()->getEditable('locale.settings')->get('translation.path'),
     '#maxlength' => 255,
     '#description' => t('A local file system path where interface translation files will be stored.'),
     '#required' => TRUE,
@@ -705,7 +705,7 @@ function locale_system_file_system_settings_submit(&$form, FormStateInterface $f
     locale_translation_clear_status();
   }
 
-  \Drupal::config('locale.settings')
+  \Drupal::configFactory()->getEditable('locale.settings')
     ->set('translation.path', $form_state->getValue('translation_path'))
     ->save();
 }
diff --git a/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php b/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
new file mode 100644
index 0000000..4a7d402
--- /dev/null
+++ b/core/modules/locale/src/Tests/LocaleFileSystemFormTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains Drupal\locale\Tests\LocaleFileSystemFormTest.
+ */
+
+namespace Drupal\locale\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests the locale functionality in the altered file settings form.
+ *
+ * @group locale
+ */
+class LocaleFileSystemFormTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('system');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(){
+    parent::setUp();
+    $account = $this->drupalCreateUser(array('administer site configuration'));
+    $this->drupalLogin($account);
+  }
+
+  /**
+   * Tests translation directory settings on the file settings form.
+   */
+  function testFileConfigurationPage() {
+    // By default there should be no setting for the translation directory.
+    $this->drupalGet('admin/config/media/file-system');
+    $this->assertNoFieldByName('translation_path');
+
+    // With locale module installed, the setting should appear.
+    $module_installer = $this->container->get('module_installer');
+    $module_installer->install(['locale']);
+    $this->rebuildContainer();
+    $this->drupalGet('admin/config/media/file-system');
+    $this->assertFieldByName('translation_path');
+
+    // The setting should persist.
+    $translation_path = $this->publicFilesDirectory . '/translations_changed';
+    $fields = array(
+      'translation_path' => $translation_path
+    );
+    $this->drupalPostForm(NULL, $fields, t('Save configuration'));
+    $this->drupalGet('admin/config/media/file-system');
+    $this->assertFieldByName('translation_path', $translation_path);
+    $this->assertEqual($translation_path, $this->config('locale.settings')->get('translation.path'));
+  }
+
+}
