diff --git a/test/e2e/pkg/infrastructure.go b/test/e2e/pkg/infrastructure.go
index 22f8e9ae0cf..e91a5691ed0 100644
--- a/test/e2e/pkg/infrastructure.go
+++ b/test/e2e/pkg/infrastructure.go
@@ -39,9 +39,11 @@ type InfrastructureData struct {
 // InstanceData contains the relevant information for a machine instance backing
 // one of the nodes in the testnet.
 type InstanceData struct {
-	IPAddress    net.IP `json:"ip_address"`
-	ExtIPAddress net.IP `json:"ext_ip_address"`
-	Port         uint32 `json:"port"`
+	IPAddress          net.IP `json:"ip_address"`
+	ExtIPAddress       net.IP `json:"ext_ip_address"`
+	RPCPort            uint32 `json:"rpc_port"`
+	GRPCPort           uint32 `json:"grpc_port"`
+	PrivilegedGRPCPort uint32 `json:"privileged_grpc_port"`
 }
 
 func sortNodeNames(m Manifest) []string {
@@ -74,9 +76,11 @@ func NewDockerInfrastructureData(m Manifest) (InfrastructureData, error) {
 	localHostIP := net.ParseIP("127.0.0.1")
 	for _, name := range sortNodeNames(m) {
 		ifd.Instances[name] = InstanceData{
-			IPAddress:    ipGen.Next(),
-			ExtIPAddress: localHostIP,
-			Port:         portGen.Next(),
+			IPAddress:          ipGen.Next(),
+			ExtIPAddress:       localHostIP,
+			RPCPort:            portGen.Next(),
+			GRPCPort:           portGen.Next(),
+			PrivilegedGRPCPort: portGen.Next(),
 		}
 
 	}
diff --git a/test/e2e/pkg/testnet.go b/test/e2e/pkg/testnet.go
index 9fe417ac736..fc1a42c0a3d 100644
--- a/test/e2e/pkg/testnet.go
+++ b/test/e2e/pkg/testnet.go
@@ -148,7 +148,6 @@ func NewTestnetFromManifest(manifest Manifest, file string, ifd InfrastructureDa
 	dir := strings.TrimSuffix(file, filepath.Ext(file))
 
 	keyGen := newKeyGenerator(randomSeed)
-	proxyPortGen := newPortGenerator(proxyPortFirst)
 	prometheusProxyPortGen := newPortGenerator(prometheusProxyPortFirst)
 	_, ipNet, err := net.ParseCIDR(ifd.Network)
 	if err != nil {
@@ -230,9 +229,9 @@ func NewTestnetFromManifest(manifest Manifest, file string, ifd InfrastructureDa
 			NodeKey:                 keyGen.Generate("ed25519"),
 			InternalIP:              ind.IPAddress,
 			ExternalIP:              extIP,
-			RPCProxyPort:            proxyPortGen.Next(),
-			GRPCProxyPort:           proxyPortGen.Next(),
-			GRPCPrivilegedProxyPort: proxyPortGen.Next(),
+			RPCProxyPort:            ind.RPCPort,
+			GRPCProxyPort:           ind.GRPCPort,
+			GRPCPrivilegedProxyPort: ind.PrivilegedGRPCPort,
 			Mode:                    ModeValidator,
 			Database:                "goleveldb",
 			ABCIProtocol:            Protocol(testnet.ABCIProtocol),