diff --git a/util/testutil/peer.go b/util/testutil/peer.go
index e74e43c2b..82249f92b 100644
--- a/util/testutil/peer.go
+++ b/util/testutil/peer.go
@@ -1,6 +1,8 @@
 package testutil
 
 import (
+	"testing"
+
 	ma "github.com/jbenet/go-ipfs/Godeps/_workspace/src/github.com/jbenet/go-multiaddr"
 	ci "github.com/jbenet/go-ipfs/crypto"
 	peer "github.com/jbenet/go-ipfs/peer"
@@ -21,6 +23,14 @@ func RandPeer() (Peer, error) {
 	return &testpeer{*p}, nil
 }
 
+func RandPeerOrFatal(t *testing.T) Peer {
+	p, err := RandPeerNetParams()
+	if err != nil {
+		t.Fatal(err)
+	}
+	return &testpeer{*p}
+}
+
 // peer is a temporary shim to delay binding of PeerNetParams.
 type testpeer struct {
 	PeerNetParams