diff --git a/test/benchmark_utils.go b/test/benchmark_utils.go
index b6d096c..714bf0d 100644
--- a/test/benchmark_utils.go
+++ b/test/benchmark_utils.go
@@ -2,45 +2,33 @@ package test
 
 import (
 	"context"
-	cr "crypto/rand"
 	"fmt"
 	"testing"
 
-	"github.com/mr-tron/base58/base58"
+	"github.com/libp2p/go-libp2p-peer"
+	pt "github.com/libp2p/go-libp2p-peer/test"
 	ma "github.com/multiformats/go-multiaddr"
-	mh "github.com/multiformats/go-multihash"
 )
 
 type peerpair struct {
-	ID   string
+	ID   peer.ID
 	Addr ma.Multiaddr
 }
 
 func randomPeer(b *testing.B) *peerpair {
-	buf := make([]byte, 50)
+	var pid peer.ID
+	var err error
+	var addr ma.Multiaddr
 
-	for {
-		n, err := cr.Read(buf)
-		if err != nil {
-			b.Fatal(err)
-		}
-		if n > 0 {
-			break
-		}
-	}
-
-	id, err := mh.Encode(buf, mh.SHA2_256)
-	if err != nil {
-		b.Fatal(err)
-	}
-	b58ID := base58.Encode(id)
-
-	addr, err := ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/6666/ipfs/%s", b58ID))
-	if err != nil {
+	if pid, err = pt.RandPeerID(); err != nil {
 		b.Fatal(err)
 	}
 
-	return &peerpair{b58ID, addr}
+	if addr, err = ma.NewMultiaddr(fmt.Sprintf("/ip4/127.0.0.1/tcp/6666/ipfs/%s", pid.Pretty())); err != nil {
+		b.Fatal(err)
+	}
+
+	return &peerpair{pid, addr}
 }
 
 func addressProducer(ctx context.Context, b *testing.B, addrs chan *peerpair) {
diff --git a/test/peerstore_suite.go b/test/peerstore_suite.go
index 5317a49..eac6aad 100644
--- a/test/peerstore_suite.go
+++ b/test/peerstore_suite.go
@@ -299,8 +299,7 @@ func benchmarkPeerstore(ps pstore.Peerstore) func(*testing.B) {
 		b.ResetTimer()
 		for i := 0; i < b.N; i++ {
 			pp := <-addrs
-			pid := peer.ID(pp.ID)
-			ps.AddAddr(pid, pp.Addr, pstore.PermanentAddrTTL)
+			ps.AddAddr(pp.ID, pp.Addr, pstore.PermanentAddrTTL)
 		}
 		cancel()
 	}
diff --git a/test/test_utils.go b/test/test_utils.go
index 0b308a7..d94f640 100644
--- a/test/test_utils.go
+++ b/test/test_utils.go
@@ -23,4 +23,4 @@ func multiaddr(t *testing.T, m string) ma.Multiaddr {
 		t.Fatal(err)
 	}
 	return maddr
-}
\ No newline at end of file
+}