diff --git a/src/components/ModelSelector.tsx b/src/components/ModelSelector.tsx
index a7063c8..eb39250 100644
--- a/src/components/ModelSelector.tsx
+++ b/src/components/ModelSelector.tsx
@@ -10,6 +10,8 @@ interface TrainingRun {
   metrics_summary?: {
     f1_macro?: number;
     accuracy?: number;
+    test_f1_macro?: number;
+    test_accuracy?: number;
     [key: string]: number | undefined;
   };
 }
@@ -118,7 +120,7 @@ export default function ModelSelector({
           {isLoadingModel ? 'Loading...' : '— select a model —'}
         </option>
         {runs.map((run) => {
-          const f1 = run.metrics_summary?.f1_macro;
+          const f1 = run.metrics_summary?.f1_macro ?? run.metrics_summary?.test_f1_macro;
           const label = [
             run.model_type.replace('_', ' '),
             formatDate(run.created_at),
diff --git a/src/components/TrainingPanel.tsx b/src/components/TrainingPanel.tsx
index be2e9c1..c1efd31 100644
--- a/src/components/TrainingPanel.tsx
+++ b/src/components/TrainingPanel.tsx
@@ -20,6 +20,8 @@ interface TrainingRun {
   metrics_summary?: {
     accuracy?: number;
     f1_macro?: number;
+    test_accuracy?: number;
+    test_f1_macro?: number;
     [key: string]: number | undefined;
   };
   error?: string;
@@ -304,11 +306,11 @@ export default function TrainingPanel() {
                     <div className="text-muted-foreground">{formatDate(run.created_at)}</div>
                     {run.status === 'completed' && run.metrics_summary && (
                       <div className="flex flex-wrap gap-x-2 text-muted-foreground">
-                        {run.metrics_summary.accuracy !== undefined && (
-                          <span>Acc: {(run.metrics_summary.accuracy * 100).toFixed(1)}%</span>
+                        {(run.metrics_summary.accuracy ?? run.metrics_summary.test_accuracy) !== undefined && (
+                          <span>Acc: {((run.metrics_summary.accuracy ?? run.metrics_summary.test_accuracy)! * 100).toFixed(1)}%</span>
                         )}
-                        {run.metrics_summary.f1_macro !== undefined && (
-                          <span>F1: {(run.metrics_summary.f1_macro * 100).toFixed(1)}%</span>
+                        {(run.metrics_summary.f1_macro ?? run.metrics_summary.test_f1_macro) !== undefined && (
+                          <span>F1: {((run.metrics_summary.f1_macro ?? run.metrics_summary.test_f1_macro)! * 100).toFixed(1)}%</span>
                         )}
                       </div>
                     )}