diff --git a/driver-core/src/test/java/com/datastax/driver/core/DnsEndpointTests.java b/driver-core/src/test/java/com/datastax/driver/core/DnsEndpointTest.java
similarity index 94%
rename from driver-core/src/test/java/com/datastax/driver/core/DnsEndpointTests.java
rename to driver-core/src/test/java/com/datastax/driver/core/DnsEndpointTest.java
index 869cfe5ef23..d87e5e0f096 100644
--- a/driver-core/src/test/java/com/datastax/driver/core/DnsEndpointTests.java
+++ b/driver-core/src/test/java/com/datastax/driver/core/DnsEndpointTest.java
@@ -7,11 +7,17 @@
 import java.util.List;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.testng.annotations.AfterClass;
 import org.testng.annotations.Test;
 
-public class DnsEndpointTests {
+public class DnsEndpointTest {
 
-  private static final Logger logger = LoggerFactory.getLogger(DnsEndpointTests.class);
+  private static final Logger logger = LoggerFactory.getLogger(DnsEndpointTest.class);
+
+  @AfterClass(alwaysRun = true)
+  public void clearMocks() {
+    MappedHostResolverProvider.unsetResolver();
+  }
 
   @Test(groups = "long")
   public void replace_cluster_test() {
diff --git a/driver-core/src/test/java/com/datastax/driver/core/MappedHostResolverProvider.java b/driver-core/src/test/java/com/datastax/driver/core/MappedHostResolverProvider.java
index 1bc4b1884ba..7bce7c61d5e 100644
--- a/driver-core/src/test/java/com/datastax/driver/core/MappedHostResolverProvider.java
+++ b/driver-core/src/test/java/com/datastax/driver/core/MappedHostResolverProvider.java
@@ -18,6 +18,15 @@ public static synchronized boolean setResolver(MappedHostResolver newResolver) {
     return true;
   }
 
+  public static synchronized boolean unsetResolver() {
+    if (resolver == null) {
+      return false;
+    }
+    resolver = null;
+    HostResolutionRequestInterceptor.INSTANCE.uninstall();
+    return true;
+  }
+
   public static synchronized void addResolverEntry(String hostname, String address) {
     if (resolver == null) {
       setResolver(new MappedHostResolver());