diff --git a/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolSseIntegrationTest.java b/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolSseIntegrationTest.java
index f4e245b575e6..bee08404f0e4 100644
--- a/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolSseIntegrationTest.java
+++ b/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolSseIntegrationTest.java
@@ -62,7 +62,9 @@ void whenMcpClientCallTool_thenTheToolReturnsMockedResponse() {
             .findFirst()
             .orElseThrow();
 
-        String argumentName = exchangeRateTool.inputSchema().keySet().stream()
+		String argumentName = ((Map<String, Object>) exchangeRateTool.inputSchema().get("properties"))
+			.keySet()
+			.stream()
             .findFirst()
             .orElseThrow();
 
diff --git a/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolStreamableIntegrationTest.java b/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolStreamableIntegrationTest.java
index 77058d29c978..9c01404d6eeb 100644
--- a/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolStreamableIntegrationTest.java
+++ b/spring-ai-modules/spring-ai-mcp/src/test/java/com/baeldung/springai/mcp/test/ExchangeRateMcpToolStreamableIntegrationTest.java
@@ -64,7 +64,9 @@ void whenMcpClientCallTool_thenTheToolReturnsMockedResponse() {
             .findFirst()
             .orElseThrow();
 
-        String argumentName = exchangeRateTool.inputSchema().keySet().stream()
+		String argumentName = ((Map<String, Object>) exchangeRateTool.inputSchema().get("properties"))
+			.keySet()
+			.stream()
             .findFirst()
             .orElseThrow();