diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index 2175734..4738839 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -557,6 +557,11 @@ function node_update_8003() {
       variable_set('node_type_language_hidden_' . $type, TRUE);
     }
     if ($node_type_language == 2) {
+      // Translation was enabled, so enable it again and
+      // unhide the language selector. Because if language is
+      // LANGUAGE_NOT_SPECIFIED and the selector hidden, translation
+      // cannot be enabled.
+      variable_set('node_type_language_hidden_' . $type, FALSE);
       variable_set('node_type_language_translation_enabled_' . $type, 2);
     }
     variable_del('node_type_language_' . $type);
diff --git a/core/modules/system/tests/upgrade/upgrade.language.test b/core/modules/system/tests/upgrade/upgrade.language.test
index c92380c..2f2eb46 100644
--- a/core/modules/system/tests/upgrade/upgrade.language.test
+++ b/core/modules/system/tests/upgrade/upgrade.language.test
@@ -72,12 +72,11 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase {
     $this->assertRaw('<td>Chuvash</td>', 'There is a Chuvash translation of the node.');
     $this->assertLinkByHref("node/$translation_nid", 0, 'The translation table links to the Chuvash translation.');
     $this->assertRaw('<td>Catalan</td><td>n/a</td><td>Not translated</td>', 'There is no Catalan translation of this node.');
-
     // Check for node content type settings upgrade.
     $this->drupalGet('node/add/article');
-    $this->assertFieldByName('langcode');
+    $this->assertField('langcode', 'There is a langauge selector');
     $this->drupalGet('node/add/page');
-    $this->assertFieldByName('langcode');
+    $this->assertNoField('langcode', 'There is no langauge selector');
 
     // Check that the user language value was retained in both langcode and
     // preferred_langcode.