diff --git a/TESTS.md b/TESTS.md
index c795e19..7bf5694 100644
--- a/TESTS.md
+++ b/TESTS.md
@@ -17,7 +17,8 @@ Keep this file as the reusable verification checklist while implementing
     - `PUT /api/uploads/:id/chunks/:index` rejects out-of-range indexes.
     - `PUT /api/uploads/:id/chunks/:index` accepts duplicate chunks.
     - `GET /api/uploads/:id` reports completed chunks from disk.
-    - `POST /api/uploads/:id/complete` assembles verified chunks.
+    - `POST /api/uploads/:id/complete` assembles verified chunks and removes
+      staging data.
     - `POST /api/uploads/:id/complete` rejects incomplete uploads.
     - `POST /api/uploads/:id/complete` rejects corrupt chunk files.
     - `static/app.js` passes `node --check`.
diff --git a/src/storage.rs b/src/storage.rs
index 8116dee..82b049b 100644
--- a/src/storage.rs
+++ b/src/storage.rs
@@ -171,6 +171,7 @@ impl Storage {
         drop(output);
 
         fs::rename(&tmp_path, &final_path).await?;
+        self.remove_upload_dir(upload_id).await?;
 
         Ok(meta.complete_response(final_path.display().to_string()))
     }
@@ -257,6 +258,14 @@ impl Storage {
 
         Ok(())
     }
+
+    async fn remove_upload_dir(&self, upload_id: &str) -> Result<(), StorageError> {
+        match fs::remove_dir_all(self.upload_dir(upload_id)).await {
+            Ok(()) => Ok(()),
+            Err(error) if error.kind() == std::io::ErrorKind::NotFound => Ok(()),
+            Err(error) => Err(error.into()),
+        }
+    }
 }
 
 #[derive(Debug)]
diff --git a/tests/completion.rs b/tests/completion.rs
index e917071..089a452 100644
--- a/tests/completion.rs
+++ b/tests/completion.rs
@@ -48,11 +48,11 @@ async fn assembles_completed_upload() -> Result<(), Box<dyn std::error::Error>>
         b"hello world"
     );
     assert!(
-        temp_dir
+        !temp_dir
             .path()
             .join("staging")
             .join(&upload.upload_id)
-            .is_dir()
+            .exists()
     );
 
     let duplicate = app
@@ -61,7 +61,7 @@ async fn assembles_completed_upload() -> Result<(), Box<dyn std::error::Error>>
             &format!("/api/uploads/{}/complete", upload.upload_id),
         )?)
         .await?;
-    assert_eq!(duplicate.status(), StatusCode::CONFLICT);
+    assert_eq!(duplicate.status(), StatusCode::NOT_FOUND);
 
     Ok(())
 }