diff --git a/modules/field/modules/text/text.install b/modules/field/modules/text/text.install
index b9bd25f..a714c9e 100644
--- a/modules/field/modules/text/text.install
+++ b/modules/field/modules/text/text.install
@@ -70,12 +70,20 @@ function text_field_schema($field) {
  * Implements hook_update_dependencies().
  */
 function text_update_dependencies() {
-  // Ensure that format columns are only changed after Filter module has changed
-  // the primary records.
+  // text_update_7000() was only intended for D7 beta-beta updates, but is
+  // executed too early in a D6 to D7 upgrade, if CCK's Text module was
+  // installed.
   $dependencies['text'][7000] = array(
+    // System module needs to enable Field and Field UI (7020) and Text module
+    // (7027) first.
+    'system' => 7027,
+    // Wait for Filter module to change its primary records first.
     'filter' => 7010,
+    // Convert node body and teaser to text fields first.
+    'node' => 7006,
+    // Convert comment body to text field first.
+    'comment' => 7006,
   );
-
   return $dependencies;
 }
 
diff --git a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php
index a916281..fe5881c 100644
--- a/modules/simpletest/tests/upgrade/drupal-6.filled.database.php
+++ b/modules/simpletest/tests/upgrade/drupal-6.filled.database.php
@@ -12146,6 +12146,18 @@ db_insert('system')->fields(array(
   'info' => 'a:8:{s:4:"name";s:8:"Taxonomy";s:11:"description";s:38:"Enables the categorization of content.";s:7:"package";s:15:"Core - optional";s:7:"version";s:8:"6.20-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:0:{}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
 ))
 ->values(array(
+  'filename' => 'sites/all/modules/cck/modules/text/text.module',
+  'name' => 'text',
+  'type' => 'module',
+  'owner' => '',
+  'status' => '1',
+  'throttle' => '0',
+  'bootstrap' => '0',
+  'schema_version' => '0',
+  'weight' => '0',
+  'info' => 'a:8:{s:4:"name";s:4:"Text";s:11:"description";s:32:"Defines simple text field types.";s:7:"package";s:3:"CCK";s:7:"version";s:11:"6.x-2.x-dev";s:4:"core";s:3:"6.x";s:12:"dependencies";a:1:{i:0;s:7:"content";}s:10:"dependents";a:0:{}s:3:"php";s:5:"4.3.5";}',
+))
+->values(array(
   'filename' => 'modules/throttle/throttle.module',
   'name' => 'throttle',
   'type' => 'module',