diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java
index afee01f26..603c6138e 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/query/StringBasedJdbcQueryUnitTests.java
@@ -193,7 +193,7 @@ class StringBasedJdbcQueryUnitTests {
 		query.execute(new Object[] { asList(Direction.LEFT, Direction.RIGHT) });
 
 		ArgumentCaptor<SqlParameterSource> captor = ArgumentCaptor.forClass(SqlParameterSource.class);
-		verify(operations).query(anyString(), captor.capture(), any(ResultSetExtractor.class));
+		verify(operations).queryForObject(anyString(), captor.capture(), any(RowMapper.class));
 
 		SqlParameterSource sqlParameterSource = captor.getValue();
 		assertThat(sqlParameterSource.getValue("directions")).asList().containsExactlyInAnyOrder("LEFT", "RIGHT");
@@ -209,7 +209,7 @@ class StringBasedJdbcQueryUnitTests {
 		query.execute(new Object[] { asList(Direction.LEFT, Direction.RIGHT) });
 
 		ArgumentCaptor<SqlParameterSource> captor = ArgumentCaptor.forClass(SqlParameterSource.class);
-		verify(operations).query(anyString(), captor.capture(), any(ResultSetExtractor.class));
+		verify(operations).queryForObject(anyString(), captor.capture(), any(RowMapper.class));
 
 		SqlParameterSource sqlParameterSource = captor.getValue();
 		assertThat(sqlParameterSource.getValue("directions")).asList().containsExactlyInAnyOrder(-1, 1);
@@ -225,7 +225,7 @@ class StringBasedJdbcQueryUnitTests {
 		query.execute(new Object[] { 1 });
 
 		ArgumentCaptor<SqlParameterSource> captor = ArgumentCaptor.forClass(SqlParameterSource.class);
-		verify(operations).query(anyString(), captor.capture(), any(ResultSetExtractor.class));
+		verify(operations).queryForObject(anyString(), captor.capture(), any(RowMapper.class));
 
 		SqlParameterSource sqlParameterSource = captor.getValue();
 		assertThat(sqlParameterSource.getValue("value")).isEqualTo(1);
@@ -308,7 +308,7 @@ class StringBasedJdbcQueryUnitTests {
 	private enum Direction {
 		LEFT, CENTER, RIGHT
 	}
-	
+
 	@WritingConverter
 	enum DirectionToIntegerConverter implements Converter<Direction, JdbcValue> {
 
diff --git a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
index aa097dd0b..a2179f6f9 100644
--- a/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
+++ b/spring-data-jdbc/src/test/java/org/springframework/data/jdbc/repository/support/JdbcQueryLookupStrategyUnitTests.java
@@ -25,7 +25,6 @@ import java.util.stream.Stream;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
@@ -78,6 +77,7 @@ class JdbcQueryLookupStrategyUnitTests {
 
 		doReturn(NumberFormat.class).when(metadata).getReturnedDomainClass(any(Method.class));
 		doReturn(ClassTypeInformation.from(NumberFormat.class)).when(metadata).getReturnType(any(Method.class));
+		doReturn(ClassTypeInformation.from(NumberFormat.class)).when(metadata).getDomainTypeInformation();
 	}
 
 	@Test // DATAJDBC-166