diff --git a/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java b/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java
index b12a737..9803255 100644
--- a/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java
+++ b/src/test/java/org/springframework/data/r2dbc/repository/query/StringBasedR2dbcQueryUnitTests.java
@@ -230,7 +230,7 @@ public class StringBasedR2dbcQueryUnitTests {
 		verifyNoMoreInteractions(bindSpec);
 	}
 
-	@Test // gh-321
+	@Test // gh-321, gh-644
 	void skipsNonBindableParameters() {
 
 		StringBasedR2dbcQuery query = getQueryMethod("queryWithUnusedParameter", String.class, Sort.class);
@@ -241,7 +241,7 @@ public class StringBasedR2dbcQueryUnitTests {
 		assertThat(stringQuery.get()).isEqualTo("SELECT * FROM person WHERE lastname = :name");
 		assertThat(stringQuery.bind(bindSpec)).isNotNull();
 
-		verify(bindSpec).bind(0, "Walter");
+		verify(bindSpec).bind("name", "Walter");
 		verifyNoMoreInteractions(bindSpec);
 	}