diff --git a/pift.install b/pift.install
index 330ff1b..9ac9b98 100644
--- a/pift.install
+++ b/pift.install
@@ -27,11 +27,17 @@ function pift_schema() {
         'not null' => TRUE,
       ),
       'id' => array(
-        'description' => t('Related test detail record ID, either rid, or fid.'),
+        'description' => t('Related test detail record ID, either label_id, or fid.'),
         'type' => 'int',
         'unsigned' => TRUE,
         'not null' => TRUE,
       ),
+      'nid' => array(
+        'description' => t('Related test nid info, either rid, or pi.nid.'),
+        'type' => 'int',
+        'unsigned' => TRUE,
+        'not null' => FALSE,
+      ),
       'status' => array(
         'description' => t('Status of the test, PIFT_STATUS_*.'),
         'type' => 'int',
@@ -315,4 +321,28 @@ function pift_update_6206() {
   );
   db_change_field($ret, 'pift_test', 'message', 'message', $newattr);
   return $ret;
-}
\ No newline at end of file
+}
+
+/**
+ * Change schema to add pift_test.nid column, and update branch test unique id
+ */
+function pift_update_6208() {
+  // TODO:  Is this punishing enough that it should be converted to use Batch API?
+  $ret = array();
+  $newattr = array(
+    'description' => t('Related test nid information, either rid, or pi.nid.'),
+    'type' => 'int',
+    'unsigned' => TRUE,
+    'not null' => FALSE,
+  );
+  // Add nid column to pift_test
+  db_add_field($ret, 'pift_test', 'nid', $newattr);
+  // Datafill nid for branch tests
+  $ret[] = update_sql("UPDATE {pift_test} SET nid = id WHERE type = 1");
+  // Datafill nid for file tests
+  $ret[] = update_sql("UPDATE {pift_test} pt, {upload} u SET pt.nid = u.nid WHERE pt.id = u.fid AND pt.type = 2");
+  $ret[] = update_sql("UPDATE {pift_test} pt, {comment_upload} cu SET pt.nid = cu.nid WHERE pt.id = cu.fid AND pt.type = 2");
+  // Update id column for branch tests
+  $ret[] = update_sql("UPDATE {pift_test} pt, {versioncontrol_release_labels} vcs SET pt.id = vcs.label_id WHERE pt.id = vcs.release_nid and pt_type = 1");
+  return $ret;
+}