diff --git a/macros/edr/tests/on_run_end/handle_tests_results.sql b/macros/edr/tests/on_run_end/handle_tests_results.sql
index 6b8e0eef2..baea5bdd5 100644
--- a/macros/edr/tests/on_run_end/handle_tests_results.sql
+++ b/macros/edr/tests/on_run_end/handle_tests_results.sql
@@ -202,7 +202,9 @@
         {% do result_rows.append({
           "elementary_test_results_id": test_result.id,
           "detected_at": test_result.detected_at,
-          "result_row": result_row
+          "result_row": result_row,
+          "row_index": loop.index,
+          "test_type": test_result.test_type
         }) %}
       {% endfor %}
     {% endif %}
diff --git a/models/edr/run_results/test_result_rows.sql b/models/edr/run_results/test_result_rows.sql
index 17d15c018..89bd7d908 100644
--- a/models/edr/run_results/test_result_rows.sql
+++ b/models/edr/run_results/test_result_rows.sql
@@ -2,7 +2,6 @@
 {{
   config(
     materialized = 'incremental',
-    unique_key = 'elementary_test_results_id',
     on_schema_change = 'append_new_columns',
     indexes=[{'columns': ['created_at']}, {'columns': ['elementary_test_results_id']}, {'columns': ['detected_at']}] if target.type == "postgres" else [],
     full_refresh=elementary.get_config_var('elementary_full_refresh'),
@@ -21,4 +20,6 @@
     ('result_row', 'long_string'),
     ('detected_at','timestamp'),
     ('created_at','timestamp'),
+    ('row_index','int'),
+    ('test_type','string'),
 ]) }}