2 files changed, 6 insertions, 18 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
index a2887ae76c1..7b5efad9647 100755
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/ContainerClusterTest.java
@@ -239,27 +239,15 @@ public class ContainerClusterTest {
     }
 
     @Test
-    public void requireThatPoolAndQueueCanNotBeControlledByPropertiesWhenNoFlavor() {
+    public void requireThatNonHostedUsesExpectedDefaultThreadpoolConfiguration() {
         MockRoot root = new MockRoot("foo");
         ApplicationContainerCluster cluster = createContainerCluster(root, false);
         addContainer(root, cluster, "c1", "host-c1");
         root.freezeModelTopology();
 
         ThreadpoolConfig threadpoolConfig = root.getConfig(ThreadpoolConfig.class, "container0/component/default-threadpool");
-        assertEquals(500, threadpoolConfig.maxthreads());
-        assertEquals(0, threadpoolConfig.queueSize());
-    }
-
-    @Test
-    public void requireThatDefaultThreadPoolConfigIsSane() {
-        MockRoot root = new MockRoot("foo");
-        ApplicationContainerCluster cluster = createContainerCluster(root, false);
-        addContainer(root, cluster, "c1", "host-c1");
-        root.freezeModelTopology();
-
-        ThreadpoolConfig threadpoolConfig = root.getConfig(ThreadpoolConfig.class, "container0/component/default-threadpool");
-        assertEquals(500, threadpoolConfig.maxthreads());
-        assertEquals(0, threadpoolConfig.queueSize());
+        assertEquals(-2, threadpoolConfig.maxthreads());
+        assertEquals(-40, threadpoolConfig.queueSize());
     }
 
     @Test
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
index 4c1fda44038..a0552880b8c 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/SearchBuilderTest.java
@@ -242,9 +242,9 @@ public class SearchBuilderTest extends ContainerModelBuilderTestBase {
 
         ContainerThreadpoolConfig config = root.getConfig(
                 ContainerThreadpoolConfig.class, "default/component/" + SearchHandler.HANDLER_CLASS + "/threadpool@search-handler");
-        assertEquals(500, config.maxThreads());
-        assertEquals(500, config.minThreads());
-        assertEquals(0, config.queueSize());
+        assertEquals(-2, config.maxThreads());
+        assertEquals(-2, config.minThreads());
+        assertEquals(-40, config.queueSize());
     }
 
     @Test