diff --git a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
index 8948f4d377..02aa47be80 100644
--- a/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
+++ b/curator-test/src/main/java/org/apache/curator/test/InstanceSpec.java
@@ -206,6 +206,10 @@ public int getQuorumPort()
         return quorumPort;
     }
 
+    /**
+     * @deprecated use {@link TestingServer#getConnectString()} or {@link TestingCluster#getConnectString()} instead
+     */
+    @Deprecated
     public String getConnectString()
     {
         return hostname + ":" + port;
diff --git a/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java b/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
index fbfe8646b2..ce5cb88731 100644
--- a/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
+++ b/curator-test/src/main/java/org/apache/curator/test/QuorumConfigBuilder.java
@@ -95,7 +95,12 @@ public void close()
         }
     }
 
-    public QuorumPeerConfig buildConfig(int instanceIndex) throws Exception
+    public QuorumPeerConfig buildConfig(int instanceIndex) throws Exception {
+        InstanceSpec spec = instanceSpecs.get(instanceIndex);
+        return buildConfig(instanceIndex, spec.getPort());
+    }
+
+    QuorumPeerConfig buildConfig(int instanceIndex, int instancePort) throws Exception
     {
         boolean isCluster = (instanceSpecs.size() > 1);
         InstanceSpec spec = instanceSpecs.get(instanceIndex);
@@ -109,7 +114,7 @@ public QuorumPeerConfig buildConfig(int instanceIndex) throws Exception
         properties.setProperty("initLimit", "10");
         properties.setProperty("syncLimit", "5");
         properties.setProperty("dataDir", spec.getDataDirectory().getCanonicalPath());
-        properties.setProperty("clientPort", Integer.toString(spec.getPort()));
+        properties.setProperty("clientPort", Integer.toString(instancePort));
         String tickTime = Integer.toString((spec.getTickTime() >= 0) ? spec.getTickTime() : new Timing2().tickTime());
         properties.setProperty("tickTime", tickTime);
         properties.setProperty("minSessionTimeout", tickTime);
@@ -123,7 +128,8 @@ public QuorumPeerConfig buildConfig(int instanceIndex) throws Exception
         {
             for ( InstanceSpec thisSpec : instanceSpecs )
             {
-                properties.setProperty("server." + thisSpec.getServerId(), String.format("%s:%d:%d;%s:%d", thisSpec.getHostname(), thisSpec.getQuorumPort(), thisSpec.getElectionPort(), thisSpec.getHostname(), thisSpec.getPort()));
+                int clientPort = thisSpec == spec ? instancePort : thisSpec.getPort();
+                properties.setProperty("server." + thisSpec.getServerId(), String.format("%s:%d:%d;%s:%d", thisSpec.getHostname(), thisSpec.getQuorumPort(), thisSpec.getElectionPort(), thisSpec.getHostname(), clientPort));
             }
         }
         Map<String,Object> customProperties = spec.getCustomProperties();
diff --git a/curator-test/src/main/java/org/apache/curator/test/TestingServer.java b/curator-test/src/main/java/org/apache/curator/test/TestingServer.java
index 5228c8e837..788746138b 100644
--- a/curator-test/src/main/java/org/apache/curator/test/TestingServer.java
+++ b/curator-test/src/main/java/org/apache/curator/test/TestingServer.java
@@ -97,7 +97,7 @@ public TestingServer(int port, File tempDirectory) throws Exception
      */
     public TestingServer(int port, File tempDirectory, boolean start) throws Exception
     {
-        this(new InstanceSpec(tempDirectory, port, -1, -1, true, -1), start);
+        this(new InstanceSpec(tempDirectory, Math.max(0, port), -1, -1, true, -1), start);
     }
 
     /**
@@ -119,13 +119,18 @@ public TestingServer(InstanceSpec spec, boolean start) throws Exception
     }
 
     /**
-     * Return the port being used
+     * Return the port being used or will be used.
      *
+     * @apiNote the port will be 0 if server is not started and {@link InstanceSpec#getPort()} is 0
      * @return port
      */
     public int getPort()
     {
-        return spec.getPort();
+        int port = spec.getPort();
+        if (port > 0) {
+            return port;
+        }
+        return testingZooKeeperServer.getLocalPort();
     }
 
     /**
@@ -181,10 +186,10 @@ public void close() throws IOException
     /**
      * Returns the connection string to use
      *
+     * @apiNote the connection string will have port 0 if server is not started and {@link InstanceSpec#getPort()} is 0
      * @return connection string
      */
-    public String getConnectString()
-    {
-        return spec.getConnectString();
+    public String getConnectString() {
+        return spec.getHostname() + ":" + getPort();
     }
 }
\ No newline at end of file
diff --git a/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java b/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
index cdf59d07be..0469a2ceb0 100644
--- a/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
+++ b/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperMain.java
@@ -74,6 +74,10 @@ public class TestingZooKeeperMain implements ZooKeeperMainFace
         MAX_WAIT_MS = Math.max((int)elapsed * 2, 1000);
     }
 
+    ServerCnxnFactory getCnxnFactory() {
+        return cnxnFactory;
+    }
+
     @Override
     public void kill()
     {
diff --git a/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperServer.java b/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperServer.java
index 58cf8d4e20..d7010708ec 100644
--- a/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperServer.java
+++ b/curator-test/src/main/java/org/apache/curator/test/TestingZooKeeperServer.java
@@ -19,6 +19,7 @@
 
 package org.apache.curator.test;
 
+import org.apache.zookeeper.server.ServerCnxnFactory;
 import org.apache.zookeeper.server.quorum.QuorumPeer;
 import org.apache.zookeeper.server.quorum.QuorumPeerConfig;
 import org.slf4j.Logger;
@@ -39,6 +40,7 @@ public class TestingZooKeeperServer implements Closeable
     private final int thisInstanceIndex;
     private volatile ZooKeeperMainFace main;
     private final AtomicReference<State> state = new AtomicReference<State>(State.LATENT);
+    private int thisInstancePort;
 
     private enum State
     {
@@ -56,6 +58,7 @@ public TestingZooKeeperServer(QuorumConfigBuilder configBuilder, int thisInstanc
 
         this.configBuilder = configBuilder;
         this.thisInstanceIndex = thisInstanceIndex;
+        this.thisInstancePort = configBuilder.getInstanceSpec(thisInstanceIndex).getPort();
         main = isCluster() ? new TestingQuorumPeerMain() : new TestingZooKeeperMain();
     }
 
@@ -154,7 +157,7 @@ public void run()
             {
                 try
                 {
-                    QuorumPeerConfig config = configBuilder.buildConfig(thisInstanceIndex);
+                    QuorumPeerConfig config = configBuilder.buildConfig(thisInstanceIndex, thisInstancePort);
                     main.runFromConfig(config);
                 }
                 catch ( Exception e )
@@ -165,5 +168,16 @@ public void run()
         }).start();
 
         main.blockUntilStarted();
+
+        // Save bind port across restart.
+        if (thisInstancePort == 0 && !isCluster()) {
+            TestingZooKeeperMain serverMain = (TestingZooKeeperMain) main;
+            ServerCnxnFactory cnxnFactory = serverMain.getCnxnFactory();
+            thisInstancePort = cnxnFactory.getLocalPort();
+        }
+    }
+
+    public int getLocalPort() {
+        return thisInstancePort;
     }
 }
\ No newline at end of file