diff --git a/Capnp.Net.Runtime.Tests/TcpRpc.cs b/Capnp.Net.Runtime.Tests/TcpRpc.cs
index 1412600..fef274c 100644
--- a/Capnp.Net.Runtime.Tests/TcpRpc.cs
+++ b/Capnp.Net.Runtime.Tests/TcpRpc.cs
@@ -14,7 +14,7 @@ namespace Capnp.Net.Runtime.Tests
     [TestClass]
     public class TcpRpc
     {
-        public static int TcpPort = 33444;
+        public static int TcpPort = 49153;
 
         (TcpRpcServer, TcpRpcClient) SetupClientServerPair()
         {
diff --git a/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs b/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs
index b498e47..0ea2f24 100644
--- a/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs
+++ b/Capnp.Net.Runtime.Tests/TcpRpcInterop.cs
@@ -95,6 +95,15 @@ namespace Capnp.Net.Runtime.Tests
             Assert.AreEqual(expected, line.Result);
         }
 
+        [TestInitialize]
+        public void PrepareNextTest()
+        {
+            if (++TcpPort >= 65534)
+            {
+                TcpPort = 49152;
+            }
+        }
+
         [TestMethod, Timeout(10000)]
         public void BasicClient()
         {
@@ -980,7 +989,7 @@ namespace Capnp.Net.Runtime.Tests
             LaunchCompatTestProcess("server:MoreStuff", EmbargoErrorImpl);
         }
 
-        [TestMethod, Timeout(60000)]
+        [TestMethod, Timeout(120000)]
         public void RepeatedEmbargoError()
         {
             LaunchCompatTestProcess("server:MoreStuff", stdout =>
diff --git a/Capnp.Net.Runtime.Tests/TestBase.cs b/Capnp.Net.Runtime.Tests/TestBase.cs
index 8ce04a6..8d94055 100644
--- a/Capnp.Net.Runtime.Tests/TestBase.cs
+++ b/Capnp.Net.Runtime.Tests/TestBase.cs
@@ -13,11 +13,18 @@ namespace Capnp.Net.Runtime.Tests
 {
     public class TestBase
     {
-        public static int TcpPort = 33444;
+        public static int TcpPort = 49152;
         public static int MediumNonDbgTimeout => Debugger.IsAttached ? Timeout.Infinite : 5000;
         public static int LargeNonDbgTimeout => Debugger.IsAttached ? Timeout.Infinite : 10000;
         public static int ShortTimeout => 500;
 
+        public static int GetNextTcpPort()
+        {
+            if (++TcpPort == 65535)
+                TcpPort = 49152;
+            return TcpPort;
+        }
+
         protected ILogger Logger { get; set; }
 
         protected TcpRpcClient SetupClient() => new TcpRpcClient("localhost", TcpPort);
diff --git a/CapnpCompatTest/CapnpCompatTest.cpp b/CapnpCompatTest/CapnpCompatTest.cpp
index 352d28c..688dc65 100644
--- a/CapnpCompatTest/CapnpCompatTest.cpp
+++ b/CapnpCompatTest/CapnpCompatTest.cpp
@@ -1413,7 +1413,7 @@ int main(int argc, const char* argv[])
 			return 2;
 		}
 
-		capnp::EzRpcServer server(mainInterface, argv[2], 33444);
+		capnp::EzRpcServer server(mainInterface, argv[2], 0);
 		auto& waitScope = server.getWaitScope();
 
 		uint port = server.getPort().wait(waitScope);