Index: tests/solr_index_and_search.test
--- tests/solr_index_and_search.test Base (1.1.2.3)
+++ tests/solr_index_and_search.test Locally Modified (Based On 1.1.2.3)
@@ -45,7 +45,7 @@
 
     variable_set('minimum_word_size', 3);
     for ($i = 1; $i <= 7; ++$i) {
-      $documents[] = $this->_solr_build_document($i, $this->getText($i), array('nid' => $i));
+      $documents[] = $this->_solr_build_document($i, $this->getText($i), array('nid' => apachesolr_document_id($i)));
     }
 
     $this->_solr_index($documents);
@@ -72,7 +72,7 @@
     if (!$fields['body']) {
         $field['body'] = $body;
     }
-    $fields = array('title', 'body', 'type', 'uid', 'changed', 'nid', 'comment_count', 'name', 'language');
\ No newline at end of file
+    $fields = array('title', 'body', 'type', 'uid', 'changed', 'id', 'comment_count', 'name', 'language');
\ No newline at end of file
     foreach ($values as $key => $value) {
       if (in_array($key, $fields)) {
         $document->$key = $value;