diff --git a/langchain4j-azure-ai-search-spring-boot-starter/src/test/java/dev/langchain4j/azure/aisearch/spring/AutoConfigIT.java b/langchain4j-azure-ai-search-spring-boot-starter/src/test/java/dev/langchain4j/azure/aisearch/spring/AutoConfigIT.java
index 5b052cd8..16f547b9 100644
--- a/langchain4j-azure-ai-search-spring-boot-starter/src/test/java/dev/langchain4j/azure/aisearch/spring/AutoConfigIT.java
+++ b/langchain4j-azure-ai-search-spring-boot-starter/src/test/java/dev/langchain4j/azure/aisearch/spring/AutoConfigIT.java
@@ -15,6 +15,7 @@
 import dev.langchain4j.rag.content.retriever.azure.search.AzureAiSearchQueryType;
 import dev.langchain4j.rag.query.Query;
 import dev.langchain4j.store.embedding.EmbeddingMatch;
+import dev.langchain4j.store.embedding.EmbeddingSearchRequest;
 import dev.langchain4j.store.embedding.EmbeddingStore;
 import dev.langchain4j.store.embedding.azure.search.AzureAiSearchEmbeddingStore;
 import org.junit.jupiter.api.AfterEach;
@@ -237,8 +238,12 @@ void should_provide_ai_search_embedding_store() {
                         embeddingStore.add(embedding, textSegment);
                     }
 
-                    Embedding relevantEmbedding = embeddingModel.embed("fruit").content();
-                    List<EmbeddingMatch<TextSegment>> relevant = embeddingStore.findRelevant(relevantEmbedding, 3);
+                    EmbeddingSearchRequest searchRequest = EmbeddingSearchRequest.builder()
+                            .queryEmbedding(embeddingModel.embed("fruit").content())
+                            .maxResults(3)
+                            .build();
+
+                    List<EmbeddingMatch<TextSegment>> relevant = embeddingStore.search(searchRequest).matches();
                     assertThat(relevant).hasSize(3);
                     // TODO uncomment after https://github.com/langchain4j/langchain4j/issues/1617 is closed
                     // assertThat(relevant.get(0).embedding()).isNotNull();
diff --git a/langchain4j-spring-boot-tests/src/test/java/dev/langchain4j/store/embedding/spring/EmbeddingStoreAutoConfigurationIT.java b/langchain4j-spring-boot-tests/src/test/java/dev/langchain4j/store/embedding/spring/EmbeddingStoreAutoConfigurationIT.java
index ee8301e5..08634e28 100644
--- a/langchain4j-spring-boot-tests/src/test/java/dev/langchain4j/store/embedding/spring/EmbeddingStoreAutoConfigurationIT.java
+++ b/langchain4j-spring-boot-tests/src/test/java/dev/langchain4j/store/embedding/spring/EmbeddingStoreAutoConfigurationIT.java
@@ -61,7 +61,11 @@ void should_provide_embedding_store_without_embedding_model() {
 
                     awaitUntilPersisted(context);
 
-                    List<EmbeddingMatch<TextSegment>> relevant = embeddingStore.findRelevant(embedding, 10);
+                    EmbeddingSearchRequest searchRequest = EmbeddingSearchRequest.builder()
+                            .queryEmbedding(embedding)
+                            .maxResults(10)
+                            .build();
+                    List<EmbeddingMatch<TextSegment>> relevant = embeddingStore.search(searchRequest).matches();
                     assertThat(relevant).hasSize(1);
 
                     EmbeddingMatch<TextSegment> match = relevant.get(0);
@@ -90,23 +94,15 @@ void should_provide_embedding_store_with_embedding_model() {
 
                     awaitUntilPersisted(context);
 
-                    List<EmbeddingMatch<TextSegment>> relevant = embeddingStore.findRelevant(embedding, 10);
-                    assertThat(relevant).hasSize(1);
-
-                    EmbeddingMatch<TextSegment> match = relevant.get(0);
-                    assertThat(match.score()).isCloseTo(1, withPercentage(1));
-                    assertThat(match.embeddingId()).isEqualTo(id);
-                    assertThat(match.embedding()).isEqualTo(embedding);
-                    assertThat(match.embedded()).isEqualTo(segment);
-
-                    // New API
-                    EmbeddingSearchResult<TextSegment> searchResult = embeddingStore.search(EmbeddingSearchRequest.builder()
+                    EmbeddingSearchRequest searchRequest = EmbeddingSearchRequest.builder()
                             .queryEmbedding(embedding)
                             .maxResults(10)
-                            .build());
+                            .build();
+
+                    List<EmbeddingMatch<TextSegment>> matches = embeddingStore.search(searchRequest).matches();
+                    assertThat(matches).hasSize(1);
 
-                    assertThat(searchResult.matches()).hasSize(1);
-                    match = searchResult.matches().get(0);
+                    EmbeddingMatch<TextSegment> match = matches.get(0);
                     assertThat(match.score()).isCloseTo(1, withPercentage(1));
                     assertThat(match.embeddingId()).isEqualTo(id);
                     assertThat(match.embedding()).isEqualTo(embedding);