diff --git a/tests/flows/teleporter_registry.go b/tests/flows/teleporter_registry.go
index b7019db47..71e81340a 100644
--- a/tests/flows/teleporter_registry.go
+++ b/tests/flows/teleporter_registry.go
@@ -140,7 +140,7 @@ func TeleporterRegistry(network interfaces.LocalNetwork) {
 		false,
 	)
 
-	// Update the subnets to use new Teleporter messengers
+	// Manually update the subnets to use new Teleporter messengers.
 	network.SetTeleporterContractAddress(newTeleporterAddress)
 	cChainInfo = network.GetPrimaryNetworkInfo()
 	subnetAInfo, subnetBInfo = utils.GetTwoSubnets(network)
diff --git a/tests/local/e2e_test.go b/tests/local/e2e_test.go
index bec22d677..e07efaa36 100644
--- a/tests/local/e2e_test.go
+++ b/tests/local/e2e_test.go
@@ -165,7 +165,7 @@ var _ = ginkgo.Describe("[Teleporter integration tests]", func() {
 		func() {
 			flows.RelayerModifiesMessage(LocalNetworkInstance)
 		})
-	ginkgo.It("Teleporter registry",
+	ginkgo.FIt("Teleporter registry",
 		ginkgo.Label(upgradeabilityLabel),
 		func() {
 			flows.TeleporterRegistry(LocalNetworkInstance)
diff --git a/tests/local/network.go b/tests/local/network.go
index ad954551e..a16481863 100644
--- a/tests/local/network.go
+++ b/tests/local/network.go
@@ -7,6 +7,7 @@ import (
 	"math/big"
 	"os"
 	"slices"
+	"sort"
 	"time"
 
 	"github.com/ava-labs/avalanchego/api/info"
@@ -44,7 +45,7 @@ type LocalNetwork struct {
 	primaryNetworkInfo        *interfaces.SubnetTestInfo
 	subnetsInfo               map[ids.ID]*interfaces.SubnetTestInfo
 
-	extraNodes []*tmpnet.Node // to add as more subnet vaidators in the tests
+	extraNodes []*tmpnet.Node // to add as more subnet validators in the tests
 
 	globalFundedKey *ecdsa.PrivateKey
 
@@ -339,11 +340,15 @@ func (n *LocalNetwork) DeployTeleporterRegistryContracts(
 	log.Info("Deployed TeleporterRegistry contracts to all subnets")
 }
 
+// Returns all subnet info sorted in lexicographic order of SubnetName.
 func (n *LocalNetwork) GetSubnetsInfo() []interfaces.SubnetTestInfo {
 	subnetsInfo := make([]interfaces.SubnetTestInfo, 0, len(n.subnetsInfo))
 	for _, subnetInfo := range n.subnetsInfo {
 		subnetsInfo = append(subnetsInfo, *subnetInfo)
 	}
+	sort.Slice(subnetsInfo, func(i, j int) bool {
+		return subnetsInfo[i].SubnetName < subnetsInfo[j].SubnetName
+	})
 	return subnetsInfo
 }
 
@@ -438,7 +443,7 @@ func (n *LocalNetwork) setAllSubnetValues() {
 	for _, subnetInfo := range n.subnetsInfo {
 		subnet := n.tmpnet.GetSubnet(subnetInfo.SubnetName)
 		Expect(subnet).ShouldNot(BeNil())
-		n.setSubnetValues(n.tmpnet.GetSubnet(subnetInfo.SubnetName))
+		n.setSubnetValues(subnet)
 	}
 
 	n.setPrimaryNetworkValues()