2 files changed, 2 insertions, 4 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
index 6f9127779db..e9e96d8b0cf 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/IndexedTest.java
@@ -113,7 +113,7 @@ public class IndexedTest extends ContentBaseTest {
         VespaModelCreatorWithMockPkg creator = getIndexedVespaModelCreator();
         VespaModel model = creator.create();
         DeployState deployState = creator.deployState;
-        IndexedSearchCluster cluster = model.getContentClusters().get("test").getSearch().getIndexed();
+        IndexedSearchCluster cluster = model.getContentClusters().get("test").getSearch().getSearchCluster();
         assertEquals(3, cluster.getDocumentDbs().size());
         NewDocumentType type1 = deployState.getDocumentModel().getDocumentManager().getDocumentType("type1");
         NewDocumentType type2 = deployState.getDocumentModel().getDocumentManager().getDocumentType("type2");
@@ -163,7 +163,6 @@ public class IndexedTest extends ContentBaseTest {
         //                               "transactionlogserver"};
         // DomContentBuilderTest.assertServices(h, expectedServices);
         ContentCluster s = model.getContentClusters().get("test");
-        assertFalse(s.getSearch().hasIndexedCluster());
 
         StorServerConfig.Builder builder = new StorServerConfig.Builder();
         s.getStorageCluster().getConfig(builder);
@@ -175,7 +174,6 @@ public class IndexedTest extends ContentBaseTest {
         VespaModel model = getStreamingVespaModel();
         ContentCluster s = model.getContentClusters().get("test");
         assertNotNull(s);
-        assertFalse(s.getSearch().hasIndexedCluster());
         ClusterListConfig config = model.getConfig(ClusterListConfig.class, VespaModel.ROOT_CONFIGID);
         assertEquals(1, config.storage().size());
         assertEquals("test", config.storage(0).name());
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
index 0cdcf0534c2..8b83c941631 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/cluster/ClusterTest.java
@@ -30,7 +30,7 @@ public class ClusterTest {
                 "  <query-timeout>1.1</query-timeout>",
                 "  <visibility-delay>2.3</visibility-delay>",
                 "</search>"));
-        SearchCluster searchCluster = cluster.getSearch().getIndexed();
+        SearchCluster searchCluster = cluster.getSearch().getSearchCluster();
         assertNotNull(searchCluster);
         assertEquals(1.1, searchCluster.getQueryTimeout(), DELTA);
         assertEquals(2.3, searchCluster.getVisibilityDelay(), DELTA);