diff --git a/hoot-services/src/test/java/hoot/services/controllers/info/AdvancedOptResourceTest.java b/hoot-services/src/test/java/hoot/services/controllers/info/AdvancedOptResourceTest.java
index 2ce7734..123551f 100644
--- a/hoot-services/src/test/java/hoot/services/controllers/info/AdvancedOptResourceTest.java
+++ b/hoot-services/src/test/java/hoot/services/controllers/info/AdvancedOptResourceTest.java
@@ -50,8 +50,9 @@ public class AdvancedOptResourceTest extends HootServicesJerseyTestAbstract {
.request(MediaType.APPLICATION_JSON)
.get();
+ // BuildingKeepMoreComplexGeometryWhenAutoMerging is one of the settings that Attribute Conflation customizes. That's unlikely to change.
String jsonStr = responseData.readEntity(String.class);
- assertThat(jsonStr, CoreMatchers.containsString("AttributeConflationAggressiveHighwayJoining"));
+ assertThat(jsonStr, CoreMatchers.containsString("BuildingKeepMoreComplexGeometryWhenAutoMerging"));
}
@Test