diff --git a/script/gen_test_report.py b/script/gen_test_report.py
index fb9a41a..965aaa0 100755
--- a/script/gen_test_report.py
+++ b/script/gen_test_report.py
@@ -69,7 +69,7 @@
 REPORT_JSON = "report.json"
 
 # Maximum depth for the tree of results, excluding status
-MAX_RESULTS_DEPTH = 5
+MAX_RESULTS_DEPTH = 7
 
 # We'd have a minimum of 3: group, a build config, a run config.
 MIN_RESULTS_DEPTH = 3
@@ -82,6 +82,8 @@
         "TF Build Config",
         "TFTF Build Config",
         "SCP Build Config",
+        "SCP tools Config",
+        "SPM Build Config",
         "Run Config",
         "Status"
 ]
@@ -407,7 +409,7 @@
         test_config = desc[:-len(TEST_SUFFIX)]
         build_config, run_config = test_config.split(":")
         spare_commas = "," * (MAX_RESULTS_DEPTH - MIN_RESULTS_DEPTH)
-        tf_config, tftf_config, scp_config, *_ = (build_config +
+        tf_config, tftf_config, scp_config, scp_tools, spm_config, *_ = (build_config +
                 spare_commas).split(",")
 
         build_number = child_build_numbers[i]
@@ -423,7 +425,9 @@
         tf_node = group_node.set_child(tf_config)
         tftf_node = tf_node.set_child(tftf_config)
         scp_node = tftf_node.set_child(scp_config)
-        run_node = scp_node.set_child(run_config)
+        scp_tools_node = scp_node.set_child(scp_tools)
+        spm_node = scp_tools_node.set_child(spm_config)
+        run_node = spm_node.set_child(run_config)
         run_node.set_result(test_result, build_number)
         run_node.set_desc(os.path.join(workspace, f))