diff --git a/core/modules/language/src/Tests/LanguageEntityFormTest.php b/core/modules/language/src/Tests/LanguageEntityFormTest.php
new file mode 100644
index 0000000..27ecac8
--- /dev/null
+++ b/core/modules/language/src/Tests/LanguageEntityFormTest.php
@@ -0,0 +1,99 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\language\Tests\LanguageEntityFormTest.
+ */
+
+namespace Drupal\language\Tests;
+
+use Drupal\language_test\Entity\NoLanguageEntityTest;
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests entity form with language module.
+ *
+ * This is to ensure that an entity form by default does not show the language
+ * select, but it does so when it's enabled from the content language settings
+ * page.
+ * In this test we test it with the particular cases of the contact messages
+ * and with a custom entity_test without language definition.
+ *
+ * @group language
+ */
+class LanguageEntityFormTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array(
+    'contact',
+    'language',
+    'contact_test',
+    'language_test',
+  );
+
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp() {
+    parent::setUp();
+
+    // Create and login administrative user.
+    $admin_user = $this->drupalCreateUser(array(
+      'access site-wide contact form',
+      'administer languages',
+    ));
+    $this->drupalLogin($admin_user);
+  }
+
+  /**
+   * Tests configuration options with language.
+   */
+  public function testContactLanguage() {
+    // Ensure that contact form by default does not show the language select.
+    $this->drupalGet('contact');
+    $this->assertResponse(200, 'The page exists');
+    $this->assertNoField('edit-langcode-0-value');
+
+    // Enable language select from content language settings page.
+    $settings_path = 'admin/config/regional/content-language';
+    $edit['entity_types[contact_message]'] = TRUE;
+    $edit['settings[contact_message][feedback][settings][language][language_alterable]'] = TRUE;
+    $this->drupalPostForm($settings_path, $edit, t('Save configuration'));
+
+    // Ensure that contact form now shows the language select.
+    $this->drupalGet('contact');
+    $this->assertResponse(200, 'The page exists');
+    $this->assertField('edit-langcode-0-value');
+  }
+
+  /**
+   * Tests configuration options with empty langcode.
+   */
+  public function testEmptyLangcode() {
+    // Create an entity which empty langcode.
+    $entity = NoLanguageEntityTest::create();
+    $entity->save();
+
+    // Ensure that node by default does not show the language select.
+    $this->drupalGet('no_language_entity_test/manage/' . $entity->id());
+    $this->assertResponse(200, 'The page exists');
+    $this->assertNoField('edit-langcode-0-value');
+
+    // Enable language select from content language settings page.
+    $settings_path = 'admin/config/regional/content-language';
+    $edit['entity_types[no_language_entity_test]'] = TRUE;
+    $edit['settings[no_language_entity_test][no_language_entity_test][settings][language][language_alterable]'] = TRUE;
+    $this->drupalPostForm($settings_path, $edit, t('Save configuration'));
+
+    // Ensure that there is still no language selector for entity with
+    // empty langcode.
+    $this->drupalGet('no_language_entity_test/manage/' . $entity->id());
+    $this->assertResponse(200, 'The page exists');
+    $this->assertNoField('edit-langcode-0-value');
+  }
+
+}
diff --git a/core/modules/language/tests/language_test/language_test.info.yml b/core/modules/language/tests/language_test/language_test.info.yml
index 03051cd..3557210 100644
--- a/core/modules/language/tests/language_test/language_test.info.yml
+++ b/core/modules/language/tests/language_test/language_test.info.yml
@@ -4,3 +4,5 @@ description: 'Support module for the language layer tests.'
 core: 8.x
 package: Testing
 version: VERSION
+dependencies:
+  - entity_test
diff --git a/core/modules/language/tests/language_test/language_test.routing.yml b/core/modules/language/tests/language_test/language_test.routing.yml
index 489a7fe..bd5271b 100644
--- a/core/modules/language/tests/language_test/language_test.routing.yml
+++ b/core/modules/language/tests/language_test/language_test.routing.yml
@@ -31,3 +31,15 @@ language_test.entity_using_current_language:
         type: entity:configurable_language
         # Force load in the interface text language selected for page.
         with_config_overrides: TRUE
+
+entity.no_language_entity_test.edit:
+  path: '/no_language_entity_test/manage/{no_language_entity_test}'
+  defaults:
+    _controller: '\Drupal\entity_test\Controller\EntityTestController::testEdit'
+    entity_type_id: 'no_language_entity_test'
+  requirements:
+    _access: 'TRUE'
+  options:
+    parameters:
+      no_language_entity_test:
+        type: entity:no_language_entity_test