diff --git a/p2p/peer_test.go b/p2p/peer_test.go
index 4551d2dba..7569f1281 100644
--- a/p2p/peer_test.go
+++ b/p2p/peer_test.go
@@ -4,6 +4,8 @@ import (
 	"fmt"
 	golog "log"
 	"net"
+	"reflect"
+	"sync"
 	"testing"
 	"time"
 
@@ -98,8 +100,12 @@ func createOutboundPeerAndPerformHandshake(
 	if err != nil {
 		return nil, err
 	}
+	mlc := &metricsLabelCache{
+		mtx:               &sync.RWMutex{},
+		messageLabelNames: make(map[reflect.Type]string),
+	}
 
-	p := newPeer(pc, mConfig, peerNodeInfo, reactorsByCh, msgTypeByChID, chDescs, func(p Peer, r interface{}) {})
+	p := newPeer(pc, mConfig, peerNodeInfo, reactorsByCh, msgTypeByChID, chDescs, func(p Peer, r interface{}) {}, mlc)
 	p.SetLogger(log.TestingLogger().With("peer", addr))
 	return p, nil
 }
diff --git a/p2p/pex/pex_reactor_test.go b/p2p/pex/pex_reactor_test.go
index 429624719..70e5e8c02 100644
--- a/p2p/pex/pex_reactor_test.go
+++ b/p2p/pex/pex_reactor_test.go
@@ -697,8 +697,7 @@ func TestPexVectors(t *testing.T) {
 	for _, tc := range testCases {
 		tc := tc
 
-		w, err := tc.msg.(p2p.Wrapper).Wrap()
-		require.NoError(t, err)
+		w := tc.msg.(p2p.Wrapper).Wrap()
 		bz, err := proto.Marshal(w)
 		require.NoError(t, err)
 
diff --git a/statesync/messages_test.go b/statesync/messages_test.go
index 18dcaf748..962e1cab1 100644
--- a/statesync/messages_test.go
+++ b/statesync/messages_test.go
@@ -100,8 +100,7 @@ func TestStateSyncVectors(t *testing.T) {
 
 	for _, tc := range testCases {
 		tc := tc
-		w, err := tc.msg.(p2p.Wrapper).Wrap()
-		require.NoError(t, err)
+		w := tc.msg.(p2p.Wrapper).Wrap()
 		bz, err := proto.Marshal(w)
 		require.NoError(t, err)