diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/AsynchronousTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/AsynchronousTest.java
index b4bb403cf..a5c820c63 100644
--- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/AsynchronousTest.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/AsynchronousTest.java
@@ -15,8 +15,8 @@ import java.util.concurrent.CancellationException;
 import org.junit.Before;
 import org.junit.Test;
 import org.springframework.cassandra.core.AsynchronousQueryListener;
-import org.springframework.cassandra.core.ConsistencyLevel;
 import org.springframework.cassandra.core.Cancellable;
+import org.springframework.cassandra.core.ConsistencyLevel;
 import org.springframework.cassandra.core.QueryForListOfMapListener;
 import org.springframework.cassandra.core.QueryForMapListener;
 import org.springframework.cassandra.core.QueryForObjectListener;
diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/ListListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/ListListener.java
index 074036bb2..1b1060da8 100644
--- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/ListListener.java
+++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/template/async/ListListener.java
@@ -12,13 +12,13 @@ public class ListListener<T> extends TestListener implements QueryForListListene
 
 	@Override
 	public void onQueryComplete(List<T> results) {
-		countDown();
 		this.result = results;
+		countDown();
 	}
 
 	@Override
 	public void onException(Exception x) {
-		countDown();
 		this.exception = x;
+		countDown();
 	}
 }