diff --git a/core/modules/language/src/Tests/LanguageEntityFormTest.php b/core/modules/language/src/Tests/LanguageEntityFormTest.php
new file mode 100644
index 0000000..a332727
--- /dev/null
+++ b/core/modules/language/src/Tests/LanguageEntityFormTest.php
@@ -0,0 +1,61 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\language\Tests\LanguageEntityFormTest.
+ */
+
+namespace Drupal\language\Tests;
+
+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 case of the contact messages.
+ *
+ * @group contact
+ */
+class LanguageEntityFormTest extends WebTestBase {
+
+  /**
+   * Modules to enable.
+   *
+   * @var array
+   */
+  public static $modules = array(
+    'contact',
+    'language',
+    'contact_test',
+  );
+
+  /**
+   * Tests configuration options with language.
+   */
+  public function testContactLanguage() {
+    // Create and login administrative user.
+    $admin_user = $this->drupalCreateUser(array(
+      'access site-wide contact form',
+      'administer languages',
+    ));
+    $this->drupalLogin($admin_user);
+
+    // Ensure that contact form by default does not show the language select.
+    $this->drupalGet('contact');
+    $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->assertField('edit-langcode-0-value');
+  }
+
+}