diff --git a/commonspace/requestmanager/requestmanager_test.go b/commonspace/requestmanager/requestmanager_test.go
index e57b615f..94134ce2 100644
--- a/commonspace/requestmanager/requestmanager_test.go
+++ b/commonspace/requestmanager/requestmanager_test.go
@@ -66,12 +66,14 @@ func TestRequestManager_SyncRequest(t *testing.T) {
 		defer fx.stop()
 
 		peerId := "PeerId"
+		peerCtx := peer.CtxWithPeerId(ctx, peerId)
 		peerMock := mock_peer.NewMockPeer(fx.ctrl)
 		conn := &drpcconn.Conn{}
 		msg := &spacesyncproto.ObjectSyncMessage{}
 		resp := &spacesyncproto.ObjectSyncMessage{}
 		fx.peerPoolMock.EXPECT().Get(ctx, peerId).Return(peerMock, nil)
 		fx.clientMock.EXPECT().ObjectSync(ctx, msg).Return(resp, nil)
+		peerMock.EXPECT().Context().Return(peerCtx).AnyTimes()
 		peerMock.EXPECT().DoDrpc(ctx, gomock.Any()).DoAndReturn(func(ctx context.Context, drpcHandler func(conn drpc.Conn) error) {
 			drpcHandler(conn)
 		}).Return(nil)
@@ -86,12 +88,14 @@ func TestRequestManager_SyncRequest(t *testing.T) {
 		ctx = fx.requestManager.ctx
 
 		peerId := "PeerId"
+		peerCtx := peer.CtxWithPeerId(ctx, peerId)
 		peerMock := mock_peer.NewMockPeer(fx.ctrl)
 		conn := &drpcconn.Conn{}
 		msg := &spacesyncproto.ObjectSyncMessage{}
 		resp := &spacesyncproto.ObjectSyncMessage{}
 		fx.peerPoolMock.EXPECT().Get(ctx, peerId).Return(peerMock, nil)
 		fx.clientMock.EXPECT().ObjectSync(ctx, msg).Return(resp, nil)
+		peerMock.EXPECT().Context().Return(peerCtx).AnyTimes()
 		peerMock.EXPECT().DoDrpc(ctx, gomock.Any()).DoAndReturn(func(ctx context.Context, drpcHandler func(conn drpc.Conn) error) {
 			drpcHandler(conn)
 		}).Return(nil)
diff --git a/net/peer/context_test.go b/net/peer/context_test.go
new file mode 100644
index 00000000..d0a4919e
--- /dev/null
+++ b/net/peer/context_test.go
@@ -0,0 +1,14 @@
+package peer
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestCtxProtoVersion(t *testing.T) {
+	ctx := CtxWithProtoVersion(ctx, 1)
+	ver, err := CtxProtoVersion(ctx)
+	require.NoError(t, err)
+	require.Equal(t, uint32(1), ver)
+}