diff --git a/src-tauri/src/capture.rs b/src-tauri/src/capture.rs
index efd934a..823d2af 100644
--- a/src-tauri/src/capture.rs
+++ b/src-tauri/src/capture.rs
@@ -326,15 +326,16 @@ fn spool_folder_loop(
 
             match fs::read(&path) {
                 Ok(bytes) => {
+                    let is_test_capture = already_forwarded && label.starts_with("test-");
                     let (forwarded, error) = if already_forwarded {
-                        (true, None)
+                        (!is_test_capture, None)
                     } else {
                         forward_payload(&config, &bytes)
                     };
                     process_payload(
                         &state,
                         &app,
-                        source,
+                        if is_test_capture { "cups-test" } else { source },
                         label.clone(),
                         bytes,
                         forwarded,
diff --git a/src-tauri/src/printers.rs b/src-tauri/src/printers.rs
index e732bdb..88a14ed 100644
--- a/src-tauri/src/printers.rs
+++ b/src-tauri/src/printers.rs
@@ -36,6 +36,7 @@ def safe(value):
 
 job_id = safe(sys.argv[1] if len(sys.argv) > 1 else "job")
 title = safe(sys.argv[3] if len(sys.argv) > 3 else "print")
+printer = safe(os.environ.get("PRINTER", "printer"))
 content_type = os.environ.get("CONTENT_TYPE", "application/pdf")
 ext = {
     "application/pdf": "pdf",
@@ -43,7 +44,8 @@ ext = {
     "image/png": "png",
     "image/jpeg": "jpg",
 }.get(content_type, "dat")
-name = f"{job_id}-{title}-{uuid.uuid4().hex}.{ext}"
+prefix = "test-" if printer.lower() == "fieldlens-test-capture" else "print-"
+name = f"{prefix}{printer}-{job_id}-{title}-{uuid.uuid4().hex}.{ext}"
 final_path = os.path.join(SPOOL, name)
 part_path = final_path + ".part"