1 files changed, 4 insertions, 3 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
index c4d32111124..fd01fb9a740 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java
@@ -153,7 +153,7 @@ public class FastSearcherTestCase {
         }
 
         { // direct.summaries due to query cache
-            String query = "?query=sddocname:a&ranking.queryCache";
+            String query = "?query=sddocname:a&ranking.queryCache&timeout=5000ms";
             Result result = doSearch(fastSearcher, new Query(query), 0, 10);
             doFill(fastSearcher, result);
             ErrorMessage error = result.hits().getError();
@@ -162,7 +162,7 @@ public class FastSearcherTestCase {
         }
 
         { // direct.summaries due to no summary features
-            String query = "?query=sddocname:a&dispatch.summaries&summary=simple&ranking=simpler";
+            String query = "?query=sddocname:a&dispatch.summaries&summary=simple&ranking=simpler&timeout=5000ms";
             Result result = doSearch(fastSearcher, new Query(query), 0, 10);
             doFill(fastSearcher, result);
             ErrorMessage error = result.hits().getError();
@@ -185,6 +185,7 @@ public class FastSearcherTestCase {
                                                      documentdbConfigWithOneDb);
 
         Query query = new Query("?query=foo&model.restrict=testDb");
+        query.getRanking().getSoftTimeout().setEnable(false);
         query.prepare();
         doSearch(fastSearcher, query, 0, 10);
 
@@ -330,7 +331,7 @@ public class FastSearcherTestCase {
         byte[] actual = new byte[buf.remaining()];
         buf.get(actual);
 
-        SessionId sessionId = query.getSessionId(false);
+        SessionId sessionId = query.getSessionId();
         byte IGNORE = 69;
         ByteBuffer answer = ByteBuffer.allocate(1024);
         answer.put(new byte[] { 0, 0, 0, (byte)(141+sessionId.asUtf8String().getByteLength()), 0, 0, 0, -37, 0, 0, 16, 17, 0, 0, 0, 0,