diff --git a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
index c6a2c3d0f7..81dbdad15c 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/manager/TestDistributedControllerManager.java
@@ -36,6 +36,7 @@
 import org.apache.helix.model.LiveInstance;
 import org.apache.helix.tools.ClusterStateVerifier;
 import org.apache.helix.tools.ClusterStateVerifier.BestPossAndExtViewZkVerifier;
+import org.apache.helix.tools.ClusterVerifiers.BestPossibleExternalViewVerifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.testng.Assert;
@@ -71,18 +72,19 @@ public void simpleIntegrationTest() throws Exception {
           new MockMSModelFactory());
       distributedControllers[i].connect();
     }
+    BestPossibleExternalViewVerifier verifier = new BestPossibleExternalViewVerifier
+        .Builder(clusterName).setZkAddress(ZK_ADDR).build();
 
-    boolean result = ClusterStateVerifier
-        .verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+    boolean result = verifier.verifyByZkCallback();
     Assert.assertTrue(result);
 
     // disconnect first distributed-controller, and verify second takes leadership
     distributedControllers[0].disconnect();
 
-    // verify leader changes to localhost_12919
     Thread.sleep(100);
-    result = ClusterStateVerifier
-        .verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+
+    // verify leader changes to localhost_12919
+    result = verifier.verifyByZkCallback();
     Assert.assertTrue(result);
 
     ZKHelixDataAccessor accessor =
@@ -120,8 +122,9 @@ private void expireController(ClusterDistributedController expireController,
     LOG.debug("Expired distributedController: " + expireController.getInstanceName()
         + ", oldSessionId: " + oldSessionId + ", newSessionId: " + newSessionId);
 
-    boolean result = ClusterStateVerifier.verifyByPolling(
-        new ClusterStateVerifier.BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+    BestPossibleExternalViewVerifier verifier = new BestPossibleExternalViewVerifier
+        .Builder(clusterName).setZkAddress(ZK_ADDR).build();
+    boolean result = verifier.verifyByPolling();
     Assert.assertTrue(result);
 
     // verify leader changes to localhost_12919
@@ -172,9 +175,9 @@ public void simpleSessionExpiryTest() throws Exception {
           new MockMSModelFactory());
       distributedControllers[i].connect();
     }
-
-    boolean result = ClusterStateVerifier
-        .verifyByZkCallback(new BestPossAndExtViewZkVerifier(ZK_ADDR, clusterName));
+    BestPossibleExternalViewVerifier verifier = new BestPossibleExternalViewVerifier
+        .Builder(clusterName).setZkAddress(ZK_ADDR).build();
+    boolean result = verifier.verifyByZkCallback();
     Assert.assertTrue(result);
 
     // expire localhost_12918