diff --git a/core/modules/locale/locale.test b/core/modules/locale/locale.test
index b2f511b..919ec3f 100644
--- a/core/modules/locale/locale.test
+++ b/core/modules/locale/locale.test
@@ -2339,7 +2339,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
     $edit = array(
       'type' => 'page',
       'title' => $node_title,
-      'body' => array($langcode => array(array('value' => $node_body))),
+      'body' => array(LANGUAGE_NOT_SPECIFIED => array(array('value' => $node_body))),
       'langcode' => $langcode,
     );
     $node = $this->drupalCreateNode($edit);
@@ -2431,7 +2431,7 @@ class LocaleContentFunctionalTest extends DrupalWebTestCase {
     $edit = array(
       'type' => 'article',
       'title' => $node_title,
-      'body' => array($langcode => array(array('value' => $node_body))),
+      'body' => array(LANGUAGE_NOT_SPECIFIED => array(array('value' => $node_body))),
       'langcode' => $langcode,
       'promote' => 1,
     );
diff --git a/core/modules/node/node.test b/core/modules/node/node.test
index 6334347..39a6fcd 100644
--- a/core/modules/node/node.test
+++ b/core/modules/node/node.test
@@ -2352,8 +2352,8 @@ class NodeTokenReplaceTestCase extends NodeWebTestCase {
     $tests['[node:type]'] = 'article';
     $tests['[node:type-name]'] = 'Article';
     $tests['[node:title]'] = check_plain($node->title);
-    $tests['[node:body]'] = _text_sanitize($instance, $node->langcode, $node->body[$node->langcode][0], 'value');
-    $tests['[node:summary]'] = _text_sanitize($instance, $node->langcode, $node->body[$node->langcode][0], 'summary');
+    $tests['[node:body]'] = _text_sanitize($instance, $node->langcode, $node->body[LANGUAGE_NOT_SPECIFIED][0], 'value');
+    $tests['[node:summary]'] = _text_sanitize($instance, $node->langcode, $node->body[LANGUAGE_NOT_SPECIFIED][0], 'summary');
     $tests['[node:langcode]'] = check_plain($node->langcode);
     $tests['[node:url]'] = url('node/' . $node->nid, $url_options);
     $tests['[node:edit-url]'] = url('node/' . $node->nid . '/edit', $url_options);
@@ -2373,8 +2373,8 @@ class NodeTokenReplaceTestCase extends NodeWebTestCase {
 
     // Generate and test unsanitized tokens.
     $tests['[node:title]'] = $node->title;
-    $tests['[node:body]'] = $node->body[$node->langcode][0]['value'];
-    $tests['[node:summary]'] = $node->body[$node->langcode][0]['summary'];
+    $tests['[node:body]'] = $node->body[LANGUAGE_NOT_SPECIFIED][0]['value'];
+    $tests['[node:summary]'] = $node->body[LANGUAGE_NOT_SPECIFIED][0]['summary'];
     $tests['[node:langcode]'] = $node->langcode;
     $tests['[node:author:name]'] = user_format_name($account);