diff --git a/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php b/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php
index 67d51e2..84d02f8 100644
--- a/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php
+++ b/core/modules/simpletest/tests/upgrade/drupal-7.language.database.php
@@ -512,11 +512,11 @@ db_insert('variable')->fields(array(
 ))
 ->values(array(
   'name' => 'language_content_type_article',
-  'value' => 's:1:"1";',
+  'value' => 's:1:"2";',
 ))
 ->execute();
 
-// Enable the locale module.
+// Enable Locale and Translation module.
 db_update('system')->fields(array(
   'status' => 1,
   'schema_version' => '7001',
@@ -524,3 +524,159 @@ db_update('system')->fields(array(
 ->condition('type', 'module')
 ->condition('name', 'locale')
 ->execute();
+db_update('system')->fields(array(
+  'status' => 1,
+  'schema_version' => '7001',
+))
+->condition('type', 'module')
+->condition('name', 'translation')
+->execute();
+
+// Add nodes for testing.
+db_insert('node')->fields(array(
+  'nid',
+  'vid',
+  'type',
+  'language',
+  'title',
+  'uid',
+  'status',
+  'created',
+  'changed',
+  'comment',
+  'promote',
+  'sticky',
+  'tnid',
+  'translate',
+))
+// Add a sample node with LANGUAGE_NONE as language.
+->values(array(
+  'nid' => '38',
+  'vid' => '50',
+  'type' => 'article',
+  'language' => 'und',
+  'title' => 'Node title 38',
+  'uid' => '6',
+  'status' => '1',
+  'created' => '1263769200',
+  'changed' => '1263769200',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))
+// Add a sample node with 'ca' as language code.
+->values(array(
+  'nid' => '39',
+  'vid' => '55',
+  'type' => 'article',
+  'language' => 'ca',
+  'title' => 'Node title 39',
+  'uid' => '6',
+  'status' => '1',
+  'created' => '1263769300',
+  'changed' => '1263769300',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+  'tnid' => '0',
+  'translate' => '0',
+))
+// Add a translation set, consisting of a 'en' node and an 'cv' node.
+->values(array(
+  'nid' => '40',
+  'vid' => '60',
+  'type' => 'article',
+  'language' => 'en',
+  'title' => 'Node title 40',
+  'uid' => '6',
+  'status' => '1',
+  'created' => '1263769534',
+  'changed' => '1263769534',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+  'tnid' => '40',
+  'translate' => '0',
+))
+->values(array(
+  'nid' => '41',
+  'vid' => '65',
+  'type' => 'article',
+  'language' => 'cv',
+  'title' => 'Node title 41',
+  'uid' => '6',
+  'status' => '1',
+  'created' => '1263770064',
+  'changed' => '1263770064',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+  'tnid' => '40',
+  'translate' => '0',
+))
+->execute();
+
+// Add node revision information.
+db_insert('node_revision')->fields(array(
+  'nid',
+  'vid',
+  'uid',
+  'title',
+  'log',
+  'timestamp',
+  'status',
+  'comment',
+  'promote',
+  'sticky',
+))
+->values(array(
+  'nid' => '38',
+  'vid' => '50',
+  'uid' => '6',
+  'title' => 'Node title 38',
+  'log' => 'Created a LANGUAGE_NONE node.',
+  'timestamp' => '1263769200',
+  'status' => '1',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+))
+->values(array(
+  'nid' => '39',
+  'vid' => '55',
+  'uid' => '6',
+  'title' => 'Node title 39',
+  'log' => 'Created a Catalan node.',
+  'timestamp' => '1263769300',
+  'status' => '1',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+))
+->values(array(
+  'nid' => '40',
+  'vid' => '60',
+  'uid' => '6',
+  'title' => 'Node title 40',
+  'log' => 'Created source translation in English.',
+  'timestamp' => '1263769534',
+  'status' => '1',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+))
+->values(array(
+  'nid' => '41',
+  'vid' => '65',
+  'uid' => '6',
+  'title' => 'Node title 41',
+  'log' => 'Created Chuvash translation.',
+  'timestamp' => '1263770064',
+  'status' => '1',
+  'comment' => '0',
+  'promote' => '0',
+  'sticky' => '0',
+))
+->execute();
diff --git a/core/modules/simpletest/tests/upgrade/upgrade.language.test b/core/modules/simpletest/tests/upgrade/upgrade.language.test
index ee77fa7..bcdccf0 100644
--- a/core/modules/simpletest/tests/upgrade/upgrade.language.test
+++ b/core/modules/simpletest/tests/upgrade/upgrade.language.test
@@ -41,10 +41,22 @@ class LanguageUpgradePathTestCase extends UpgradePathTestCase {
       $this->assertTrue($language->default == ($language->langcode == 'ca'), t('@language default property properly set', array('@language' => $language->name)));
     }
 
+    // Test that the 'language' property was properly renamed to 'langcode'.
+    $language_none_nid = 38;
+    $spanish_nid = 39;
+    $translation_source_nid = 40;
+    $translation_nid = 41;
+    // Check directly for the $node->langcode property.
+    $this->assertEqual(node_load($language_none_nid)->langcode, LANGUAGE_NONE, "'language' property was renamed to 'langcode' for LANGUAGE_NONE node.");
+    $this->assertEqual(node_load($spanish_nid)->langcode, 'ca', "'language' property was renamed to 'langcode' for Catalan node.");
+    // Check that the translation table works correctly.
+    $this->drupalGet("node/$translation_source_nid/translate");
+    $this->drupalGet("node/$translation_nid/translate");
+
     // Check for node content type settings upgrade.
     $this->drupalGet('node/add/article');
-    $this->assertFieldByName('language');
+    $this->assertFieldByName('langcode');
     $this->drupalGet('node/add/page');
-    $this->assertNoFieldByName('language');
+    $this->assertNoFieldByName('langcode');
   }
 }