diff --git a/src/org/labkey/test/tests/AttachmentFieldTest.java b/src/org/labkey/test/tests/AttachmentFieldTest.java
index 6ccf85af4b..dfe316e6f7 100644
--- a/src/org/labkey/test/tests/AttachmentFieldTest.java
+++ b/src/org/labkey/test/tests/AttachmentFieldTest.java
@@ -91,9 +91,9 @@ public void testFileFieldInSampleType()
 
         clickAndWait(Locator.tagWithText("a", "S1"));
         clickAndWait(Locator.tagWithClass("a", "labkey-text-link").withText("edit"));
-        waitForElement(Locator.tagContainingText("div", "sampletype/jpg_sample.jpg"));
+        waitForElement(Locator.tagContainingText("div", "jpg_sample.jpg"));
         // Issue 53200: Update form incorrectly shows that a file is not available
-        assertTextNotPresent("sampletype/jpg_sample.jpg (unavailable)");
+        assertTextNotPresent("jpg_sample.jpg (unavailable)");
         clickButton("Cancel");
 
         log("Verifying view in browser works");
diff --git a/src/org/labkey/test/tests/FileAttachmentColumnTest.java b/src/org/labkey/test/tests/FileAttachmentColumnTest.java
index ca935d5f8c..6a2f817e01 100644
--- a/src/org/labkey/test/tests/FileAttachmentColumnTest.java
+++ b/src/org/labkey/test/tests/FileAttachmentColumnTest.java
@@ -613,7 +613,7 @@ private void validateAssayRun(String assayName, String folderPath, String runNam
         checker().withScreenshot("unexpected_run_file_links")
                 .wrapAssertion(()-> Assertions.assertThat(runFileTexts.stream().map(String::trim).toList())
                         .as("expect complete run files")
-                        .containsOnly(String.format("assaydata%s%s", File.separatorChar, runFile.getName()))
+                        .containsOnly(runFile.getName())
                         .hasSize(5));
     }
 
@@ -637,7 +637,7 @@ private void validateDatasetData(String datasetName, String folderPath, List<Fil
             }
             else
             {
-                Optional<WebElement> optionalFileLink = Locator.linkContainingText(String.format("datasetdata%s%s", File.separatorChar, file.getName()))
+                Optional<WebElement> optionalFileLink = Locator.linkContainingText(file.getName())
                         .findOptionalElement(dataRegionTable);
                 checker().withScreenshot("unexpected_file_state")
                         .awaiting(Duration.ofSeconds(2),
diff --git a/src/org/labkey/test/tests/InlineImagesAssayTest.java b/src/org/labkey/test/tests/InlineImagesAssayTest.java
index 84ead2a935..7512bdc002 100644
--- a/src/org/labkey/test/tests/InlineImagesAssayTest.java
+++ b/src/org/labkey/test/tests/InlineImagesAssayTest.java
@@ -182,10 +182,7 @@ public final void testAssayInlineImages() throws Exception
         customizeView.addColumn(FieldKey.fromParts("Run", "RowId"));
         customizeView.addColumn(FieldKey.fromParts("Run", "Protocol", "RowId"));
         customizeView.applyCustomView();
-        var protocolId = list.getDataAsText(0, "Run/Protocol/RowId");
-        var runId = list.getDataAsText(0, "Run/RowId");
-        String helpJpgFilePath = String.format("AssayId_%s%sRunId_%s%s%s", protocolId, File.separatorChar,
-                runId, File.separatorChar, HELP_JPG_FILE.getName());
+        String helpJpgFilePath = HELP_JPG_FILE.getName();
 
         log("Validate that two links to this image file are now present.");
         assertElementPresent("Did not find the expected number of icons for images for " + PNG01_FILE.getName() + " from the runs.", Locator.xpath("//img[contains(@title, '" + PNG01_FILE.getName() + "')]"), 3);
@@ -206,7 +203,7 @@ public final void testAssayInlineImages() throws Exception
 
             log("Validate that the 'File' (last) column is as expected.");
             assertEquals("Values in 'File' column not exported as expected [" + exportedFile.getName() + "]",
-                    Arrays.asList("Batch File Field", "assaydata" + File.separator + XLS_FILE.getName(), "assaydata" + File.separator + XLS_FILE.getName(), "assaydata" + File.separator + XLS_FILE.getName()),
+                    Arrays.asList("Batch File Field", XLS_FILE.getName(), XLS_FILE.getName(), XLS_FILE.getName()),
                     ExcelHelper.getColumnData(workbook.getSheetAt(workbook.getActiveSheetIndex()), 7));
         }
 
@@ -286,7 +283,7 @@ private void validateExcelExport(File exportedFile, Workbook workbook, String he
 
         exportedColumn = ExcelHelper.getColumnData(sheet, 5);
         assertEquals("Values in 'File' column not exported as expected [" + exportedFile.getName() + "]",
-                Arrays.asList("Run File Field", "assaydata" + File.separator + PNG01_FILE.getName(), "assaydata" + File.separator + PNG01_FILE.getName(), "assaydata" + File.separator + PNG01_FILE.getName()),
+                Arrays.asList("Run File Field", PNG01_FILE.getName(), PNG01_FILE.getName(), PNG01_FILE.getName()),
                 exportedColumn);
 
     }
diff --git a/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java b/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java
index c85d967a4e..949f22c58b 100644
--- a/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java
+++ b/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java
@@ -182,7 +182,7 @@ public void testRTransformWarning()
         clickAndWait(Locator.linkWithText(runName), longWaitForPage);
 
         // Verify file uploaded
-        assertTextPresent("assaydata" + File.separator + JAVA_TRANSFORM_SCRIPT.getName(), 1);
+        assertTextPresent(JAVA_TRANSFORM_SCRIPT.getName(), 1);
 
         DataRegionTable table = new DataRegionTable("Data", this);
         assertEquals(1, table.getDataRowCount());
diff --git a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java
index 509cb9b5c2..fa2df123b2 100644
--- a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java
+++ b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java
@@ -383,7 +383,7 @@ public void testAllowedFileExtensionsInSampleType()
         {
             fieldMap = Map.of("Name", String.format("S-%d", i), stFileField, fileMap.get(allowedType).getAbsolutePath());
             sampleTypeHelper.insertRow(fieldMap);
-            expectedValues.add(String.format(" sampletype%s%s", File.separator, fileMap.get(allowedType).getName()));
+            expectedValues.add(String.format(" %s", fileMap.get(allowedType).getName()));
             i++;
         }