diff --git a/core/modules/comment/src/Tests/CommentLanguageTest.php b/core/modules/comment/src/Tests/CommentLanguageTest.php
index 746aea4..1d5d89d 100644
--- a/core/modules/comment/src/Tests/CommentLanguageTest.php
+++ b/core/modules/comment/src/Tests/CommentLanguageTest.php
@@ -93,7 +93,7 @@ function testCommentLanguage() {
       $edit = array(
         'title[0][value]' => $title,
         'body[0][value]' => $this->randomMachineName(),
-        'langcode' => $node_langcode,
+        'langcode[0][value]' => $node_langcode,
         'comment[0][status]' => CommentItemInterface::OPEN,
       );
       $this->drupalPostForm("node/add/article", $edit, t('Save'));
diff --git a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php b/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
index 971d091..6b2f538 100644
--- a/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
+++ b/core/modules/node/src/Tests/NodeTypeInitialLanguageTest.php
@@ -66,8 +66,8 @@ function testNodeTypeInitialLanguageDefaults() {
     );
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->drupalGet('node/add/article');
-    $this->assertField('langcode', 'Language is selectable on node add/edit page when language not hidden.');
-    $this->assertOptionSelected('edit-langcode', 'hu', 'The initial language is the site default on the node add page after the site default language is changed.');
+    $this->assertField('langcode[0][value]', 'Language is selectable on node add/edit page when language not hidden.');
+    $this->assertOptionSelected('edit-langcode-0-value', 'hu', 'The initial language is the site default on the node add page after the site default language is changed.');
 
     // Tests if the language field can be rearranged on the manage form display
     // tab.
@@ -75,20 +75,13 @@ function testNodeTypeInitialLanguageDefaults() {
     $language_field = $this->xpath('//*[@id="langcode"]');
     $this->assert(!empty($language_field), 'Language field is visible on manage form display tab.');
 
-    // Tests if the language field can be rearranged on the manage display tab.
-    $this->drupalGet('admin/structure/types/manage/article/display');
-    $language_display = $this->xpath('//*[@id="langcode"]');
-    $this->assert(!empty($language_display), 'Language field is visible on manage display tab.');
-    // Tests if the language field is hidden by default.
-    $this->assertOptionSelected('edit-fields-langcode-type', 'hidden', 'Language is hidden by default on manage display tab.');
-
     // Changes the initial language settings.
     $edit = array(
       'language_configuration[langcode]' => 'en',
     );
     $this->drupalPostForm('admin/structure/types/manage/article', $edit, t('Save content type'));
     $this->drupalGet('node/add/article');
-    $this->assertOptionSelected('edit-langcode', 'en', 'The initial language is the defined language.');
+    $this->assertOptionSelected('edit-langcode-0-value', 'en', 'The initial language is the defined language.');
   }
 
   /**
@@ -110,20 +103,5 @@ function testLanguageFieldVisibility() {
       ':id' => 'field-language-display',
     ));
     $this->assertTrue(empty($language_field), 'Language field value is not shown by default on node page.');
-
-    // Changes Language field visibility to true and check if it is saved.
-    $edit = array(
-      'fields[langcode][type]' => 'visible',
-    );
-    $this->drupalPostForm('admin/structure/types/manage/article/display', $edit, t('Save'));
-    $this->drupalGet('admin/structure/types/manage/article/display');
-    $this->assertOptionSelected('edit-fields-langcode-type', 'visible', 'Language field has been set to visible.');
-
-    // Loads node page and check if Language field is shown.
-    $this->drupalGet('node/' . $node->id());
-    $language_field = $this->xpath('//div[@id=:id]/div', array(
-      ':id' => 'field-language-display',
-    ));
-    $this->assertFalse(empty($language_field), 'Language field value is shown on node page.');
   }
 }