dbraley
diff --git a/‎driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java‎
Lines changed: 3 additions & 2 deletions b/‎driver-core/src/test/java/com/datastax/driver/core/ControlConnectionTest.java‎
Lines changed: 3 additions & 2 deletions
diff --git a/‎driver-core/src/test/java/com/datastax/driver/core/RecommissionedNodeTest.java‎
Lines changed: 11 additions & 2 deletions b/‎driver-core/src/test/java/com/datastax/driver/core/RecommissionedNodeTest.java‎
Lines changed: 11 additions & 2 deletions
@@ -22,14 +22,14 @@
 import java.util.concurrent.atomic.AtomicInteger;
 
 import com.google.common.base.Function;
-import com.google.common.collect.Collections2;
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Maps;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.Test;
 
-import static org.assertj.core.api.Assertions.assertThat;
+import static com.datastax.driver.core.Assertions.assertThat;
+import static com.datastax.driver.core.TestUtils.nonDebouncingQueryOptions;
 
 import com.datastax.driver.core.policies.DelegatingLoadBalancingPolicy;
 import com.datastax.driver.core.policies.LoadBalancingPolicy;
@@ -111,6 +111,7 @@ public void should_reestablish_if_control_node_decommissioned() throws Interrupt
 
             cluster = Cluster.builder()
                     .addContactPoint(CCMBridge.ipOfNode(1))
+                    .withQueryOptions(nonDebouncingQueryOptions())
                     .build();
             cluster.init();
 
 
@@ -20,6 +20,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.annotations.AfterMethod;
+import org.testng.annotations.BeforeMethod;
 import org.testng.annotations.Test;
 
 
@@ -143,6 +144,14 @@ public void should_ignore_node_that_does_not_support_protocol_version_on_session
             .isNotReconnectingFromDown();
     }
 
+    @BeforeMethod(groups = "long")
+    public void clearFields() {
+        // Clear cluster and ccm instances between tests.
+        mainCluster = null;
+        mainCcm = null;
+        otherCcm = null;
+    }
+
     @AfterMethod(groups = "long")
     public void teardown() {
         if (mainCluster != null)
@@ -164,8 +173,8 @@ private static int countUpHosts(Cluster cluster) {
     }
 
     private static void waitForCountUpHosts(Cluster cluster, int expectedCount) throws InterruptedException {
-        int maxRetries = 30;
-        int interval = 10;
+        int maxRetries = 10;
+        int interval = 6;
 
         for (int i = 0; i <= maxRetries; i++) {
             int actualCount = countUpHosts(cluster);