diff --git a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
index 9b2d82d..ba7e015 100644
--- a/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
+++ b/core/modules/language/src/Tests/LanguageConfigurationElementTest.php
@@ -31,30 +31,30 @@ class LanguageConfigurationElementTest extends WebTestBase {
   public function testLanguageConfigurationElement() {
     $this->drupalGet('language-tests/language_configuration_element');
     $edit['lang_configuration[langcode]'] = 'current_interface';
-    $edit['lang_configuration[language_show]'] = FALSE;
+    $edit['lang_configuration[language_alterable]'] = FALSE;
     $this->drupalPostForm(NULL, $edit, 'Save');
-    $lang_conf = language_get_default_configuration('some_custom_type', 'some_bundle');
+    $lang_conf = language_get_default_configuration('entity_test', 'some_bundle');
 
     // Check that the settings have been saved.
     $this->assertEqual($lang_conf['langcode'], 'current_interface');
-    $this->assertFalse($lang_conf['language_show']);
+    $this->assertFalse($lang_conf['language_alterable']);
     $this->drupalGet('language-tests/language_configuration_element');
     $this->assertOptionSelected('edit-lang-configuration-langcode', 'current_interface');
-    $this->assertNoFieldChecked('edit-lang-configuration-language-show');
+    $this->assertNoFieldChecked('edit-lang-configuration-language-alterable');
 
     // Reload the page and save again.
     $this->drupalGet('language-tests/language_configuration_element');
     $edit['lang_configuration[langcode]'] = 'authors_default';
-    $edit['lang_configuration[language_show]'] = TRUE;
+    $edit['lang_configuration[language_alterable]'] = TRUE;
     $this->drupalPostForm(NULL, $edit, 'Save');
-    $lang_conf = language_get_default_configuration('some_custom_type', 'some_bundle');
+    $lang_conf = language_get_default_configuration('entity_test', 'some_bundle');
 
     // Check that the settings have been saved.
     $this->assertEqual($lang_conf['langcode'], 'authors_default');
-    $this->assertTrue($lang_conf['language_show']);
+    $this->assertTrue($lang_conf['language_alterable']);
     $this->drupalGet('language-tests/language_configuration_element');
     $this->assertOptionSelected('edit-lang-configuration-langcode', 'authors_default');
-    $this->assertFieldChecked('edit-lang-configuration-language-show');
+    $this->assertFieldChecked('edit-lang-configuration-language-alterable');
   }
 
   /**
@@ -70,13 +70,13 @@ public function testDefaultLangcode() {
     }
 
     // Fixed language.
-    language_save_default_configuration('custom_type', 'custom_bundle', array('langcode' => 'bb', 'language_show' => TRUE));
-    $langcode = language_get_default_langcode('custom_type', 'custom_bundle');
+    language_save_default_configuration('entity_test', 'custom_bundle', array('langcode' => 'bb', 'language_alterable' => TRUE));
+    $langcode = language_get_default_langcode('entity_test', 'custom_bundle');
     $this->assertEqual($langcode, 'bb');
 
     // Current interface.
-    language_save_default_configuration('custom_type', 'custom_bundle', array('langcode' => 'current_interface', 'language_show' => TRUE));
-    $langcode = language_get_default_langcode('custom_type', 'custom_bundle');
+    language_save_default_configuration('entity_test', 'custom_bundle', array('langcode' => 'current_interface', 'language_alterable' => TRUE));
+    $langcode = language_get_default_langcode('entity_test', 'custom_bundle');
     $language_interface = \Drupal::languageManager()->getCurrentLanguage();
     $this->assertEqual($langcode, $language_interface->getId());
 
@@ -87,8 +87,8 @@ public function testDefaultLangcode() {
     $this->assertTrue($configurable_language->isDefault(), 'The en language entity is flagged as the default language.');
 
     \Drupal::config('system.site')->set('langcode', 'cc')->save();
-    language_save_default_configuration('custom_type', 'custom_bundle', array('langcode' => LanguageInterface::LANGCODE_SITE_DEFAULT, 'language_show' => TRUE));
-    $langcode = language_get_default_langcode('custom_type', 'custom_bundle');
+    language_save_default_configuration('entity_test', 'custom_bundle', array('langcode' => LanguageInterface::LANGCODE_SITE_DEFAULT, 'language_alterable' => TRUE));
+    $langcode = language_get_default_langcode('entity_test', 'custom_bundle');
     $this->assertEqual($langcode, 'cc');
 
     // Ensure the language entity default value is correct.
@@ -107,7 +107,7 @@ public function testDefaultLangcode() {
     $some_user->preferred_langcode = 'bb';
     $some_user->save();
     $this->drupalLogin($some_user);
-    language_save_default_configuration('custom_type', 'some_bundle', array('langcode' => 'authors_default', 'language_show' => TRUE));
+    language_save_default_configuration('entity_test', 'some_bundle', array('langcode' => 'authors_default', 'language_alterable' => TRUE));
     $this->drupalGet('language-tests/language_configuration_element_test');
     $this->assertOptionSelected('edit-langcode', 'bb');
   }
@@ -125,12 +125,12 @@ public function testNodeTypeUpdate() {
     $this->drupalLogin($admin_user);
     $edit = array(
       'language_configuration[langcode]' => 'current_interface',
-      'language_configuration[language_show]' => TRUE,
+      'language_configuration[language_alterable]' => TRUE,
     );
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     // Check the language default configuration for the articles.
     $configuration = language_get_default_configuration('node', 'article');
-    $this->assertEqual($configuration, array('langcode' => 'current_interface', 'language_show' => TRUE), 'The default language configuration has been saved on the Article content type.');
+    $this->assertEqual($configuration, array('langcode' => 'current_interface', 'language_alterable' => TRUE), 'The default language configuration has been saved on the Article content type.');
     // Rename the article content type.
     $edit = array(
       'type' => 'article_2'
@@ -138,6 +138,6 @@ public function testNodeTypeUpdate() {
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     // Check that we still have the settings for the new node type.
     $configuration = language_get_default_configuration('node', 'article_2');
-    $this->assertEqual($configuration, array('langcode' => 'current_interface', 'language_show' => TRUE), 'The default language configuration has been kept on the new Article content type.');
+    $this->assertEqual($configuration, array('langcode' => 'current_interface', 'language_alterable' => TRUE), 'The default language configuration has been kept on the new Article content type.');
   }
 }
diff --git a/core/modules/language/tests/language_elements_test/language_elements_test.info.yml b/core/modules/language/tests/language_elements_test/language_elements_test.info.yml
index d8a3da1..52ed285 100644
--- a/core/modules/language/tests/language_elements_test/language_elements_test.info.yml
+++ b/core/modules/language/tests/language_elements_test/language_elements_test.info.yml
@@ -4,3 +4,5 @@ description: 'Support module for the language form elements tests.'
 core: 8.x
 package: Testing
 version: VERSION
+dependencies:
+  - entity_test
diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
index f9a0e1b..16129f7 100644
--- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
+++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElement.php
@@ -25,12 +25,12 @@ public function getFormID() {
    * {@inheritdoc}
    */
   public function buildForm(array $form, FormStateInterface $form_state) {
-    $conf = language_get_default_configuration('some_custom_type', 'some_bundle');
+    $conf = language_get_default_configuration('entity_test', 'some_bundle');
 
     $form['lang_configuration'] = array(
       '#type' => 'language_configuration',
       '#entity_information' => array(
-        'entity_type' => 'some_custom_type',
+        'entity_type' => 'entity_test',
         'bundle' => 'some_bundle',
       ),
       '#default_value' => $conf,
diff --git a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
index 130c069..eda727a 100644
--- a/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
+++ b/core/modules/language/tests/language_elements_test/src/Form/LanguageConfigurationElementTest.php
@@ -28,7 +28,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
     $form['langcode'] = array(
       '#title' => t('Language select'),
       '#type' => 'language_select',
-      '#default_value' => language_get_default_langcode('custom_type', 'some_bundle'),
+      '#default_value' => language_get_default_langcode('entity_test', 'some_bundle'),
     );
     return $form;
   }