diff --git a/script/gen_test_report.py b/script/gen_test_report.py
index 7953cfb..6a6bdf1 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 = 7
+MAX_RESULTS_DEPTH = 5
 
 # We'd have a minimum of 3: group, a build config, a run config.
 MIN_RESULTS_DEPTH = 3
@@ -81,8 +81,6 @@
         "Test Group",
         "TF Build Config",
         "TFTF Build Config",
-        "SCP Build Config",
-        "SCP tools Config",
         "SPM Build Config",
         "Run Config",
         "Status"
@@ -276,7 +274,6 @@
         if not Level_empty[child_node.depth - 1]:
             # - TF config might be "nil" for TFTF-only build configs;
             # - TFTF config might not be present for non-TFTF runs;
-            # - SCP config might not be present for non-SCP builds;
             # - All build-only configs have runconfig as "nil";
             #
             # Make nil cells empty, and grey empty cells out.
@@ -440,7 +437,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, scp_tools, spm_config, *_ = (build_config +
+        tf_config, tftf_config, spm_config, *_ = (build_config +
                 spare_commas).split(",")
 
         build_number = child_build_numbers[i]
@@ -455,9 +452,7 @@
         group_node = results.set_child(group)
         tf_node = group_node.set_child(tf_config)
         tftf_node = tf_node.set_child(tftf_config)
-        scp_node = tftf_node.set_child(scp_config)
-        scp_tools_node = scp_node.set_child(scp_tools)
-        spm_node = scp_tools_node.set_child(spm_config)
+        spm_node = tftf_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))