diff --git a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java
index 827209e16e..264af5e0fe 100644
--- a/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java
+++ b/src/org/labkey/test/tests/SampleTypeNameExpressionTest.java
@@ -71,7 +71,10 @@
 public class SampleTypeNameExpressionTest extends BaseWebDriverTest
 {
     private static final String PROJECT_NAME = "SampleType_Name_Expression_Test";
-    private static final String DEFAULT_SAMPLE_PARENT_VALUE = "SS" + TestDataGenerator.randomString(3).replaceAll("[_)]", "."); // '_' is used as delimiter to get batchRandomId and ) is used to close the defaultValue()
+
+    // Issue 53548: Naming Pattern with a default value containing a () or {} cannot be saved.
+    private static final String DEFAULT_SAMPLE_PARENT_VALUE = "SS" +
+            EscapeUtil.escapeForNameExpression(TestDataGenerator.randomString(3, "{}()_"));
 
     private static final String PARENT_SAMPLE_TYPE = "PS" + DOMAIN_TRICKY_CHARACTERS;
     private static final String PARENT_SAMPLE_TYPE_INPUT = escapeForNameExpression(PARENT_SAMPLE_TYPE);
diff --git a/src/org/labkey/test/tests/SampleTypeRenameTest.java b/src/org/labkey/test/tests/SampleTypeRenameTest.java
index f5f8d40a16..e61a745ea0 100644
--- a/src/org/labkey/test/tests/SampleTypeRenameTest.java
+++ b/src/org/labkey/test/tests/SampleTypeRenameTest.java
@@ -102,6 +102,8 @@ public void testSampleTypeFieldRename() throws IOException, CommandException
             testDataGenerator.addCustomRow(Map.of(FIELD_INT, intVal++));
         testDataGenerator.insertRows();
 
+        SearchAdminAPIHelper.waitForIndexer();
+
         goToProjectHome();
         SampleTypeHelper sampleHelper = new SampleTypeHelper(this);
         UpdateSampleTypePage updatePage = sampleHelper.goToEditSampleType(sampleTypeName);