diff --git a/tests/test_run_all.lsp b/tests/test_run_all.lsp
index 4399820..69f2494 100644
--- a/tests/test_run_all.lsp
+++ b/tests/test_run_all.lsp
@@ -325,16 +325,17 @@
             (if (findfile csv-pfad)   (vl-file-delete csv-pfad))
             (if (findfile sivas-pfad) (vl-file-delete sivas-pfad))
 
+            ;; Nur die beiden CSV-Namen ersetzen, alle uebrigen Keys
+            ;; (z.B. kreisel_weichen_datei) unveraendert uebernehmen -
+            ;; eine hart nachgebaute Liste verliert sonst neue Keys.
             (setq old-filenames *export-filenames*)
             (setq *export-filenames*
-              (list
-                (cons "raw_json_datei" (cdr (assoc "raw_json_datei" old-filenames)))
-                (cons "sivas_script"   (cdr (assoc "sivas_script"   old-filenames)))
-                (cons "sivas_csv"      sivas-name)
-                (cons "csv_script"     (cdr (assoc "csv_script"     old-filenames)))
-                (cons "csv_csv"        csv-name)
-              )
-            )
+              (mapcar
+                '(lambda (p)
+                   (cond ((= (car p) "sivas_csv") (cons "sivas_csv" sivas-name))
+                         ((= (car p) "csv_csv")   (cons "csv_csv"   csv-name))
+                         (T p)))
+                old-filenames))
 
             (princ (strcat "\n  CSV-Export -> " csv-name))
             (c:EXPORTCSV)