diff --git a/Cargo.toml b/Cargo.toml
index 29131c6..cac587c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -402,7 +402,7 @@ path = "tests/e2e/scripts/manual/upstream_media_e2e_contract.rs"
 
 [[test]]
 name = "client_rct_transport_summary_golden_contract"
-path = "tests/golden/diagnostics/client_rct_transport_summary_golden_contract.rs"
+path = "tests/contract/diagnostics/client_rct_transport_summary_golden_contract.rs"
 
 [[test]]
 name = "client_server_rct_blind_route_e2e_contract"
diff --git a/scripts/ci/test_gate.sh b/scripts/ci/test_gate.sh
index 2ea6b4c..6bb651c 100755
--- a/scripts/ci/test_gate.sh
+++ b/scripts/ci/test_gate.sh
@@ -83,10 +83,9 @@ test_category_names = {
     'integration', 'manual', 'performance', 'regression', 'reliability',
     'security', 'smoke', 'system', 'ui', 'unit',
 }
-support_category_names = {'fixtures', 'golden', 'helpers'}
 
 def normalize_category(category: str) -> str:
-    if category in test_category_names or category in support_category_names:
+    if category in test_category_names:
         return category
     return 'uncategorized'
 
@@ -277,6 +276,7 @@ publish_metrics() {
   fi
 
   curl --fail --silent --show-error \
+    --request PUT \
     --data-binary @"${METRICS_FILE}" \
     "${PUSHGATEWAY_URL%/}/metrics/job/${PUSHGATEWAY_JOB}/suite/lesavka/gate/tests"
 }
diff --git a/tests/golden/diagnostics/client_rct_transport_summary_golden_contract.rs b/tests/contract/diagnostics/client_rct_transport_summary_golden_contract.rs
similarity index 93%
rename from tests/golden/diagnostics/client_rct_transport_summary_golden_contract.rs
rename to tests/contract/diagnostics/client_rct_transport_summary_golden_contract.rs
index 632bf63..0f215f2 100644
--- a/tests/golden/diagnostics/client_rct_transport_summary_golden_contract.rs
+++ b/tests/contract/diagnostics/client_rct_transport_summary_golden_contract.rs
@@ -20,17 +20,17 @@ const CASES: &[SummaryCase] = &[
     SummaryCase {
         name: "pass",
         json: include_str!("../../fixtures/client_rct/transport_summary_pass.json"),
-        golden: include_str!("../client_rct/transport_summary_pass.txt"),
+        golden: include_str!("../../golden/client_rct/transport_summary_pass.txt"),
     },
     SummaryCase {
         name: "weak evidence",
         json: include_str!("../../fixtures/client_rct/transport_summary_weak_evidence.json"),
-        golden: include_str!("../client_rct/transport_summary_weak_evidence.txt"),
+        golden: include_str!("../../golden/client_rct/transport_summary_weak_evidence.txt"),
     },
     SummaryCase {
         name: "freshness fail",
         json: include_str!("../../fixtures/client_rct/transport_summary_freshness_fail.json"),
-        golden: include_str!("../client_rct/transport_summary_freshness_fail.txt"),
+        golden: include_str!("../../golden/client_rct/transport_summary_freshness_fail.txt"),
     },
 ];
 
diff --git a/tests/contract/testing/quality_ratchet_evidence_contract.rs b/tests/contract/testing/quality_ratchet_evidence_contract.rs
index 0a8dcea..3d2c4d2 100644
--- a/tests/contract/testing/quality_ratchet_evidence_contract.rs
+++ b/tests/contract/testing/quality_ratchet_evidence_contract.rs
@@ -174,8 +174,8 @@ fn audio_epoch_ui_security_install_and_diagnostics_are_backstopped() {
                 path: "tests/contract/diagnostics/report_schema_contract.rs",
             },
             EvidencePath {
-                category: "golden",
-                path: "tests/golden/diagnostics/client_rct_transport_summary_golden_contract.rs",
+                category: "contract",
+                path: "tests/contract/diagnostics/client_rct_transport_summary_golden_contract.rs",
             },
             EvidencePath {
                 category: "reliability",