diff --git a/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php b/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
index a15a15a..e4e5ada 100644
--- a/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
+++ b/core/modules/comment/lib/Drupal/comment/Tests/CommentFieldsTest.php
@@ -68,6 +68,17 @@ function testCommentEnable() {
     $this->admin_user = $this->drupalCreateUser(array('access administration pages', 'administer modules'));
     $this->drupalLogin($this->admin_user);
 
+    // Make sure that comment module could not be disabled.
+    $this->drupalGet('admin/modules');
+    $this->assertText('Required by: Drupal (Field type(s) in use - see Field list)');
+
+    // Enable core content type module (book).
+    $edit = array();
+    $edit['modules[Core][book][enable]'] = 'book';
+    $this->drupalPost('admin/modules', $edit, t('Save configuration'));
+    $this->rebuildContainer();
+    $this->assertTrue(module_exists('book'), 'Book module enabled.');
+
     // Create nodes of each type.
     comment_add_default_comment_field('node', 'book');
     $book_node = $this->drupalCreateNode(array(
diff --git a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php
index 8d3955c..ad91786 100644
--- a/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php
+++ b/core/modules/translation_entity/lib/Drupal/translation_entity/Tests/EntityTranslationSettingsTest.php
@@ -72,7 +72,7 @@ function testSettingsUI() {
     $edit = array(
       'entity_types[comment]' => TRUE,
       'settings[comment][comment][settings][language][langcode]' => LANGUAGE_NOT_SPECIFIED,
-      'settings[comment][comment][settings][language][language_show]' => TRUE,
+      'settings[comment][comment][settings][language][language_show]' => FALSE,
       'settings[comment][comment][translatable]' => TRUE,
       'settings[comment][comment][fields][comment_body]' => TRUE,
     );
@@ -84,7 +84,7 @@ function testSettingsUI() {
     $edit = array(
       'entity_types[comment]' => TRUE,
       'settings[comment][comment][settings][language][langcode]' => 'current_interface',
-      'settings[comment][comment][settings][language][language_show]' => FALSE,
+      'settings[comment][comment][settings][language][language_show]' => TRUE,
       'settings[comment][comment][translatable]' => TRUE,
       'settings[comment][comment][fields][comment_body]' => TRUE,
     );