diff --git a/server/src/api/import/import.test.ts b/server/src/api/import/import.test.ts
index befdfa213..0463cd268 100644
--- a/server/src/api/import/import.test.ts
+++ b/server/src/api/import/import.test.ts
@@ -40,7 +40,7 @@ t.test("POST /api/import/file", async (t) => {
                 .set("Cookie", cookie)
                 .attach(
                     "scoreData",
-                    GetKTDataBuffer("./csv_eamusement-iidx/small-hv-file.csv"),
+                    GetKTDataBuffer("./eamusement-iidx-csv/small-hv-file.csv"),
                     "my_csv.csv"
                 )
                 .field("importType", "file/eamusement-iidx-csv")
@@ -125,7 +125,7 @@ t.test("POST /api/import/file", async (t) => {
                 .set("Cookie", cookie)
                 .attach(
                     "scoreData",
-                    GetKTDataBuffer("./json_batch-manual/empty-file.json"),
+                    GetKTDataBuffer("./batch-manual/empty-file.json"),
                     "empty-file.json"
                 )
                 .field("importType", "file/batch-manual");
@@ -155,7 +155,7 @@ t.test("POST /api/import/file", async (t) => {
                 .set("Cookie", cookie)
                 .attach(
                     "scoreData",
-                    GetKTDataBuffer("./json_batch-manual/small-file.json"),
+                    GetKTDataBuffer("./batch-manual/small-file.json"),
                     "small-file.json"
                 )
                 .field("importType", "file/batch-manual");
diff --git a/server/src/test-utils/test-data.ts b/server/src/test-utils/test-data.ts
index cbdb3f845..46112dc28 100644
--- a/server/src/test-utils/test-data.ts
+++ b/server/src/test-utils/test-data.ts
@@ -49,10 +49,10 @@ export const TestingGITADORADoraDryScore = GetKTDataJSON(
 ) as DryScore<"gitadora:Dora">;
 
 export const TestingIIDXEamusementCSV26 = GetKTDataBuffer(
-    "./csv_eamusement-iidx/pre-leggendaria.csv"
+    "./eamusement-iidx-csv/pre-leggendaria.csv"
 );
 export const TestingIIDXEamusementCSV27 = GetKTDataBuffer(
-    "./csv_eamusement-iidx/post-leggendaria.csv"
+    "./eamusement-iidx-csv/post-leggendaria.csv"
 );
 
 export const HC511Goal: GoalDocument = {
diff --git a/server/src/test-utils/test-data/json_batch-manual/empty-file.json b/server/src/test-utils/test-data/batch-manual/empty-file.json
similarity index 100%
rename from server/src/test-utils/test-data/json_batch-manual/empty-file.json
rename to server/src/test-utils/test-data/batch-manual/empty-file.json
diff --git a/server/src/test-utils/test-data/json_batch-manual/small-file.json b/server/src/test-utils/test-data/batch-manual/small-file.json
similarity index 100%
rename from server/src/test-utils/test-data/json_batch-manual/small-file.json
rename to server/src/test-utils/test-data/batch-manual/small-file.json
diff --git a/server/src/test-utils/test-data/csv_eamusement-iidx/invalid/large-duplicates.csv b/server/src/test-utils/test-data/eamusement-iidx-csv/invalid/large-duplicates.csv
similarity index 100%
rename from server/src/test-utils/test-data/csv_eamusement-iidx/invalid/large-duplicates.csv
rename to server/src/test-utils/test-data/eamusement-iidx-csv/invalid/large-duplicates.csv
diff --git a/server/src/test-utils/test-data/csv_eamusement-iidx/invalid/small-duplicate.csv b/server/src/test-utils/test-data/eamusement-iidx-csv/invalid/small-duplicate.csv
similarity index 100%
rename from server/src/test-utils/test-data/csv_eamusement-iidx/invalid/small-duplicate.csv
rename to server/src/test-utils/test-data/eamusement-iidx-csv/invalid/small-duplicate.csv
diff --git a/server/src/test-utils/test-data/csv_eamusement-iidx/post-leggendaria.csv b/server/src/test-utils/test-data/eamusement-iidx-csv/post-leggendaria.csv
similarity index 100%
rename from server/src/test-utils/test-data/csv_eamusement-iidx/post-leggendaria.csv
rename to server/src/test-utils/test-data/eamusement-iidx-csv/post-leggendaria.csv
diff --git a/server/src/test-utils/test-data/csv_eamusement-iidx/pre-leggendaria.csv b/server/src/test-utils/test-data/eamusement-iidx-csv/pre-leggendaria.csv
similarity index 100%
rename from server/src/test-utils/test-data/csv_eamusement-iidx/pre-leggendaria.csv
rename to server/src/test-utils/test-data/eamusement-iidx-csv/pre-leggendaria.csv
diff --git a/server/src/test-utils/test-data/csv_eamusement-iidx/small-hv-file.csv b/server/src/test-utils/test-data/eamusement-iidx-csv/small-hv-file.csv
similarity index 100%
rename from server/src/test-utils/test-data/csv_eamusement-iidx/small-hv-file.csv
rename to server/src/test-utils/test-data/eamusement-iidx-csv/small-hv-file.csv