diff --git a/core/modules/system/src/Tests/File/ConfigTest.php b/core/modules/system/src/Tests/File/ConfigTest.php
index 6a0bd65..aa37efd 100644
--- a/core/modules/system/src/Tests/File/ConfigTest.php
+++ b/core/modules/system/src/Tests/File/ConfigTest.php
@@ -37,15 +37,28 @@ function testFileConfigurationPage() {
       'file_default_scheme' => 'private',
     );
 
-    // Check that all fields are present.
-    foreach ($fields as $field => $path) {
-      $this->assertFieldByName($field);
-    }
+    // Check that public and private can be selected as default scheme.
+    $this->assertFieldById('edit-file-default-scheme-public');
+    $this->assertFieldById('edit-file-default-scheme-private');
 
     $this->drupalPostForm(NULL, $fields, t('Save configuration'));
     $this->assertText(t('The configuration options have been saved.'));
     foreach ($fields as $field => $value) {
       $this->assertFieldByName($field, $value);
     }
+
+    // Remove the private path, rebuild the container and verify that private
+    // can no longer be selected in the UI.
+    $settings['settings']['file_private_path'] = (object) array(
+      'value' => '',
+      'required' => TRUE,
+    );
+    $this->writeSettings($settings);
+    drupal_flush_all_caches();
+
+    $this->drupalGet('admin/config/media/file-system');
+    $this->assertFieldById('edit-file-default-scheme-public');
+    $this->assertNoFieldById('edit-file-default-scheme-private');
   }
+
 }