diff --git a/README.md b/README.md
index 17bc9cc..add41f0 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ Local web app for exploring cycling data from any source (Strava, TCX, GPX, JSON
 
 - **Backend**: FastAPI + SQLite (metadata) + Parquet (per-ride streams)
 - **Frontend**: Svelte 5 (Vite + TypeScript) with synchronized uPlot charts and MapLibre GL maps
-- **Data sources**: Strava bulk export, individual activity files (TCX/GPX/JSON), or SQLite database import/export
+- **Data sources**: Strava bulk export, one or more activity files (TCX/GPX/JSON), or SQLite database import/export
 
 ## Quick start
 
@@ -16,7 +16,7 @@ pip install -e backend
 
 # 2. Ingest data (pick one)
 python -m app.ingest "path/to/strava/export"    # Strava bulk export
-# Or upload individual files via the UI at /import
+# Or upload one or more files via the UI
 
 # 3. Run API
 uvicorn app.main:app --reload --port 8000
@@ -37,7 +37,8 @@ docker compose up --build
 
 ## Features
 
-- **Multi-source ingestion** — Strava exports, individual TCX/GPX/JSON files, or full database import/export
+- **Multi-source ingestion** — Strava exports, TCX/GPX/JSON files, or full database import/export
+- **Multi-file upload** — Drag and drop multiple GPX/FIT/TCX files at once; edit each file's name and bike before uploading
 - **Bike management** — Track multiple bikes with per-bike stats and ride assignment
 - **Rich charts** — Synchronized time-series views (power, HR, speed, cadence, elevation, distance)
 - **Interactive route map** — Color-coded routes by metric with hover synchronization
diff --git a/docs/plan-multi-upload.md b/docs/plan-multi-upload.md
new file mode 100644
index 0000000..d3460a8
--- /dev/null
+++ b/docs/plan-multi-upload.md
@@ -0,0 +1,75 @@
+# Plan — Multi-file drag-and-drop upload
+
+Feature: upload multiple ride files (`.fit/.tcx/.gpx/.gz`) at once via drag-and-drop,
+while keeping per-file **name** and **bike** editable.
+
+## Core decision (lazy-but-correct)
+**Frontend-only.** The backend `POST /api/uploads` already accepts a single file +
+`name`/`bike_id` metadata, and `recompute_all(force=False)` is incremental (it skips
+activities that already have bests), so calling the endpoint once per file in a loop is
+cheap. **No new backend endpoint.** Only `UploadDialog.svelte`, `api.ts` (tiny),
+`i18n.ts`, one new backend test, and the README change.
+
+## Open design questions
+1. **Per-row editable fields** — default: **name + bike only** (exactly the ask).
+   Type + description stay editable *after* upload via the existing per-ride edit (no regression).
+   *Alt:* add type/description per row (more clutter).
+2. **Sequential vs parallel uploads** — default: **sequential** (`for…await`).
+   Parallel would hit SQLite single-writer locks in the per-file recompute.
+   *Alt:* parallel only if a batch endpoint is added.
+3. **New batch endpoint?** — default: **none.** Only add `POST /api/uploads/batch`
+   (single recompute, atomicity) if 50+ file uploads become routine.
+
+---
+
+## Milestones
+
+### M0 — Branch setup
+- `git checkout -b feat/multi-upload` from `master` (clean tree).
+
+### M1 — Frontend: multi-file queue + drag-and-drop (core)
+- Rework `UploadDialog.svelte` into a multi-file flow:
+  - **Drop zone**: `on:dragover` (preventDefault) + `on:drop` (read `e.dataTransfer.files`);
+    hidden `<input type="file" multiple>` for click-to-browse.
+  - **Queue** of `{ file, name, bikeId }`; each row: filename (read-only) + **name**
+    (pre-filled from filename) + **bike** (select) + remove button.
+  - **Dedupe** by `name+size` so the same file isn't queued twice.
+  - Accept filter `.fit,.tcx,.gpx,.gz`. A single drop = a one-row queue (single upload keeps working).
+- Reuses `api.uploadRide` unchanged.
+
+### M2 — Frontend: batch submit + per-file status
+- Submit loops the queue **sequentially** → `api.uploadRide(row.file, { name, bike_id })`.
+- Per-row status (`idle/uploading/done/error`) + overall progress; summary on finish
+  (N uploaded, M failed).
+- After completion → dispatch `uploaded` → `RidesList` reloads (existing).
+- Optional: "clear all" + keep-failed affordances.
+
+### M3 — i18n + polish
+- New de + en keys: drop hint, "N files", per-row labels, statuses, errors, remove,
+  clear-all, progress.
+- Keyboard/focus: Escape closes, focus management, `aria` on drop zone + rows.
+
+### M4 — Tests
+- **Backend:** new `tests/backend/routers/test_admin.py` — upload a tiny GPX with
+  `name` + `bike_id` via `POST /api/uploads`, assert `activity_id` returned and
+  name + bike persisted (validates the exact call the frontend makes in a loop).
+  *(Currently `/api/uploads` has no test coverage.)*
+- **Frontend:** **no new test framework** (none exists; YAGNI) — the queue + loop is
+  simple and covered by manual QA. *Alt:* add vitest if wanted.
+
+### M5 — Documentation
+- **README.md**: extend the upload/ingestion feature section to state multi-file
+  drag-and-drop upload with per-file name + bike.
+- Note any new manual-QA steps in the README.
+
+### M6 — Commit strategy + handoff
+Logical commits on `feat/multi-upload` (each a coherent unit):
+1. `feat(upload): multi-file drag-and-drop queue with per-file name + bike` *(M1)*
+2. `feat(upload): sequential batch submit with per-file status + progress` *(M2)*
+3. `i18n(upload): de + en strings for multi-upload` *(M3)*
+4. `test(upload): cover name + bike metadata on POST /api/uploads` *(M4)*
+5. `docs: document multi-file upload` *(M5)*
+- Then open a PR to `master` (or merge directly).
+
+**Upgrade path (not built unless requested):** `POST /api/uploads/batch` endpoint for
+atomicity + single recompute, if large batch uploads become common.
\ No newline at end of file
diff --git a/frontend/src/lib/UploadDialog.svelte b/frontend/src/lib/UploadDialog.svelte
index 88a7396..8b98e64 100644
--- a/frontend/src/lib/UploadDialog.svelte
+++ b/frontend/src/lib/UploadDialog.svelte
@@ -1,65 +1,140 @@
 <script lang="ts">
   import { createEventDispatcher } from "svelte";
+  import { Upload, X, Loader2, CheckCircle2, XCircle } from "lucide-svelte";
   import { api, type Bike } from "./api";
   import { t } from "./i18n";
 
   export let open = false;
   export let bikes: Bike[] = [];
 
-  const dispatch = createEventDispatcher<{ uploaded: { activity_id: number } }>();
+  const dispatch = createEventDispatcher<{ uploaded: { count: number; failed: number } }>();
 
-  const ACTIVITY_TYPES = ["Ride", "Gravel Ride", "Mountain Bike Ride", "Virtual Ride", "E-Bike Ride"];
+  type Status = "idle" | "uploading" | "done" | "error";
+  interface QueueItem {
+    id: number;
+    file: File;
+    name: string;
+    bikeId: number | "";
+    status: Status;
+    error?: string;
+  }
 
-  let file: File | null = null;
-  let name = "";
-  let bikeId: number | "" = "";
-  let activityType = "Ride";
-  let description = "";
+  let queue: QueueItem[] = [];
   let busy = false;
   let error = "";
+  let dragging = false;
+  let progress = 0;
+  let total = 0;
+  let nextId = 1;
+  let fileInputEl: HTMLInputElement | null = null;
+
+  const EXT_RE = /\.(fit|tcx|gpx)(\.gz)?$/i;
+
+  $: doneCount = queue.filter((q) => q.status === "done").length;
+  $: failedCount = queue.filter((q) => q.status === "error").length;
+
+  function baseName(f: File) {
+    return f.name.replace(EXT_RE, "");
+  }
+
+  function isRideFile(f: File) {
+    return EXT_RE.test(f.name) || /\.gz$/i.test(f.name) || f.type === "application/gzip";
+  }
+
+  function addFiles(files: FileList | File[]) {
+    const added: QueueItem[] = [];
+    for (const f of Array.from(files)) {
+      if (!isRideFile(f)) continue;
+      const dup = queue.some((q) => q.file.name === f.name && q.file.size === f.size);
+      if (dup) continue;
+      added.push({ id: nextId++, file: f, name: baseName(f), bikeId: "", status: "idle" });
+    }
+    if (added.length) queue = [...queue, ...added];
+  }
+
+  function onDrop(e: DragEvent) {
+    e.preventDefault();
+    dragging = false;
+    if (e.dataTransfer?.files) addFiles(e.dataTransfer.files);
+  }
+
+  function onDragOver(e: DragEvent) {
+    e.preventDefault();
+    dragging = true;
+  }
+
+  function onDragLeave() {
+    dragging = false;
+  }
+
+  function openBrowse() {
+    fileInputEl?.click();
+  }
+
+  function onBrowse(e: Event) {
+    const input = e.target as HTMLInputElement;
+    if (input.files?.length) addFiles(input.files);
+    input.value = "";
+  }
+
+  function removeAt(id: number) {
+    queue = queue.filter((q) => q.id !== id);
+  }
+
+  function clearAll() {
+    if (busy) return;
+    queue = [];
+    error = "";
+  }
+
+  function setRow(id: number, patch: Partial<QueueItem>) {
+    queue = queue.map((q) => (q.id === id ? { ...q, ...patch } : q));
+  }
 
   function reset() {
-    file = null;
-    name = "";
-    bikeId = "";
-    activityType = "Ride";
-    description = "";
+    queue = [];
     error = "";
     busy = false;
+    dragging = false;
+    progress = 0;
+    total = 0;
   }
 
   function close() {
     open = false;
-    reset();
-  }
-
-  function onFile(e: Event) {
-    const input = e.target as HTMLInputElement;
-    file = input.files?.[0] ?? null;
-    if (file && !name) name = file.name.replace(/\.(fit|tcx|gpx)(\.gz)?$/i, "");
+    if (!busy) reset();
   }
 
   async function submit() {
-    if (!file) {
+    if (queue.length === 0) {
       error = $t("upload.error.no_file");
       return;
     }
     busy = true;
     error = "";
-    try {
-      const res = await api.uploadRide(file, {
-        name: name || undefined,
-        bike_id: bikeId === "" ? null : Number(bikeId),
-        activity_type: activityType,
-        description: description || undefined,
-      });
-      dispatch("uploaded", res);
-      close();
-    } catch (e: any) {
-      error = e?.message ?? String(e);
-    } finally {
-      busy = false;
+    const toUpload = queue.filter((q) => q.status !== "done");
+    total = toUpload.length;
+    progress = 0;
+    let done = 0;
+    let failed = 0;
+    for (const q of toUpload) {
+      setRow(q.id, { status: "uploading", error: undefined });
+      try {
+        await api.uploadRide(q.file, {
+          name: q.name.trim() || undefined,
+          bike_id: q.bikeId === "" ? null : Number(q.bikeId),
+        });
+        setRow(q.id, { status: "done" });
+        done++;
+      } catch (e: any) {
+        setRow(q.id, { status: "error", error: e?.message ?? String(e) });
+        failed++;
+      }
+      progress++;
     }
+    busy = false;
+    dispatch("uploaded", { count: done, failed });
+    if (failed === 0) close();
   }
 </script>
 
@@ -73,47 +148,88 @@
     tabindex="-1"
   >
     <div class="modal" role="document">
-      <h3>{$t("upload.title")}</h3>
-
-      <label class="field">
-        <span>{$t("upload.file")}</span>
-        <input type="file" accept=".fit,.tcx,.gpx,.gz,application/gzip" on:change={onFile} />
-      </label>
-
-      <label class="field">
-        <span>{$t("upload.name")}</span>
-        <input type="text" bind:value={name} placeholder={$t("upload.name_placeholder")} />
-      </label>
-
-      <label class="field">
-        <span>{$t("upload.bike")}</span>
-        <select bind:value={bikeId}>
-          <option value="">{$t("ride.bike.none")}</option>
-          {#each bikes as b}
-            <option value={b.id}>{b.name}</option>
-          {/each}
-        </select>
-      </label>
-
-      <label class="field">
-        <span>{$t("upload.type")}</span>
-        <select bind:value={activityType}>
-          {#each ACTIVITY_TYPES as t}
-            <option value={t}>{t}</option>
+      <div class="head">
+        <h3>{$t("upload.title")}</h3>
+        {#if queue.length > 0 && !busy}
+          <button type="button" class="link" on:click={clearAll}>{$t("upload.clear")}</button>
+        {/if}
+      </div>
+
+      <div
+        class="drop"
+        class:dragging
+        role="button"
+        tabindex="0"
+        aria-label={$t("upload.drop")}
+        on:click={openBrowse}
+        on:keydown={(e) => (e.key === "Enter" || e.key === " ") && openBrowse()}
+        on:drop={onDrop}
+        on:dragover={onDragOver}
+        on:dragleave={onDragLeave}
+      >
+        <Upload size={20} />
+        <span>{$t("upload.drop")}</span>
+      </div>
+      <input
+        type="file"
+        multiple
+        accept=".fit,.tcx,.gpx,.gz,application/gzip"
+        style="display:none"
+        bind:this={fileInputEl}
+        on:change={onBrowse}
+      />
+
+      {#if queue.length > 0}
+        <div class="count-row">
+          <span class="muted">{$t("upload.files_count").replace("{count}", String(queue.length))}</span>
+          {#if busy}
+            <span class="muted spin-wrap"><span class="spin"><Loader2 size={13} /></span> {$t("upload.progress").replace("{i}", String(progress)).replace("{n}", String(total))}</span>
+          {/if}
+        </div>
+        <div class="rows">
+          {#each queue as q (q.id)}
+            <div class="row" class:done={q.status === "done"} class:error={q.status === "error"}>
+              <div class="row-head">
+                <span class="fname" title={q.file.name}>{q.file.name}</span>
+                {#if q.status === "uploading"}
+                  <span class="stat spin"><Loader2 size={14} /></span>
+                {:else if q.status === "done"}
+                  <span class="stat ok"><CheckCircle2 size={14} /></span>
+                {:else if q.status === "error"}
+                  <span class="stat err" title={q.error}><XCircle size={14} /></span>
+                {/if}
+                <button type="button" class="rm" title={$t("upload.remove")} on:click={() => removeAt(q.id)} disabled={busy}>
+                  <X size={14} />
+                </button>
+              </div>
+              <div class="row-fields">
+                <input type="text" bind:value={q.name} placeholder={$t("upload.name_placeholder")} disabled={q.status === "uploading"} />
+                <select bind:value={q.bikeId} disabled={q.status === "uploading"}>
+                  <option value="">{$t("ride.bike.none")}</option>
+                  {#each bikes as b}
+                    <option value={b.id}>{b.name}</option>
+                  {/each}
+                </select>
+              </div>
+              {#if q.status === "error" && q.error}
+                <div class="row-err">{q.error}</div>
+              {/if}
+            </div>
           {/each}
-        </select>
-      </label>
+        </div>
+      {/if}
 
-      <label class="field">
-        <span>{$t("upload.description")}</span>
-        <textarea rows="3" bind:value={description} placeholder={$t("upload.description_placeholder")}></textarea>
-      </label>
+      {#if !busy && doneCount + failedCount > 0}
+        <div class="summary" class:has-error={failedCount > 0}>
+          {$t("upload.summary").replace("{done}", String(doneCount)).replace("{failed}", String(failedCount))}
+        </div>
+      {/if}
 
       {#if error}<div class="error">{error}</div>{/if}
 
       <div class="actions">
         <button type="button" on:click={close} disabled={busy}>{$t("ride.cancel")}</button>
-        <button type="button" class="primary" on:click={submit} disabled={busy || !file}>
+        <button type="button" class="primary" on:click={submit} disabled={busy || queue.length === 0}>
           {busy ? $t("upload.submitting") : $t("upload.submit")}
         </button>
       </div>
@@ -136,25 +252,121 @@
     border: 1px solid var(--border);
     border-radius: 10px;
     padding: 20px 22px;
-    width: min(440px, 92vw);
+    width: min(560px, 94vw);
     max-height: 90vh;
     overflow: auto;
     box-shadow: 0 20px 60px rgba(0, 0, 0, 0.5);
   }
+  .head {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+  }
   .modal h3 { margin-top: 0; }
-  .field {
-    display: block;
-    margin-bottom: 12px;
+  .link {
+    background: none;
+    border: none;
+    color: var(--muted);
+    font-size: 12px;
+    cursor: pointer;
+  }
+  .link:hover { color: var(--accent); }
+  .drop {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 10px;
+    border: 1.5px dashed var(--border);
+    border-radius: 8px;
+    padding: 22px 16px;
+    margin: 14px 0;
+    color: var(--muted);
+    font-size: 13px;
+    cursor: pointer;
+    transition: border-color 0.15s, background 0.15s;
+  }
+  .drop:hover,
+  .drop:focus-visible {
+    border-color: var(--accent);
+    color: var(--accent);
+    outline: none;
+  }
+  .drop.dragging {
+    border-color: var(--accent);
+    background: rgba(252, 82, 0, 0.08);
+    color: var(--accent);
+  }
+  .count-row {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    margin-bottom: 8px;
+  }
+  .muted { color: var(--muted); font-size: 12px; }
+  .rows {
+    display: flex;
+    flex-direction: column;
+    gap: 8px;
+    max-height: 40vh;
+    overflow-y: auto;
+    margin-bottom: 8px;
+  }
+  .row {
+    border: 1px solid var(--border);
+    border-radius: 8px;
+    padding: 8px 10px;
+  }
+  .row.done { border-color: rgba(34, 197, 94, 0.4); }
+  .row.error { border-color: rgba(239, 68, 68, 0.5); }
+  .row-head {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    margin-bottom: 6px;
+  }
+  .fname {
+    flex: 1;
     font-size: 13px;
+    color: var(--text);
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+  }
+  .stat { flex-shrink: 0; display: inline-flex; }
+  .stat.ok { color: #22c55e; }
+  .stat.err { color: #ef4444; }
+  .rm {
+    background: none;
+    border: none;
     color: var(--muted);
+    cursor: pointer;
+    padding: 2px;
+    display: inline-flex;
+    flex-shrink: 0;
+  }
+  .rm:hover { color: #ef4444; }
+  .rm:disabled { opacity: 0.4; cursor: not-allowed; }
+  .row-fields {
+    display: grid;
+    grid-template-columns: 1fr 150px;
+    gap: 8px;
   }
-  .field span { display: block; margin-bottom: 4px; }
-  .field input[type="text"],
-  .field input[type="file"],
-  .field select,
-  .field textarea {
+  .row-fields input,
+  .row-fields select {
     width: 100%;
+    font-size: 13px;
   }
+  .row-err {
+    color: #ef4444;
+    font-size: 12px;
+    margin-top: 6px;
+  }
+  .summary {
+    font-size: 13px;
+    color: #22c55e;
+    margin: 8px 0;
+  }
+  .summary.has-error { color: #ef4444; }
   .actions {
     display: flex;
     justify-content: flex-end;
@@ -176,4 +388,9 @@
     font-size: 13px;
     margin-top: 8px;
   }
-</style>
+  @keyframes spin { to { transform: rotate(360deg); } }
+  .spin { animation: spin 1s linear infinite; }
+  @media (prefers-reduced-motion: reduce) {
+    .spin { animation: none; }
+  }
+</style>
\ No newline at end of file
diff --git a/frontend/src/lib/i18n.ts b/frontend/src/lib/i18n.ts
index 8feb1de..1666c8f 100644
--- a/frontend/src/lib/i18n.ts
+++ b/frontend/src/lib/i18n.ts
@@ -84,6 +84,12 @@ export const dictionaries = {
     "upload.submit": "Hochladen",
     "upload.submitting": "Lade hoch …",
     "upload.error.no_file": "Bitte eine Datei auswählen.",
+    "upload.drop": "Eine oder mehrere Dateien hierher ziehen oder klicken",
+    "upload.remove": "Entfernen",
+    "upload.clear": "Alle entfernen",
+    "upload.files_count": "{count} Dateien",
+    "upload.progress": "Lade {i}/{n} hoch …",
+    "upload.summary": "{done} hochgeladen · {failed} fehlgeschlagen",
     "power.bests.mean_max": "Power-Bestwerte (Mean-Max)",
     "power.bests.all_time": "Power-Bestwerte (All-Time)",
     "power.bests.col.duration": "Dauer",
@@ -208,6 +214,12 @@ export const dictionaries = {
     "upload.submit": "Upload",
     "upload.submitting": "Uploading …",
     "upload.error.no_file": "Please select a file.",
+    "upload.drop": "Drop one or more files here, or click to browse",
+    "upload.remove": "Remove",
+    "upload.clear": "Clear all",
+    "upload.files_count": "{count} files",
+    "upload.progress": "Uploading {i}/{n} …",
+    "upload.summary": "{done} uploaded · {failed} failed",
     "power.bests.mean_max": "Power Best Values (Mean-Max)",
     "power.bests.all_time": "Power Best Values (All-Time)",
     "power.bests.col.duration": "Duration",
diff --git a/tests/backend/routers/test_admin.py b/tests/backend/routers/test_admin.py
new file mode 100644
index 0000000..e0f3511
--- /dev/null
+++ b/tests/backend/routers/test_admin.py
@@ -0,0 +1,95 @@
+"""API tests for the admin upload endpoint (POST /api/uploads)."""
+from __future__ import annotations
+
+import datetime
+
+import pytest
+
+
+def _gpx(start: str, lat: float = 47.0, lon: float = 8.0, n: int = 60) -> bytes:
+    """Minimal GPX: ``n`` trackpoints spaced 1s apart starting at ``start``."""
+    base = datetime.datetime.strptime(start, "%Y-%m-%dT%H:%M:%SZ")
+    pts = []
+    for i in range(n):
+        t = base + datetime.timedelta(seconds=i)
+        pts.append(
+            f'<trkpt lat="{lat + i * 0.0001:.6f}" lon="{lon + i * 0.0001:.6f}">'
+            f'<time>{t.strftime("%Y-%m-%dT%H:%M:%SZ")}</time><ele>{500 + i}</ele></trkpt>'
+        )
+    return (
+        '<?xml version="1.0" encoding="UTF-8"?>'
+        '<gpx version="1.1" creator="test" xmlns="http://www.topografix.com/GPX/1/1">'
+        f'<trk><trkseg>{"".join(pts)}</trkseg></trk></gpx>'
+    ).encode()
+
+
+def _empty_gpx() -> bytes:
+    return (
+        '<?xml version="1.0" encoding="UTF-8"?>'
+        '<gpx version="1.1" xmlns="http://www.topografix.com/GPX/1/1">'
+        "<trk><trkseg></trkseg></trk></gpx>"
+    ).encode()
+
+
+def _upload(client, fname: str, content: bytes, **form):
+    data = {k: v for k, v in form.items() if v is not None}
+    return client.post(
+        "/api/uploads",
+        data=data,
+        files={"file": (fname, content, "application/gpx")},
+    )
+
+
+def _rides(client) -> list[dict]:
+    return client.get("/api/rides", params={"limit": 100}).json()["items"]
+
+
+def test_upload_with_name_and_bike(api_client) -> None:
+    bike = api_client.post("/api/bikes", json={"name": "Test Bike"}).json()
+    res = _upload(
+        api_client, "a.gpx", _gpx("2026-05-01T09:00:00Z"),
+        name="Morning", bike_id=str(bike["id"]),
+    )
+    assert res.status_code == 200
+    body = res.json()
+    assert body["name"] == "Morning"
+    assert body["bike_id"] == bike["id"]
+    assert isinstance(body["activity_id"], int)
+
+    ride = next(i for i in _rides(api_client) if i["id"] == body["activity_id"])
+    assert ride["name"] == "Morning"
+    assert ride["bike_name"] == "Test Bike"
+    assert ride["bike_id"] == bike["id"]
+
+
+def test_upload_without_bike(api_client) -> None:
+    res = _upload(api_client, "b.gpx", _gpx("2026-05-02T09:00:00Z"), name="Evening")
+    assert res.status_code == 200
+    assert res.json()["bike_id"] is None
+
+    ride = next(i for i in _rides(api_client) if i["id"] == res.json()["activity_id"])
+    assert ride["name"] == "Evening"
+    assert ride["bike_name"] is None
+    assert ride["bike_id"] is None
+
+
+def test_upload_defaults_name_to_filename_stem(api_client) -> None:
+    res = _upload(api_client, "morning.gpx", _gpx("2026-05-03T09:00:00Z"))
+    assert res.status_code == 200
+    ride = next(i for i in _rides(api_client) if i["id"] == res.json()["activity_id"])
+    # No name supplied -> the original filename stem is used.
+    assert ride["name"] == "morning"
+
+
+def test_upload_rejects_unsupported_extension(api_client) -> None:
+    res = _upload(api_client, "notes.txt", b"definitely not a ride file")
+    assert res.status_code == 400
+
+
+def test_upload_rejects_file_without_trackpoints(api_client) -> None:
+    res = _upload(api_client, "empty.gpx", _empty_gpx())
+    assert res.status_code == 422
+
+
+if __name__ == "__main__":
+    raise SystemExit(pytest.main([__file__, "-v"]))
\ No newline at end of file