diff --git a/test/script/tskdbdiff.py b/test/script/tskdbdiff.py
index 920cee63a5..f0aae2c2a5 100644
--- a/test/script/tskdbdiff.py
+++ b/test/script/tskdbdiff.py
@@ -844,7 +844,9 @@ def normalize_tsk_event_descriptions(guid_util: TskGuidUtils, row: Dict[str, any
     # replace object ids with information that is deterministic
     row_copy['event_description_id'] = MASKED_ID
     row_copy['content_obj_id'] = guid_util.get_guid_for_file_objid(row['content_obj_id'])
-    row_copy['artifact_id'] = guid_util.get_guid_for_artifactid(row['artifact_id']) if row['artifact_id'] else None
+    row_copy['artifact_id'] = guid_util.get_guid_for_artifactid(row['artifact_id']) \
+        if row['artifact_id'] is not None else None
+    row_copy['data_source_obj_id'] = guid_util.get_guid_for_file_objid(row['data_source_obj_id'])
 
     if row['full_description'] == row['med_description'] == row['short_description']:
         row_copy['full_description'] = _mask_event_desc(row['full_description'])
@@ -933,6 +935,7 @@ def normalize_tsk_files(guid_util: TskGuidUtils, row: Dict[str, any]) -> Dict[st
         row_copy['md5'] = "MD5_IGNORED"
         row_copy['sha256'] = "SHA256_IGNORED"
 
+    row_copy['data_source_obj_id'] = guid_util.get_guid_for_file_objid(row['data_source_obj_id'])
     row_copy['obj_id'] = MASKED_OBJ_ID
     row_copy['os_account_obj_id'] = 'MASKED_OS_ACCOUNT_OBJ_ID'
     row_copy['parent_path'] = normalize_file_path(row['parent_path'])