diff --git a/src/test/java/org/sdnplatform/sync/internal/BootstrapTest.java b/src/test/java/org/sdnplatform/sync/internal/BootstrapTest.java
index 378333a6d8ad270120874f821cb9dfc1f2963f49..0bd1764f7290728602cf430c2d15fbe9733687f6 100644
--- a/src/test/java/org/sdnplatform/sync/internal/BootstrapTest.java
+++ b/src/test/java/org/sdnplatform/sync/internal/BootstrapTest.java
@@ -70,10 +70,6 @@ public class BootstrapTest {
                     new File(dbFolder.getRoot(), 
                              "server" + i).getAbsolutePath();
             fmc.addConfigParam(syncManager, "dbPath", dbPath);
-            /*fmc.addConfigParam(syncManager, "keystorePath", keyStorePath);
-            fmc.addConfigParam(syncManager, "keystorePassword", keyStorePassword);
-            fmc.addConfigParam(syncManager, "authScheme", dbPath);
-            fmc.addConfigParam(syncManager, "port", dbPath);*/
 
             tp.init(fmc);
             syncManager.init(fmc);
@@ -114,7 +110,7 @@ public class BootstrapTest {
             unsyncStore.put("seeds", curSeed);
 
             waitForValue(unsyncStore, "localNodeId", null, 
-                         3000, "unsyncStore" + i);
+                         10000, "unsyncStore" + i);
             short nodeId = 
                     Short.parseShort(unsyncStore.getValue("localNodeId"));
             Node node = nodeStore.getValue(nodeId);