diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java
index bac13b20d..852e02dee 100644
--- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/BookListener.java
@@ -33,14 +33,16 @@ public class BookListener extends TestListener implements AsynchronousQueryListe
 	private boolean done;
 
 	@Override
-	public void onQueryComplete(ResultSetFuture rsf) {
+	public void onQueryComplete(ResultSetFuture resultSetFuture) {
 
 		Row row;
+
 		try {
-			row = rsf.get().one();
+			row = resultSetFuture.get().one();
 		} catch (Exception e) {
 			throw new RuntimeException("Failed to get ResultSet from ResultSetFuture", e);
 		}
+
 		book = new Book();
 		book.setIsbn(row.getString("isbn"));
 		book.setTitle(row.getString("title"));
@@ -65,5 +67,4 @@ public class BookListener extends TestListener implements AsynchronousQueryListe
 	public Book getBook() {
 		return book;
 	}
-
 }
diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/async/AsynchronousCassandraTemplateTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/async/AsynchronousCassandraTemplateTest.java
index 3fd3c4056..03546661e 100644
--- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/async/AsynchronousCassandraTemplateTest.java
+++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/async/AsynchronousCassandraTemplateTest.java
@@ -100,7 +100,7 @@ public class AsynchronousCassandraTemplateTest extends AbstractSpringDataEmbedde
 	@Table
 	public static class Thing {
 
-		public static final String uuid() {
+		public static String uuid() {
 			return UUID.randomUUID().toString();
 		}