diff --git a/p2p/net/mock/mock_net.go b/p2p/net/mock/mock_net.go
index 9242cea5..2e34d3f7 100644
--- a/p2p/net/mock/mock_net.go
+++ b/p2p/net/mock/mock_net.go
@@ -3,6 +3,7 @@ package mocknet
 import (
 	"context"
 	"fmt"
+	"net"
 	"sort"
 	"sync"
 
@@ -17,10 +18,13 @@ import (
 	peer "github.com/libp2p/go-libp2p-peer"
 	pstore "github.com/libp2p/go-libp2p-peerstore"
 	pstoremem "github.com/libp2p/go-libp2p-peerstore/pstoremem"
-	testutil "github.com/libp2p/go-testutil"
 	ma "github.com/multiformats/go-multiaddr"
 )
 
+// IP6 range that gets blackholed (in case our traffic ever makes it out onto
+// the internet).
+var blackholeIP6 = net.ParseIP("100::")
+
 // mocknet implements mocknet.Mocknet
 type mocknet struct {
 	nets  map[peer.ID]*peernet
@@ -54,8 +58,20 @@ func (mn *mocknet) GenPeer() (host.Host, error) {
 	if err != nil {
 		return nil, err
 	}
-
-	a := testutil.RandLocalTCPAddress()
+	id, err := peer.IDFromPrivateKey(sk)
+	if err != nil {
+		return nil, err
+	}
+	suffix := id
+	if len(id) > 8 {
+		suffix = id[len(id)-8:]
+	}
+	ip := append(net.IP{}, blackholeIP6...)
+	copy(ip[net.IPv6len-len(suffix):], suffix)
+	a, err := ma.NewMultiaddr(fmt.Sprintf("/ip6/%s/tcp/4242", ip))
+	if err != nil {
+		return nil, fmt.Errorf("failed to create test multiaddr: %s", err)
+	}
 
 	h, err := mn.AddPeer(sk, a)
 	if err != nil {
diff --git a/p2p/net/mock/mock_test.go b/p2p/net/mock/mock_test.go
index d22294c8..0f888a70 100644
--- a/p2p/net/mock/mock_test.go
+++ b/p2p/net/mock/mock_test.go
@@ -582,6 +582,14 @@ func TestLimitedStreams(t *testing.T) {
 		t.Fatal("Expected 2ish seconds but got ", time.Since(before))
 	}
 }
+func TestFuzzManyPeers(t *testing.T) {
+	for i := 0; i < 50000; i++ {
+		_, err := FullMeshConnected(context.Background(), 2)
+		if err != nil {
+			t.Fatal(err)
+		}
+	}
+}
 
 func TestStreamsWithLatency(t *testing.T) {
 	latency := time.Millisecond * 500