diff --git a/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java b/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
index 1cd542f5c7a..fadc150079a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/AbstractZkTestCase.java
@@ -102,7 +102,7 @@ public abstract class AbstractZkTestCase extends SolrTestCaseJ4 {
   private static void putConfig(SolrZkClient zkClient, final String name)
       throws Exception {
     zkClient.makePath("/configs/conf1/" + name, getFile("solr"
-        + File.separator + "conf" + File.separator + name), false, false);  
+        + File.separator + "conf" + File.separator + name), false, true);  
   }
 
   @Override
diff --git a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
index d5c6bee8971..b352f365863 100644
--- a/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/LeaderElectionIntegrationTest.java
@@ -100,7 +100,7 @@ public class LeaderElectionIntegrationTest extends SolrTestCaseJ4 {
         AbstractZkTestCase.TIMEOUT);
     
     reader = new ZkStateReader(zkClient); 
-
+    reader.createClusterStateWatchersAndUpdate();
     log.info("####SETUP_END " + getName());
     
   }
@@ -217,7 +217,6 @@ public class LeaderElectionIntegrationTest extends SolrTestCaseJ4 {
   
   private String getLeader() throws InterruptedException, KeeperException {
     
-    reader.updateCloudState(true);
     ZkNodeProps props = reader.getLeaderProps("collection1", "shard1", 30000);
     String leader = props.get(ZkStateReader.NODE_NAME_PROP);