diff --git a/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php b/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php
new file mode 100644
index 0000000..4e418d1
--- /dev/null
+++ b/core/modules/config/src/Tests/ConfigEntityListMultilingualTest.php
@@ -0,0 +1,66 @@
+<?php
+
+/**
+ * @file
+ * Definition of Drupal\config\Tests\ConfigEntityListMultilingualTest.
+ */
+
+namespace Drupal\config\Tests;
+
+use Drupal\simpletest\WebTestBase;
+use Drupal\language\Entity\ConfigurableLanguage;
+
+/**
+ * Tests the listing of configuration entities in a multilingual scenario.
+ *
+ * @group config
+ */
+class ConfigEntityListMultilingualTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array('config_test', 'language');
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+    // Delete the override config_test entity. It is not required by this test.
+    \Drupal::entityManager()->getStorage('config_test')->load('override')->delete();
+    ConfigurableLanguage::createFromLangcode('hu')->save();
+  }
+
+  /**
+   * Tests the listing UI with different language scenarios.
+   */
+  function testListUI() {
+    // Log in as an administrative user to access the full menu trail.
+    $this->drupalLogin($this->drupalCreateUser(array('access administration pages', 'administer site configuration')));
+
+    // Get the list page.
+    $this->drupalGet('admin/structure/config_test');
+    $this->assertLinkByHref('admin/structure/config_test/manage/dotted.default');
+
+    // Add a new entity using the action link.
+    $this->clickLink('Add test configuration');
+    $edit = array(
+      'label' => 'Antilop',
+      'id' => 'antilop',
+      'langcode' => 'hu',
+    );
+    $this->drupalPostForm(NULL, $edit, t('Save'));
+    // Ensure that operations for editing the Hungarian entity appear English.
+    $this->assertLinkByHref('admin/structure/config_test/manage/antilop');
+
+    // Get the list page in Hungarian and assert Hungarian admin links
+    // regardless of language of config entities.
+    $this->drupalGet('hu/admin/structure/config_test');
+    $this->assertLinkByHref('hu/admin/structure/config_test/manage/dotted.default');
+    $this->assertLinkByHref('hu/admin/structure/config_test/manage/antilop');
+  }
+
+}
diff --git a/core/modules/config/tests/config_test/src/ConfigTestForm.php b/core/modules/config/tests/config_test/src/ConfigTestForm.php
index 56195e2..feab817 100644
--- a/core/modules/config/tests/config_test/src/ConfigTestForm.php
+++ b/core/modules/config/tests/config_test/src/ConfigTestForm.php
@@ -9,6 +9,7 @@
 
 use Drupal\Core\Entity\EntityForm;
 use Drupal\Core\Form\FormStateInterface;
+use Drupal\Core\Language\LanguageInterface;
 
 /**
  * Form controller for the test config edit forms.
@@ -98,6 +99,13 @@ public function form(array $form, FormStateInterface $form_state) {
       '#access' => !empty($size),
     );
 
+    $form['langcode'] = array(
+      '#type' => 'language_select',
+      '#title' => t('Language'),
+      '#languages' => LanguageInterface::STATE_ALL,
+      '#default_value' => $entity->language()->getId(),
+    );
+
     $form['actions'] = array('#type' => 'actions');
     $form['actions']['submit'] = array(
       '#type' => 'submit',